gentoo auto-resync : 17:03:2023 - 18:28:08

author: V3n3RiX <venerix@koprulu.sector> 2023-03-17 18:28:08 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-03-17 18:28:08 +0000
commit: 1f254b1ee917690b4f8f7738fdcfc295ee304ff7 (patch)
tree: 136ad1b72b899873af1ab7e8fcc6ec343484f41f
parent: bcf596975a1c2450e077c80c84017c54198f216c (diff)
1200 files changed, 6365 insertions, 9541 deletions
diff --git a/Manifest b/Manifest
index c1b7c813a9a5..3453c078b157 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29471 BLAKE2B 97020182559352fcabecae079adc7f73da5dc97bde1e18a109cdc87361b1769e43bb7c67b542305507bb77c25377a69ee24b69f3301bece4342ebdadcadad38a SHA512 f02cced8077ffc1db301d6999c0871f4f969e2f33ed5b504a42f6bc3ada1631a31ffbc9f26adebff2602760a8bd0aca6cf5de595a88d62d20d291c755b63aebb
-TIMESTAMP 2023-03-17T12:09:48Z
+MANIFEST Manifest.files.gz 29481 BLAKE2B eed699bddd433ebfcca51e204a0599d3e5bada1517eef36446b68b13ba71784c13c7d861befa5ee9659839589213d13eeefd3ef34ca133277950dcbe5241cfe9 SHA512 01e3546aac2e9619056dac54eeca3a449895d84393988862c98bbf1c508c3fa5f772a3c59ed0a1d756d0025fbad88f9fd5fff58ff84d7f3f3c54db93fd9ecbff
+TIMESTAMP 2023-03-17T18:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQUWIxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQUrPNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDa5g//emiPCpvxxko2eUXJBGbvWlwbFRgedMFpF+5Bgv5wRvxascJaOswejm3A
-aAje+aPXC28bzTsoxeIthGR2OuBCTUMerL6cmVGoAA/WgFHqSQ0jyrQwmXOsE9yt
-4lkyiRm6pCpCBW3YUMhGhVx6LQ2pyyOjwfgf7Gqvhz9jyC5IPjoEfTbYsceX36gu
-xfDSqU1JaJYBCcmMqNtQWf88WQjh8P8HdzsGmxwAMDla88Ylt08eJQur5XCyoc1a
-Xf1tH+PKjDPNzgkOboJ64X3jxtFjT6kcuE0m1JydzfQe9KSET+zGAV1Hq9SqorQ8
-MqHLejnuhHzKyu1Y9ASQuPmzehh3NaUnF38PS1oRCrdzF0xoUye/JOb1VrHJ8kB8
-QmlinZvQJLGUNqPkARd55O7qAqBXzTp56Oe2ysJXz+YezCU6irQ8KQNqhxxj2LJh
-xusjq5exdKBknHbC1L65406HZhJmwbRVrQbU05B5W0a4o4e1CN1zIHVRsiOp3ifi
-PtBDGDDUqJJOblIONJDAAPpAIfTTNwVS8HWvlxH3ewISBUdjcehdheHdFahGJU+M
-iK+crkt3MoUuK44+Qwv8ko9wWbNDlj1UIznWEBmjyfJ5WjvpmnnfsxU3rHK/otYd
-wuTOyy2X4YspeqNWT5VJ4V62E43jxx+tfDwORSImx/BjnSd0h2I=
-=OIYu
+klDXhxAAjpEL/gXwZH0tST4K+IukIQPbfQ8kiuCPPin1tJdSNIqOaQuBf7IbPWuR
+Uq/rq8MA++lhH+JuhBl4DuOcAsi2zfL5FaHoXjXEZScaBNsALIV5WnDnLBD7/ADR
+foFu86IlPHSvP5YVAN5R6ihCzbReT1ADlhHOaqfyPVumbQnnqppPaNjukpIAozUY
+uvAwUw0TBrqhIu9ozpure6MSa1JSxNqzur6rcW04s7cz5hW1hCLx0vKrq+2q5e9b
+jyXgJHZ6xxzTRlzcI8j1I5lxhN0WiIpalwRoRi9ltZKCfxfSXVLtCcTL6mGTisOO
+LSWC6nop8oqz28xamErGzRGWtVprIZ8bxSOlGkS0nTOdWSs6WCPL2n66YT6vdmBx
+ge8vkDhoVMHFUwRpRArO1mW5ckVuONNU65FjTxkxTOC05cfjWyNKuFwyQhAIJF0L
+3a7tmn8lJKqySNu/IPq7RiegBKDtN3njZw9ykq0l44dUy35BA/HWp0grVWCDtMza
+BsHw3/zlQq9/oKFbtFmUF5eHWOPJYbJ4yBYSJhbWhHKIDDYOt65B+Nbt13YXtVK8
+MMPohIQZwSJQN2rkpgRshp5A8/iAunGdizEWzLIItfKveQxHpJDNkNtJA0lVUmk5
+x0i804+eHxoZG4Auir6gx0pey3CMXFIuDv7ahLIVpl77vs1WOsc=
+=kwwW
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 59ecb3a8886e..d5c93727c105 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f506b85a25a8..4f3bbf411a8b 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index 7acda3a67039..5affc823a416 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -7,6 +7,6 @@ EBUILD ansible-core-2.12.10.ebuild 1561 BLAKE2B ede6d8a22f1cbbf48bb142a2eb2f15f9
 EBUILD ansible-core-2.13.7.ebuild 1325 BLAKE2B ca6bdb1f2b9eb14c94a4e443f02751f41e1ddf9eaec7e46ed91ebfb2fc9a77ed3d4d9bfef2bc9fd92e9ec6fe707a4854ddb0fdfd457d8859a5dd48da4783313e SHA512 380e6c95b884d493f0de5a6a721a2fbe02bc5ac99b9de8e8a2b7be901c9510b5d7f9f876352a2ff0fe553da03d50d5e55275135a899cc3f7a8e88e1bd8db714c
 EBUILD ansible-core-2.13.8.ebuild 1328 BLAKE2B 80846b2634fa068a5194947e74fba62825738df1de99e890b1923ede0fc33594e3f6d4fadcdddcfb44e73b27671f17698c9062f8cefe008d01603d14cb1e5038 SHA512 bc4a5ce71b0bc318652216ff7a147ffcb78cf0221de26fadc5d1d4ad9bf617252485f0f0e61903d508cf4ee025b647f6003b38461ff9a5845cd9477dc8fb6bb3
 EBUILD ansible-core-2.14.2.ebuild 1325 BLAKE2B ca6bdb1f2b9eb14c94a4e443f02751f41e1ddf9eaec7e46ed91ebfb2fc9a77ed3d4d9bfef2bc9fd92e9ec6fe707a4854ddb0fdfd457d8859a5dd48da4783313e SHA512 380e6c95b884d493f0de5a6a721a2fbe02bc5ac99b9de8e8a2b7be901c9510b5d7f9f876352a2ff0fe553da03d50d5e55275135a899cc3f7a8e88e1bd8db714c
-EBUILD ansible-core-2.14.3.ebuild 1328 BLAKE2B 80846b2634fa068a5194947e74fba62825738df1de99e890b1923ede0fc33594e3f6d4fadcdddcfb44e73b27671f17698c9062f8cefe008d01603d14cb1e5038 SHA512 bc4a5ce71b0bc318652216ff7a147ffcb78cf0221de26fadc5d1d4ad9bf617252485f0f0e61903d508cf4ee025b647f6003b38461ff9a5845cd9477dc8fb6bb3
-EBUILD ansible-core-9999.ebuild 1570 BLAKE2B be1cec89cbfd906deea937ce4f8d0ec7cab913bf36cc727caee509686dc67a9176ef704819a1f714e5f55c035e4420d11f7520ee848366c22111d99e5c6ce939 SHA512 a3c9abeadd37539fe23959db4b784d985ff29a45623896a0943dad5cf1469f2830feeab9bc74234e11c2b6196ffc68aba20b7a476c578b6ae5a5d0a53afaca50
+EBUILD ansible-core-2.14.3.ebuild 1309 BLAKE2B f3adc97a33c27b02a57ffa48d078f19368f12e659fd5c9e27b101df8018931866b6885c7312ffea16fab79f7657fa0558f0c0d6bbc8fb978366c7a42ad83dddc SHA512 dc7eb766d7e3cb23400df9fd194bd5745cec05d73869ea900378d4ef1495e5722d96188cd8f1ff44d53df2759a8738c7d50584a71f0b8a7de5f1e981b34c9cd4
+EBUILD ansible-core-9999.ebuild 1309 BLAKE2B f3adc97a33c27b02a57ffa48d078f19368f12e659fd5c9e27b101df8018931866b6885c7312ffea16fab79f7657fa0558f0c0d6bbc8fb978366c7a42ad83dddc SHA512 dc7eb766d7e3cb23400df9fd194bd5745cec05d73869ea900378d4ef1495e5722d96188cd8f1ff44d53df2759a8738c7d50584a71f0b8a7de5f1e981b34c9cd4
 MISC metadata.xml 1042 BLAKE2B bf5f9a6d7f2b7a0465332ce47a343566749ac3e6b8c29d37c21140c69e56a3c58ba2bc6335b6839da43993dc427a12350506dc55b0f727856f16b173c0df90a4 SHA512 4adc7776bc6f02d91f2229ea96566e94b1e8155f75bac27d7391f87d6fc3100da425235f2c02dccd1ce7534abc9c30be0ab5a15ec9dc4278463f10dcf95e8b4d
diff --git a/app-admin/ansible-core/ansible-core-2.14.3.ebuild b/app-admin/ansible-core/ansible-core-2.14.3.ebuild
index 84f6bffd432f..e9f5858cfb36 100644
--- a/app-admin/ansible-core/ansible-core-2.14.3.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.14.3.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
+PYPI_NO_NORMALIZE=1
 
 inherit distutils-r1
 
@@ -16,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 fi
 
diff --git a/app-admin/ansible-core/ansible-core-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild
index 1cec22f8239c..e9f5858cfb36 100644
--- a/app-admin/ansible-core/ansible-core-9999.ebuild
+++ b/app-admin/ansible-core/ansible-core-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
+PYPI_NO_NORMALIZE=1
 
 inherit distutils-r1
 
@@ -16,13 +17,12 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="test"
 RESTRICT="test"
 
 RDEPEND="
@@ -35,27 +35,20 @@ RDEPEND="
 	dev-python/netaddr[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
 "
-DEPEND="
+BDEPEND="
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	test? (
-		${RDEPEND}
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
+		dev-python/botocore[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
 	)"
 
+distutils_enable_tests pytest
+
 python_compile() {
 	export ANSIBLE_SKIP_CONFLICT_CHECK=1
 	distutils-r1_python_compile
 }
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index ddacee5e3d8a..0c4eb389f6de 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,25 +1,7 @@
-DIST aws-cli-1.27.74.gh.tar.gz 2368706 BLAKE2B 3eb9d8c21b9ddfd3a3e4bb53172a46ad69ca71033785bd29fd8b0b0f694c2ed62a4cad998ccd13b07949b86a89f2ca238a63a4553e591ba9066832f51ed87759 SHA512 cf61a3f1dd643bb7d0f81f047c1eeae78a7793532bffa612045273c46ae970b2763156a7679b6e16e65c2f886dec68e54db0169580bb3c37cc08420f874e704c
-DIST aws-cli-1.27.79.gh.tar.gz 2376690 BLAKE2B 8e55d3607b805ebc5673c682731483f0fd6eb77a6cc972d58ce3219c33f9f2054529df6ab46fc85b39849871580cea03c4d7f490c4386cd5ce9d222ecb3c8eda SHA512 fd8b880b6358c50ed189fac538d91ef88d762b8c382da1b57bb086a316f7ee96fa33206a53f3eae2df98df175929c819b855c7ff5b7e5f84c73ecff88f297c79
 DIST aws-cli-1.27.84.gh.tar.gz 2378573 BLAKE2B b85d7eeb22b0a2a9264b49a27f2e3d3da9d35dbc44de205521c39522fcec31948ef8b67dfc3ce919b772ba85fa59cfc5a4d69e3c67aadd9cbb029da883ad699e SHA512 1d31d1b800b0795a8473af0dc334feb69f62d2fd8fcb88e0e4e7e4068435f6f37792d2c9382ec1b0c6b074d5eca09142e52f6e36c472145df9d57db2cc4ee078
-DIST aws-cli-1.27.85.gh.tar.gz 2378716 BLAKE2B c3bc3294d11815eb7607020e78d0349a1b9ac1c93e09351f960a997c974dad905bbff171139e68b776eae7ac2e6d3ec0d0154b05c42afc29ab4655933806bed6 SHA512 a2e1d471f64cf2c7c3e0657e67c88d79c9430195c81b11054977352f3f66f21fa68c67b3eff537ca6991e2f55379a9955665a8514ce0804d40c71d1d2ef38e3f
-DIST aws-cli-1.27.86.gh.tar.gz 2379304 BLAKE2B 8bca8deaf377def250e772bd7568f7d4b82b7be4ba951a95529b8b8eb13d9ac8be791a7e9588bb01fa7167d3304224e2db426f25e25d7af94de298dd5ebf673d SHA512 9c98965c03685ba806a16531c68ec75c043b8c94eb64238d7500894211e3e9b500d00111132122226502ad3ea588bf09ae470a862d6d97b880a06808c96dfe6d
-DIST aws-cli-1.27.87.gh.tar.gz 2381669 BLAKE2B eb279545fcab3ac279ee127acbd4e06f15d365bf0c4d9b17e682d852de81acf2b94ef197ed8444ca5d6ffb5a3ba814d6ace72bcf7ed956bfbbd955508942d6ec SHA512 23af96758d9664f3ae72f2abcb2c94817f2bd9a7b68564eb2eabbd7fb121247bedb77a3e5d24e04975ab5db101dee47bd5b6324152a6132891b542c402898c3a
-DIST aws-cli-1.27.88.gh.tar.gz 2382383 BLAKE2B a97e1235add4bf34b73e4def10771e54af03d6afb9a2a3ed4d4d78a8fdd26c07f400c6ead8afa926a4516069e6f42c2b08b335028ef3caccc9bca8ca2e783c06 SHA512 0eb1858ea6a6af408f16972c66778e84fc9e0f08cfb3734417fb747fb3505fde587954c2645309ba444bd5bf2ebb6a550569321afd3899844623f79d0a5cce8e
 DIST aws-cli-1.27.89.gh.tar.gz 2382599 BLAKE2B 3a2dae3cc1928e149dd605de1e9a350989e1cf4f813dc14466ba40c0a2747e69b6a8c5716d48f2526920798f0d341dcaa7ec0c2fd95af1b5decd3830814a243b SHA512 9a90c933e5ae3f25271ec369607cb6c44adf96dc9d324205714c9790b6744d7f2c8e4c6b901d4bb4f58b6871c315e0543b3f846cf530e7f95ed31d196f8c3326
-DIST aws-cli-1.27.90.gh.tar.gz 2383305 BLAKE2B c67abc7d2c7e09bbbcc34bd07f2aebc76e9b03904b9e5ce6fe5569f2f1ba0341c4b7cf6dfe8cec6fc1840a5567bfde1f073d3a91ae1443c1354648fd6b330b34 SHA512 f6391afff00a53d998cffa000b309587e3bb50ca0d526f0979a2a2cf1303186400428eb10a9c09cb139ac2428717f8e8c76c72b4243943426afef77e188f0167
-DIST aws-cli-1.27.91.gh.tar.gz 2384591 BLAKE2B ca80ec0bbbb96168f959cfef9e134a72cff8cad57e2e694cbf3a239c68c0ddcafa2a6fbdf6e02c9dcb601165df6597976d0097be820eedbc6977dfc56146d31a SHA512 310b14d4d21ffbc41ae0c205810f308e99a9d2110415e32236c9dacf1f288e62a79367db16b2acc794175e6a37764154d8923d8291dbbb2ecb5ab43c54dbfd5f
-DIST aws-cli-1.27.92.gh.tar.gz 2384667 BLAKE2B e7cf1485ef7c3a1fd31532482b555ceb73317a124150d4953b4ee3c2ef94ceb7677910b2c27edb06cea4ef5340638e3763d06e1b76385160e79f9c09802f7148 SHA512 94494273da5dcd80d03db42bee81974ce8843f883dfc434013938a4b817e2c441d21de4f3c5902de542c82f081b4478442a4251d51c1d84dadd1db90b1f1e2b5
 DIST aws-cli-1.27.93.gh.tar.gz 2385084 BLAKE2B 18dc59339303b9f32e297ca6a37c5d2a9466a2ac2b2f8795baeb686465dfe561ecb5abb29c38d37f32f44408b9ff1e083c330fbe23a5bf3c19a05033993dc533 SHA512 ce979f35966f2c48d8bf74ed95d27e5d6de9e33990bc01556bba660fd5692dd3751002d1dafbba11121e768a21d97130d9e76d309640ade5377193ba79ba1628
-EBUILD awscli-1.27.74.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
-EBUILD awscli-1.27.79.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.84.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.85.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.86.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.87.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.88.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.84.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.89.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.90.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.91.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.92.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.93.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.74.ebuild b/app-admin/awscli/awscli-1.27.74.ebuild
deleted file mode 100644
index 2d91a172182b..000000000000
--- a/app-admin/awscli/awscli-1.27.74.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 arm arm64 ppc ppc64 ~riscv sparc 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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.79.ebuild b/app-admin/awscli/awscli-1.27.79.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.79.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.84.ebuild b/app-admin/awscli/awscli-1.27.84.ebuild
index 62c19f3a63fb..2d91a172182b 100644
--- a/app-admin/awscli/awscli-1.27.84.ebuild
+++ b/app-admin/awscli/awscli-1.27.84.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc 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.27.85.ebuild b/app-admin/awscli/awscli-1.27.85.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.85.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.86.ebuild b/app-admin/awscli/awscli-1.27.86.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.86.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.87.ebuild b/app-admin/awscli/awscli-1.27.87.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.87.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.88.ebuild b/app-admin/awscli/awscli-1.27.88.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.88.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.90.ebuild b/app-admin/awscli/awscli-1.27.90.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.90.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.91.ebuild b/app-admin/awscli/awscli-1.27.91.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.91.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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.27.92.ebuild b/app-admin/awscli/awscli-1.27.92.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.92.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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/entr/Manifest b/app-admin/entr/Manifest
index 06b2d5f35867..058b2b3fdf3a 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -2,5 +2,5 @@ AUX entr-5.3-no-which.patch 495 BLAKE2B ca5ba048e53c4cdee12b88d792e5e7b6e5fae218
 DIST entr-5.2.tar.gz 25834 BLAKE2B c14eddaaf26994679991c43b38dcea0f1cbf53ce517af462cfed9dea2c914d9c1719053cb3b9f28f04d0cbf8719fe5612963c1428832e02bd55545ba33c72556 SHA512 b12310b6695f0b3d3d830b651dd182ddf2321aad38f569066cc2e5b17570070e48eb4900725c88c1d31a8ff71099aba78fb7508ad60706265cbdf8f29257eaaa
 DIST entr-5.3.tar.gz 20905 BLAKE2B 79b4c39ee3f9530db1d8a6cd62a6aa925e201d6b5b370b25c3884b160a83658688204005db612b1d18743ba39f0de6ccad8492910142ebfff7b550a5ec48516d SHA512 b160cb60de99a743226b472256d937ef6ace54f5350a83420f59ac2706cd0fb042d6f85fcac6c73e76c161c6225b956df8b00156dea9ce55d8b8225e8ca13e7f
 EBUILD entr-5.2.ebuild 611 BLAKE2B ae084f4e1104a3e8652ae939bc338cb36777ef2f380c328d449217a42caa9f0734369c1f872301732742b0845ac9fbf7989049119eb4196baf9711014cfd2f8d SHA512 9e07fe4c426f03c751e52c7f94ec0f0ee5799755e9cae56c47067e15fbc14898e6104fc1f2028b4efdc5f89dc703a8cc95dd5dd4ef786c9707bb97b6923431e9
-EBUILD entr-5.3-r1.ebuild 735 BLAKE2B 8b7dd24df4c35bda9c5043db25a6df372a7a28773f908556c3a7341a5a8a890d2b86533e0576c212e31db7c917cd9426fd530f79f4d0fbfb03368b07281710ed SHA512 db81c3c5fbea27eeb47f4dd2a36b54deb8ab1567df9376bde2660d1a97e6f4444dc50644409350908d27cca4c8b26fe1cca3fda49a5e98f5cb72c42ad61bbd72
+EBUILD entr-5.3-r1.ebuild 730 BLAKE2B 6dd71082975572bdc0869e24c2351aec96c9d3b584cd90a54ac5898460cc65cfe7ab3a973cd8a96725e2d2436467e8215822d8a6dc96071f41a05691decf1f0b SHA512 82826cd34bc477c4713c43ad0cf50914a2b69326986b3897702efbedaadbe96c1bb2ffc5be501bf78413f49cd7e6e1722be1fc29efc716fd9333027278592638
 MISC metadata.xml 706 BLAKE2B d01cfcb5fccc39dfa4c298f3f741c9360ac6c77926bda0d3ade3db29e8c08a4a7a42a5d62c9c05eef73172c60aa7dba01da67747b8048dbb2b99a7af798a374b SHA512 d1ecfec008b55545b5a1317968a2d1067b72ef3f8a18d2473635994d6e47cb57b01dfb27c55e3dd3b38298a5657d12fb63c12ec47b127087d7900069d46fd593
diff --git a/app-admin/entr/entr-5.3-r1.ebuild b/app-admin/entr/entr-5.3-r1.ebuild
index 848e44370ac6..1c8d1773e7a2 100644
--- a/app-admin/entr/entr-5.3-r1.ebuild
+++ b/app-admin/entr/entr-5.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 76258f7c9f85..cf4d6db6eee9 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index f4c0f4534f14..8ead5ba9a967 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-autoar-0.4.3.tar.xz 50860 BLAKE2B ab7360d422e3f2d06cc00d765c203e6472a50d8cd9c220cc87b6fc40ca9bdfc3677a2a7d50b383b8f195bba1ffe72773b23773f703cbd24e5768f0f907790e10 SHA512 9f1ba584c4fc8e82d842fb21d3a113d64faa85f8f27cb7afb5d09919f510e350608b6a4e2f3ac527162ab338d008271bd430fb5b8ead265098c1810ffcbcef30
+DIST gnome-autoar-0.4.4.tar.xz 51300 BLAKE2B db3390f771205166aaf9b6a90da15bd68c80ad5e874cc7ddc14b2a79d4dc2b3d41b9636acd6f44e4a6ce3590c3659c51cd8a910ab4e588aba41cdc7dbcf72725 SHA512 c38d3703e61d7338b97c362127bdc61f77d259eecd662f3963f28bfcb1ce7be8a948e9a57e79a8181a55dfc3635f671f2160ade947a1b5122204a2dc0025682d
 EBUILD gnome-autoar-0.4.3.ebuild 1120 BLAKE2B 4f3cf06a80427f0ecceee45ea46a7da067070e1992cd9c8a85f733b8b04d341812407b31f06a7d09c1be01392dfdbf028122feb70f678e2129cdec6f253d85ff SHA512 8b25553735cb7009dd8b135aa6b2f07926ab594417dd2e6ff49b110b1fca8301bfb01f83b0a0cdee65f2fb8f14f19a0089b23ceda2b16532b97fc556d269fe74
+EBUILD gnome-autoar-0.4.4.ebuild 1125 BLAKE2B 8f0286e5305ecf1bea1afe55605a224e5f2ca756920a443d03e48ef92fddac8a9ec126af28c997e770879b9567b4621163c18496eb50e96e0f068af41c2fbc29 SHA512 09cbcf8768af6a9d7a641bf0528e78ac05d1ab3b745b0b9ab4e5912aae09526a148b4d85678208176177dd042f3f91f5eb7225b9a4b799b2d33338cd15be93e6
 MISC metadata.xml 568 BLAKE2B 9080855f261c70b0ec720b1d4cfd72910991625e83504813107eba7782275e26726352298c893c9688f78e10f1d9db2f4a5e18e45594e79513b101fa33f8cc24 SHA512 58985c869210ef88e0f49af3dd8e8f2cc09bbbf3998098f44525cd4be856fffe32a159bf7ebaf7cb9bc45d2f2be9ae17589fa5ecd3f5a0f1b7cc0611d8281525
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.4.4.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.4.4.ebuild
new file mode 100644
index 000000000000..acdebc5d274b
--- /dev/null
+++ b/app-arch/gnome-autoar/gnome-autoar-0.4.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala
+
+DESCRIPTION="Automatic archives creating and extracting library"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-autoar"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gtk gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection ) gtk-doc? ( gtk )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=app-arch/libarchive-3.4.0:=
+	>=dev-libs/glib-2.35.6:2
+	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk)
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use test tests)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index e37b9429c04c..8ac6240dae84 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/docker-buildx/Manifest b/app-containers/docker-buildx/Manifest
index e231ec75f0de..6b8a8238b62f 100644
--- a/app-containers/docker-buildx/Manifest
+++ b/app-containers/docker-buildx/Manifest
@@ -1,6 +1,6 @@
 DIST docker-buildx-0.10.2.tar.gz 9187634 BLAKE2B 9a43a7bcb224f33d718928ef3070449cac4db87c951f4337368d0c994f211d4c3db3a5e9c309ce10e357ab24746bed2507e2867c9fdab3b51a5423787362fee1 SHA512 ba6b8baae1a8e24bf9ddc58d5e2451270fa6e3891bae83112ca00ae56b7a4842b45ec970898ec27a2123e312885bf0d8c58cc600d8462787242eb878f45cd877
 DIST docker-buildx-0.10.4.tar.gz 9184825 BLAKE2B f0e71c0f6dda5f02da4cf0b0514f67f5d339ba10359afc69aae25abf907447fd22fe3d92427299bc67aeaa6a84e748a8a5cbd86151b2baba2dd01f25cc04a793 SHA512 f82b89b8dd4e45524c8d353c4d7588f47b1c7b7ecf759fd9605247c1c7aa0ca152c3ecdec0e0b62b5eef05e6b65d2ca1f5ccab6d75819b92fc92ff62b44105b7
 EBUILD docker-buildx-0.10.2.ebuild 1419 BLAKE2B 9270f5131fc4ff742928ad8308a6017d5ec96dca156b50992d3df77477af5d302be5457b9745026e14f7129aaefb0a0aef6e1ddf3778f2157c73c26adce1f4b7 SHA512 b57cabd264c6e89158107691581ede6fab15cc108c7a7c3248f38c12d3137dd8d610bec6e2757f4c7863bfbebc43a68c6cd82d19d4e3c2ad8b5aefccf0d8b0bd
-EBUILD docker-buildx-0.10.4.ebuild 1521 BLAKE2B 1947c4345adb1d3c642f88733330fee5a7e2cfcabe1ed68a8f9dd02f7cc8478d197ccec328a3ab3b206b8b7dfc9bb5a62900d27dc7ea96c82a7b280c905fe4da SHA512 c8559990538a01f78345f2f10650edeb18d89220be9e1125a7f24a5f3ac1d32a6ceda757d39cf30d6fd58bad8f21a2466364f1933cf10fcf64f8ab859b0635dc
+EBUILD docker-buildx-0.10.4.ebuild 1526 BLAKE2B e03a4bfc7e024cb2b1e7d3035cbbb7e7ad75e5d0b650e7eaca44b686dca9dd3c6bfab8bc3513a0dfe81ff49eaa3f512ea029d14ac3fae99d5f65945811bd6da7 SHA512 153fd2d03f47708500c5d91ce3141dff627077c1a39c1e5a84e8438fd59033e83d40670ffbdd6ecbe9f6e24f5b15ecc392545a9b89e28bcf3f40d2f3e9ce279d
 EBUILD docker-buildx-9999.ebuild 1521 BLAKE2B 1947c4345adb1d3c642f88733330fee5a7e2cfcabe1ed68a8f9dd02f7cc8478d197ccec328a3ab3b206b8b7dfc9bb5a62900d27dc7ea96c82a7b280c905fe4da SHA512 c8559990538a01f78345f2f10650edeb18d89220be9e1125a7f24a5f3ac1d32a6ceda757d39cf30d6fd58bad8f21a2466364f1933cf10fcf64f8ab859b0635dc
 MISC metadata.xml 710 BLAKE2B e54ba5993825b2fa455c7ad33dc37d3edddbf74f19cc2e8ce3260fdac0d581c3c719d5f7252b7836d263efd020b4d3d90d717c3873531055418dbb556f02288c SHA512 f217f1f7f8ac31cbf5516630eea107a686394efc960384c67a216f80b57c61323b6b02b5dd1ae458817a851b9f166c684087790079e48b7d4a2a78130dc2a411
diff --git a/app-containers/docker-buildx/docker-buildx-0.10.4.ebuild b/app-containers/docker-buildx/docker-buildx-0.10.4.ebuild
index e46ea450eaef..f0c8423fc4c5 100644
--- a/app-containers/docker-buildx/docker-buildx-0.10.4.ebuild
+++ b/app-containers/docker-buildx/docker-buildx-0.10.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/docker/buildx.git"
 else
 	SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm ~arm64"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 4db63d04b3e1..319d0638876f 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index 40fa12cd37c2..2440bdbf4dfc 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -4,5 +4,5 @@ DIST easy-rsa-3.0.8.tar.gz 3864366 BLAKE2B 8bbb16a8885a2141c59f590882002f5e4fa5c
 DIST easy-rsa-3.1.2.tar.gz 6424018 BLAKE2B fef84b90875837c151bf9d71f71587d81aba79579948f4ff29ec3632cd17b0de82bf64c7d25b93720a696d339acdbf520b3a366e3ab214789acd17629d5db5ba SHA512 f36d3e11488ee98be4d901a8ae4f6cf08f4f0efc95bec38d1f1cde3ebd9dd133fe493cab2ebbbbbc99e803e318f93536e6a45ae677adb65c94d998114278035a
 EBUILD easy-rsa-3.0.6.ebuild 726 BLAKE2B 7877107a820558a01423c4e7060d92c44e645fe5ca2d2a8ac715a758d3c0bb3ee5cbc2ab573d49df79a7ba32ed6fc51825abba661be2d4490d43c273492857a7 SHA512 a618400d47f9fd8628099b4c20a282e552bb00e759976c6c628cfe75a7f70cc6d47c17916a0201e29ea86490947ffe2031055b12d636d5125ea47ab2f38da282
 EBUILD easy-rsa-3.0.8.ebuild 733 BLAKE2B 346eb414a4eb33ee183f29555797db2d863d37010e8575c4bfdb333c8b86dbd06c388ad7b697a24a54c8c0db23e1207a2a2ce803af246382976b5dfa57409954 SHA512 6e6ff81a50cbaa1f8aa6ec89c11033b89fc7fbdceed9e2f12bfb3fc11e3998296c1a1e149cce229a13b5071826755bc3a47858836b8aea235601858f313b5573
-EBUILD easy-rsa-3.1.2.ebuild 739 BLAKE2B ea8a36a87a31a05a3b0da567fac8a1869fe35dbe8ac5e2ef84e9bf026ff37f1a4aada80a9c73b303e41ca204ae634b05c05b6b18a3ca30386bf0e7ae91596960 SHA512 7021b250ec57cbfd010c92c8386ea298ca33bd3cd48e4a7b33759de5c755c9a0bf1fdb9ec803db5dcc2e58038b8b7932dfa9aa24b22072a8da3d7a2f79efe6c5
+EBUILD easy-rsa-3.1.2.ebuild 734 BLAKE2B e81e35cfec22e735ee61bb827faf2d18d20efb6276f864c9cbcc31047531cd8e8a9970bdc756b6829bba2189a98fe76ab67ecf23caa77967ca20464011b4e1a1 SHA512 2f3c6629a58d9ea720f6e461e601a4e48d31bf89a6be60cd6648d52fbba3bc9ee79da5b36467a7974d312d5823e6fb671e526758e1246afbd2a1ced93bf8e563
 MISC metadata.xml 249 BLAKE2B 864917b2d898441818f1d1388cb58f61ba5385cee0a5fcfce0670de6977bcb294c9e41e338c201376de0ec797fcb74ed47375c7cff60d6d472dabdd7e404f559 SHA512 9910fca2a5cb132e8a0f53d85629214392fd794f941264dcdb83f203569bb77539296f5da64b6b2c8ab347eefb8ccf7f4419ac83e9e870c2ca6e63d5d4b228b5
diff --git a/app-crypt/easy-rsa/easy-rsa-3.1.2.ebuild b/app-crypt/easy-rsa/easy-rsa-3.1.2.ebuild
index c35bb375fc0c..766b5097f3b2 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.1.2.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 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"
 
 DEPEND=">=dev-libs/openssl-0.9.6:0="
 RDEPEND="${DEPEND}"
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 191c1cd8bc48..e6679d79fd9b 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -2,6 +2,6 @@ AUX tpm-tools-1.3.9.1-openssl-1.1.patch 5937 BLAKE2B b8ca021f3b1cd91656a0b0f43df
 DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2 SHA512 63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
 DIST tpm-tools-1.3.9.2.tar.gz 431930 BLAKE2B bbea3848765d9907c6faa1b5f4a60002e94243040985ce503f392bc8d7392bea41b54317b15fd227b5d73d589cf2c330729532448751d4375484375725310dfa SHA512 b684716c71702140591d89eb03d3724ed5b448e7ba2881bc44de9d44ffc23a9f7dfcf4351eec24e5438cc883f49a7dafee82bb19f90800610cf764ce74e60ccb
 EBUILD tpm-tools-1.3.9.1-r1.ebuild 954 BLAKE2B f53bed313b12de4bd985c76d168a110a5f2e66448afb39636f8ccbef173810ec2ce60d0a01a39fb289cdc82b723237e58091b4f561668b77e28144d141592969 SHA512 045475346c2c8778ce588cf8fe893c24eca0c9d6ecf27161a2807f35d47737ba75f16d44d7b3c244b5ce35dc382a24c52ba3bd9c72e48bff9dfd8d488465a40e
-EBUILD tpm-tools-1.3.9.2-r1.ebuild 1101 BLAKE2B 67423e414641a9467e533011fd20293ff19cf199c54062221b14e1bf62489c61d088aec566e7a81248b7cb45f9590fb382ea17f128c3b82029160d4cb6113d58 SHA512 4966ad5f4dc0eaa4847546c3beabbbc442a4a70711e9c2271d16ef8562b5c9ff373438276d91f1b2c434cca8aab002f8b69b6305e2b4f53be40882878f3d044d
+EBUILD tpm-tools-1.3.9.2-r1.ebuild 1098 BLAKE2B 530cb0fb4ef300bb2d278d58d00b37cd336d0bc87deecbbf0b8618919b0f8173064a51ad96aa7acecd7884c70545395afdf1b101e67b109ed6ed0d562cc2bc9b SHA512 ff2ae54dcf8069db4767b68802fcafea634dc8c9f8e0255ed8138be265d41f705e09f7f8803029611867dffea5dbeb1fc1787bb693ac4ac8e8b55fa3e1c96430
 EBUILD tpm-tools-1.3.9.2.ebuild 1094 BLAKE2B f635866f67a93e3d4aac3d5435ff39399753978a8d2a67e404d0416e7dace32135aa54a80146a0b44de7d65391d977d038b7d0fa34a8923740ef34605eeed2de SHA512 310612239dc290c2b013c69a968c09013a1215a6cb6607ed1b49ebd4fb60e6afafbd413450f975f3fe8f258dc4e939294218408a05999ef1d025009e4f3f45f2
 MISC metadata.xml 655 BLAKE2B 32c7f70c902ebfbc7f182b4ff474b97163112e4418597f12e2c4f10e082f7803a27948e1cbf17bfea491564a26a1c968fa5d7ec51878eaa79eb3e9598ee51ad9 SHA512 57f1c5a445c98a90025ab2b19fa00b55071bec42e3b130dae8dae203e1a81544cbcf723f8b4d4bfcc47771060e350663bb1c0ea976595c6c044809ed358f7ad0
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
index 68163a060786..eff74ea8520a 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 x86"
 IUSE="nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.15-r1
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 795f45c55b7b..971ddbf9ed7c 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -5,6 +5,6 @@ AUX trousers-0.3.13-nouseradd.patch 606 BLAKE2B 7e4a479fe1bdc75f743263c1321f2d99
 AUX trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch 746 BLAKE2B 91dec77a329a4931487cdff54ab8c77ae302af6bc741da3db61bc34b416d29615808799c8a4c5b39a293021dc1cc16642461037fcb367507ceadcc4456565715 SHA512 704a87fd4b5e50356ac6a0ad68aec04eebb2030d9818c9e23a40f2e621d6e2d5e5660b81997b459e67a8059a0d88a254a41baa833806ce99268ee24b1190ae0b
 AUX trousers-0.3.15-tspi-drop-the-use-of-getpwent_r.patch 2114 BLAKE2B a24415a49a81376303d96654eb5147db5843865a139f2f8f226f3f6d647b4a78c1314ee17384809020fca514117b6aaa43f057fad3e3ba0008133db56109b0e3 SHA512 5402a8c3b41fe5f53d8da29a58e5052990ba254b05c4b2455e5068c0d0ca52513e3b29c6f344abd59c0cefd2192077c194628955154d7474e4f6b3c8464dd59b
 DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb
-EBUILD trousers-0.3.15-r1.ebuild 1598 BLAKE2B 752d525bb474cc06912d55ad458978ba7b2286eda61aaa722c1324393e91253db83d08554436eb35ff0c1940da4f5d513c226ae13426747aab815e9d41ff84d3 SHA512 aa3dd2f3612bf5ed01d766fdbf1e1bd28e20f7a5f82155a5aaa2c3cc18d4c86325980cab13542d761a046b409cd4a24b3543bb2293d8aaaa19ccc595a9c2543e
+EBUILD trousers-0.3.15-r1.ebuild 1595 BLAKE2B ad3f415eb77ad3b42c829f4ba20f35cf3f3ac052764ef2a9fa933d050afb801b76e9c16bb783a5a8954d1c9a2bcecaee3ffb523b44c4aa6482162919d11bf7a1 SHA512 20b020894d0d0a5a86735c6cb6dddcc784f2ff0e605f068c5c0d1ec647fd3992ddbcbb377334ab9dfce5a7fee8877e7ba2652e901c8d294e7eb007bd40588e11
 EBUILD trousers-0.3.15.ebuild 1537 BLAKE2B d25c6df85b82c68da044c52b46cb551b8071b10ade85f868fb526d6763ae721d8d582c059814f2bd9f66099ec034fe37db4b6d9b095a936acf49509450f6d64b SHA512 9d06c08b97b57cbef371c10d46cdb389848fe15514d5750257f0cd6def5c0924f761978e157448d4720a546b9cb0e2b780a6292347d92a9370c40c6afe1c7c08
 MISC metadata.xml 542 BLAKE2B 07459ff82ec6f21116e860820a212a751bd07fcad1b175417d8d3b12709c870c523776e228c19aa7f824ac13d304afb533c697c22551ef977b3b9c687d2f6b00 SHA512 c980dfc26aaf0c6718fb9088d91296760db245807f0293a6c7abe412774e9bc297c401153df71ebeeddbc28e92441e3e1e78a5e16c5fca8d3445fe0558faadb1
diff --git a/app-crypt/trousers/trousers-0.3.15-r1.ebuild b/app-crypt/trousers/trousers-0.3.15-r1.ebuild
index b3e0685ab946..406a9131d1b0 100644
--- a/app-crypt/trousers/trousers-0.3.15-r1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 x86"
 IUSE="doc selinux" # gtk
 
 # gtk support presently does NOT compile.
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 76cd9a33253b..18052aa3907c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/yudit/Manifest b/app-editors/yudit/Manifest
index 1436a273bab6..c1e696c77967 100644
--- a/app-editors/yudit/Manifest
+++ b/app-editors/yudit/Manifest
@@ -1,5 +1,5 @@
 DIST yudit-2.9.6.tar.gz 2797142 BLAKE2B 76fb8e0ade65c84389db71b4100e458f5b70aebba27eea4b604bfcee08974060dcd2bab2d86586b5ba729d8d5090c943e825dfe58d71c609f0ca2f2e0c3900c9 SHA512 a9a0b6f6c44451cf2fefc4fc0bb1bbd9ffccd17c4c622dc35b08113245b3bb9f3ca949f3e7b9d2aa919ebf3840295c5e63c0297576e74a5f2d1fb99cfc97c46b
 DIST yudit-3.1.0.tar.gz 4317815 BLAKE2B fdcec8402bd87f800b0e2712f74d5d546d7ba0733b36fec720e46ef0c5efc0be340ec8db7ffe101c5596d054cc10e1364bf2d5a70f25b234e57165b5116edd80 SHA512 07b89cdea29971fe49a7e61e2919261d6a39a6420c2587fad160a78885513460cb210b63dbfc1320f993d38e56e4104f77911530b9b7da210bfb7390e37ed352
 EBUILD yudit-2.9.6.ebuild 612 BLAKE2B 9fc03d9e79eb473ba93311f1f1ee0b06d89fcb660824a6208f91336843a155699915932b76ddf23cbfed1416728b15656abcb5a8559e577df7ed607535f58a9f SHA512 b75ab3cf367289057aa900abf457404076a1d42e094c9cda26adf7404e43ba22b09e7d074b4f09acbfba3ff34ccf57ceb84878b1b0aeaeef61a1160c7b693aed
-EBUILD yudit-3.1.0.ebuild 611 BLAKE2B c1d47b4b6b56f72947b3127494453316cbd503bae9dd7ffd833d286c5f80f6fbcc2f18835689598a71c4b07e1a9e829c990035eb52ecf8be63388aaa047d02fb SHA512 0dc0cdbae8e043a7ee1d7ef3f54bc84a61b5dd5c76e3428c876d07093ca6c6a99d1ddbf40441e7489b81434128733b825e07f7bb1de9df9c84f102fad33859ae
+EBUILD yudit-3.1.0.ebuild 609 BLAKE2B 59964dad6f6c5a6f7d9d69fc14fd405071d53669d7af77119a69424c734d552fdb50bbce819b62dda998e0769c970da44200813d3d41f95cda1edc4767535ef8 SHA512 1ed3a2e2949f96975ba54ce53c0ddab386a52ab4e9fe6748df1779b27e5f81060e436aca5f10a331ffa78177b38c96850081d366c3737cdbb4f95552ca2992dd
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-editors/yudit/yudit-3.1.0.ebuild b/app-editors/yudit/yudit-3.1.0.ebuild
index 242bbde3de65..d8a33c321865 100644
--- a/app-editors/yudit/yudit-3.1.0.ebuild
+++ b/app-editors/yudit/yudit-3.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://yudit.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 5b8253af2815..cc285c141693 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index f099e85cc6f3..8e7d4b4e00f9 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,4 +1,4 @@
 DIST diskimage-builder-3.26.0.tar.gz 515778 BLAKE2B ac57ddb043f08052c337093e74255e7a4a01d6469e26387dd3c968dabb840db2323c8bb6cb4d4758c62c4b6e659873d2c6228312d6798a4101a3792ce760d067 SHA512 06b949f7561e2d60397b27f905ebd997356537091b39a9a2ec26c14da9d7ebcf44f79c97895cfd3b4dde576407840b6f407b9009fbea3def40bcc218589a034f
-EBUILD diskimage-builder-3.26.0.ebuild 1121 BLAKE2B e89ebddfc32dbdc6825e8b5edf7b6f5adb384c10ac5b9aeb20b62aef1d811381e93181796776051856e88d30d5c0d01401b1d300acf6e8b9541017a9b5ce2054 SHA512 b5b95cd72d41807e7ba1bcbd6a3e19c37f09da44f285c04774e895c8d5cb8bab9487eb6d58409d7c8c910853c9e8a01f2af27da54ded72fabbfa421a2967de3c
-EBUILD diskimage-builder-9999.ebuild 1123 BLAKE2B c6441445f6cd98d665a42b4a5b2032e8d5ca867cb0fc140a4581f6b2818f2e73cfa7bf400cfec0d6dd5cc6daf881da052eb4c2eec3193219e49a71379fc521f6 SHA512 dd49cca58ff04323682193ef3cec4a2e4c4e91148b701df0f8c031c1eb337354aee8f3899fae3599d4acf9a01eb803db1843779540718b90c5532510ac3697e6
+EBUILD diskimage-builder-3.26.0.ebuild 1102 BLAKE2B 36bc5a7a5f52fd813c25e76a83c6689129698f692e2a2c4b1dfe09877a6e89ff5b0977daae4aa65afefd0629e663a847a36db546b611ae3d9879fc5b5272084f SHA512 8e9e11a64270cc9321974f2cdc36d6566880b47a3a44c580d2a0ac05fea7dd3ab1fe367964fcd0ac38a60f6fb19a0778824edbd42eb1376c9a3e2032e6e67b6e
+EBUILD diskimage-builder-9999.ebuild 1104 BLAKE2B f877866ce37f63920a57ce4dde025e070409a4829717ff953c1b1bdf740fd52d02c31767cb4115c3e3f60be51099b61591a085732a8357728630958ecc91e51a SHA512 85470183d0484a39229bebfed182050d7007457468150b70c649c87bde38299f52e951fdcc1bcfa7e0dfa9508fa3e5dee4b36c46f39a885af6b544615e626552
 MISC metadata.xml 719 BLAKE2B 872a4d37e8ddb2a28eb85d18cd88990934327bc23194f3be9e5dea03627a6169987b246a93b50754cbe5e331f8c854a808bf307b70521c481d83b846f7385606 SHA512 d151fd95659211b2057ef0a61a6020e2f9efebebf3d7c5e1392ddb9954e3627e1040f2a9fe84ea4caeb65a745411fefebf2d896bbddbe0ddbb56acf42d2fedc3
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.26.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.26.0.ebuild
index 7c64fde7e608..1d348d8a3139 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-3.26.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.26.0.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
+PYPI_NO_NORMALIZE=1
 inherit distutils-r1
 
 DESCRIPTION="Golden Disk Image builder"
@@ -13,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
diff --git a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
index 43658e0c4cf3..ba17dcfdbb9d 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
+PYPI_NO_NORMALIZE=1
 inherit distutils-r1
 
 DESCRIPTION="Golden Disk Image builder"
@@ -13,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index cde64e553e85..c2418e5a6f58 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index c59cea3c0161..35317b79db7c 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -6,5 +6,5 @@ AUX aideinit 2949 BLAKE2B 244aaec9a38f19c6a7af706572a896e922215d6321aee4537ef5ce
 DIST aide-0.17.4.tar.gz 331783 BLAKE2B 584a385d0a0e80edf0b89eef202431adfea7fe8ba04c774e49dfb7230e766e19a48572e9d6c80386668572e459db9770b04978df484bd49c7de6433657500e13 SHA512 b6dba54fd204e1899d47b0b4139786cbeaa51c388027e2cfc1bb839297a70ae8ad6f37429594a730fac8007d62b4ba5b61a4aa22edbc55cbe986ccfaf5197f31
 DIST aide-0.18.tar.gz 375922 BLAKE2B 03c961682fd25581831ca0715e57546b5595057115a456778ac0846fd1f23622600a061e2d8524f7381dfa6d43cefcdaa52d00eed2639dd60c7f3501efe8b474 SHA512 99d8140523ebe1d80b5d73c20bf13b8559aa22f08a9df485c15daeba7f5448c27d86ed310f2e7963076958dbe1fc2e4636807ca073dd0a6568b4eb8af2a38f4b
 EBUILD aide-0.17.4-r4.ebuild 2515 BLAKE2B 202941531fa273db05abc704a617313c993a9fbbd66f8af26505ea11b227258e922e0be9e508ed99cc4557af3ee9827355e6eee309411c8119209a811cf864e2 SHA512 66281a42979112dc1719c4c1f3f57b77ffc1a8a8038fd17bfdb452817e64835ae7833f1cbaa2d7c4a2c563a568a1861257aca1e26f069261a7f390ee5dcc3888
-EBUILD aide-0.18.ebuild 2373 BLAKE2B cbe9420df3f870c12f079792cc717486c85ddf66169d511e565e9e91b12ba1c63267c2bab983201168fc942534b4f7cc3afb1750314b152405f28aa7b555eb26 SHA512 5f06e1e3ca2a3595e1fd8e15a2c14a6b5b3c2eb3752f0a5f7e34863c705e9fb53967c354563119d79f48caf63ddeac06920799f629de08335b4cb3b37713a966
+EBUILD aide-0.18.ebuild 2372 BLAKE2B e46a4c03dd9bee384cd342ebc2a95e7fa3a43ac387affaa69c6681799119c58de92b2dac0a51bb28eb005509fc77b599723df307fc8c0ece2d27392f8e32426b SHA512 25dcc87b75e3130dafaa544c1e18cb3aeca1b652c9fbe3eb684190ae00bdfe1e17009d9950739107a179b65a80583805dd53118aefa6cb309de773aafecb18ef
 MISC metadata.xml 567 BLAKE2B a3b852325f904e2fbf4a95b67a49ba259583e78f01194bb2dd79851cbd77bd35b5bc786e74c72892adf264471a9a93ae609611252f7e2f1a630dbe1463a80b33 SHA512 c7e14ed38ffa394bd611cb831e509a5f8897c6d394bc78b6ae5074141188ca7bb8aa9efe425930c6db5fade44505fc60f212b0e86bf187622ac8c7443e7a5272
diff --git a/app-forensics/aide/aide-0.18.ebuild b/app-forensics/aide/aide-0.18.ebuild
index 7378603a57e9..37cc61ba2835 100644
--- a/app-forensics/aide/aide-0.18.ebuild
+++ b/app-forensics/aide/aide-0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aide/aide/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="acl audit curl e2fs mhash selinux xattr"
 
 DEPEND="
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 1efce5c441fd..dd1538c4a345 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index 76cb0862118b..3b1243cbf6f7 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,3 +1,3 @@
 DIST ibus-anthy-1.5.14.tar.gz 267418 BLAKE2B a4da45588d8736f10ccf26af52179da85bd3a17a8f1fbdba622058d1eaed933b0102fe12357613574e377df323145487838c3f74c052c813462b435905d5c941 SHA512 4d06d4e177df62d22c61bf6ebfda04ddbf545ea1947d0c315e3dfe5e48d9ddc57e5fcc89919ae3b9f7430e6124a5dfb1295f4ca7362fbc35714d627f80fae6d8
-EBUILD ibus-anthy-1.5.14.ebuild 1310 BLAKE2B 4e830748dd48bfb27d04a436ffec0bda713b7bc8ab78924982e973b3a110b0ad940637e10a46775e3a97d8bffda9bc996df88da3d943f51836209fca659f0681 SHA512 b89fe71e3e14c99e5ceb32ca4e1d28e41bd6f665ccf97ccdabd0de69b07919fb10ce4dd0dd548730252f01f2e2a35ff2c423ec130577fa537aec3469204380b9
+EBUILD ibus-anthy-1.5.14.ebuild 1310 BLAKE2B 806f7c1a3bbf5bb7a516060d7b110163cc00df002537ac0725c57ee4b9f4d243b58a72e0f4a974d4851c1784269e38dc45dac784713e54632337717188eeda40 SHA512 a820a7b41ab9effb17e4acfeeeef089c143c87539ddd9985d3a9afb47c212eb8e4c2bb1d3a21f18e7c6a6022122327ba6d226032b3ca7ea5b87bd68430e110c2
 MISC metadata.xml 325 BLAKE2B ae0af274a4321f66c02696f5f6440ce55a1a8406efe0f5c17c76606ab536b157f528eb93508d1ac95a893a54ada06c538d627754f8795271e3bb99eb4bbfdcc1 SHA512 64b47eae1d72f07324b98eb1dbc9a2a4b7cc0c74172e0df55e9d5abdaf10ebe1d90f4217b973979e3b53c5a21084fcad6785203a7b4280dc0706d4e6d1bd74f6
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
index f3ea48dfeb8a..f216847fcb19 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.14.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..11} )
 
 inherit autotools gnome2-utils python-single-r1 xdg
 
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 26c330db2fe8..481bebbb5f12 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,4 +1,4 @@
 AUX ibus-hangul-test.patch 446 BLAKE2B 06a83c8701e803f97b5755215488639b77c3be819b39932e6d6e957467eec482f32bf0477d84e7ec552a495f2e5b56f4dc730c27851cff2f252b0b36152d19f6 SHA512 3171d14b3eb495f09c5a90cee9fc85d87a5b773452367f1ed1bd33eaa3a220658052f6edef53fc7585292b0811f5b04b53eade0175d609dadcee0d29ea3506ac
 DIST ibus-hangul-1.5.4.tar.gz 542612 BLAKE2B 46495c04a37888a3ed21831b5bbca5b788f4d3a831fb3ce4eb13d95f302877fadddf831016f1d29aa2c1a6ba73fc0d585f2be57c10267a51a1a2186642632918 SHA512 dc4c755349424605de3832496a8a0cf7e8da577cbeff85d2b03da187fd5fdc9de5475eb523c69310e4f7edbb9a513f6f218de082ba32a25a477cdf5eb6f65513
-EBUILD ibus-hangul-1.5.4.ebuild 1221 BLAKE2B fd6dc0349c97d9fc05f83ca1b75ad27287503c4cdc2adab868dba8bfb59285a6a5270c798115456bf151e384895d9cbd02647d214a01f7cc9faa74c776208845 SHA512 eb116571622d5f507f8bf1ccafba2f072b354c64cab28263fcf6c9a4a6380cebb5c98fcda00d517b8aca67abf731f9dc8fd4618fcd49e8d76cfaa311a222a8b8
+EBUILD ibus-hangul-1.5.4.ebuild 1221 BLAKE2B d46ad40c590652e0520b4dd3160fba207321ecc8ac2140a37359082f71e1109e73870bb9f15ce32ffd686e8f663dedc5e7d06452c8d004a6c3b38b22626c4441 SHA512 a1df418c8599e6ff129cc26765a80f8d8d03f73759a80e09d46c0e48e36701991432b7049b662cb2e601a0c60f972591e0546b66c8391abc6f81122684a2702d
 MISC metadata.xml 321 BLAKE2B d336297b96a4ba3ae1e2c8bf3b1493717b49ce42c85cb0748af54c7bf6be4a1c74461c122dbbfc9b107fa02f4e83800798dd61c1bba74426bb7a2487e0d8fef9 SHA512 d05f79c856e4e579d1f98cd7c9869294f1906fa7e73eeae7120ee6af710d5f16f103d63f1261a9d798ba5584fa8e6f349d73d407a747811515280c736b43eb48
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
index 3209f64fea79..d93d65dad6a2 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit gnome2-utils python-single-r1 xdg virtualx
 
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index ba8863d75055..b4ab808be2a2 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -3,5 +3,5 @@ AUX ibus-pinyin-1.5.0-python3.patch 2983 BLAKE2B 35f8b1d0649a3614fcecec78b3246dc
 AUX ibus-pinyin-1.5.0-sqlite-3.41.0.patch 764 BLAKE2B fe9989fb0b5935a7baa429ef389f8e874d0c59fb849e771e810f8581fe9ed928ae41bf868954a440adb484bb9ea502f005bcc084f7cb15d1070e386ee439d783 SHA512 b9165594d6c97dd511eca6b5c61486b4f1a9be2acda0a35d6013371fb08e13d244ee046f7cf30f568d32367a96f9d19402361ffd8e2b69877e0909d110ec7d09
 AUX ibus-pinyin-boost.patch 409 BLAKE2B 5fececc7f4ed6941d374799ccdb1d9d7deeeb7078bedc8d0085e12f8310c42d752c14168a7d07a88e9412fa9cbff5c5bdf4274202d2ed6b6e7f337a96c65c3f0 SHA512 8e4efe9b5d12d35672dd8891a49599bef6611aeb723e8fbc08197896e417cca1d55cf31a0bb1f3ec572db489b01aa36349eaf9238d1a693483d6e21bc10eab2e
 DIST ibus-pinyin-1.5.0.tar.gz 692516 BLAKE2B ae53eb79ea4e5336347d689814d8ef033551a9b432268e643927b28911da3d03701acb3f337d7781168461c1c53537f2271fc8f253d1e99a269f61ae5eb83b05 SHA512 b0cd849ee3154543747dde8994eec9aed01d67e0d9be308a2f0230cf22f0281cd8fcabd9763b24238547a37e54400bcd8e541937767b93f005d04302f0c00241
-EBUILD ibus-pinyin-1.5.0-r5.ebuild 1347 BLAKE2B eb00cbb1bb3d6281112a7bb70fb5405e0f1dc3769f1c33000b34a9c46af2fef5c95140066f9cd1987697a2e1c2dbfbb6d49f088300e3d0b469039836b780743b SHA512 3045384031a24255946759d9b0be08c9b6149486527346405933bcc0e71240bc1e9ee8f8e11bf0e0e860119e1aaacfb301f5dcb0d66977b8f959442877276b44
+EBUILD ibus-pinyin-1.5.0-r5.ebuild 1347 BLAKE2B 7315fc873e59a2be1fbe840280d147b35d5be6831d9a533527594702c70bcd686004cec5f92ba0d5abdc65e09e0336ba2bf3ac2bfc1e249ee91ade4f052f2df8 SHA512 739768d7cc8b48d5bd712eaa10305d4894bfd7a54d8bd36f945e125778ab02b1935667e7542655704b747f295e0173acc8526efca514e8ba7ba632cc460d6583
 MISC metadata.xml 525 BLAKE2B 54c6aef9209148f57e663ae762242e0d3d0ef4ecb1eed537c8509083c8094842074f072668d595bc55d28698a1433997632ce0daede144cbaff1b35a32ff0447 SHA512 7dd6aa126f71457e8e86a2b02998944144399b73815f5afa789a320f531d74e41b5d7a21b2639ec673216bae09fc0b1e09659d8e975926a7c03934e5beddc2f2
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
index 2df80c6b265c..08a8d07be40b 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools lua-single python-single-r1
 
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index be6e3dcd2153..c6ecd6f4b384 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,3 +1,3 @@
 DIST ibus-table-1.16.14.tar.gz 1534056 BLAKE2B 512c1610e4e7096d25c5ff8678e0e91a4cae96ca7036dae0b33ef8f3461e0e6c89cddb35bcd0bf50c48d308d1b0831c02957863419ccbfba64182290a9567acb SHA512 a865c8913bee5e462ed8f3ba74a720b3eb37062ae762e3909827b660dc62d3055e6b90fd3c583487fb23edd2d9572d9eae201d7fbde889ec5cd8e5848b83291f
-EBUILD ibus-table-1.16.14.ebuild 1037 BLAKE2B 4ef7f9d91e3d0599e22930babb4515ad800b5743682eadc3feda5fbb47aad7f4880a27ae3281c2f30a9ea32eca19b9f929068888e5665c9ef5ced2e6f2b15c98 SHA512 b3c42aff6e782a7eea5eb664b603f03e35d5acfb344cfb7f3f262831af7d42a7056031ab4db93dc74d4c885f6a568cab7d6b51782895b7b0f6423f7dfdd59b2f
+EBUILD ibus-table-1.16.14.ebuild 1037 BLAKE2B 56ee9b86b1d4cbf9b9435df557cf46c169b0e89625465185fe7b23b246d76f81728d7ab9c9784d4191179103cf1170985e8b5e751b95b3c34e013d9d6da8616a SHA512 1cca3c1fb1da3a2e525e461f83e012ce6ad410011fc529c5fd2713889d16bcc828142ef9399b84d074d03c6578d9d74d84042348024604ec0c6c84321aaddc12
 MISC metadata.xml 315 BLAKE2B eeff056ce020201cb6e59f0f160232486fd94cc9de7cc90980155f9ef97988199d592b01190b13b013433853fbc25d9c4e5e29fe33fb74aa4239318cfac312fd SHA512 3329cc73468815ecf7f122ee8e8b81ca7295abcfeab95082841ae460c7ca76fdf2cb3d01b1548795bb525ce855052f512b8b2d77fa3afd302f41c156edf35de0
diff --git a/app-i18n/ibus-table/ibus-table-1.16.14.ebuild b/app-i18n/ibus-table/ibus-table-1.16.14.ebuild
index e7f61522cd98..65ace9b39f9b 100644
--- a/app-i18n/ibus-table/ibus-table-1.16.14.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.16.14.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..11} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit gnome2-utils python-single-r1 xdg
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 020efc3f5701..9dc9d3fdcf2a 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,4 +1,4 @@
 DIST opencc-1.1.4.tar.gz 2806887 BLAKE2B 150fd83818616de42e535f349b2574ff3319e41618e522583a57a00ab08b7f28db6e8f4fa4a0d4dbe027753b5be87065b2015542251986c6301ad441c4bf4c98 SHA512 ab8e7e6a0cc71106cf09eb32899fa8620b946a406f042d75a2444096e0b383cb1993d6c2d12cd7862e71854da4cd5893442bce51df84c32ed09fdfb4a2846f46
-EBUILD opencc-1.1.4.ebuild 1584 BLAKE2B a3cd5a97d1eece59c780d213de06b5345f72dd98d1ba7173599bcb5842be6b3a373c0e27d5c55c097304089433731ce79d086d42126832b605f6a097e4d04ae5 SHA512 88ab0927ae0fe2328903b304a9ca92152e33aca5aebc03045614e45c3bece7bf860f6a43bc1b9673aa11e20d73d009c3d8b05d466d9918264d134841e2e870dd
+EBUILD opencc-1.1.4.ebuild 1584 BLAKE2B a318d5c94785f65c3de09e0c4bb6fd9b35941248bfbfc0af60c7a6b610342f757118b806d41eb867757aead58415234db3b483769ff4805d4e0d6ff6bfc1f69b SHA512 d35610c8c6a687cb5e7568c781c179c67656ed05b27128345b24b9a9106917cbc865d75f531148e26fc481c525be541bbf66109c19a18bee46af4be116a9cc25
 EBUILD opencc-9999.ebuild 1533 BLAKE2B 299501d905c1ede7ef325145d509cf5720ca7a995bf26fd3b815ad0d10a49163b6f072536e822a849c483f97855a5371952bcee97fae7ca30ca228964bb1ee68 SHA512 0310e4ebb741bbfff36a57cd1e5519606d486c6f92a8dd562ac04cfe2649427d1ab959df20709c02f16787457c8e2c684da2268bee9757a0c18f50ef8bb1ded1
 MISC metadata.xml 624 BLAKE2B 0fc3325d54820e80e6800c408c9590b0ad55587f94f1cde371c1c2f5396eb650dc53e3d568eeab3e92739c5db142e698119dea51ccacaaed106765d03db9242c SHA512 562f4b08443ed1a7e9ff97b412d5e050ebb6d9e89cd6609302fdaa903cacd5a031f12360c7cbc2504b027b08d3690a119568760621cfeea0294916366bf5261c
diff --git a/app-i18n/opencc/opencc-1.1.4.ebuild b/app-i18n/opencc/opencc-1.1.4.ebuild
index b8a6652fc9d5..f9d91ca6ab7e 100644
--- a/app-i18n/opencc/opencc-1.1.4.ebuild
+++ b/app-i18n/opencc/opencc-1.1.4.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..11} )
 
 inherit cmake python-any-r1
 
diff --git a/app-i18n/pyzy/Manifest b/app-i18n/pyzy/Manifest
index 5d3bfa16927f..8b2e1d46e0a8 100644
--- a/app-i18n/pyzy/Manifest
+++ b/app-i18n/pyzy/Manifest
@@ -1,5 +1,5 @@
 DIST pyzy-0.1.0-patches.tar.xz 5288 BLAKE2B 9a6c86aeedd496ae8372bb0640cb1e03386408a0b00a4c51a6223c4fba23f59631267eb0b7c707a11662025ded410609d17ba39327e0ca5011f48bea3422cd79 SHA512 3a3b9fc317f1c5f59bbe83f3ce58fc76a50bcee798118d66571ba31d504e73fbe7a6976f03ae28f9712c0ba641386ac69390a86185464371728782a62b98291f
 DIST pyzy-0.1.0.tar.xz 752248 BLAKE2B 5f927cfea31f8cd67cb3e7af9b48c6f48a7707e8324b6b211c3baea0e07683df1da3c8683a5f9aa5073277229ee4d712174f95a764b4dcc5dc5f40330791561e SHA512 18d78bc70229caad44fdba4b7971014979da0aeb35841cea9577d05e5eca871dfe40d285a926ac05a247c8a0b8ab34fd721dcd34517200c5cc75b6b1ed545b35
 DIST pyzy-database-1.0.0.tar.bz2 9977983 BLAKE2B 86f9ee48d584f33ada1ee5380efdaefd85750290caada320c4c9a21206b8fb50fe6a43b931fb41a8c3bc24853bb7843e23d1778b40e6eae68fa4ec383f2b4dcc SHA512 5a7248870407f7f92c418ada49a275062325f2eb33a7eb4b91492e4b706ae70ba931b04377a758ce429fa64cd22e8bee2ac4279d4f205bbce406248eda1decf7
-EBUILD pyzy-0.1.0-r3.ebuild 1226 BLAKE2B b3e7732656a27b6478fcad3be1af17340ccc8605348fb2ecb3192e946da8328bdd289cfbd4d2941c03232ca149b04bdb04c855ffb95536da52af509c57b35a9c SHA512 bc9a9244f4f2756f26818c57e4e7600593b3b601bf7caacd5e096b117134f20130be8d53e0cf1a3824e3a31112089f3c6288b562d0404c875ed12a7f8ad2d465
+EBUILD pyzy-0.1.0-r3.ebuild 1226 BLAKE2B 700ff5d720f0c9d80dfaa1f69e52430f164a8733ff387c00cfd22ad7eac6fed22b05181d219e54931f2948aa87ac95160c33b5391f1a397fee1bbc210948d000 SHA512 a9b9c0d3586b8f2ef8cab123449fd5733650f8fb39b3737347f16c4b4b806de46ed1e4a3a092f23d9f3f77d88648d5474688553b3d399d6b660ca65e171aadd0
 MISC metadata.xml 650 BLAKE2B 9aa1686850306d58efcf0b2d64247f0aa6fd588a988700aa3eac21c08b9aa958571038bdf0774a383db6c8950bb0f62a3fba80d1aec134b57a7a605c037b70ad SHA512 98b3bac13ba2166dcccc681adf5106a3d5278c5aa162ba0c8e71878767520d4cc2b5383f434bb7747c9ca97c96592f927674cc48d732a5d77d660d5147f058f7
diff --git a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
index bdcf77c9e239..69d5e704ce42 100644
--- a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
+++ b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools python-any-r1
 
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index b3b38afc4e3e..12b0dd6b6076 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 79d7b369f03e..a9b710e78ede 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -2,9 +2,10 @@ AUX gnucash-3.8-examples-subdir.patch 316 BLAKE2B 77779cebb75896e8d51981f5fc0cbc
 AUX gnucash-3.8-exclude-license.patch 634 BLAKE2B d6b86102a4ced983684e75f4f4801b7da096923a65c7fca10f13e9da45adb70ac5c2c3c5af9151a14e6f1eb3a3711d6283840db232ee6113818e1f1b215be9dc SHA512 a9c43405226d2256c0b3c981e70a4fc79bd126c08089e68ac01edc86070a2936eaa3f77ac16bad94954addd2085ca0bf1c62bec3d31840559bbf213e1b530f2d
 AUX gnucash-4.12-drop-broken-test.patch 1214 BLAKE2B 6e977f65cecee6b9102881529799f04ddd03b170f0e9cbe8959b3e356d2dfbef14d9cb11d3e37f0225991fe7bd08ef50163db1d007836cb1024b0c1a6e79b0fd SHA512 8f18214982537514cb0640a4fa52fe9707c6f3ea0db0eef1108fb7b36fb89d0dadc87d12796c60b94d9ed8224655c35a9954bfb463f9f6b56cb02eca4d9d4cda
 AUX gnucash-4.12-fix-test.patch 751 BLAKE2B 650ee0592dbc21f36792f135bf3c13b5b4869cf343170917b5bf408d43d6bb2d105e7f987fba38073bd16e6cf65ad8615812851b05b4909800ec9784ae1b5279 SHA512 f1e2a7fdab9849167dbca2fb407416ba6e55a158b609a995a9bbde3ea1d06cff1de00cc9839f4623b3ac04300b7043a38d5cd6cc70d1fab131159fb3e4ffbfd3
+AUX gnucash-4.13-no-werror.patch 1631 BLAKE2B 7cb2a662bc7cc5b0d94cd4fec7b0f06d3d20dc91e8ccab553549dcd7a18a30d8d1f11b6879816de7512aa7bba533c8377bac8cd23f5cdea41dd4e40e2d2f9810 SHA512 578ef558adb9b3e4e96eb5bd4bd23680edf6f3a66f52c1bd71ad636e5d01bfd1dfaecea433fa9c17dd52a049989e7866e27bc98458c300475c72a88a8c850c1f
 AUX gnucash-4.13-webkit2gtk-4.1.patch 552 BLAKE2B 8fd437c963fd8d6ba61d6b4c9db75ee3ab7a80671d4f02621727b00d256793242e9b94da0a61df36c1b7f53c8c205007ebb49d3a0cc1f8caf0d3de08d56f5d46 SHA512 546d068ac56897115aad9ba58dfa1e93b8bca2d789d1aaf2d22ec86a2d4a478be135b2bc1780ab9992496d764fbdea8b673386febcb9b4fbf85634f1578d5956
 DIST gnucash-4.12.tar.bz2 14552115 BLAKE2B 6d5faf2fa1d096315bd6c346e0291109669fd9df4bc0404f4dbc2fc56c8a361aeff57e3535fea862f21ff59391319010b7f28c9bd7df658a1b0c518894862585 SHA512 4c930dfc9a10dfd06d3c52874a61e533ddc39deb1c334162dc3a096d998dbdfcac61520ae94dedbc6742b7807e250ff92d26067a70c4ab156e46bed333bbfd37
 DIST gnucash-4.13.tar.bz2 14658572 BLAKE2B 027151a800194b854ad8bbe5175b24c99e924331f2b0a35745870542c2ade1e7347d2cbc3e400f621c6b5c1bb708633609a1891e729f8923d0c717537f884ca9 SHA512 7f1f5a6c6e537aca7e88c806461c58e90256954842026d801dba48586fa5817519220f532b9e460bc34751c94e6be4a80aac06325b7bada716616a735e2de3d3
 EBUILD gnucash-4.12-r1.ebuild 5313 BLAKE2B 245467b20d279494f07c4e234303d456424b0545f390468522b95042774a297970dd20a3a3c298cd93024ec6dce671ee6a5abb6c89cd258d3a42f1be9e976eec SHA512 30fc2f0259634169a02e5084efc169577cba07c4ea429f07fa27e188576c19c9daa7473792763b2381a83ed959c2a8e946f4b818110c8b337ba5f96db9d15e83
-EBUILD gnucash-4.13.ebuild 5289 BLAKE2B 034a624da89d49f55fcff26328d325727f6254ac5839f293305d076b4cc5c3a939fa90b6cab9bf02088a6cff5f3052453621924bde4a1d5976575a4365382dbb SHA512 97c08df38ae8eb1f8be020027cddfa6b810aeb8c2a8f5b614ecb4cd4f7467ccdf2e13b0bf0ae6348fbe2e46cfded052443bef591bc1dc0e4b8ebc27a74f7e233
+EBUILD gnucash-4.13.ebuild 5331 BLAKE2B 7790e6b494e0cc867fe13a178fa47d42e0d8715c7a6c4eca290a48ac57c436fe1cb00fce427450314f8f476320fa45dd97b4a2cfe5d16366e85eb2d0f50bd290 SHA512 4cb941ee2f69dc52108a9abf78672721d76f7fc787631e38e976e7f4f18ee67beb11a9c133fe507e8c20617f44174f85df03669ce19ac1dfeaeed2ce17d08d08
 MISC metadata.xml 1920 BLAKE2B 797f0dd6443bbb96fe31e287c4733fa477ac64cabc19bea78d3c12b479c08d635d52f03ba0ca0c5e1a992709eef68af01c2d0beb6f9c47e8a9909be327154228 SHA512 d3ed034a7b95480748e7d8431b25d1ef7aa7d2df04df82c35d58450709f8963822ff30476a2be7dd92461efbabbce6963e51158640153f7159c76b244e9b1861
diff --git a/app-office/gnucash/files/gnucash-4.13-no-werror.patch b/app-office/gnucash/files/gnucash-4.13-no-werror.patch
new file mode 100644
index 000000000000..5b45898eacc1
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-4.13-no-werror.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -578,14 +578,14 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
+ set(CMAKE_C_EXTENSIONS ON)
+ 
+ if (UNIX)
+-  set( CMAKE_C_FLAGS "-Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
++  set( CMAKE_C_FLAGS "-Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
+   set( CMAKE_C_FLAGS "-Wno-error=deprecated-declarations -Wno-error=parentheses ${CMAKE_C_FLAGS}")
+-  set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations -Wno-unused -Wno-error=parentheses ${CMAKE_CXX_FLAGS}")
++  set( CMAKE_CXX_FLAGS "-Wall -Wmissing-declarations -Wno-unused -Wno-error=parentheses ${CMAKE_CXX_FLAGS}")
+   set( CMAKE_CXX_FLAGS "-Wno-error=deprecated-declarations ${REGISTER_CXXFLAG} ${CMAKE_CXX_FLAGS}")
+   set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
+ endif()
+ if (MINGW)
+-  set( CMAKE_C_FLAGS "-Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations  -Wno-unused -Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")
++  set( CMAKE_C_FLAGS "-Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations  -Wno-unused -Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")
+   set( CMAKE_CXX_FLAGS "-DWINVER=0x0500 -D_EMULATE_GLIBC=0 ${CMAKE_CXX_FLAGS}") # Workaround for bug in gtest on mingw, see https://github.com/google/googletest/issues/893 and https://github.com/google/googletest/issues/920
+ endif()
+ 
diff --git a/app-office/gnucash/gnucash-4.13.ebuild b/app-office/gnucash/gnucash-4.13.ebuild
index f1335eb5330f..42de933a3330 100644
--- a/app-office/gnucash/gnucash-4.13.ebuild
+++ b/app-office/gnucash/gnucash-4.13.ebuild
@@ -101,6 +101,7 @@ PDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-3.8-exclude-license.patch"
 	"${FILESDIR}/${PN}-4.12-drop-broken-test.patch"
+	"${FILESDIR}/${PN}-4.13-no-werror.patch"
 
 	# This is only to prevent webkit2gtk-4 from being selected.
 	# https://bugs.gentoo.org/893676
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index 9d6950583467..3e64eff4c5c0 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -2,6 +2,6 @@ DIST homebank-5.5.4.tar.gz 3089097 BLAKE2B 3b73ca8a016a02c5050bed4d702cb2e71ed34
 DIST homebank-5.6.1.tar.gz 3357600 BLAKE2B 487ae9ea6c518a5cf53438a6095a29319dff9b1b77dd52fff6c9f1638eb9c86c34895697c6d9964493cbd62192eeba0220bd3d56a0cc64583d4eb2aa109bba1d SHA512 5d0b7c1a843e61d655cfe5dd3690cbe1f121baa695fd476c5322036458712faa038fcb8f6504378a856cd9181840f1cd1e485e2d8d26b729f93709a887b7b021
 DIST homebank-5.6.2.tar.gz 3370041 BLAKE2B 0735535bf4366d2190448272aaa4b49ffff80f38d1b3086fa5f94753e14f0cfe9c88ded7986189fd949e30298e903b35649aaba23ef015682226213f1cb57e5a SHA512 6820e7d23af9097928edd17dd71a875fefa01f4ad9a5e1d9b27ae5080bc0e030c123c1ec2940eea58dc04cf04fb533207a062b87ca5ece7244ef56f9a3971f7d
 EBUILD homebank-5.5.4.ebuild 888 BLAKE2B b1975b299a1924bbcec2ff5ee92c719dec42a1ff3ba2ef77a4b055de82ba1dde5c91a85a41ba660f893adb59b91c72bd79aab816b53444be5fa993d9bc83270d SHA512 4a5a607af4994893b4e766730360b8439ac8ee2e13f89e59e71ad95b64d22d360308f53df19fe945dc7b419ad8a710dd00ec5ceb3fc66a811a7b3f0e333fa16f
-EBUILD homebank-5.6.1.ebuild 783 BLAKE2B 2049250a121a67a68040ab8da212fc49b3f2a414d193fd957dc25fec27e0f66cf7dcf69c096848e3897ffb21761496e0eacd198ea7add974062d9d73d5c1bd93 SHA512 8b49458509409abfa36dc36630109885ae76b6b7975acc446f72eea6f29171cdd2a837b90b4b42b6b7b380650f45479083735c6765ccc6a5ac423b2aea3785ee
+EBUILD homebank-5.6.1.ebuild 780 BLAKE2B 0b620af3e3f49ab4ded033f8e43756872c0cf6fe875bcb7f1ba9a1365a1da376140684763ac3fe06f4d4313b04bdcac4887f800e628d5c0ee1d09ff50cd4a89c SHA512 0641488db862bbdab66ef4b69184b6e5f9536edd3da88d66ec8e4efe475eb2e8da14fc91e2a93527e2ca59c7d12fd49b41148b2fadb83d8cde4ee1c4e862b9f0
 EBUILD homebank-5.6.2.ebuild 783 BLAKE2B 2049250a121a67a68040ab8da212fc49b3f2a414d193fd957dc25fec27e0f66cf7dcf69c096848e3897ffb21761496e0eacd198ea7add974062d9d73d5c1bd93 SHA512 8b49458509409abfa36dc36630109885ae76b6b7975acc446f72eea6f29171cdd2a837b90b4b42b6b7b380650f45479083735c6765ccc6a5ac423b2aea3785ee
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-office/homebank/homebank-5.6.1.ebuild b/app-office/homebank/homebank-5.6.1.ebuild
index 2e1c67a5408b..29ac29e41ddd 100644
--- a/app-office/homebank/homebank-5.6.1.ebuild
+++ b/app-office/homebank/homebank-5.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://homebank.free.fr/public/sources/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+ofx"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 RDEPEND=">=dev-libs/glib-2.39:2
 	>=net-libs/libsoup-2.26:2.4
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8aff01aa0602..d3d7e91475cb 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/crengine-ng/Manifest b/app-text/crengine-ng/Manifest
index bbadb6df25f9..9e570a38554a 100644
--- a/app-text/crengine-ng/Manifest
+++ b/app-text/crengine-ng/Manifest
@@ -1,3 +1,3 @@
 DIST crengine-ng-0.9.7.tar.bz2 3594561 BLAKE2B 65adf26be6198a29c26a506e5e00dde809a6bd9371e7f226ca954a89e0dfc68f314891f9e060a3055e5313673c266a26954353479f486abcf1bb87951202f64c SHA512 94775722f8ff3680c36278e2cecd864b5e3f9de7940aa0e681b683cc5136c8098650e495c3f0729af187839e45d6409993fdc2fc2738250cacd406f2540fdc31
-EBUILD crengine-ng-0.9.7.ebuild 1604 BLAKE2B d7aad36f4d880e7f08d11c4e00f74720059655d7e1f2a100890902065ba8e83d01d887425c85e13cd52b499521d712150b157f890e1f5066dc5788967701cff3 SHA512 d07c26dc2427c71fb982e70cf2437d3e23557e640d6f4f2a8d49930c9490e8da3306ecf2f25c0d2012fc50178cac41ced9d75eba0161eff39664ed16461bcca0
+EBUILD crengine-ng-0.9.7.ebuild 1603 BLAKE2B 329732800dad5c21757e64fe999fe609ba32f55356e7525bdaacd76a2544e8fd27ea0f7f8fe4026d6bade1a8df1017d2d4d58a34b521c0239178cd6c52754519 SHA512 4e65f89650a407d761f883102838ef3652998459474898e325271077feedea03698ac2a46a0f7b3028a2ed1290df229c999c27e3171646d2e6fc355605785309
 MISC metadata.xml 1232 BLAKE2B ecb2f3ff8720e43b48f6e211da27f0f34d3123644a429cb7853ae4044761793f5137dfbeaa0962093f2b722fdcfb6e3bf9ad432835fa6fa3f5bbf5f7f7abd78c SHA512 6aa7904c0d002926d4223c46b31de30f5ab06dee8291909498ecaa6deed3a6b547cfaa40df1ad7dca7e74faa55e95ab4fe4fa4ac0698202b5dd0221a50288036
diff --git a/app-text/crengine-ng/crengine-ng-0.9.7.ebuild b/app-text/crengine-ng/crengine-ng-0.9.7.ebuild
index e29bd60b0df3..73d57f0593b8 100644
--- a/app-text/crengine-ng/crengine-ng-0.9.7.ebuild
+++ b/app-text/crengine-ng/crengine-ng-0.9.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs"
 
 CDEPEND="sys-libs/zlib
diff --git a/app-text/crqt-ng/Manifest b/app-text/crqt-ng/Manifest
index a1f89463016b..d6d3e4aed6e7 100644
--- a/app-text/crqt-ng/Manifest
+++ b/app-text/crqt-ng/Manifest
@@ -1,3 +1,3 @@
 DIST crqt-ng-1.0.9.tar.bz2 435826 BLAKE2B 771b073fadf6f1bc9ddf7887603aaf6081d54c2effd548523f7afbb8b6bdf20d21bf55c1c37101662c2b851e932c6b4dce777c8e9160b059dbb1daed499db1c4 SHA512 b4f395be1d2029024dfb064f38db2ea372587151de1f5fae3cef492d4285d6ce597bc93a48d98594c5b703db8c99ba29cd9afdaae4c39b80b53cf6a7bafdbb97
-EBUILD crqt-ng-1.0.9.ebuild 1087 BLAKE2B 84f678c66151bb54c72c62b38485a99c2e9d7e3f15eb940dd29f24ec3c9a3c902a132a1d151fe0b42fcae8577f18c7736f2f868da1c41155038a47e627b2f312 SHA512 0a178c678d10dcfcb74453e6753130f123de75844ae675ba9b6cc80e4190b8371bce5cedced5b92459ef51501343cb39f7954aaa5d4554e5925244c1ab5ff3b9
+EBUILD crqt-ng-1.0.9.ebuild 1086 BLAKE2B c03f1180d865ad16ceee507e8286d191de30ab48536dcaa5e3c5156f59838c832da9edc64611a0ce64f2cbb5f968715de0c524c13ce9f39f5031406dfdd83a1b SHA512 25880e2f6980a4ed051c38a88b23ab58d5485212986f8eddd7bc7c37e1d609265d9649ddbfc99ab20926d93b1afb98d03c53dba84bd708579f39773ecc5ee745
 MISC metadata.xml 1177 BLAKE2B 0c28a5a4feb5c6dd5cb1115c063770bb276f2accff5c7a5e695b1492ae5cf3a188ceef2d5fb3519da87f6b68eff452f4f61b87f6ebd196b08cba55a26836047f SHA512 7cd49c422506be812eb080160286b21e0ecd48d6ae877e3bbea2ea8fd2ca0998e36c670db0e75c708a54c0b311b55fcadbfc1bf791e4c0c912c29b42ed6fcee4
diff --git a/app-text/crqt-ng/crqt-ng-1.0.9.ebuild b/app-text/crqt-ng/crqt-ng-1.0.9.ebuild
index 9db0e77feeaf..73ef92e6b18a 100644
--- a/app-text/crqt-ng/crqt-ng-1.0.9.ebuild
+++ b/app-text/crqt-ng/crqt-ng-1.0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"
 
 CDEPEND=">=app-text/crengine-ng-0.9.7[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
diff --git a/app-text/openpaperwork-core/Manifest b/app-text/openpaperwork-core/Manifest
index 159b332989c2..9d71960b107a 100644
--- a/app-text/openpaperwork-core/Manifest
+++ b/app-text/openpaperwork-core/Manifest
@@ -1,5 +1,5 @@
 DIST openpaperwork-core-2.1.1.tar.gz 115580 BLAKE2B a6abd47967b1f94e41d2c491cbbaead3cc2c509e1dc980269e5575d2c08e0a30d50357b5e42ba56569f35b44a470992e45994413dddefd63ba65f8018853a939 SHA512 ef7917dcc0c2520ff63c776b170770a936743fbc8ff2a15993bae7090ef43aa76e66b787aeee6f6d43961fac2f67ebeaf8ba4eb93a912ecfe93567e3c78ed219
 DIST openpaperwork-core-2.1.2.tar.gz 104694 BLAKE2B cf7cc132758662495d4b586efebccaa20c892cdca2ae3bb68d5fc45639c828b8441906c56067db079c12f1393adcd69d2edec19ca51fe5fcd5930ce2a7005c0c SHA512 88cb55b7b94e1e149042357d3a1c6c2a2184e4810b5895e02ef896554ae88ed0ebacd9c11e401da5e155aec857cd1b148328b1ffd0b760f939e4e97b96d1ce1a
 EBUILD openpaperwork-core-2.1.1.ebuild 491 BLAKE2B b7b1e0db1826d9ac7b02dc46bbedee952988408e622f9e4232a90ce696b957331c839e8e9668fdc4624906b9793140b67351970b44d906893e59f3a32e611f03 SHA512 1dd424212431cdc4f3e7ebcbbff583b40b5d3f8d7ae8bd0be3b909342df5834e05e362e6b15e072bad4f95286b9aa9e6b067e1af0cc0b9043327e131acc1ea09
-EBUILD openpaperwork-core-2.1.2.ebuild 491 BLAKE2B 0c8af123304bc87e79ec4a83fb1a29ffafdfcfa5ceb8be24975d0bcd5fca8dd1eae0e21c1ede71741bf19d599546858386bc1576d35b6603b207fcab43f2889b SHA512 0b4ffffa6170d15c08836844bf1322399e0d78eb827d78f4ba810cb79ed6748a2a24eb30ad9d8e65197a7b0c594865e1aee330abe1707723462278aca474d5b6
+EBUILD openpaperwork-core-2.1.2.ebuild 464 BLAKE2B 2fd7b5444a3f202bf3ebc74e7b59de5f1bdeb9a98e41a41a4bc662a72c93b5db926ef51820e8f3fa8ff9ed270b30ff011d2fbcb3a22182d881833f583195dea4 SHA512 7ebe9f6e6de60c9e72fb8ef830dc4102ac771e97c61d47cffbd09c070f2a2d0f6a8caa47166c325f71b2673511529403a93e8c67033fde848b523213d41b3c91
 MISC metadata.xml 411 BLAKE2B 3b2c93ec0ef42b0af9ef95f4ddaa408bccbcad56b10358ee781b828274e00fc309be763a3193e411ca0886f9a96450fb6a52a86bf796713408cc1fdccf743d59 SHA512 43487d9ab1dd7bf0076cbd43b55f3ac30c53ec05d16fd8250d344af06528be0bc9aae1099530c342239b795d98398c4154ce03b7f5354b09b2632db62e5a81b3
diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild
index 7629df447682..58b64fac3c8c 100644
--- a/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild
+++ b/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Core part of Paperwork (plugin management)"
 HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-text/openpaperwork-gtk/Manifest b/app-text/openpaperwork-gtk/Manifest
index ffc3519af3b5..8c6c7be736d0 100644
--- a/app-text/openpaperwork-gtk/Manifest
+++ b/app-text/openpaperwork-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST openpaperwork-gtk-2.1.1.tar.gz 57893 BLAKE2B 387e04fe0e280f8ac4b8ed7d1c94c2fd8c76d556ee8f7ed7e76e7a1c298e8323664511538c947da4d460e5626cc8b7e3da984360467b96add50ca0c9a77075eb SHA512 0250c457639068a8b6e95f98570872340a145d5b6939d00f9a33139a7c539978e5591dda148e1d3fbedc366f9a0a58ddfb89510374c7b135bcf1550ec744857e
 DIST openpaperwork-gtk-2.1.2.tar.gz 59104 BLAKE2B 94782b0fbd29e749b68f277e5c48a8f194d4feafe2f1579615b51bed44855a9113631302e3ed0f8248683ba524e72147da7cdce76e54b266ae9d8dbaa5cba2a5 SHA512 9f11482e68ee01356644fc2a679044a835308f6591b1b3ef6fc079c26e87a5c8c7fa8ba23545e7bf7fc9d37d85151a70cd7bdf4c45c271f67f8a8dcf95a5c440
 EBUILD openpaperwork-gtk-2.1.1.ebuild 597 BLAKE2B 8c91e07b8c95a235782b5c961d57504dead47dde9302596a0f151d63a96323bcedfaa3da24cb058d82c08365886256913eb9ad9fcaf6bec42d67e28b5a84eff2 SHA512 58f9235076765ae4c3e04beb171d5afe5d27691ed941b4e3dd1efeb2c147dac51f8219b86b6d9ece26e305e11ad8dcee1efdc060168adb547f2e3821c814f1ac
-EBUILD openpaperwork-gtk-2.1.2.ebuild 644 BLAKE2B 5776c7a7a9f3d26fa91795acd7949b055e1fff4d6baa7ddd50f96514179cf5c2ede13960e9a479d72a4abb7854893760b7b39ee4a914afc94988eb5b9da1f66c SHA512 60831e4cd9d820150de53b7f527ecdebc59767d41c80c3c34208cb61cea4a3aae3db0de624d8044b93240179f090465c02811f44975828a95c5863bfdb4699a7
+EBUILD openpaperwork-gtk-2.1.2.ebuild 617 BLAKE2B 103d453bad52d8a3915fb431898f0ff9406547bfb9951b7caabcb5fcd7e44fb818451529da5bf1cb5332bf3819fafcc6b999ecb32291d1e8dd05435216db100e SHA512 e3e1f4e27fe96b26a2e57036e359c5aa95bd6c1017c11cd6aaa8f4b0ddccc14ee3195b7b0533730db7072ff1df90472d0b3742a5b6bfd8443fa92eda7dcb2dd6
 MISC metadata.xml 410 BLAKE2B 13172be1299a64f5856e03791df45398d802340ece2eb41856623f3d5649efc0fe26aefda55ed180b5e042bd9d14ad88298e5c2383c3ea64a29c8748b74a18eb SHA512 90faa39c2bfe806ba21302a6daaa9a7a01f6489e1fb8756a3dcc0f47d4cfeef52b51d8eb785b61c1b734d691a15c55764590736ea1e56c8102139b7b72424baf
diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.2.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.2.ebuild
index fc4ab026ab78..7884f8b08f13 100644
--- a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.2.ebuild
+++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.2.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Paperwork plugins"
 HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index 73041f9dc608..af4004fde1d0 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,5 +1,5 @@
 DIST paperwork-backend-2.1.1.tar.gz 1383107 BLAKE2B 0e814a829581fe6322cc0ae44e9e3a20a2fc066e9be5de038c4d08b9d85218961ca87777271ebc646b03425e78017109ddf35c05a4b11e8fcc3bb4b6d10a6273 SHA512 ab75aaf01571eaa52a283ac6e1b9ff080d09e2514e1efb98bc96e9986acf85ec2ab2d94fc27ba15230370c642e39fddf6e11922a3d18b16af38f4281ff9c628f
 DIST paperwork-backend-2.1.2.tar.gz 1346499 BLAKE2B daf8c6dee97b0bdf814bcf7e9c83a80ab878250994a770f5fa6be4c0b4e23f0def51e22c0a8652a19e9294f3fab0b522b25c2a91c306ad760d568faf76a78610 SHA512 0156baa658a9fe26680bf6d146af3f03b98da307ee1cfaf4803f8b70a2ffdb0010fe23c4d4f9b5a572919c4be94a1aad4fd070220849248cdb18c5b1c4bc478b
 EBUILD paperwork-backend-2.1.1-r1.ebuild 1312 BLAKE2B 2e44f4f10b445c03679e290e6d5141652d2e3699dad829be1b006641cc43d93656c962d16f9c4913d71007d69ff8f9e8b6645adf672bd5e6ab41a6351ffb5467 SHA512 763cf674c45ad4e845b71e12ad3f1b684305d43f70cb3f57d04b2b19f87b57e4b3d3548987cb11458f7dce98c9dbc1dc298dcfb46c872d4e62a2d2388f7384e0
-EBUILD paperwork-backend-2.1.2.ebuild 1344 BLAKE2B e08ad2534d207cde143ea2c12f7e1f55a0061aab1931a6b8270b2614fa7c36fe47fc52c5ca0f18dfe944d656df7cbb76c94abe79ad832f6c58b8275bdbe5d3b8 SHA512 79d0d69ed0e66ac16534f3527e51082d280d56061f681cb5c1cedc8f2f1042f6237c0c04a53436731a9f3731cb5db4b5f0b5dc9bdd68ca4a98e0bb9914daaf4e
+EBUILD paperwork-backend-2.1.2.ebuild 1317 BLAKE2B 1cd4f19bdd2c9ebd2808ec4a98e9dcc367be5061ff439019894e722f13d39bd5eeed39a21bcfc34fee76d931fc59227cc53693b5a02a083eb55e4d562fc1621a SHA512 517e128b5eb38752eb173a308ec4f898d1a40de714c9349c8f0553bf416dd411b87fc6071fae196437a91ee6099db9cd0ef786d7efc3fe7289025f007df23c6b
 MISC metadata.xml 410 BLAKE2B c6ed41347886699086f69694dbaa5134e9ebfb02cbc157909e02971cce01cc562e82f31c15bb5ae1ee261d79d6e5a9ece81c1cf7fa48a9839ddf467c06fab392 SHA512 01bf86e9c8fd1b9e1d514edca46992609eb8789fe95ea914914ef4fc43c7b3f0fcaffaa712bb5c72e3936679b44749837b0ba73c2b62c1b0bc52f318fcc8e31f
diff --git a/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild
index a9afa9ad51d7..2e602b216a83 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
 HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index dc8d83bcb7c0..1f7fb50d8089 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -4,6 +4,6 @@ DIST tesseract-5.2.0.tar.gz 1913462 BLAKE2B 6b80e5bb71543cf971683f66b87fd45a971a
 DIST tesseract-5.3.0.tar.gz 1913678 BLAKE2B 975b3a50dc2c9ec7ded82caaa068d2d9d362ee0bc6d51b41a52c692ac7f51231d4c64a9dda9e7b850297d4c1f13eb40a709e59eebe143df4f5e2a060cfbbfd3a SHA512 fc0cfda980059390b7d6d3d8e475b4ecc9dcfee1abc3b16fc9ffc8904db0a0847a5f6f1b32bd2e1f6f5a714a8c4df0fb3dc7c6aa25ece6162bf52fe86b4d0f34
 EBUILD tesseract-4.1.1-r1.ebuild 2058 BLAKE2B c6dc012b5c08976caf609ef582abbf448b1600ad2662ed2e9a8b392b9023ca60cc0e38a4865a2eb0e2865720432fea77797d285ad8d7456db655853ab75cbdca SHA512 aa34edc5c33973df0933752b182a70c76e037b2a9540c1a7bbccda9201ea775f245e25f38ef2b8c976649e4fcf6bbec8c31b3b0958c09eb86fc2d3b3550b86e9
 EBUILD tesseract-5.2.0-r1.ebuild 2098 BLAKE2B c5af7218c00662fca7f198e564e54d5c6afd6816e1bb26ffb49c29c90247db484130ddff9d19e3fef817fc8c70a0b698b4ef0719ba391efd48b615f329a2aab4 SHA512 608fb9c3af3c41ff6c6ea3a99e91b126b755ca85964f77602f0f7cb11ecd4bcd22a11c927bb331c068087caddab7338d1d6931963fc76be0db15907e3b4c5a51
-EBUILD tesseract-5.3.0.ebuild 2144 BLAKE2B 0e38991dec34a572003bde0a71296865c191e3630292df5aa8ff3f6d3b5f8a046e8e8641520be2cf8dad31fb1117a093ad1aae58e0cad39a747b8104dd8fdfa6 SHA512 7ee159cac432d98edaaadf9790443023ad9372ce902d26083efc7b50b110396c5761a508f54759e06231561dcc554a182dff40cd813f7096bbd0923b65711aa1
+EBUILD tesseract-5.3.0.ebuild 2142 BLAKE2B c587468a5c607d979f6de1326b7fcdbfe4491481e65caad18db916939fa089a7c9c203787f94d811169e6ed4da04d44ba674f8a35ba9d03888ee6cd0ab9d327a SHA512 910ad5737d58abb9506579954933ccd37b3801e4d9ef63026fde12b2d9db14f4c9c820574d4a9e861c46b93293396660fc73361eb965a786277e7dd52b5e0e2d
 EBUILD tesseract-9999.ebuild 2015 BLAKE2B 66bf7e18c2028ea2e219119394a5d0d22d2080533c25f108074b47958acbcbce43824f7d7e718a558d9ded2b12a35b348872d0c161620c315b25c8c1266ddbcf SHA512 9711dbbfe399b7d80343778461632fe9ba1907475ba78ef7df6142b2e308f46b332f7c8f32c31ff8f58c65509851929a4bf4e5547c8564af87109cf6b16ed6bc
 MISC metadata.xml 1020 BLAKE2B 77f6c8f3962e00b65495fff0176e7765a9583de651db12b0e532ad5ff4b8005ede93d42d58093ae3b397c40d085963f47ef0e41cfed609b581c1a2f8231ccc72 SHA512 d9ea277a6ad9ec5178252863d60bac1244e372ab6c4f4ce3fe4f7220492e78dec2349742699031ed727251f87173e821c64dec44fb9787c08aad216cad64fa05
diff --git a/app-text/tesseract/tesseract-5.3.0.ebuild b/app-text/tesseract/tesseract-5.3.0.ebuild
index cb7040d39bc6..7442416d462d 100644
--- a/app-text/tesseract/tesseract-5.3.0.ebuild
+++ b/app-text/tesseract/tesseract-5.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp"
 
 COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index f1d22eaae4c4..812ece079a73 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -5,6 +5,6 @@ DIST zathura-pdf-mupdf-0.3.9.tar.gz 9201 BLAKE2B a74621e6330889363e25875e25984d8
 DIST zathura-pdf-mupdf-0.4.0.tar.gz 9323 BLAKE2B e633e2d52080dc017cd59be184fc52f52b21f9bfa1cecb48c83b4383366226f8e65fcd92503493e8df568847f84a39f2f7d8e4a87df44c66ec121c246557e10a SHA512 44a8d72f54adf29cc853c636f2387edb52e253522c82175533a2f80a6afc45ca88a785785bb840bf81e368ef8f35e31f5e9bf7648ee6a13d394eb4133585c060
 EBUILD zathura-pdf-mupdf-0.3.8-r2.ebuild 783 BLAKE2B 87ad7d1eadc88026806ec9999bfc3486257362db0b3e0a6546c98f00b32dd89c8a699362c3085e822110fdd4b0645b3b968538917bbafd852eb69bcd49b01e2f SHA512 677fb3b5ced87f54d9d69367cba816f781bc08800f32219dea880e1cb767252401410b67c211908e815e3d54a2d3e7754d16d818439e9291bacbff9a182267a9
 EBUILD zathura-pdf-mupdf-0.3.9.ebuild 784 BLAKE2B cc9ff02db43aa1f51fff3ce73d51cb84e5070fae3fe130cf124da98191ca840c985b0b5ffd6fb48bfa7512b5fa9032043cef28fa0cc1470cb3c55e5945645cd4 SHA512 1877ff3986f1c4a507d6c8a68b6f31b159b42789bcb3bbdd65be56b287c8ad7cdfa344ef2a68652d72153255b5f4987b87e58aac1e5068e5d39b2675bcde1ff8
-EBUILD zathura-pdf-mupdf-0.4.0.ebuild 850 BLAKE2B 5a22d731aaaf6b7cd2d1306eb3b68050e87bbaf5442ec6334137973dccefc6b037acf49645712c3fd0d93a538636c78c348ece5aa5eab956bdf0916c3b71d7d4 SHA512 7334ceb8d5a68317b28eb6ccc4580a7c464f01b69911b3591372f502be1257dc378d76fffee4efe3fb315505e65d4c49d03c6f9fb605e1bbf66577f8a979d1f3
+EBUILD zathura-pdf-mupdf-0.4.0.ebuild 847 BLAKE2B e76b4863334eee0543e35938ca4d00eed77fcacfe0ba5a8e3e7167fa480530d6c8375b854557d6508f944f28be23193623a4672c79210c07c06bb93ff444e765 SHA512 c43ee375c0e9fefefd22b9676cec0b916b421c3d1762c4bc11ced376d7c261b270771367401d0e411a6df21e70a5091217d333f64792802c3b706ce0e3c012a4
 EBUILD zathura-pdf-mupdf-9999.ebuild 857 BLAKE2B fc48aa72ddb8caa36c3e32c51307d6779feb954e9607211dec5944c6c200c42fd180f0f5dc63c55eceb07401b3f08213fe24d1024f678bdf46b4491d2f6cfa12 SHA512 8867464a50199c1c523b587d2cec37d64ac17478a74002596a85bfa81bf66e9b83d09b95bf9802d29513001c07558f182bc5a7a63dac46daceb907bff113475d
 MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild
index 9e7a5e2f892b..80d004c0aeca 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
 fi
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 76248c7a65df..a573c826a05f 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest
index 6abf04052836..e873d4bb9d6e 100644
--- a/dev-db/kyotocabinet/Manifest
+++ b/dev-db/kyotocabinet/Manifest
@@ -5,5 +5,5 @@ AUX kyotocabinet-1.2.79-configure-clang16.patch 505 BLAKE2B 86113c69eb70f3d44305
 DIST kyotocabinet-1.2.77.tar.gz 949326 BLAKE2B faacde57e8c7fed3fb232ea6fd12b668f2d2ee352cd357d5e16e0d1740cd8f73e223964249efeae50f3ea5d0672117b2410b91ba557ebe1ac7ba4075ac28deab SHA512 f38794c11faa3f4b64097a2e314307e1a6b75ddc495103647ebe52786a689336754496e7083697417ea90436e7fad681f16440975abec9ae917874aa25153e0f
 DIST kyotocabinet-1.2.79.tar.gz 943804 BLAKE2B 8a12e6dd953a1ba995d5a60126fb2682a07be390698bf98535633af894573aafc63b55497dc869cad14eceb14824ceb4f8c471b9aa1dad51944c35eac0cf4912 SHA512 9243192c81d3aa37cc8c80eb3bdf235192a0919b134cededa2b4178be515d148916e7405e094cbcdd7dbf13bf38a569bf21863afac7cc05d6418cca5853a2ff4
 EBUILD kyotocabinet-1.2.77.ebuild 1469 BLAKE2B 81e5c87898efcaa4d7a8d51229b92896975ba19d04d8359f77061e770953f0dac5543bf9d28f051b2ad17c35d45096c287efbc82bdbe263c9750911036ac7a8b SHA512 67eecba0c4beee2500bf897cddbfc583b6c0e184c0664f043a460ffd4458f0d3e7a027142b75ce30899b19fe6f81db6f4f1fed7665b8c3af1ccb79600c8c9e1a
-EBUILD kyotocabinet-1.2.79-r1.ebuild 1535 BLAKE2B ae9524be38409b515fbc25fbc645d3f0c06fc5316363fe23516d0ada49ba423b1496fb92d8b4179dae86db9ee01a03f664d3ac7318d867f2e82701567e3f2885 SHA512 68a572b51e8e5106ed52ecf3b814b0bc7ecec3be979a93f659f4646ce73a726ac59ee0faaa5150be34c61662113fbae030fbe4b0c430d13fb2e92b1e8858e15c
+EBUILD kyotocabinet-1.2.79-r1.ebuild 1531 BLAKE2B c349157a2470fb9901387001d88725aa6f46704a55d7f21586ed89d1156ad8d872b5e0366e31c859e88e3548132d6650d3d931e0641622f46358d2e1a941e491 SHA512 843125ee419ec83b92180eb1699f668e2e8cf60efd14ec6baf18b5009c3996cd55522f22c505dba81eb3596c328a512086d41f021ada5e0d9272a07e5f0e164b
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.79-r1.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.79-r1.ebuild
index 82925dad05aa..e9050f518f2f 100644
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.79-r1.ebuild
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.79-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dbmx.net/kyotocabinet/pkg/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug doc examples +lzma +lzo static-libs"
 
 DEPEND="sys-libs/zlib[static-libs?]
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index c42d3f1044f4..0ca39c4ac822 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,9 +1,12 @@
 AUX sqlite-3.39.4-icu-72-test.patch 800 BLAKE2B 799fd4df209886e5df6fc050247719a0eafae494bd23c3ee44e4e1c0b86da036d438ac86f763101b846fef7b7f3c1196c0ebdbd3e7aa70394c76307673a44cc6 SHA512 dca2f9552e144dfb5636c4796c634d892d1de0beb980ce6683906266fb4c9a9a98e03eb92c8c3fe7a8de427ae41d0f784ac32c0f93630563cb6a3d6db6fb5493
 DIST sqlite-doc-3400100.zip 10934836 BLAKE2B 52adbfa911a5d8556e4e071bf14ad83145023fbd426f285d9724d7f06e41257df53d3c28224581f12b4ca8f699bf3d3ec829ee161374ce0208783e5da72639dc SHA512 1131b0a6304a4dd6287c85d38d1450fd2dd0e3377d88a263e3c4716415e0587750357f25486727b9433797da0331229682565e7a8a3986eba89cfcab550a2d41
 DIST sqlite-doc-3410000.zip 10979224 BLAKE2B aa42dd8977b1a2f782fcaecdea9797d0a97c623349854b8bf3050bbc8627482e77c1fd8952633c759e99ab6dd1038ab71fd4942429af9f9422cbc76deaac46ed SHA512 6eff61b7a63ee8cd8c9460b50f6ab6c9bf8074a270e900fee8bf28c1602cc5da35b0c626a780e735f349f08310a924ba83cd1420f2767f8d12d0ee0455374109
+DIST sqlite-doc-3410100.zip 10996110 BLAKE2B 03a0c77547ba20957884e202138a280d4f65e25f08e784b06026fdcb97a79999c1065009b8102362d4e58817a359d18245f2f34e98c210faa795b8b96ad4014f SHA512 796e3f75506ab1819043377cfaa96ff156e962b19d1aa5f04da591842ea52bc4e5dc5c69d765d9d7debd34e9075e1c48276d0a57c90d914ccb6236044cad0895
 DIST sqlite-src-3400100.zip 13725560 BLAKE2B 24d2efbbf7f8f35888b1e53c98f9c7fece9b1cf0b175bf49b78869253aa753ce47e2db67247183c07368e69d6eb63a6e39c06b212c8fd5ca36c892ff535bedca SHA512 78f8c6396bf8da090671c6f4c41255e60788324fccdaad906c53610eb6e37705f4d25c7f84da3be00b511ddf9f2e0545901f33f5ae4b6e00b1ea9413af095299
 DIST sqlite-src-3410000.zip 13831104 BLAKE2B 3bc0828f53c9e1e4344352375ef749fa145579b1a07ef657ca8d05417b5b0a211c785b44613fffe45d4bf74cff6f8e5320b5af7e8e97c1199e3d69916bc6ae6c SHA512 9c39202eb058e421035ffe4d5c9f74164a0ad4a928f6f01e4fa04af0e7efb64635ab5902220dbb37478c5c777170e4c49a171b36a0f908315e187a8f1aa2b5e8
+DIST sqlite-src-3410100.zip 13833820 BLAKE2B e863f03355bb47ba4464d953c0191a02845e651ec6ceaa1bb203c9976cf4c11ad2739af3f538c7fb675c863fd0b4980ed4f2237fa7e66abacca3bc4dc1986a72 SHA512 840d2542825db2d1758cf9fa0f7159a8c6c7d40d23a5249d1c7bdf0210a6cc83e4dd8e3393c0c6e76e922a76614a1b5f311e232d7439759bdc0e2fbb4c12244a
 EBUILD sqlite-3.40.1.ebuild 13018 BLAKE2B cacf271b8d62005ff052e2f76e64be08d772807e24c7609cce41e610633faceff5ed3583fab6e15489d8ee79f8643b637accbfb05aac1d537ef48529d663b8da SHA512 dfd0999b6bd41f54829d8d30679ac9592f9ba239864a70d3c1c79d09f173dace94dc9b23b15b94f2e6a9ba336f76b3871a65d901b28e58ab1c1080c128bb897e
 EBUILD sqlite-3.41.0.ebuild 12967 BLAKE2B ba52cd5e44d4f80b258950151e676d8db65ff62fc40568edd5d2daa522ce53a41b99a51623c4c8aac75f2ff3c95e91e39f60d4825de83934e41f8bba41a9e645 SHA512 c2d177d3f4e269dcc346a2060521ad82c6435fd0497a6f9c91932f2c80eb8cb2e057245bb6d49e64c6dbdd60dc6ab9205fc67fb5d28764b9a3a63082d82f2c82
+EBUILD sqlite-3.41.1.ebuild 12967 BLAKE2B ba52cd5e44d4f80b258950151e676d8db65ff62fc40568edd5d2daa522ce53a41b99a51623c4c8aac75f2ff3c95e91e39f60d4825de83934e41f8bba41a9e645 SHA512 c2d177d3f4e269dcc346a2060521ad82c6435fd0497a6f9c91932f2c80eb8cb2e057245bb6d49e64c6dbdd60dc6ab9205fc67fb5d28764b9a3a63082d82f2c82
 EBUILD sqlite-9999.ebuild 12967 BLAKE2B f6724f1c26d68d81390a6acecbefacae560d4c396f870749131202fcd9c59262fa07bba6b3629ef9c988ca8758ba29927df178dc0d35c717f9799682ddf6e344 SHA512 02598d374b55edf52ea3641b06812b554f80beb48137166b81b285499b92872574131e1afef3ab5d3ea6b7791cf1c2e47e86e144c2e2ad472be7adc07229353a
 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/sqlite-3.41.1.ebuild b/dev-db/sqlite/sqlite-3.41.1.ebuild
new file mode 100644
index 000000000000..b57b59ba8cf1
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.41.1.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+
+# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
+# for hints regarding test failures, backports, etc.
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}"/${PN}
+	PROPERTIES="live"
+else
+	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+	DOC_PV="${SRC_PV}"
+	#DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+
+	SRC_URI="
+		https://sqlite.org/2023/${PN}-src-${SRC_PV}.zip
+		doc? ( https://sqlite.org/2023/${PN}-doc-${DOC_PV}.zip )
+	"
+	S="${WORKDIR}/${PN}-src-${SRC_PV}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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
+
+LICENSE="public-domain"
+SLOT="3"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )
+"
+BDEPEND=">=dev-lang/tcl-8.6:0"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" dev-vcs/fossil"
+else
+	BDEPEND+=" app-arch/unzip"
+fi
+
+_fossil_fetch() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local repo_uri="${2}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	mkdir -p "${T}/fossil/${repo_id}" || die
+	pushd "${T}/fossil/${repo_id}" > /dev/null || die
+
+	if [[ -n "${EVCS_OFFLINE}" ]]; then
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+		fi
+	else
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
+			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
+			echo
+		else
+			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
+			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
+			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
+			echo
+		fi
+
+		(
+			addwrite "${distdir}"
+			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
+			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
+		)
+	fi
+
+	popd > /dev/null || die
+}
+
+_fossil_checkout() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local branch_or_commit="${2}"
+	local target_directory="${3}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+	fi
+
+	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
+		mkdir -p "${T}/fossil/${repo_id}" || die
+		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
+	fi
+
+	mkdir "${target_directory}" || die
+	pushd "${target_directory}" > /dev/null || die
+
+	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
+	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
+	echo
+
+	popd > /dev/null || die
+}
+
+fossil_fetch() {
+	local repo_id="${1}"
+	local repo_uri="${2}"
+	local target_directory="${3}"
+
+	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
+
+	_fossil_fetch "${repo_id}" "${repo_uri}"
+	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
+		if use doc; then
+			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
+		fi
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+	local options=()
+
+	options+=(
+		--enable-load-extension
+		--enable-threadsafe
+	)
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support bytecode and tables_used virtual tables.
+	# https://sqlite.org/compile.html#enable_bytecode_vtab
+	# https://sqlite.org/bytecodevtab.html
+	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
+
+	# Support column metadata functions.
+	# https://sqlite.org/compile.html#enable_column_metadata
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support sqlite_dbpage virtual table.
+	# https://sqlite.org/compile.html#enable_dbpage_vtab
+	# https://sqlite.org/dbpage.html
+	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/compile.html#enable_dbstat_vtab
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
+	# https://sqlite.org/compile.html#enable_deserialize
+	# https://sqlite.org/c3ref/serialize.html
+	# https://sqlite.org/c3ref/deserialize.html
+	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/compile.html#enable_fts3
+	# https://sqlite.org/compile.html#enable_fts3_parenthesis
+	# https://sqlite.org/compile.html#enable_fts4
+	# https://sqlite.org/compile.html#enable_fts5
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=( --enable-fts5 )
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support memsys5 memory allocator.
+	# https://sqlite.org/compile.html#enable_memsys5
+	# https://sqlite.org/malloc.html#memsys5
+	append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+	# Support sqlite3_normalized_sql() function.
+	# https://sqlite.org/c3ref/expanded_sql.html
+	append-cppflags -DSQLITE_ENABLE_NORMALIZE
+
+	# Support sqlite_offset() function.
+	# https://sqlite.org/compile.html#enable_offset_sql_func
+	# https://sqlite.org/lang_corefunc.html#sqlite_offset
+	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+	# Support pre-update hook functions.
+	# https://sqlite.org/compile.html#enable_preupdate_hook
+	# https://sqlite.org/c3ref/preupdate_count.html
+	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/compile.html#enable_rbu
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/compile.html#enable_rtree
+	# https://sqlite.org/compile.html#enable_geopoly
+	# https://sqlite.org/rtree.html
+	# https://sqlite.org/geopoly.html
+	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+	# Support Session extension.
+	# https://sqlite.org/compile.html#enable_session
+	# https://sqlite.org/sessionintro.html
+	append-cppflags -DSQLITE_ENABLE_SESSION
+
+	# Support scan status functions.
+	# https://sqlite.org/compile.html#enable_stmt_scanstatus
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support sqlite_stmt virtual table.
+	# https://sqlite.org/compile.html#enable_stmtvtab
+	# https://sqlite.org/stmt.html
+	append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+	# Support unknown() function.
+	# https://sqlite.org/compile.html#enable_unknown_sql_function
+	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+	# Support unlock notification.
+	# https://sqlite.org/compile.html#enable_unlock_notify
+	# https://sqlite.org/c3ref/unlock_notify.html
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+	# https://sqlite.org/compile.html#enable_update_delete_limit
+	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
+	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
+	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+	# Support soundex() function.
+	# https://sqlite.org/compile.html#soundex
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# Support URI filenames.
+	# https://sqlite.org/compile.html#use_uri
+	# https://sqlite.org/uri.html
+	append-cppflags -DSQLITE_USE_URI
+
+	options+=( $(use_enable debug) )
+
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+	fi
+
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+
+	if use readline; then
+		options+=( --with-readline-inc="-I${ESYSROOT}/usr/include/readline" )
+	fi
+
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/compile.html#secure_delete
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	options+=( $(use_enable static-libs static) )
+
+	# tcl, test, tools USE flags.
+	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
+		options+=(
+			--enable-tcl
+			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
+		)
+	else
+		options+=( --disable-tcl )
+	fi
+
+	if [[ "${ABI}" == "x86" ]]; then
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+			append-cflags -mfpmath=sse
+		else
+			append-cflags -ffloat-store
+		fi
+
+		# Skip known-broken test for now
+		# https://sqlite.org/forum/forumpost/d97caf168f
+		# https://sqlite.org/forum/forumpost/50f136d91d
+		if use test ; then
+			rm test/atof1.test || die
+		fi
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usev tcl 1)" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+	fi
+
+	if [[ ${PV} == 9999 ]] && use doc && multilib_is_native_abi; then
+		emake tclsqlite3.c
+
+		local build_directory="$(pwd)"
+		build_directory="${build_directory##*/}"
+
+		mkdir "${WORKDIR}/${PN}-doc-build" || die
+		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
+
+		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
+		rmdir doc/matrix{/*,} || die
+
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
+
+	# e_uri.test tries to open files in /.
+	# bug #839798
+	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict "/test.db:/ÿ.db"
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(usex debug 'fulltest' 'test')
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool dbdump sqlite3-db-dump
+		install_tool dbhash sqlite3-db-hash
+		install_tool dbtotxt sqlite3-db-to-txt
+		install_tool index_usage sqlite3-index-usage
+		install_tool rbu sqlite3-rbu
+		install_tool scrub sqlite3-scrub
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showshm sqlite3-show-shm
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+		install_tool sqlite3_checker sqlite3-checker
+		install_tool sqlite3_expert sqlite3-expert
+		install_tool sqltclsh sqlite3-tclsh
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	doman sqlite3.1
+
+	if use doc; then
+		if [[ ${PV} == 9999 ]]; then
+			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
+		else
+			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
+		fi
+
+		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
+		if [[ ${PV} != 9999 ]]; then
+			rm search search.d/admin || die
+			rmdir search.d || die
+			find -name "*~" -delete || die
+		fi
+
+		(
+			docinto html
+			dodoc -r *
+		)
+
+		popd > /dev/null || die
+	fi
+}
diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index 0f8e3adc2c57..baec4628dc2a 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,5 +1,5 @@
 AUX fix_rpath.patch 1792 BLAKE2B 38d89cc47984b4d83e2df79b444cba657b814a0d9f80d0c3172c49984a7c22eac40d7c880872be632244fcc2efbf24c52b5613ecbdef624db47df97d6c27c1c1 SHA512 aca59f03c289ed2ffc1df1a387d7f141df56968866187324d14239258c6b270a8a56739bfea7c8398af90f52c5ec7a87eedba4194eb3b097cd0df05cc8553964
 DIST tokyocabinet-1.4.48.tar.gz 1000485 BLAKE2B 4da2659a90dcee1cc99be286fe0e286ee75bd8179b75a944f229a3cc04169b8007220e36400d4934a7b5fde554bbc1783c4813fdf44b4a3530882ea0a8ef258e SHA512 b9995c838e713c13f781ab41062caefeb5c613f696dab08039f992f6860413d60a513114b83468cafdf7fc5b5e51ab880226972465d532f873f2a55f615e1440
 EBUILD tokyocabinet-1.4.48-r2.ebuild 1651 BLAKE2B 2f877ce218520685a36db536a94628e4eeea161c04078126414159091363a19606e9466699f1e615d858779cb5a3dce6aaf003b037aae41b53b1fb2107074962 SHA512 01c2bdd227aee1fd9081d0d66995fb08fa65cd89c7502a647a0d7d5145514a40e14849f2336a5acc88dc551c8c367ac02381c0f3b7db3fbc3ecf129eb6def8a6
-EBUILD tokyocabinet-1.4.48-r3.ebuild 1644 BLAKE2B 188a618d9294701d1e339456ada9845702b4dd4798e32e8075f55bf8e5392d47b69860266e148d5f487d0c6d00b646c0623e0749ff07bdcdba76782757920313 SHA512 de9ec17c5f20f46174df5ab7a33eecb12420d6b6b0b320426dd9f28965f121d54933636a2e3f139e96585cae4b4effaa8bd483f9f0218ffc861d2b792ef7384a
+EBUILD tokyocabinet-1.4.48-r3.ebuild 1639 BLAKE2B c1a2bc285909a90e620efa66cc753f3f179a65ed1b5403c317aa93abdcc51eaa98e691e2b646b8b8081bf7c6c311fd380498681e7c5d8d1344df5df12ddf7f38 SHA512 7d28de1e66cbd83a63262cd43f84c822c0f7c0019014339945ecf8969fdadb804104d3bf0965b3188fb8e84e5a73d37dc5c33459250496d9bdb88817fee5e965
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r3.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r3.ebuild
index 4d76957c742e..b74247f414d9 100644
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r3.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fallabs.com/tokyocabinet/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 debug doc examples threads zlib"
 
 DEPEND="
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 645384526dbd..b3f137787c7b 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 5369d5142bdc..c2ccb5505774 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -15,7 +15,7 @@ DIST php-8.0.28.tar.xz 10801568 BLAKE2B de03f5ad262e830c70d24b9e2dd997897e5613d8
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1 SHA512 437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.1.14.tar.xz 11752004 BLAKE2B 5ba60621c641b25c2d8ab0c82e97d59131587718c75cc013dc4ba1ad68e668e7f86b67f01f02c434e65c8a9075581a7f2decb2b8c3706e325e25e9f717cdfd82 SHA512 75a5dc3b0490cd8105d4f6c5446522b38953d78fe7b568798db749740f365c818b251d86aba72f5e555c5fe4e4a28e352a9510803bf3cdfe37d125824ae84d61
 DIST php-8.1.16.tar.xz 11760948 BLAKE2B ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1 SHA512 4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
-DIST php-8.2.3.tar.xz 12038240 BLAKE2B 97df5470813bcfb3f07b62ba9a5ab5f5931cf4c6df5abb7354c41080f8bdd8fe4e311841b217448993bc57f98f238fa107f29614bc19cab2902de519d826e67c SHA512 4e3ae840ac486868d5bedc2ae771e3ff5d4939ba4c2f7c769b7052322a5eccc8fba253df311a77f3ea852bf42f9dec34653baf828f68c9c191d3a425a8968d4c
+DIST php-8.2.4.tar.xz 11991796 BLAKE2B 4e1aa90472e2dbacb23f95736c399ac2b0f6e9577f58b502c26b5a2731b7c1eabb34bbdb75a13a5903870937a063ef8f321bf22bb23a74404592542186065ff6 SHA512 997435f3f921f305147a520497c68031aad6d1212365ddf04674d919fd2787d169d2898536a59709b5530857c5746a25cf43e726a2c3a30bcf3372107b2cd388
 EBUILD php-7.4.33-r1.ebuild 21423 BLAKE2B 8dd66cd6b064ac0fd5b4157a37e819cccde4a2e40e3185624e73b1d5e1c0acc9efbb62c3da887942fd7e5813953a75b5e64baee72844fbb5e7b82c44148227d7 SHA512 5ade5f1bded3433579af049bc70a8bacecfda257efbb1165133033ed8f2b68a6ed6adc0479a6d9ec6abf6ec291d81f41fc4cf6bd29d894c94d86c20b2d53f908
 EBUILD php-7.4.33-r2.ebuild 21561 BLAKE2B df6e401349347bb40e6582fe3abfd50e79911b7ccae77c0c0f0f345c3e18b5555a13466e4d8fa1b1b6bfd5bb8efe5ffe2ef38caa6548e48c647fe970c3d2d811 SHA512 12344d03c72ad15d145d4e60773d5502a268311e0d5477ea18c523572acf335ab65c1b533064b42f74e25e8417227a843a2ff3dae2cfedeb1d94a4d4c0024e51
 EBUILD php-7.4.33.ebuild 21371 BLAKE2B 1a1f130cec31dac7fea7b6aa38473eb7ac19b1194c2c2a76023b09043261f73e516a3ba5d21d1da5e3354d6abf3ac606dfb2f27bc0fe1ab1aa162f7c05f95522 SHA512 4ffaae2b5e4724860c40d789f920a3e06455a0efe5ed5d628d74a7012aa57b352188bd577a8e4707ce01be9f3e26534ba1524dfbc4218a93927c6417277cc2e4
@@ -25,5 +25,5 @@ EBUILD php-8.0.28.ebuild 21885 BLAKE2B e01e91b50e5833a2b25d523bd7c6f78fb8a24914c
 EBUILD php-8.1.12.ebuild 21815 BLAKE2B c1610ff5a4e439954b228744cd0223a4205dd1b53e6cff7a48535db414b6d20d307ba1b31c96ea6ab60b2ed1f811eb612c80e245b49acdf9659a6f8b2bb94b08 SHA512 73b766c5dec9b7231f1149b279b47e8621e527bbce2e1606bafdf1e6cd3f647ca30b2fcd16e1d9c3160c4a50c464fdeefbd05e1102f9debe7b79abd68fbceb4d
 EBUILD php-8.1.14.ebuild 21820 BLAKE2B cda25e68ea7ea22d38db686ebb940f52d616ec7f72320ef66ad12a7768f6f484a72045577ce2d5e3e250d5065a278aa96496bb84ae7686a5b1edc8f057f52785 SHA512 315620f4d75fe120620c149a45b84917cac7b0ca3138797a0894f9ad3907d8cfc73fb18e0233ab2b3f3891771c2aac585a2d2b6d04995129923936e132f7dd45
 EBUILD php-8.1.16.ebuild 21820 BLAKE2B eb143842e7dd5203a1b5e27c4be523d3b59ede11d524469a32574e20b0eaccdde3226f4ab0e6fd04fbe9739812440a170d308ee91451a4d19712dba2dba964e5 SHA512 0aaf26fb71899af646d7a05dfb66534a50f9d4eadbd656bc1316c6c350d077878cda8f7b881d4ad891d435ba3ac8c65e76bb847ab1c9b399af2ca5a76c5572bf
-EBUILD php-8.2.3.ebuild 21929 BLAKE2B 3071d992c1ab559358f7412c170f1d39411769e232117cacab97a229fbc4257e5f154dda46863b93524e99de55500b8fc840a98a14871426d94f5de3520be958 SHA512 5074206a61d3b81ce66434d4e6aa3f210b538725082fddd4fef0aa85ed8b10d5c5555e78c1031fce0bc64a9a1be8caea22161c388af64a826f6f752c84abf1ae
-MISC metadata.xml 3225 BLAKE2B d1a3cfff7e27471f841dc25e8f4e8f4f844c253ee2b49c86dcc6c75840516785ae2de1693530be86a1056776f5fa5696c6aceee0742c4c8253abf7b2c8074bfa SHA512 3147bb5309beb5e632358792cff73489f8595bb0f1fccde14b94d8b9c32acee92425a2aff7a6b25fa402fa9086f2b4e186d2b891d9efc8d8ad25f9a36db48bf8
+EBUILD php-8.2.4.ebuild 21938 BLAKE2B 961781609a864080f2a53f834ab59522bd8b61af484188fb770a24b482890aed9c3c04dbe7fd9b5717c2f6072653b2439572c0451eb64ba51e96149961308fe8 SHA512 0c1a248916133b760585f6622708c5abd0a5defe8a5c3018ff418b65c7399e9c96acb936d0fee85c0cfb15b9624f25b841dac64d3d163faabc9edc15dab8c649
+MISC metadata.xml 3940 BLAKE2B 30345df2362f848bcb46aae1822d7c70716bb45348b25a75a3d19acf450d777c247445bb24eb8a17f5bf72758894a2d2ebfe05e9256dbe4aad7459b0fe3c1db1 SHA512 e5d9f6281cab122b3239fb694344b8ff5ae0c30da4bb9ed92594d1cf70bf82ddfe6816db3ee0326adfa471f5aec508ab0a7284fc3efab98dfc73fcc6770551ef
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 87b3df81499e..7143eef2004b 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -10,36 +10,82 @@
     <name>Michael Orlitzky</name>
   </maintainer>
   <use>
-    <flag name="apparmor">Support FPM application confinement through <pkg>sys-libs/libapparmor</pkg></flag>
-    <flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag>
-    <flag name="bcmath">Add support for libbcmath</flag>
-    <flag name="cli">Enable CLI SAPI</flag>
+    <flag name="apparmor">
+      Support FPM application confinement through
+      <pkg>sys-libs/libapparmor</pkg>
+    </flag>
+    <flag name="argon2">
+      Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg>
+    </flag>
+    <flag name="bcmath">
+      Enable the BCMath Arbitrary Precision Mathematics extension
+    </flag>
+    <flag name="cli">
+      Enable the Command-Line Interface (CLI) SAPI
+    </flag>
     <flag name="coverage">
       Include gcov symbols for test coverage and lcov reports. Only
       useful for extension developers, and requires GCC.
     </flag>
-    <flag name="ctype">Enable ctype functions</flag>
-    <flag name="embed">Enable embed SAPI</flag>
-    <flag name="enchant">Add supports Enchant spelling library</flag>
-    <flag name="ffi">Add foreign function interface (ffi extension) support</flag>
-    <flag name="fileinfo">Add fileinfo extension support</flag>
-    <flag name="filter">Add filter extension support</flag>
-    <flag name="flatfile">Add dbm support for flat files</flag>
-    <flag name="fpm">Enable the FastCGI Process Manager SAPI</flag>
-    <flag name="gd">Adds support for gd (bundled with PHP)</flag>
-    <flag name="inifile">Add dbm support for .ini files</flag>
-    <flag name="jit">Enable PCRE JIT support</flag>
-    <flag name="json">Enable JSON support</flag>
-    <flag name="ldap-sasl">Add SASL support for the PHP LDAP extension</flag>
-    <flag name="lmdb">Enable support for <pkg>dev-db/lmdb</pkg> db backend</flag>
+    <flag name="ctype">
+      Enable the Character type checking (ctype) extension
+    </flag>
+    <flag name="embed">
+      Enable embed SAPI
+    </flag>
+    <flag name="enchant">
+      Enable the Enchant spelling library extension using
+      <pkg>app-text/enchant</pkg>
+    </flag>
+    <flag name="ffi">
+      Enable the Foreign Function Interface (FFI) extension using
+      <pkg>dev-libs/libffi</pkg>
+    </flag>
+    <flag name="fileinfo">
+      Enable the File Information extension
+    </flag>
+    <flag name="filter">
+      Enable the Data Filtering extension
+    </flag>
+    <flag name="flatfile">
+      Add dbm support for flat files
+    </flag>
+    <flag name="fpm">
+      Enable the FastCGI Process Manager SAPI
+    </flag>
+    <flag name="gd">
+      Enable the Image Processing and GD extension (requires
+      <pkg>media-libs/libjpeg-turbo</pkg> and
+      <pkg>media-libs/libpng</pkg>)
+    </flag>
+    <flag name="inifile">
+      Add dbm support for .ini files
+    </flag>
+    <flag name="jit">
+      Enable PCRE JIT support
+    </flag>
+    <flag name="json">
+      Enable the JavaScript Object Notation extension
+    </flag>
+    <flag name="ldap-sasl">
+      Add SASL support for the PHP LDAP extension using
+      <pkg>dev-libs/cyrus-sasl</pkg>
+    </flag>
+    <flag name="lmdb">
+      Enable support for <pkg>dev-db/lmdb</pkg> db backend
+    </flag>
     <flag name="intl">
       Enables the intl extension for extended internalization support
     </flag>
     <flag name="opcache">
       Enables built-in opcode cache, replacing pecl-apc et al.
     </flag>
-    <flag name="pcntl">Add support for process creation functions</flag>
-    <flag name="pdo">Enable the bundled PDO extensions</flag>
+    <flag name="pcntl">
+      Enable the Process Control extension
+    </flag>
+    <flag name="pdo">
+      Enable the PHP Data Objects extension
+    </flag>
     <flag name="phar">
       Enables the phar extension to provide phar archive support
     </flag>
@@ -49,21 +95,36 @@
     <flag name="session-mm">
       Include <pkg>dev-libs/mm</pkg> support for session storage
     </flag>
-    <flag name="sharedmem">Add support for shared memory use</flag>
-    <flag name="simplexml">Support for SimpleXML</flag>
+    <flag name="sharedmem">
+      Enable the shmop extension
+    </flag>
+    <flag name="simplexml">
+      Enable the SimpleXML extension
+    </flag>
     <flag name="sodium">
       Enable support for crypto through <pkg>dev-libs/libsodium</pkg>
     </flag>
     <flag name="sysvipc">
-      Support for System V-compatible inter-process communication
+      Enable the PHP System-V semaphore, shared memory and IPC extension
+    </flag>
+    <flag name="tokenizer">
+      Add support for the PHP file parser
     </flag>
-    <flag name="tokenizer">Add support for the PHP file parser</flag>
     <flag name="tokyocabinet">
-      Enable support for <pkg>dev-db/tokyocabinet</pkg> db backend</flag>
-    <flag name="xmlreader">Enable XMLReader support</flag>
-    <flag name="xmlwriter">Enable XMLWriter support</flag>
-    <flag name="xslt">Enable the XSL extension</flag>
-    <flag name="webp">Enable webp support for GD in php-7.x</flag>
+      Enable support for <pkg>dev-db/tokyocabinet</pkg> db backend
+    </flag>
+    <flag name="xmlreader">
+      Enable the XMLReader extension
+    </flag>
+    <flag name="xmlwriter">
+      Enable the XMLWriter extension
+    </flag>
+    <flag name="xslt">
+      Build the XSL extension
+    </flag>
+    <flag name="webp">
+      Enable webp support for GD in php-7.x
+    </flag>
   </use>
   <upstream>
     <remote-id type="github">php/php-src</remote-id>
diff --git a/dev-lang/php/php-8.2.3.ebuild b/dev-lang/php/php-8.2.4.ebuild
index b67b15fa8e18..bb2d5ee06588 100644
--- a/dev-lang/php/php-8.2.3.ebuild
+++ b/dev-lang/php/php-8.2.4.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 WANT_AUTOMAKE="none"
 
-inherit flag-o-matic systemd autotools
+inherit flag-o-matic multilib systemd autotools
 
 MY_PV=${PV/_rc/RC}
 DESCRIPTION="The PHP language runtime engine"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ea21203c4a73..9e5286d5d2f4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest
index e0260b8cefb0..151c1a9afe1c 100644
--- a/dev-libs/libcgroup/Manifest
+++ b/dev-libs/libcgroup/Manifest
@@ -16,5 +16,5 @@ DIST libcgroup-2.0.tar.bz2 953191 BLAKE2B d4fe008a51a4f90047210a3c8e4ce48b1c4a12
 DIST libcgroup-3.0.0.tar.gz 1125800 BLAKE2B 5d4999ac513de756ffe741d2e959c01d8500a2000f521dff31832e1ef545869fb9c8ae1c78d05aaa051e7e6e68266bd57a751ba3aa897966a83ff50128090ba5 SHA512 1e8a7c9a71d928ab0e354254b007b30fc159a30e441bd52a03ded142420c94e130594bb512680c62fc22f5193934fb78afc31453342b032d1db3197fd4c3e606
 EBUILD libcgroup-0.41-r6.ebuild 2692 BLAKE2B 6bf892931d82de9ea1fe68a26d7902ff820a4a97bf0b1b0cf1a9dadc91c9af6e5af4735c65f82c7a8c2b19c6ed0f01ac4036e00729927f74b3b2e63c1846352b SHA512 82b0d4ccb18b66e6631adbc65df27292a5530e76d9e94f3c1caac67da8338eaa1de4a1a1a14cb0106a0aa80fec4882296cb4f4dd6c87b8e1369de8a623c5207b
 EBUILD libcgroup-2.0.ebuild 2318 BLAKE2B 48821bd83b937359e5b7a8dafcd285cf7aaf87efbfc323f38afc679907d68fdcb5ac3d58fe245fa1965277458676191b900e3e1eabed5de5b961b55b148cf80f SHA512 24ab58cc48929a107ab1f5b3ccecad538a55385f39b1e9fa1b57a1751697f7e381dedabebff67976729cb0e347fdd705bef1eac5555508529ef19c30366ddf0b
-EBUILD libcgroup-3.0.0.ebuild 2632 BLAKE2B e20cd6272610bdb12348ec49ec2ecf768b90f09c650e764aebf920e33d88887c924701e6a4a2b1839c8f9b8b02ac463c46d5974437da9a94f99526b6ae7939da SHA512 ce68636c2bc46752f20d7cd3a4683cab182619a294996cd1d65578c022be936c30eef1d68c684bad6922b190fe938048aa48b949b9be65102cab6b6191322a1c
+EBUILD libcgroup-3.0.0.ebuild 2628 BLAKE2B 00ed2f46d37bd3f6e29add1a4faf7bae6b410ee6bdc2232555b4dcb823803daa1d914bd68b4f8a4d77e5fb439966053002b2ebf29d819554d00217e6ef325e19 SHA512 bc870e7aab410ddda6368344257c8dd1e7fdff9bac9f61116503bdaca07d5a66212d51dcf5c853a41762fe226a7c2161fc76a7c7184aa7f47c948b9b22efb816
 MISC metadata.xml 675 BLAKE2B 2904270c2fc59a91ad0f0820094cb4569ca84b1c97010519bfa19e86d312f5d310fe7e11d04d185125eb3d2c017c7d9e7bedc4950c487154941084ea11250b59 SHA512 fbc778a739e6b0fef0844a61b12cc18ee7fa377c978b389818d47eea2ecc0ff154e56c779e37730f7c8257daf07bb54cc8dbc7225e082fd7adb8eb6a5fc91bc8
diff --git a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild
index a5009c1da4d8..bcd109be15c0 100644
--- a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild
+++ b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v$(ver_cut 1-2
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+daemon pam static-libs test +tools"
 REQUIRED_USE="daemon? ( tools )"
 
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index 1a816870503f..f5f1fcf9fcb2 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -5,5 +5,5 @@ DIST libtpms-0.9.5.tar.gz 1264086 BLAKE2B 3e6da08dd31414bdf19260f47fce6ba7ace0ae
 DIST libtpms-0.9.6.tar.gz 1264338 BLAKE2B 7b127ef370a48214814bb9ad0e8461ed0af21f32ab84f243945980c5e36ba5e374b4de7a83bf9c67c29264609063d48eae2dae83832daed70170bb1ed39eafea SHA512 35f26e4849eb98cd73461aff439c19f77bbbcde9b7661402e3d419354c4dcddd057349c4f7178573f1ceea2e95326498eb9afea3bd48064bbff534fc7f6939c3
 EBUILD libtpms-0.9.4.ebuild 1299 BLAKE2B 6c78609afdc5385a842da2f415ef918475baab3da737cb2e43c72cf5d2aaa382dd84b4157e4b52aa7fa5f44de6db48b37f680897baabb006d923589d4ca39552 SHA512 f54857978f2f4d021055406f2f2f480f3df97ca57cf29b1967389107079cbe37551ac8717c03fdbf38cb4aa64b5567a87f27bd2ed46edd0243d076c06689f3b1
 EBUILD libtpms-0.9.5.ebuild 1358 BLAKE2B 5a0cfeb68ec4e973527fd12c59ee80331c25c58ccada0f25a85aa4c08500ceaf92bd56cec5157b83e8f939470be723390a261a01a921eaed291e68e04353a0ed SHA512 63df6fc9b53e326046515c5a9a6b8fc62128c08612dfebf4f8f3874dc6ad7e403c3ec62f42f75b5b2f7ce29024dc994cff68f3038a649caeddef4e587d378e6c
-EBUILD libtpms-0.9.6.ebuild 1359 BLAKE2B 126b4908c913e4a2589126eec59c4d45235b9cb8d391f91438df8899fe9c685527d8cf2c55d93d4df6a7ded253be90188f3e8b31e5816811d8141a333c44089d SHA512 84efa1b8c66a52436a00f4ff64ecb5adea518f1c7a8042aeeb428cdfa792627ee8c99f1224db338a59af52de446181740c41908a736351675aee51c362009d09
+EBUILD libtpms-0.9.6.ebuild 1357 BLAKE2B 21ecc3c6e03111c24c5b06f2698d980c1f22e69de41f42998ea655bafc48a8975feb32ad7b85973216fa444b7dd193bcbd9d7dc0f8cc0f7f526fab011cfa8f23 SHA512 d8a48b47cb8ca9cb13b2d8dba29692d2ad14109355a063216febd81b256f88bea5c007e9f9fa9d07d6c562fba3bb27d9d63a313e8ccba7bb78f8df1a9be5f995
 MISC metadata.xml 621 BLAKE2B 5431a08a57b654746f41820560912e2bac4fc0c5cd2eb5f44c77e4eda65c1a160845205c3ae76392c4a6f9aa33562999576c055ee6d1b89579a9e2a49c59e4f6 SHA512 5e9fff7be647a2e9e8eb71dadcc6b8cc8577ade658fd4ab8ba20cfd64f1b5ba129fc7e5f8fcfb52e69a646681741079c0bc85b06a92f9086ce66a28770c1a9da
diff --git a/dev-libs/libtpms/libtpms-0.9.6.ebuild b/dev-libs/libtpms/libtpms-0.9.6.ebuild
index 1f6096095608..b78b99d4a24a 100644
--- a/dev-libs/libtpms/libtpms-0.9.6.ebuild
+++ b/dev-libs/libtpms/libtpms-0.9.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/stefanberger/libtpms"
 SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 9288850a9bcc..5d0f293802a1 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,6 +1,6 @@
 DIST xapian-core-1.4.19.tar.xz 2994860 BLAKE2B 9566df1646192370e346c1b0d1e1cda68034fe5d3ab94835709f969df643fd36da49a58a2d3b4177a42faf5af2e71df771277848169ae62f94fe0bb0378ba6aa SHA512 d596058d7f9bfa0b73c5b6354331a799936b45f27012894f6792872ade8656bb0387b504aea8c1c3edfbd48787190452e7a49d2b62d181cb050c46edd3e67346
 DIST xapian-core-1.4.21.tar.xz 3018384 BLAKE2B 61a25ee381c84e0a9f20650d94aa097225f2e947dafad7f6b5497db74f383f5b0fcf277a35ea27ff461b34cd2a9a0b6333f88264c5817cff09a2caf42fa3b398 SHA512 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a
 EBUILD xapian-1.4.19.ebuild 1881 BLAKE2B c35cd8b3aeccab24d62187fb405ed78a83d073ccfcda27caccc29461a2f1f16f7122ad462c796c9ca3527d26f2f7d72805be83dc1cc8a40c49ea5ef574e6cf33 SHA512 58770b49391f37da0322b208d6fdc21478138deb978aa7032625b82a34c43613aec973666466e7175ad0e8e739c573767600d0ca2aa4c0b882cad70386d2644d
-EBUILD xapian-1.4.21-r1.ebuild 1438 BLAKE2B 3c120dab585a626f629ea5ce1bb462b3fbd679fd68402b754bdfe19f27486afc432ac994c86957f025f0705f89654c75b3a837c0cbeb64d532310805168caa31 SHA512 e31d28ece3aa699d98cdcf49868ca7d134557c89e1ab79d5d58806e17f3dcb2b4b443a112c2e6132c3b44f826d243a0dba032a31bbf817fc2ddbfd0dd06c39f1
+EBUILD xapian-1.4.21-r1.ebuild 1434 BLAKE2B 92734c3d2df1434377b73e269625669a8182b674f7af35179eb1883b32bb73536c14a48dbe4b8b7b8dc89fc7364c1d8721618a680d13649a8eab11ae78946ccb SHA512 5280685cd63bc172ddc9d6c21a7943e0145687af0088f660d285e476815c4075f7f9c4acfd850adaf8b354a9ecbc30b0c07bba63dd2c7f46c781a57159f41638
 EBUILD xapian-1.4.21.ebuild 1881 BLAKE2B c54cf9d37454b61dc8c8c3716439461d76884651cd68746404d6697c148895848cf01b86b864508687b7be9f689a3d4af0204f44704de073184d9168b0888b15 SHA512 a60e6628a3dfdd1a92a638f88716b8822b3b1bc66cdcb588ce86da516ced52f78640343af4333f55b90b8781a52a61393b64fc547e85e76633020f288ede7975
 MISC metadata.xml 728 BLAKE2B 7873e39dfb724c6f3268a7de74226d86dea77e6dd53b21aa0df104db1d30efa5c24c18b8e6597acc45b4b6bb39f1f069b7944ef0ebc2906e75a2b5efeed02ebc SHA512 5f582793cee9b74f5b36f57d6997120cf61c4f4204c49694d07b9ace813a9821710a812df2db315e9effa4913fa3b62ab069be96399369f46cc7c811b6d728ba
diff --git a/dev-libs/xapian/xapian-1.4.21-r1.ebuild b/dev-libs/xapian/xapian-1.4.21-r1.ebuild
index 383e75d11a63..2f5382bf1150 100644
--- a/dev-libs/xapian/xapian-1.4.21-r1.ebuild
+++ b/dev-libs/xapian/xapian-1.4.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -11,7 +11,7 @@ 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"
+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
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index f9bbedc4d1da..276cd9eb5d70 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index 8489a37890a0..6ed6c5a701d2 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -7,5 +7,5 @@ EBUILD base-0.14.0-r1.ebuild 529 BLAKE2B 926397a17c47bca7fd76f073e2804928e2853c6
 EBUILD base-0.14.1-r1.ebuild 512 BLAKE2B 31ad5cfcfdc7a58b7fd3343e17e18f579ffb41697979e2f0e9706cc3f5ca143b6d9b283348d5cd87dbf5087cf4d8e7ec8643391a8731adb7634b2d2e255944dd SHA512 9fde5670cdefdc4c36523fc63ad3d54528640f01deb97f0beedbf7f40f35df75ed31a596cb5925654f1dc3c6546b137d83aca7d34fdc4ff07676f8ac316c6cb0
 EBUILD base-0.14.3-r1.ebuild 519 BLAKE2B 47ec0987bb679f60f1ffeb09c83d71b21add88ddb7ebc73b2ffdf35478ac2cf7c8755c9af9f0a1206c57957c78c748e7e20c2e85c7cf0e02f9fe40403c27a996 SHA512 d6b621adac7f178d39cccf1e8653eed6b2177d2eaa2959fb2d33a0584da7b4dd7782c647b8f72fcd1c69cabe8bb87f65e3f7ecc3575a6676292dbda95c7c95de
 EBUILD base-0.15.0-r3.ebuild 525 BLAKE2B 3650bab4197be9ca9f88e085da93892d7a8237bce9134cee21d9c288f9c7e3eb31aee94cce4c5896eba81429c5d43c17a0d05dfe1ea4b63b07a8ccffa0b636bd SHA512 e59f607e7a0151786875d2ee107ecf2d1f424faf77bc704e12c324662a05eac9688c2afef76549f2dc776fd2e774dbc1965249056a75b8832b7df16a0dfae831
-EBUILD base-0.15.1-r1.ebuild 524 BLAKE2B 2f2843f728303ea15abe16995b796d7d526de8be058e37e176306eb78e2557566b54627ba216f2803d53409e6f09b1d733d75d91e4f1cd0e6a59f8770003bc0d SHA512 0b994da553af92cb3db046132e88c87af7d4c29c3745fe94b23495e6648689b424beebffdc6998dbdbfb5441b8de5704dd839cc6049fda1867c64c1c3c80d93f
+EBUILD base-0.15.1-r1.ebuild 521 BLAKE2B c8f08433e8707a37fb55f0e5f9562f4220f273bb19b01e98c560287c9404324803625c5a70ad6830fbc7be4c822d62e281a9000a40d5d86a9140759138f86ce7 SHA512 86f38fdd3820b8abf68aa2fe2d89f010da263a2ab03f6c70942ff6634c6e17d286d8d3013be97fc07aa752beddd5f52822eb57194dbae22700d701ea0a1c1925
 MISC metadata.xml 418 BLAKE2B 897b294ee364c5eedb4f7417bff0258fb271ea431dad1bd77482df74529ee883f5ef39e6c50554b670a344ab3d0ee8f5e19e83ccf2670346defde1a64af413b1 SHA512 6fc42ca5665bf4689ba65be528532fdbaee51371e98b58be70f56479ad0c1822e6f78ddd7a11ab0451f49b885151ab80c651c884a136e24603c9564b43443d81
diff --git a/dev-ml/base/base-0.15.1-r1.ebuild b/dev-ml/base/base-0.15.1-r1.ebuild
index 211def054e74..17850c278df9 100644
--- a/dev-ml/base/base-0.15.1-r1.ebuild
+++ b/dev-ml/base/base-0.15.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/bin_prot/Manifest b/dev-ml/bin_prot/Manifest
index 6cbd855c9666..bae0f99f5897 100644
--- a/dev-ml/bin_prot/Manifest
+++ b/dev-ml/bin_prot/Manifest
@@ -1,5 +1,5 @@
 DIST bin_prot-0.14.0.tar.gz 342884 BLAKE2B 9210ca230d9f42ce3dd6ad18e66b62e41eafccf83ac632a988cdc36c16f273076ccdd67ece333acb70e2604180084811319ae41decbd7ef6bba0ee16538c0cae SHA512 7e7bec7dc5ec49b7bc099687a90840620529c36d552e8985b45f2f9a2437396c8b41583081b8c6a75bf3b14bb3ab4db9134cebd12f70f2345c8fa74e1b8fa252
 DIST bin_prot-0.15.0.tar.gz 345362 BLAKE2B 654014d47cdf59374247bd904005972f60d24ee711da037fdfdfbd9d5318fcabbb5905df2ec7b401cadb9ce76fd5301917d3084002bae3fc61dc2debedab6024 SHA512 7adbb683ef09d9f3376cd8fff5d299c0d9cac350e14fbee5e2c9e038086e48c188bb115d0dc5701e82efc2076227a0656f49704cc8b783dc5a8d6c2a9735086b
 EBUILD bin_prot-0.14.0.ebuild 678 BLAKE2B cc7c516c93044c22e49d758179cfcf843eba6e1203e192ff60ca0b35d705ced5333c72d60a475ef7145f1a98073b7c75c11b5e3774b4bf0682d24b27dd5aa6ab SHA512 42a42908de039f1d16b2bf4935051d6a6b51dd4c0519416d04325fe122da7864072bebc79985a24fb03f8298290bd5aaf60137ce326da4a691c22383f7138d45
-EBUILD bin_prot-0.15.0-r2.ebuild 717 BLAKE2B dd1c30143048307ee37ea06600f940a071d34c254f9706a19d19bf38a57f2b66b7403fad639316096b19d9689e18246cab360a4533c817b43510f74af6c1c0e9 SHA512 fea932a4bb61fae2deebce59c7ca0067144b97a35c06876f653ec3c79fd0a3a84ad177947042666fd42bc38ccf13bb799ec5f472ffd67aacb553bf688390dfe8
+EBUILD bin_prot-0.15.0-r2.ebuild 716 BLAKE2B 956bd79b4f5244188312f75506e5ee797f67872fa2d4e02cfb2130ecb957ef8996615cc98ba20c0ad489a5f7f02f8a73e05fc4de88157bf298d6bc2fc591b0a0 SHA512 6e7ef5f3acde49f0c52e9893308bb0937467f7af5a4c13ea819f75d0c9f52ac43b9e3304975f9dbd1ae4a54983d73f3c7c4a692134d4a6fef6e7d0922b159161
 MISC metadata.xml 422 BLAKE2B f5c54bbf42f2e77c3d426e15f1b520b5145a497020543e5f024140efac14adfac6e7103e32870b9d312619bce25eed42f65737d3b950255f7f848c303c0733a8 SHA512 c384bf41c8602a7efd270a3156b004a750dfc1fb937e76f4575644293fbbcd877d5c87ea876bc0cf1c9e8dd8cfb15327d61195dd45403781dcb35788539e6e1c
diff --git a/dev-ml/bin_prot/bin_prot-0.15.0-r2.ebuild b/dev-ml/bin_prot/bin_prot-0.15.0-r2.ebuild
index 4c62b07f4b6e..8781d6b879a4 100644
--- a/dev-ml/bin_prot/bin_prot-0.15.0-r2.ebuild
+++ b/dev-ml/bin_prot/bin_prot-0.15.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index 7370d727840e..6b7c917fbff5 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,6 +1,6 @@
 AUX ounit2.patch 380 BLAKE2B 20d0c2f0b719715fc5f111bfbd81e814a4ae8229a7365ed2073d0ecc3ad1eafa4377bc3c0e497d4bf0ab73af986255ac48e179d34dfb2ded3fd7b55c22f339ba SHA512 d53ac28ba8b8eeda612d7f323bb658f272dcc785596eb47b4148ed7954a6ca0204e42b5e3cb6a55211fc1117432f3088fdc215930c26238dc2d34f063f21b062
 DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
 DIST cudf-v0.10.tar.bz2 47664 BLAKE2B 6ecdfc4243d80f12f6904b334f93ff47beb94535b6ba84992c6a31d244a7c2dcb6072e67828d96b31d4628bb244022fd962efcdcae5299f5a57694f3aa6c95a8 SHA512 b36ecad224070d2c07d4123fb7e39160390ddec4196505e66aad9fbd982bd7ca320ff5f0e771e7996da49bff22fb87fc057060277695b75cd68de19e57cb3855
-EBUILD cudf-0.10.ebuild 1714 BLAKE2B e17f37b9d2e2afb327525dcf8c47e4c6d7e36a4812e9f74f027233e8babec5abf1c97f5e80a73523dce90d915421ea84b722734cdeab834af8a041cfd9cf70f3 SHA512 d4f56b11b04c68885050ec49b0d49be64ad2ae7dfc4d687646a6396a1c2258e097ee595490628f28c61edf2d9e552760252be379991ec1df0fff5990dc559116
+EBUILD cudf-0.10.ebuild 1713 BLAKE2B e2638a7589d26c2bfaea0837609c0706b5a02b5b5f395392ae5514ae02c4c8795b50df862c563570f5ee199958f74a1cff79d2ca2bf0603122cc00a94c6a9c95 SHA512 0b6c727418908af3bbcefada4cbea4947c1aa0997f23566c925e2bfb048f99b29908ecc5fc3cd03086aab22ddbbfb4e3e39dc30957ee02f0b5a7d3e37b280626
 EBUILD cudf-0.9-r2.ebuild 1842 BLAKE2B d8461a2af2d7e06d2f58ec11d87de3b1a4e24cbd7bb902b7d9ece589230313d1bb06b7ab7c729011b66188b14024ebb961f12c9689719c36b7a2f4dc396ee77d SHA512 b28fcb640bbb14d80c1dd45eb1a3c5c71a7412ae0eb6243095d1388d7e01d27e2a11ed00806a6562d82d192fdf05477ff5fcdfa6c467780ddc5ec1da6ddefebb
 MISC metadata.xml 413 BLAKE2B f0065b78cfbaafa5376ea7395b35a9e1611ac094455d0ea28c84de8d076b8bbd1abc33167d58a37802d815e78b7f9363e706d118d8629564cf4feab4ae2c9db2 SHA512 53d4c2b11de9d79823bce6e4d683820fc08577ec7fdf238f21d37ffffe80b9f4017b25f521839bb63a606bad6f4be36542f3dc422fd6f4fbc83b170268d38e78
diff --git a/dev-ml/cudf/cudf-0.10.ebuild b/dev-ml/cudf/cudf-0.10.ebuild
index 35af527f4699..0080379c48ce 100644
--- a/dev-ml/cudf/cudf-0.10.ebuild
+++ b/dev-ml/cudf/cudf-0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/irill/${PN}/-/archive/v${PV}/${MYP}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="+ocamlopt llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index 569ff7fd208c..32f5a3240f6c 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -7,5 +7,5 @@ DIST dose3_6.0.1.orig.tar.gz 1417354 BLAKE2B c5fb08c853d2d3589416237addf767912ff
 EBUILD dose3-5.0.1_p16-r4.ebuild 2213 BLAKE2B de760d4d6da007ebe1718b2ae0f5b69767c8a1be6bc077408015693580e6547818365a409bfce8cf7e6f5c5df4d91a5884580f0e5ca45753167368da857838bc SHA512 443abf8b4c3ecb2b6fd79ab9f81b4860de65ef8ee399434ccdd32565f62b109ba0a951a4d1dec9404ab71af5746395af8e6fb56bed6a1ca07ef7397dd39f7ee3
 EBUILD dose3-6.0.1_p2-r1.ebuild 1246 BLAKE2B a2501476fd5fbbc3b0a181aeb94ff63f0213e1c795c98292b16737f1e883ba1b8387644d42ba7dc3660de874f411f8f86b0aa27beb6871f7a26eca81f7e8ce85 SHA512 903a11cafaa8cec37bdc0a2611d30b45c2b4f4f56ed7753b4811a15701c9aae290af867b90911f772412d0c6713fa051376d79d5bfb5d057aee8030ef49d8333
 EBUILD dose3-6.1-r1.ebuild 992 BLAKE2B 9ae68739546a10ca6a2e8befc3854471ec3a89a269af98e100f89d36e3468d94ba2e5e251aeab0407a7712c85669a24021fc771ae6715f307bf8ac51fbb00cf9 SHA512 a68de2da2ec6324e8ed45973fa294930a539f40f8b902f61a6f4c9ff1f6130497fcbb6ba9f574d1e9277f8a0c30cba72365fd9e6c50fd6ec3d1a3dbeafdc0f04
-EBUILD dose3-7.0.0.ebuild 1002 BLAKE2B 76ad26de122154ef4b15713c072a798f13ec50ad70e41c37a630a610c15afb2cf134ad5826180de1d9c610df420c92ec690452fea7367652d36a4478eebd9e65 SHA512 0380806a8cab70503369f4f26c288a7b9adbf7c15c033705875c8b028af95326cf46d80ab041b10f4e32b2bd466f4d78cc24e44fef5a5866eb9d47b89716e794
+EBUILD dose3-7.0.0.ebuild 1001 BLAKE2B 810c401a00c1d891f5f8edbdc68114e737530fc2e5e12037a203680106bf0c23f6c26d80429c5ba646a5d4e34e8b20fb228fbd2f34c7869d3cd7027b9cb52ff4 SHA512 13b273f042e642762d19154b32cf7e0f9df75e46cd128eff41a59ef85fba04c9c2f530678162d74cd83b524ad34c53bfe35c24c223b7bd267f80a712a85028c3
 MISC metadata.xml 644 BLAKE2B 33ac1e7d6936a2a02afc9064cbc60f96d7882611a9b2085a71622dd4dfad1b31d8a7ede9086b60cf44215e8383b203f4ccf13c829e1388ff7f7a6769b9d94342 SHA512 69b4824c627c5d8b81d8ee1fb17a1109b4106bc2bbb211bd0e5e167678e001ffb8eef3071045a3d4c49d535bee3091b6fa0963fe13a834d95d5ca0e788f85bcc
diff --git a/dev-ml/dose3/dose3-7.0.0.ebuild b/dev-ml/dose3/dose3-7.0.0.ebuild
index d332c40c3384..100e9ea4d47c 100644
--- a/dev-ml/dose3/dose3-7.0.0.ebuild
+++ b/dev-ml/dose3/dose3-7.0.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 BDEPEND="
diff --git a/dev-ml/dune-build-info/Manifest b/dev-ml/dune-build-info/Manifest
index dd15161cc1d4..502f9ebd86b2 100644
--- a/dev-ml/dune-build-info/Manifest
+++ b/dev-ml/dune-build-info/Manifest
@@ -6,6 +6,6 @@ DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b7
 EBUILD dune-build-info-2.9.1.ebuild 517 BLAKE2B a7c02238857706cecab9fe1c0efeedea17ec80c791f0fedc1361be9727ae6a45691b1746098b40e7dd25c7a22c599cfc9304254e4142c9f0f0e952055b06d344 SHA512 1b369cd3d131b4c5c293c157fadf24b600dd3dd9fc78dd120a858b19309eae6fa9ef4c7d4bb8ccbaf4add58a038ccfdd25830f47f877eac59371b2d7c8beaac1
 EBUILD dune-build-info-2.9.3.ebuild 573 BLAKE2B bed3c640cb8ca861fb0ec861efd1aec8ef0845f2529827212850c0ee6bc7f87ed6c702e64b18dd850d8a991b2de0f88c6e49109d412e99a2f2c1d97f50682bae SHA512 91d26ff3b81b0ee110a9c0236fe8c8f2e3eb534d4ac7ae3f80a85c73bbd679fcba9bbbe30b682476144fdd05764190873b98d76bbc95e3651216feaea6ac0ab4
 EBUILD dune-build-info-3.2.0.ebuild 618 BLAKE2B d806b89ad2bccdc3bad326829dd4d69ce9567511a42e83e9fe16f63a5c0670f28921f448b46a706e1b1fa1fa4bf0c2d2aa5f9f74a3b985a361a2095ed7d8f916 SHA512 886e272664f535374c0ca833d6994a13147aa5e561f23572bd43fd0c80ca10e9d0acb6ec6f1202ca4ea97a1ca5919b2ab62f2d1e388b4042a635d58df2ce1c8a
-EBUILD dune-build-info-3.6.1.ebuild 618 BLAKE2B b671c1d09e81eb843d50f1097c010196051a24c01f0fdb83004ed6eb90c2d60dad2ead239009dfc56b4ef7e94a627db9efd8e29d5e0f245fe502443f3bf564d2 SHA512 30c51f19e8422ddd2af54fff17d6f2377350c7e97c5acc550c2e9a3d290f3cafc600becafe9d316c26ee7239bc5899df70786de279b8fa78d246b3a3ee29deb9
+EBUILD dune-build-info-3.6.1.ebuild 616 BLAKE2B ed6886626692482d342018ce569fd1f0a6d631bd6472ee3320c001d812489522e20242efc21b923e66c823f31ecb6e0b59594c98d2b1986f2b2a6208057f9f89 SHA512 5fed2e6937d2e2c3214c4e7f43cf8d56bd5f891085c4e82dd9c264eb331c47d5eba20122829a61c07767141dee094a1830d8d97951b8a027d48e101ca671b5a7
 EBUILD dune-build-info-3.7.0.ebuild 618 BLAKE2B 15138fc586ca114f815b8679448a0269e67fc3f404021cc03926ee633a63b2186b9e3df6ff1a8ad6829f772937b4aa3e7cd1d0bd3e624f988e746826bc803f3e SHA512 0b7d6d35652dd3820505facf219187180fdc4d9bd4ff3bf46b954ce252a2a7fa083925ec7e2f8823ec238a4c23e9526ccc412467f19dba6b720814cb45922da9
 MISC metadata.xml 380 BLAKE2B a55122ee1d38e6491f4f2c955ab0271647054d171979d9b3a964c9d1c7239aeb17c89768008a36bd583b373069f387de809a8a62af68f725568f201f2be8b979 SHA512 9b49e03db4133c31c38c13f2502ebd56833c516d27facf46b9d83eaaf3982c3d5dd4e2dc2a1b5e5cbf8cbc60405f4aa2f0bd7a0886c3ead97598e139cac3d595
diff --git a/dev-ml/dune-build-info/dune-build-info-3.6.1.ebuild b/dev-ml/dune-build-info/dune-build-info-3.6.1.ebuild
index be24dbb7501d..a45a35cb43fa 100644
--- a/dev-ml/dune-build-info/dune-build-info-3.6.1.ebuild
+++ b/dev-ml/dune-build-info/dune-build-info-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index c3d5bab64ec2..493bd5ff1b93 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -10,6 +10,6 @@ EBUILD dune-configurator-2.9.1.ebuild 4096 BLAKE2B e5a5aa47665e30b13f1a158149f23
 EBUILD dune-configurator-2.9.3.ebuild 640 BLAKE2B 03acf53a5ff56128b81431b93f3a63f6481ba1038febaf5968ea45b05a7e320846d075d263d1c12a00275e39a32e1bc6b7261b6f0d583643772457e98ec9cc85 SHA512 cbd7dfc3eb477105f9712764d1c592f193d6093a5617d6c319d0e734fcc47c6c56f4cc48b517e6c67d231f958c13eec6534f52cfcc90e847492bb6052b9d9001
 EBUILD dune-configurator-3.0.3-r1.ebuild 939 BLAKE2B 269e8132c92e240ed5e718c4fc3b8505ab2716abaddc9ab1419ffd349f6aab7a5ede87e2c35da588c161d60b7048aec4e1ede65e936feabbdc7abdd753f349bd SHA512 d3e60cc3481bd91a827c0639fa16310a130f99f5267f28eda775f0b3764b521e545501d9c07f1b6a44a932ef39c16464c574d4335165dda898865e9f39b7d745
 EBUILD dune-configurator-3.2.0.ebuild 870 BLAKE2B 616ad1e13f0a3a3df44331ad016a0643d2248cf1110d669b224b188043b0831b372dea0f8d09e9fe3132d8da01a57bf945d764edfc748f551722fa2efe5e29ee SHA512 a507fe23d38249ac3dcd2a6e686236cb1266efebe73caef18064a3395a2243febc781c82cfd2f5b708cc553d58427a31c94d45db02f40a6d547eeb236f37d3b7
-EBUILD dune-configurator-3.6.1.ebuild 872 BLAKE2B 2694b77d3ee306a3e06f569475330ba78145a0b5502ad9ba666180c5cd0228cf1ac21d9d114e5f41ecbec8882cc6a992b2a813f9a66414e2c5294fbaed0c797c SHA512 fe04665ecc65bb8722ead5f26a520ec870c08363b4d84083c6dfffabdb7d93e96007a581bbc19b2e0a34cc0aa33bb7a9d99374b6aa66dca0f725c179e675b42e
+EBUILD dune-configurator-3.6.1.ebuild 867 BLAKE2B a88bf4a1b65df3d5d4a804074a9ff26f5cdab9509520b7fc98e5d4f5545565bd92090570019b378767f346a381325d3d7350c47e32a9f49efdec5ad5e5040af7 SHA512 3cd522602d6b1bfdfc9dc6ba03d4193cc09ffb00b1fd6d7a6198d5a4563d3f3885b2e5f82073e6812fd1eac61b470c7b5475c05eda686879d09cf5d5cd95486b
 EBUILD dune-configurator-3.7.0.ebuild 872 BLAKE2B 5e035ad05ddd4b2f13432eff66db204e4136d4eb55688e926c53758bf9df86a85f12b61ea72072ae3eae1859c943ae9494d67aeddf7382463a100902a9479a1f SHA512 cdd1308bf3dcbe1c81232487f0dc91c9934d7827ee663c3d46071bdd0489c8548a7169da6db9434b89bff5e6e36eaca31a3ffad500b63110a7198584f3b2bb65
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-configurator/dune-configurator-3.6.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.6.1.ebuild
index 06388d5576b0..8b85e3fa414c 100644
--- a/dev-ml/dune-configurator/dune-configurator-3.6.1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index 0badceca4750..22f9e485dbec 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -13,6 +13,6 @@ EBUILD dune-private-libs-2.9.3.ebuild 4427 BLAKE2B b1e9d3675cd29e48575b1470cd62c
 EBUILD dune-private-libs-3.0.3-r1.ebuild 864 BLAKE2B 501bf0290ce221b69348465d0a65e034ab3266f8e5c24a3e94cc6120ac2f77001bb33d60afae4c879c2029b463ed0a2eb98cfdd1653b8144e507147a7dba2995 SHA512 08157b52992d00ca4cf1b065969ddf7fac6591dd8490aabdeba264e52f7f439a38b4959b55d4bc74545bc073673468e6584f9a3c4d2bf98870ba9eeaee6e97b0
 EBUILD dune-private-libs-3.2.0.ebuild 782 BLAKE2B 2947af0152f8ad349bfaa2873ff912a253bc7ca42208450b64c2362f06d1479e7a89aa0eee8436ee789d3f0404f763ec49c6c4eecc213e26f88b9a617e1d9ebd SHA512 8da351970a0e88bbcc16bd8502b86cd3d47f549882062f73b308ce5e10c42a10710d0aa2a35fabd47cb3c5980d41408a3c4826868e71834316c1dc4e5b2a3466
 EBUILD dune-private-libs-3.6.1.ebuild 784 BLAKE2B 62940b51283133479f87a8a83b92a6346cbb4dc54269c0e8fc02155808638e7cb19db12bf54b40d05c3b5703f389cddb08eabbb96cfea6cb4c0ac834649d8a6f SHA512 986b83813242e72a90f705b9ae7ac021cb0900b343a7a94e0cd629b120f134828b677dd47ef0a4a3e372a456e813804e0c2ba50dc2bc45a624af3b9b13be11e4
-EBUILD dune-private-libs-3.6.2.ebuild 784 BLAKE2B d7cb093d8304d9817c94542c93641570ab28ea13ae11f0a442685164f84d5e6c84bbd11916fbe3d65b66ed59aff0bb6b871f6297e4c49c5bdb2c666c5504a60a SHA512 22904dfb998c4440a59d587f569b074032f690b7e4b837a27daac4b93e1631dc5d02876c6955e2684d4fb4e16cf75ca3687fd93f324a79f418240bc55878491c
+EBUILD dune-private-libs-3.6.2.ebuild 783 BLAKE2B 0e5c4ad9466bffc02f904bbad79cc6ff4c5b2ada28ab60840a756d3c3daa23eb6ca42398cd27a00355d11f13c1490324f54fb078f4a3b93b43658bee62fd4462 SHA512 9b6095ac9ee29f000beb9108eed8a992e8832dc71b4c1ce5b5dc0c9d1358936728cacea8929e0f6fe691c9908eab57cd72057a8e77d74cd53733e58e79a3a5fa
 EBUILD dune-private-libs-3.7.0.ebuild 784 BLAKE2B d7cb093d8304d9817c94542c93641570ab28ea13ae11f0a442685164f84d5e6c84bbd11916fbe3d65b66ed59aff0bb6b871f6297e4c49c5bdb2c666c5504a60a SHA512 22904dfb998c4440a59d587f569b074032f690b7e4b837a27daac4b93e1631dc5d02876c6955e2684d4fb4e16cf75ca3687fd93f324a79f418240bc55878491c
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.6.2.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.6.2.ebuild
index 797e233bbac6..d78578db0848 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-3.6.2.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-3.6.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/dyn/Manifest b/dev-ml/dyn/Manifest
index 76361c9b7c8c..a041d79fc8b1 100644
--- a/dev-ml/dyn/Manifest
+++ b/dev-ml/dyn/Manifest
@@ -6,6 +6,6 @@ DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b7
 EBUILD dyn-3.0.3-r1.ebuild 735 BLAKE2B 50178b1198063c8c4948fcdca0e2ee28788f9c028b315cb64f3f8ed94918e00bf7b5ef99cac87608c21394a854eb053f7f7dbe1527833a421bb1d1cb3a7e0db6 SHA512 03840527586ee0c0fce79d25467ac1345b6c526dd743284da848e1a020d663a4496cd098eacd4b5f03811367df8ccc7fabee9a596fb0932beaae1438f73fecf1
 EBUILD dyn-3.2.0.ebuild 653 BLAKE2B bc2933bc852929940726bea62cb14c93f77f2e542c60dfaf4ae14b4a49a51932ba76db8bbe8a4b584e4f82d74c233a85d9d3df86dcc81042f69319b2b2715bc4 SHA512 24b480d8439a6717ef3dd8e38eebc7edb7a4ed493efcfb3d9346697ea7a39213cd5cba0c32318d938856bcaa78a8ea0fcb4379a13c1da33a9bdba35365a4123c
 EBUILD dyn-3.6.1.ebuild 655 BLAKE2B 97de7f78f64e637d813eb83c97072ed09a8f18a4bebf224cfb48ce8c90394e4502aaaa6be6c04106a0931f010eb6a0602aec81ff3098037acf7fe210a96cf037 SHA512 34ebfe9530dacecc41aa5f1534e4cde37719fdcb6f9f4d81be3fe0360d65b805cf7168fc264e5f47776271a758056abdf8d8a356110d29a9d3de35c6d3c8c687
-EBUILD dyn-3.6.2.ebuild 660 BLAKE2B c769168187e381237eec8a74c5e78a77eee8cc7be355845a52e9bcda195d18452738eced0610f8b83a0b470075d78075389f726b6fb6c8ae981a00e0ae206fd6 SHA512 d11b82c425d67af751f9fe01d533a7c1b183d84536d90b924f6bc1beb779a607ff87319788aa24f6c0b895a65d6e60c7cf3e76e998ec49f06f0e8b334a3a2c18
+EBUILD dyn-3.6.2.ebuild 659 BLAKE2B c2c2ef854e283c81600f409fce6e745443d3ac4a81ef099d4ccb9089317482cefdaf65755042503fe1579863e0071057fa73e9da910bff8c9e1fb1c2f3a684f7 SHA512 91226e8f4ea177a86d1e666696ac3795e3ce69cf64e953c37227b5d75aa5afd902df5da295658c2735c6a1140bba835b1cdffb3f5944784684db0e0e98ff7765
 EBUILD dyn-3.7.0.ebuild 660 BLAKE2B c769168187e381237eec8a74c5e78a77eee8cc7be355845a52e9bcda195d18452738eced0610f8b83a0b470075d78075389f726b6fb6c8ae981a00e0ae206fd6 SHA512 d11b82c425d67af751f9fe01d533a7c1b183d84536d90b924f6bc1beb779a607ff87319788aa24f6c0b895a65d6e60c7cf3e76e998ec49f06f0e8b334a3a2c18
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/dyn/dyn-3.6.2.ebuild b/dev-ml/dyn/dyn-3.6.2.ebuild
index a3d55d2d7132..53cc7fe224bf 100644
--- a/dev-ml/dyn/dyn-3.6.2.ebuild
+++ b/dev-ml/dyn/dyn-3.6.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/integers/Manifest b/dev-ml/integers/Manifest
index 44c75971a1dd..838498966126 100644
--- a/dev-ml/integers/Manifest
+++ b/dev-ml/integers/Manifest
@@ -1,7 +1,7 @@
 DIST integers-0.4.0.tar.gz 9980 BLAKE2B ee67c39024d77f4ce20e9ba7e1564b3418397f1e98b9a5f30e238f5c161d7572701e3d824871b46d15b90887d5f3983a9ab440f46e22c4de8cbc68912daea5eb SHA512 73af64654579b27db18c612229044dba094064dc7d36a73f42ffd4ba7040ed326f859f588e7a764bce3b2fd6e9365f9e9f99330ef29bafbe77ca6dcb53d5ed79
 DIST integers-0.5.1.tar.gz 12687 BLAKE2B 37807cf0642ff4b85c91b82d7fa6ee46a242750970123b0d9d3bec7c532d0d6ceceb4b2365cc71e0664068b3fcb99e61e5c6621363cd527237cf3051da813791 SHA512 25d90c41d66a73ca18f2cfb5e13e9b3af57d1712dab108e45cb8e9eeb88f4a2f822e03f05e08832080d4764d46c7e5f116fe48bdf060c6ebd80c3e558de41983
 DIST integers-0.7.0.tar.gz 12758 BLAKE2B 26244bb4fd6556c4e8e493180211a778552b84ae2de269b02d3094960fe7ab059a83f01263ee9e654e2e0c83195087bae621d7b60efde5eac519f9aae3a962fa SHA512 f71bf73af2e4e0dd5bd039b28bce1fdabfb199ada1836d694814aa6d0c1c2d205531fbfc05581082b2dbb1e9cc0948e594915d5ad6a1cfa1dbffa9e44a7a7450
-EBUILD integers-0.4.0.ebuild 443 BLAKE2B 2825cc12c8d0ece3c63802e946ff57445bb02b2dd7b702a808bac7331e341bf5b729175f90266db6cfa99341f08925665d904e03324d5e9b44e5a165bab6be13 SHA512 c25a789f367e1080897a3ea998eac8304932968c6ca130580ec3232d2fad98a2b0b479b7bdbffbd46290611baa82e6c6688349c10bfa8d5ef14e564b7155ae4f
+EBUILD integers-0.4.0.ebuild 449 BLAKE2B fcf728c4b1800ee02ee75e7c507da5fa1c4a59ee8d9e5b4f793fee90fec6a6c4c659af8a066d4b56458001bee63bb63c77474ad21aad649eedac235c2fe986eb SHA512 3f0b3d1f28b9d6a7c119420a281928c6edb1ed33fac1de8acc87cc29aca7827506d946ccbd387e35b1498ba9bfdec8d714397c509d778abc04cef67b113ce90a
 EBUILD integers-0.5.1.ebuild 465 BLAKE2B b06b31740a247f0e386a10aad09e55e52e4cdb31351775163dea4f6a4259963f0bca0038c1dafd0ce3e8bcf150e143ad840fc3925f3c409df8c2543a9fc5f495 SHA512 e5cd7d824afed6e32f68b110a898e40d61bf48b30321c5592df376cae7199afb979ad01c0b4fe1d898c155facfa395857fd3afbbdb444d023e1ab407a6c44a2f
 EBUILD integers-0.7.0.ebuild 515 BLAKE2B ef75500aeb93c32d5bcb0468f2c7db9b2c027d8aacc11d8cad43833c12b959ec864890e5033ef8a6f2246dd4da1d9609ca60a105117fdd1589b0bc878a964d80 SHA512 dc544a6ca8a8d672a60251550993528c376d61b1fc2317a2e0b1a2b4f1f557e6c4581f0e5bcaee7e5d72075ccbbc28d4114c174c0d44635ed56884fca5b1832e
 MISC metadata.xml 427 BLAKE2B 230565ed0daa87fa10797f03b258e23bac9a01166ee589598b5b240c0b7833b7c73a1b32da7c43c8df6e3767876d0d54b289b74a9e062357bbd05e1164ff10dc SHA512 0d29cb64bb76f1c2443a2dd37aec0db81b5af18d902282dbabca9938d5618dcaddabd22cf083bbf3386b8994563c2e33130353e26054aeccb39e51702b136123
diff --git a/dev-ml/integers/integers-0.4.0.ebuild b/dev-ml/integers/integers-0.4.0.ebuild
index 11bdf517c4df..b080a84779b8 100644
--- a/dev-ml/integers/integers-0.4.0.ebuild
+++ b/dev-ml/integers/integers-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,5 +12,5 @@ S="${WORKDIR}/ocaml-${P}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/jst-config/Manifest b/dev-ml/jst-config/Manifest
index d01665b66260..6d2af5148816 100644
--- a/dev-ml/jst-config/Manifest
+++ b/dev-ml/jst-config/Manifest
@@ -5,5 +5,5 @@ DIST jst-config-0.15.1.tar.gz 4873 BLAKE2B 6ea2fb305a65f2db0b84dd0f3d9e4e4bb9ff1
 EBUILD jst-config-0.14.0.ebuild 537 BLAKE2B 3733f37f016cd7755e1324366bf56a6643ee2259372242a16cc368d8aa8428dffa7fa5261c179348db6101fb65c165bdbc25a59e42528fae1de98558c17b767c SHA512 888d8622b260197646dc1d9e87412cccb80de80549c4e04f96a49513924028ea5217455cb647e59bd30d7f826e37b6f3992802cec83350c2b1698cd66ecaf1eb
 EBUILD jst-config-0.14.1.ebuild 542 BLAKE2B b991afdc7d7b013ca176612070909ccc50294eb963bbc0243d2e96d0f0e994090efbabddb9c69473fb825448647b0ccfb2e6e509af597a5c26126181a03cf1fa SHA512 f5640ed8e020e3d0628bdbc35ab131cd95ade5f86c39d273f3a80296e68be31a1554f7caa1a726f4a2a1df7f1b527ecf8087b87154935a7d5ce587483ce635c5
 EBUILD jst-config-0.15.0-r1.ebuild 551 BLAKE2B ff7406d512144d3107b7fde4d96e02443e7ddf0ab5cff3623ffb10401eac48cd039d2701559ec90672bde584aeac472d015fcd76fa6a17e2f506a0fc03e6f1f3 SHA512 a573407ccc79d6746f00ccf8a5bf8ff5a8f303d3e3ec499c0d8e319a52676c03045464d2d6991800a938f9f9b51c983a5ac94d32867b5f1e610f92e0e9c4d8e4
-EBUILD jst-config-0.15.1-r1.ebuild 630 BLAKE2B ecdb7c77705c0170d9095d62510ea6ec874e5ddff1dbab28192c01c932651ff847217e0cbd4f3440eb519a7525cbcee416b085f076e0cdd79f58f8b656018394 SHA512 b5f77e9b2c38aa9a7af001441574433be60c7f98a93efe3a576a9fe945e5f389681485a80eb2655769df598504367957057f5df61b033c58e28baa375029361e
+EBUILD jst-config-0.15.1-r1.ebuild 629 BLAKE2B d765e72539eac9375736b49f0a7f76a6f5376f1c9662df89451af529909d0ae10bd1428f074a23ea28087d5c09580f03c833155d0bbf767e9f326f64e5142532 SHA512 a738cc85a2337e313d3ab98ee73651b90377a6c4d57a598d63da4b9c3935ed77cd69241ad1a76ea3748910c35d6f3fc8df322a907da3851a6caf14803c37f7f0
 MISC metadata.xml 424 BLAKE2B d9fc3127f735edee73ce9922a043dca9bdea8ac03cc61c3a492e3ad5598dffe92d147ea3e817e031c14c34fe69a0b15261ebdc64c5b9a4c9916fbbbbbedd411c SHA512 9f645aefbd7e1d14045c077cf78522e7ddad61c1f35bbf1ea5f31ab19a2973340163ababdfce8c27d79cefe3a866dfb95e7b889a81cbf364380f585f0c25b96f
diff --git a/dev-ml/jst-config/jst-config-0.15.1-r1.ebuild b/dev-ml/jst-config/jst-config-0.15.1-r1.ebuild
index 264f2ecf7f17..58eb3ff8ecce 100644
--- a/dev-ml/jst-config/jst-config-0.15.1-r1.ebuild
+++ b/dev-ml/jst-config/jst-config-0.15.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/lablgtk-sourceview/Manifest b/dev-ml/lablgtk-sourceview/Manifest
index 068b2e73f4bf..810a6672a9ed 100644
--- a/dev-ml/lablgtk-sourceview/Manifest
+++ b/dev-ml/lablgtk-sourceview/Manifest
@@ -3,5 +3,5 @@ DIST lablgtk-3.1.3.tar.gz 1043246 BLAKE2B 639b1a7610ea420cbae893eb40fd0a20a7605e
 DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
 EBUILD lablgtk-sourceview-3.1.1.ebuild 626 BLAKE2B 106126d50a42aee6179df814978205a2d047f9609edd9684d95bacf861049f5471bc84f6b8120aee4c65a9847e304cc04f4c7b00893e9aad91df07ba2f0d7513 SHA512 c5ba2b12209b5163e5699713d87c3bddff04dd0100a4395182801ff5f8053ac83a3ee49488a53f82e9bacc5de97283f8e7e21f99f63546d563f797b94e9cb782
 EBUILD lablgtk-sourceview-3.1.2.ebuild 754 BLAKE2B d93dc5fae2cb9b4c48a61ff7cde40398d61ad08a99146d6706b1c5652aebd20781bd26a1f880fe49dd5b4d340d71968c3f25f89092432bc24f3190a4636624ae SHA512 78d298b8ed7e37d51327c88c63cff7c1efbad471250c8091310987f89c8be25b9abd97ddd38cb2ea728061a2824fdfc111ae4e0f7d81d104afaef3491863799e
-EBUILD lablgtk-sourceview-3.1.3.ebuild 672 BLAKE2B b9dfe660c4211ccb0c8c959b6462879bf55ad5ad72f5c4a6c174e392ac67e74256ed60caf55702d00092fcf66dda473db78f7514c066fd71599d916b1b1a184a SHA512 c49bbb55bf7e34fa4d91c86845414afa308a6f5158b859e319c3078858f9d42b04160b846ce2265f08461e8f30503614fd1b115cd9523ae02cb9a5ec3b332f2e
+EBUILD lablgtk-sourceview-3.1.3.ebuild 671 BLAKE2B e627f35be1112c0ceb41d15f0e8c01b27b0b4cfb5caaf07190811fca97df4e083280af9a4cfcf4259b53b6772be4e01b78f5705e2f7d3281e597c7f656565831 SHA512 d8882e71286d4754ab86531d167f5f307f385b3196491ed17fc278f9b838473651e32fb5fa97de7d26d9b1fdf2ec3a13436f92feccdea0b49db4765a55064ad6
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.3.ebuild b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.3.ebuild
index c4695cb9f924..a0adf45215e9 100644
--- a/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.3.ebuild
+++ b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/lablgtk-${PV}
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="3/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 720051ba32c8..f4bde3785152 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -13,5 +13,5 @@ EBUILD lablgtk-2.18.12.ebuild 2044 BLAKE2B b0aa40188c8b484cedc44a862f5bae94b543a
 EBUILD lablgtk-2.18.13.ebuild 2066 BLAKE2B 56c886db71ae142260ac25c225280c107e0cd544dfb22c73eed1907cc9626f4d925b335bb17eafaa04d8eb5dbfd9f152d34abd990c04f65aace1314852136e22 SHA512 a21a0e43d2a9d799f5b4c56656cdc5dacf57bd35c4edd90aa17f1b0665e894a64a28a2d05c52b647255fd8eb9fd3be1db203b14116cac849ea1d48c77e54159b
 EBUILD lablgtk-3.1.1.ebuild 703 BLAKE2B 63b744a767e6f1f238434a5e8457c0c01066992d4ced47b839e623b3a9535a15e3285b466a5477a01a17d10a4a0abb135b2d40e202288f89944029c3881e9719 SHA512 cfb13c7b8a4661174c84f6f5966b56bd6ff3c11e18b28149922329d9f8c9eb5ae4d8cc0811bfdf8f53f04b8f66f54118f457d53852bffa755c89e3ffe0612cb0
 EBUILD lablgtk-3.1.2.ebuild 809 BLAKE2B 240985d82a7da9d69c117e6d5c61d3d3e8538bc9de5684d267f5d5983bdac0a335b13e8ff66314ab38dcd94204c93175a9b2f887ac35afa1c8a96f3e8c33e32e SHA512 376d0c3f2026f8b434fd1bf2f2854df478149398680988dcc97ac859702567647ae3769db823f54eeb130de425f2add64cc29255d303460406e8807fea3c762a
-EBUILD lablgtk-3.1.3.ebuild 727 BLAKE2B cf8cfdd01066fc2f7fb5a591f4d9d40f214f2f1155bea1e2640710df3c249615ae25c9d2494705929a67dc0943321a7805a8284e110ded0ca29d03bd6e3f335a SHA512 ea651a1a065162f294ce48aa7e14d1498cbfe31c314ade5e53bc1f6eb18778e2dcd76b7530da7da5d1bdcdaec5d572cbe6590e67b38fa21ea90d7deac4a6457b
+EBUILD lablgtk-3.1.3.ebuild 726 BLAKE2B e89d91038724d023b53504017116eedfebc8ce22b600f7da48a81b9f11c7a598a75e30f27ce9b59db4b3bb1967a78912129978e0797a319a92861afe23ed71fc SHA512 07c4c2e69942cf830bb1c13a0ec5e1ac5697c9cb20ee084064db37030d66437b8bc58d9ca3db52c259fe5a2735b8f1b836d6057dea2cf8b5dc893464d82ae924
 MISC metadata.xml 803 BLAKE2B 81dcea96c0622e8106473008e25574b819b522ea91f322cae81c9d9c32e1ff02759b1c0fce40d2567662abc1b373c4ea3792a4a4cc11ed346e257af840399e11 SHA512 5e6bd8af52147eb9697759509bbfff9fef9d9afc09ed924814d85903ca750122ce14723f449b4e08cd1d7f0dd2b0e75d3823164b0e7552e4d8334a7dadfc7f0d
diff --git a/dev-ml/lablgtk/lablgtk-3.1.3.ebuild b/dev-ml/lablgtk/lablgtk-3.1.3.ebuild
index f39d127d7a59..c24d6d1d8868 100644
--- a/dev-ml/lablgtk/lablgtk-3.1.3.ebuild
+++ b/dev-ml/lablgtk/lablgtk-3.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="3/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
 IUSE="+ocamlopt sourceview"
 
 BDEPEND="dev-ml/camlp5"
diff --git a/dev-ml/mmap/Manifest b/dev-ml/mmap/Manifest
index ed065e4d9314..8df43b674f59 100644
--- a/dev-ml/mmap/Manifest
+++ b/dev-ml/mmap/Manifest
@@ -1,5 +1,5 @@
 DIST mmap-1.2.0.tar.gz 15328 BLAKE2B d7ab07cb0883c7ca53827ad3d4402caf3beba765d6a7e5355f24fb77d6876676f0920bf19e38911b08dde222dbc5d404fa3d53d146bb20f3b807c8fb00ce968d SHA512 cef6c37953d62f2f7472147a03707d60401d92aaf4ddb2dbaa697ee4eee252f70d8068e8fe5c6a36e005d4cc738f61d2c5bea12d844f1e3a696fef2f6546d59c
 DIST mmap-v1.1.0.tbz 12312 BLAKE2B 3f688f5649ef51fc2a0cee76519da46dcfecd72a065de3cdc72412e27bfa39c26c6bb54d35ea6e3b139db0ccc75e9460f8285826c40ecc894a3782f279366686 SHA512 15e4ec2634998f321f495de5372dc75a3f4059ab7512115603ae8fd99a619c91299d34c8a12a697aa36df4ce14c90c66746b873eddf004b7bbbeaef8ec7858f5
 EBUILD mmap-1.1.0.ebuild 409 BLAKE2B cab1ea3ee166d6ee69f312b5687dc138ea9c5e9a5c296b244772ef049635ccad32f906d90c64b759afd8ffc529f7d9df5fa747ffdef033b40a5ba12b3f6278cd SHA512 7c8bf92e1c1fa4988b55f2634f8b9cc83ec6d86d13a8ea54278f755ee77dbcf80cd18537ebabadb03beb347e3736f6084f24d0b4d7d223f153db6ca90a763dac
-EBUILD mmap-1.2.0-r1.ebuild 438 BLAKE2B 6dccbd0d8cc66e4303298089fb48b1f76c17e1b082e6c1b7f48d456f560017a6060dc4008db5cfe2f254cdc4067f36e5c6a6379effa5a7cd6c6e873f5fbc1e19 SHA512 dd5cc6f06a813b37b4ea49d0bd2eee7e58d49d8ce798f2b3799e1bd9be69b1dcb2441372de49444a1293b61f0becce2aa478fcb725f41bf7f808213519111d88
+EBUILD mmap-1.2.0-r1.ebuild 434 BLAKE2B 1aabdc80dcc1a9c06d27b9d79575abb5264ba132001b30a1e06b784399f0624b5a5f85b757b9832829ae8eaaf98615a8b3b045df5a7191ba5dc5df54cccd58f9 SHA512 fe0f9046d6898334a14859ab630dffeb7975d7ca8a20e7d628fe5ff3ce2d679003a3f263f11fac42d585197c8b155b9292f3180b88b0284578e0f7f538cabee9
 MISC metadata.xml 414 BLAKE2B ca2d5e5b9b88df2016e6bdb882e300909454aeb9546b3435184ad5efb9de61849470b4007377351a108ce4ac8ee120b17e9d4a28350d46d4e3bffee8b2c8df2c SHA512 6e495ebfacdf381551c697f51db511125a438e3e5ada2b2b4a4560838df6b8e97e1fb8bf8cc5ddb27a2075ad01c2eda441207f77aec983f1b3089f05e39dfb2f
diff --git a/dev-ml/mmap/mmap-1.2.0-r1.ebuild b/dev-ml/mmap/mmap-1.2.0-r1.ebuild
index af5d857bc39e..10b60904460f 100644
--- a/dev-ml/mmap/mmap-1.2.0-r1.ebuild
+++ b/dev-ml/mmap/mmap-1.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mirage/mmap/archive/v${PV}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/bigarray-compat:="
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
index c00e741a21ed..cea027c66497 100644
--- a/dev-ml/mtime/Manifest
+++ b/dev-ml/mtime/Manifest
@@ -1,5 +1,5 @@
 DIST mtime-1.2.0.tbz 16272 BLAKE2B 317201f8d5e7a55636e58748ffd269db5e88aed012e8dd7ed269d1f128f8d21ed0e707679b030b9c822bac98c9b76033e8d2402171c4ee758d8c936fbeee7ee9 SHA512 0f0ed220cd0f899643930814010f8592e1f47b6dc6c4dce8eebfb17a81b0abed093a3dbf9c02490af99bf81ea640372f73b4ab88fd8ef0e0c7c66920692a8778
 DIST mtime-1.4.0.tbz 15909 BLAKE2B 3c49deaf72d3873c8447f4a6d8ce89d55f3df60df108132ec078d81702a6fb9d532266efdf5290fe396d57a84de2d1912b48ad92f84db6d573d977492407b95b SHA512 0492fa5f5187b909fe2b0550363c7dcb8cffef963d51072272ef3d876b51e1ddf8de4c4e221cffb0144658fccf6a0dc584a5c8094a4b2208156e43bad5b269d4
 EBUILD mtime-1.2.0.ebuild 718 BLAKE2B 2be384d73659fe626b5306df55b7544ab604c9359c1e63b12ef2bcee92614e9e9284f79357a47f33da9bd1d19ea594b0d0bd1946711671bd53b50bf476c1b85f SHA512 f8b26c028751b67abf9d8a1d786cb81aba9ef7dfdbd2dba5c76b587c0fa4ab8d99ab2d23f302e8633c0ee48ab2ad8ab686412ca2a732f9a1eebf38adba48e7f3
-EBUILD mtime-1.4.0.ebuild 691 BLAKE2B 161b214382eac8dc5e536be31e4fc5188217e7f01ffab1cbc4ad81ea1842541f20fbd0e7a2e8086ec95b62e709dc9ad54d44da89aa1c9654c97f62e3550978c8 SHA512 7db7dbfce3ead4fe0b529a8d2ec911952864800f76c789c3ba5d3cc87aba5ae85d5a57159e4d0dc96c984d02c209ecd6dadd5da9fad0747e53c73baa334fbf4d
+EBUILD mtime-1.4.0.ebuild 690 BLAKE2B bd5ab7d5a35ff8616f653438b1f6b7f473a50c13947906fcbf2acf9eeced93f2b384755f27e3798d8d8b50dee0397f229daa94dc16cc9618cb8ecac93f115d0d SHA512 0ae6fe7f583dbe2ea7c9bfd50965c875a35cf604f23cc1d6fa22ef42a443821eb138de028f3d7ecf91fed6b62b62e10db95ae835ca43a39d6afa1236ea7a2724
 MISC metadata.xml 312 BLAKE2B aad4e2756300a7fdc494215d874c8a754ddee0f94fb24788b8b7ba17d0062f266790d8bc74954c7c21ed481782ed9ddb2b007284266f92f707078a7466f961dd SHA512 aabba72b993e6d70b4d1d1ef3eba7d8adb37ace4afc51c4f9a067f6176bd525716118d225518b00ddc28aa31150b4c558b64d1a43b3a3db2319e02f03afef338
diff --git a/dev-ml/mtime/mtime-1.4.0.ebuild b/dev-ml/mtime/mtime-1.4.0.ebuild
index 8714e6090c62..77f795ddaa20 100644
--- a/dev-ml/mtime/mtime-1.4.0.ebuild
+++ b/dev-ml/mtime/mtime-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index bbc817d9b0b6..5d37d4fec022 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -4,5 +4,5 @@ DIST ocaml-ctypes-0.20.0.tar.gz 206559 BLAKE2B d9bf1c3f5ae7544e3950766f7eb9bac2c
 DIST ocaml-ctypes-0.20.1.tar.gz 206863 BLAKE2B a101872991d4bd83464d26e79fa5052c9dadbd10da1ae734fda8976199640091939777a1ba391d2aab84d7e14fafec6f713681e2ea52f6717f5f36d26e8aa225 SHA512 f95e65ce5003a07634afcbee431cb23c54c8335f926074615fc8d76ab777b9d2fce8f75bb25bbb6ed9550a7d6237fb377aa9ad65a426d2d7e387f86c1158fe4a
 EBUILD ocaml-ctypes-0.17.1-r1.ebuild 814 BLAKE2B 3a5bab91cdb4045286fd81c2fa5e6665eee9563de65008100d1f12c7930763ce0c32829cc908d1d9fe58ce6384267378a70a413b8c66368c89a0b9d21c9f4626 SHA512 b855d0975c4faef9516d0ea261f53cd913c314ce58a2dc18183686f2de17e8ec8e33be7b5529b933d070c8c6afaf00561fa5011e406688367be782ddbf555dfe
 EBUILD ocaml-ctypes-0.20.0.ebuild 908 BLAKE2B 18279ce659d023b2c256ea7aef01220851fba9b3e871e1bdb50305977c40cb0e8304a021f4965dd9a0a832a3fc19841a368ec5cb84c885812680351fcf588ec5 SHA512 bd6fcc9f8b186bea5313451f4ecba179f9b28ca079cc29e1ad9c90f6fe9447f40424575684bf7dd326dfa65434d70125bafdba7e9e061c6dd1530a9c56597562
-EBUILD ocaml-ctypes-0.20.1.ebuild 917 BLAKE2B 7e9d51dae5c10796cb4b89ca95c1b3edd305d5700bfc3023df3c260685cc44c7baee5850f37a4b08c80d73982ac5963c47ac205b5fbad1d40dc832a1928a0609 SHA512 fd0d4a6d9ab5a19acfae92886f331f1ea1af72eb148c3f335a4f30bdc8c43da1377171cceb4ee8ced914a7053888708892b83a59475a2f23a8bb5d6d549c2a1d
+EBUILD ocaml-ctypes-0.20.1.ebuild 914 BLAKE2B 9990de33f5bc28eab5546b893d9c3e640b8ad1258ae60e37cc94907dfc061b5f1f6b038844c560e776dde350e442153578153571fe24f31820767020d4c65949 SHA512 133d167d6dfd7533426631612a03b7b3b8cc3b079f5532a05062ecb98635750d406c6887f6bbe2d452574028b0f02794f591e507cbec8fe743bbb6f7b63d2c71
 MISC metadata.xml 425 BLAKE2B 3bdffed177ca8fc13a9f6428824f1a97e646449037b4fa5b8053b68edd66c7c8c6bef3c7bb1135e4d76ec42812059408195c3a9cdd45573e571576175e3c9add SHA512 6bd73ddc160b2c5ba8f0630e7aa1045992ff77ece38df06538a2b6b49206c51b14abbcd27367d1b7fe9b192ebf11736e6f0e60dce8df6d475d7a4986edd2547b
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
index 78e08ed8b8f7..c03362b441f0 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-expat/Manifest b/dev-ml/ocaml-expat/Manifest
index e9e6c4451fbb..68d8c44919cb 100644
--- a/dev-ml/ocaml-expat/Manifest
+++ b/dev-ml/ocaml-expat/Manifest
@@ -3,5 +3,5 @@ AUX ounit2.patch 672 BLAKE2B a47afbc8d7c33483a8a732252f7a7a624f60364d2c055097a0a
 DIST ocaml-expat-1.1.0.tar.gz 58318 BLAKE2B 137bc65c5c867180ba547de17041bd0f588da395928e92eabef45cdbb76a1d139d7cd0d80d33337e1fbff92c9fa3cab2339c0f340f50f467b8fe7d64cba10b1e SHA512 9407f91f5007d6835643719294d4e4907bfc40464d054911591ce80c31d173ddcc7b06157a19c0d3ddd78775806242dc68aea7847e588ca9fd1909def1df4d23
 DIST ocaml-expat-1.3.0.tar.gz 58331 BLAKE2B 4d56dd1354a31095afada7e4b0ccc9d1eb7fae4ed45f579d6b2eeb9366df7c0f5ae58680d4e917185bbce2e5e7c957f266cb4e89b7eb1e943f0fb9f68c28f94d SHA512 72a59c982179ebc2cbd4c0659ec81c1c7422de78f9fff4bd9feebda8739d3a50d2840bb5f058e075dd63a2d1af35727e04315361febca3af6c8605ee52e27498
 EBUILD ocaml-expat-1.1.0-r1.ebuild 938 BLAKE2B 75f023fd90c6751fc7930ed947d606f968a483d9edf3583e14a4ef5cb848291e92d5910738d19447eadd7cc1b17cedc9c3376bb802b6e2f563a23fa84a65f537 SHA512 eaa6d40fd9738941d21aed2e5c7278f9b30b4c6290f94c048a595465e886bd480deab026bbce83bc48b6ff856b6fe3cd059b55cad89b4d83db22c06e711a80fa
-EBUILD ocaml-expat-1.3.0.ebuild 950 BLAKE2B f262dc15fc84ce5638cd810069997326132f66e19f696e494b897f7e2a2dccf46d09bb5be1865d86826fdf488ca6d45ef99f018591c990a528f4a34c484ace4f SHA512 a3a28d141836b0907cf664d44bdf3f8d0ecad803c648a6f62bd8d3266703a1803dbb622c4185e507f0a6d77016de3e3b8a083d206a4b35cf7f4d80fa05ca909b
+EBUILD ocaml-expat-1.3.0.ebuild 949 BLAKE2B 7a94ce06cf68cce7c62f3e057a14472aa141e794c391f7dd9e90464800e4ac403730a199086917b21f64fcdc8f2c5509e50bee838d25237dd8f827904c9c2e06 SHA512 53eb321c09df0a92127a42b00b6937dacab480905aa11a057f4065b6602d6c1ff1668aa4e319078c4a00cf7ac4b018f14a9fb06b71e73d72ae8a9e3cdbde1835
 MISC metadata.xml 425 BLAKE2B 9e6cfb4df53dc4bdc44d06267f8a87d2674b747ff45ddeb7c43fe424b0a7633c5d06c6ce69d6e6f82c977483b582077825e1475fd793dd8aa39239d6b6013ab1 SHA512 1db57a46a05f1c5e56632024ec713be1d2dc1aff320bbe6c6d65ef8df30a036096710c4e2bfb2b1fa535e89224c5c3a15f77649d8fef88e91a1a950c77a0aaa2
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.3.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.3.0.ebuild
index 46144aef7f3f..2902133ef033 100644
--- a/dev-ml/ocaml-expat/ocaml-expat-1.3.0.ebuild
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.3.0.ebuild
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0/${PV}"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 PATCHES=(
 	"${FILESDIR}/ounit2.patch"
 	"${FILESDIR}/${PN}-1.1.0-cc.patch"
diff --git a/dev-ml/ordering/Manifest b/dev-ml/ordering/Manifest
index a6386dee4e2a..bc111f688fad 100644
--- a/dev-ml/ordering/Manifest
+++ b/dev-ml/ordering/Manifest
@@ -6,6 +6,6 @@ DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b7
 EBUILD ordering-3.0.3.ebuild 723 BLAKE2B ad341964914e19c0d9509ed4990ef2913d9c7338d72897fac8b82d03d0b6169caf15adcb62bed2a9beecfe85e00a8aedae938c7473e7e4f45bf28813eb3ab689 SHA512 5d128cc3d8edb9528e81d02017c07acbcbf8f70141e12875e9ee5a3384b47ee3308ab96959225a7c38ee43d2d07378884ba68eea910f65bec006bb92b3ac8c16
 EBUILD ordering-3.2.0.ebuild 641 BLAKE2B 44fadcc5e9f950bc8f44db92b642138da20c85e9bfd88b809b199e47665ecfe5318f17d91bc8150dfcf62940100973db06b29c0a0519ac0d336df7337d35a06e SHA512 c8deace1291c0ac0075d65c8fdf38f619ce8f1933e83800ad48b60a9ae2076d3633b5b964b3964694d17a4bdd9c7b14fd418c2fe1d7e15282ed83a2d1f0736d4
 EBUILD ordering-3.6.1.ebuild 643 BLAKE2B 390ad8cacb4eb1556bacc120d790781c5b4a70fb909a5654a30e0bb0ee5e1b700728de852065c00a17a1e412dd5b6bb7a0257800fa11a63382ff0e06c9320128 SHA512 ea847e26eab7998b97ecfe02f6a484596af2114626c0b62f2ae24f21dd2cbd2d607e5efadb69a0325b9ba1ca57d2abed639a4b580c4ec3f5c4224bf4c4fc5a13
-EBUILD ordering-3.6.2.ebuild 648 BLAKE2B 564da55b0cdc8bc6ccd67ad86cdf1e11f9706e401fab26974b1108b9493caa1df7bc10f683b37e6424ea99698745ab47eedb500fc202cbaced3bd08c1d7b251d SHA512 c69d4b8c5e9cf5b92bed2bdd1e65e707d4ecf61ecdb0920b91a52070282c45a60d5135818afa5bcbd483f3ccb476b5adbcd8607cf58b52d234a80fcfe5eaddec
+EBUILD ordering-3.6.2.ebuild 647 BLAKE2B fc86778fcb85b28dbd848f6469e541a2d424eec0f3185be5c884ce5ceda6cd6694e0edea602acbe66770a9774a341763310259bf30565f54895915b85a6b4cac SHA512 a2cfdcefbad3220b3a5e9a758c9e61029a0d7d59af8d530ca903b77352a01c16c48eb14b13f09ccabc92764f41b8955cb758b151b5bdbbbaa7e302e8eb283a92
 EBUILD ordering-3.7.0.ebuild 648 BLAKE2B 564da55b0cdc8bc6ccd67ad86cdf1e11f9706e401fab26974b1108b9493caa1df7bc10f683b37e6424ea99698745ab47eedb500fc202cbaced3bd08c1d7b251d SHA512 c69d4b8c5e9cf5b92bed2bdd1e65e707d4ecf61ecdb0920b91a52070282c45a60d5135818afa5bcbd483f3ccb476b5adbcd8607cf58b52d234a80fcfe5eaddec
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/ordering/ordering-3.6.2.ebuild b/dev-ml/ordering/ordering-3.6.2.ebuild
index 3302c44ddac1..669840ebf990 100644
--- a/dev-ml/ordering/ordering-3.6.2.ebuild
+++ b/dev-ml/ordering/ordering-3.6.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/ounit2/Manifest b/dev-ml/ounit2/Manifest
index af8df420671f..71f0fa79f0ba 100644
--- a/dev-ml/ounit2/Manifest
+++ b/dev-ml/ounit2/Manifest
@@ -4,5 +4,5 @@ DIST ounit-v2.2.4.tbz 57558 BLAKE2B 5cb1eaa1233102af49155b46a1a95742c3c6c5849015
 DIST ounit2-2.2.6.tar.gz 69910 BLAKE2B 7833738e94990c7e67d27665e994c9e3c1505dcb45e2faaba58ef7de9eccc8fc19437fa983da058b1fa2c464e74d90a4eec22380ebfa01ae5e5a9616faf6ada3 SHA512 4d808866dc4f9de6493a17910fafb2452398aef45cb29add54ed25e15a10ec7715bdd52d40190f618e77fe351d8bb67fbe12c1df6a6736c501792a57f6b3768a
 EBUILD ounit2-2.2.3.ebuild 503 BLAKE2B 6de41b834e56cf7e51c97c10f21ce476fc96df609ba9ec2e308ee077078c92f766777f66982d37210d8bfbb15c540659273061debd255adc5c23dd990f07f7c2 SHA512 4a08cc0dc1d2d6ae4c290184ffc5a9d0e1d2d2180883632cc74376ed2809a1ffee4c7c5179230bc537ee911583ff2212400ab47c607c5441d14536bd6a3f1b2e
 EBUILD ounit2-2.2.4.ebuild 498 BLAKE2B b5b21b2d27eba15291a0009de501de051e8214ff845bcb5b7f7432809793aa80df2ccfbcc1ddd0abc94ddb128f1df9c23c1f2f4a22dc8cbd23b8bc92ceb00f18 SHA512 62f31733d78021e5cb3a9ec59bbe4f15a399fc57558d04ac1c60e87a8009286bf9c952e104c37708cb0807fb9942b2731fd6c5e54b57373517fe329bb5e9f085
-EBUILD ounit2-2.2.6.ebuild 589 BLAKE2B 000bf83bc811b034d947748f2136269e53f7050f2bf1f4d14742d8d8ac60af47ecdd23105a8ec01d01d1b0e2c5da7bcb27f1bfea7b283a6193e10649c9a1ca16 SHA512 5cb108b65d1481f15c7c6b5cf2be5191c3260a65e121b0891445b1c6277c83fc8430736029e3ea558381e2a349f2e646a2ef57bfcb54f2adc08a11466fbcaa25
+EBUILD ounit2-2.2.6.ebuild 588 BLAKE2B 6083830d872f5f201adb6bb296dfdc5de3a08575c9d90a8849c39bae2d9f02f9da57ef5a795b7df14b45703fad64fb3c869cb6f6974cc8522e4c3005d804a417 SHA512 5fae75b22b0ec806be938bc18c835a7f9d56cf789517461d71d81e1b5486b702bb96abcd9370ab67e42a77b8527a8cc13b303c3bfa2a835d41941b09b0c4a28f
 MISC metadata.xml 418 BLAKE2B 96fa6f7441ac0051ee08a91ab0639196a97b66025938df081ac052182c87a9095fc17ca56e29f1b07f28e21c9ba65640748ff2284e9eb3c95eba9df37adaeed8 SHA512 029b97ddc0f6e0a850df66b6c484ff937f47e774d323ab6e463eb6dee3d6c994885644fa51c0e66fcf5559dc3afcabc3162ccebf201d66c762ca11660a229de9
diff --git a/dev-ml/ounit2/ounit2-2.2.6.ebuild b/dev-ml/ounit2/ounit2-2.2.6.ebuild
index adaa3366584c..23f1ce57500b 100644
--- a/dev-ml/ounit2/ounit2-2.2.6.ebuild
+++ b/dev-ml/ounit2/ounit2-2.2.6.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/ounit-${PV}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/pp/Manifest b/dev-ml/pp/Manifest
index fb3787ac580a..523aec5fb68a 100644
--- a/dev-ml/pp/Manifest
+++ b/dev-ml/pp/Manifest
@@ -1,3 +1,3 @@
 DIST pp-1.1.2.tbz 9586 BLAKE2B 36bf09c2623c28215f2d4d3260681dacf7041919e09eb5e53ee04f90706b037784c0f7d5cbdfee58ce2808f28df09638fa4d15b82d8542badc05c06c0d8cce96 SHA512 58f78b083483006b40814be9aac33c895349eb1c6427d2762b4d760192613401262478bd5deff909763517560b06af7bf013c6a6f87d549aafa77b26345303f2
-EBUILD pp-1.1.2.ebuild 459 BLAKE2B 468b13b6bbe43bfbaa2a95f2903705df9d480e4523bfb29da0daed55ad185736e3da8d24e73a8b705b7b97b4a90c9baecd0182407f820f393ed487f86dd0149e SHA512 5d0d7913b5219216e08e5f5cb3685663fb2e60d9f4195bbd759554709ccfbead053b0e31e3cf1a2cdca6a3a4f7331e38743a81a7b99c982b528ae1c3633dd8cf
+EBUILD pp-1.1.2.ebuild 463 BLAKE2B 57ae5d95a5e8c54b77b190783942b443e47e9718fd2f0fd6bb8184311c93b57b6a80ddae6617f9156ab0ef90953d56f22ea3c39d0a588f7c942da047307b750a SHA512 a598d8e1e5328053076db61560c5650d5443fd692a21f29b8b1c2745a583a064d423d60a5308bacf2425caf81e5c6d6de2ac3f9ebc33f4d420e49f9410c75944
 MISC metadata.xml 311 BLAKE2B 186c7e33d7f49e9833a705df8f1d1e55af53322a65a71e7a14828929ff71f661f7e0bd8f69d3fa21851a58d24273108d94f789491e9e9c65021f90d2798f1164 SHA512 c936324d80846839c2d209666f8ecbb54556bff77dd198da029944321d0344a70c16c7fecb699449f29b600d68d249a3b9ee829c53e2eee9c5b51320668cd952
diff --git a/dev-ml/pp/pp-1.1.2.ebuild b/dev-ml/pp/pp-1.1.2.ebuild
index 61daa7921fa6..b6518b8791d1 100644
--- a/dev-ml/pp/pp-1.1.2.ebuild
+++ b/dev-ml/pp/pp-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-dune/pp/releases/download/${PV}/${P}.tbz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="dev-ml/ppx_expect:=
diff --git a/dev-ml/ppx_pipebang/Manifest b/dev-ml/ppx_pipebang/Manifest
index 8de4ec109cb5..ede21c7a28ce 100644
--- a/dev-ml/ppx_pipebang/Manifest
+++ b/dev-ml/ppx_pipebang/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_pipebang-0.14.0.tar.gz 3766 BLAKE2B a2e99dd5e27ddbca5d77b1c215757d8d0d2d54b53511f0db93a09a16c25b5c5e429a08c8d42c7e4843eeb23c346649dea5700c445afe176f4b1625340901b6c1 SHA512 b07004aef0865c877f8f814068b514298568078785586933f400350d1a1dae3eb4aafe1ba4f12e17a3e2a3945297162c4a725ebfbc153e80b412c6086019959a
 DIST ppx_pipebang-0.15.0.tar.gz 3759 BLAKE2B 6d2a45a4b803a777dcf055acccbea3e54a86458d01032efd01d204cf3426b496b9d91047216c11a424ef5e7ff92fc729d1ef8fb616f807c21f512be52013665a SHA512 778dae2cd6176f9ce18f20486e16f6f76e9137095759b29ddc10fee15d8a21f51fff94245c4a750ae68cd75edbd06b9cad6ff1b56aacb38ac9e6d7d71c0bf701
 EBUILD ppx_pipebang-0.14.0.ebuild 624 BLAKE2B ddd9e2886699510e2b122d00131f2cdf3b8fb9b9b634944f072fedd82cd3e290b7f9e08feae52502f8e3a093fc3cbf4a4a62d1772ac8a7714a3798160a7c9b06 SHA512 92ce9b54f3bf734ac5d01150029762b958de9f3f6a78cf79c5426cc9b4d52f38fba10f6dbfdca12a9f51ef0c166272ffe294c167fc8a4f27095bdf5455813136
-EBUILD ppx_pipebang-0.15.0-r1.ebuild 582 BLAKE2B 38998099c30316adfba8fa437eddd2ea2db12c00778e10bbd61fd78df78d6d5fbe76fda4c4bd36f2638e258a494d7a41f012b4d36f4c5586caf41ce43e8869d7 SHA512 58514884a10236ec96c04eb0bed68a738459b521f075771d69c12e3d5c508aeb7bb67cab7e7c2621b105089b16859becf11b8c0d6ee55ee01d31ee2e007cb4f9
+EBUILD ppx_pipebang-0.15.0-r1.ebuild 580 BLAKE2B c45d7f32d97276ad3d325210a6bfc76634ba3467a16a440f5b32f591997ea4812a499585e5bcf62f5c3f74e7bcda86772eddb3240681deacb8a7f08446c22b20 SHA512 aff18018b6bd40353577dd53dcba4a6867f025a092b34766ed59670ca027545b920024e61f78702e531c1af57301d3469706ba69b2e2cf26bc668aa244e65123
 MISC metadata.xml 426 BLAKE2B d8e84eb6a88f814f66ccc7e13e0e2b7fea790c1d416af04cc9e156736d1b78519ffbb627a31b3489677ceb7894061b4f6d6ae8db7da9ed1032d5b5fa190030f0 SHA512 081f8749c443bd8777e51ba2ccdc3155cf84ddfb0a903e53abbbe48d958b3c1cf8464175a9bef2f378a05bacff451e664afa2ac397cbcabb3f79b1970c970387
diff --git a/dev-ml/ppx_pipebang/ppx_pipebang-0.15.0-r1.ebuild b/dev-ml/ppx_pipebang/ppx_pipebang-0.15.0-r1.ebuild
index 82fb8a6d3699..c51207230c1a 100644
--- a/dev-ml/ppx_pipebang/ppx_pipebang-0.15.0-r1.ebuild
+++ b/dev-ml/ppx_pipebang/ppx_pipebang-0.15.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/react/Manifest b/dev-ml/react/Manifest
index 985addcad688..b5fbb742eb49 100644
--- a/dev-ml/react/Manifest
+++ b/dev-ml/react/Manifest
@@ -1,5 +1,5 @@
 DIST react-1.2.1.tbz 39184 BLAKE2B 0ad5fd576c08292011e6543462295a11b77048f59aaaf34726c078c654fba4a9b7dd0bb6a6579fad04a6cd217b29f4efc15de9b7d9b208c593b481610534d9c8 SHA512 60f8788cc820e2be5303caedc80a377c8e5deab170d0eb9df71ff99d6fc57f31357824522f973c6e0d6b3979b58272e7f90b829474a494b94565279c53e8fbb1
 DIST react-1.2.2.tbz 40013 BLAKE2B 302f480cf2cc88fc8a97b262d41809ed4fe904d3ea4cdec8ba80a8bdc99b3ffc1c9f19cf853c3d40587a34ba7608734e60ede5b756479676af95f9470e1badac SHA512 18cdd544d484222ba02db6bd9351571516532e7a1c107b59bbe39193837298f5c745eab6754f8bc6ff125b387be7018c6d6e6ac99f91925a5e4f53af688522b1
 EBUILD react-1.2.1-r1.ebuild 660 BLAKE2B a090ae7ac7f4a371aec1b5730a8ef3d85f310d0e334f5188763be981890100af0acc8b3fa14b657dfc5c49f93871a7b163a67d95d138f1354f561a5d3f0a494f SHA512 42c053d74744f3d23f84397dc521203f553b017a7ddca21b6fef05afbcfa4b1ebdbe92d974ae79d726f484544b77a6813466dd2ac1c9d233cb48df9065eaed87
-EBUILD react-1.2.2-r1.ebuild 773 BLAKE2B e4d088aff639e63a639570ffb320c6371c3ed133ea36ad4592b82056d82c3a0c7259e74427d2d9883ab40b61cb75a8aae1d6ef2f73f99ab96d8019c75ca09592 SHA512 bdcb3c806487fc437abc23d258f5cd4e421718a955050f01ac2daf240846bd43063918ec20cd53beb8c8520746d3bce62bdef90b8ca8b2db012d5732f81074de
+EBUILD react-1.2.2-r1.ebuild 772 BLAKE2B 5c883148e64b30074e72f4d89a3765c97fb0529dca46585e3eaced4240908f7a44f94dcc19c204845a53975706bf57c0f1410485eee3392c00e30084d4543414 SHA512 4dfc2859457a438c734170dfcdd56690a3e3f03041d49ae978f431f316cad84c96bd9c5c2bd7bab8480146fe503b2c1cf926123cc6d32efd9fefa99c2bdc09cc
 MISC metadata.xml 957 BLAKE2B ffab75891fb139f7d7e87231732f337dcead0f66cdfd376d1117027cbe6100633c55c75cc63644672417aba281f9e8eeb42ef703c7754bc85e650ccbe2b40902 SHA512 fd95bb4e0207932c8fb09e82721a20c7a791b9f9e44e2480f31dfb3201e2bf1f4221b2216c9ea12093da0bf7e81dba340eefd0a42e5f406033fd26222067d635
diff --git a/dev-ml/react/react-1.2.2-r1.ebuild b/dev-ml/react/react-1.2.2-r1.ebuild
index 5f05d500056c..d00b8889f92b 100644
--- a/dev-ml/react/react-1.2.2-r1.ebuild
+++ b/dev-ml/react/react-1.2.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/dbuenzli/react.git"
 else
 	SRC_URI="http://erratique.ch/software/react/releases/${P}.tbz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-ml/rresult/Manifest b/dev-ml/rresult/Manifest
index c9fc5d3b4d8a..d28ebf2d52e3 100644
--- a/dev-ml/rresult/Manifest
+++ b/dev-ml/rresult/Manifest
@@ -1,5 +1,5 @@
 DIST rresult-0.6.0.tbz 7731 BLAKE2B d93b4a3fe54541101d52e768555aa306f87d1c34b57c7eb7a92092051a047586c43dded3be9ef0c84675d935c4a91162a8ff612d540f951f2842cfdf9f709f24 SHA512 66cb7acb525c17dde4e7572fa5a0d925466f8e759b90a12d952ca076d25de49404c962e061557f2255112fbf1d731f8da696acd536cbb9433a4b1d9662095c3a
 DIST rresult-0.7.0.tbz 8506 BLAKE2B 0ddb2c2d126e11094d8f92555c6d29fd103cff0393558a9522ad0b58f58159a7eed050976bfeb47969a6c7528c29b8352fa80114ed1684bd5415b2d6b0a30fb1 SHA512 f1bb631c986996388e9686d49d5ae4d8aaf14034f6865c62a88fb58c48ce19ad2eb785327d69ca27c032f835984e0bd2efd969b415438628a31f3e84ec4551d3
 EBUILD rresult-0.6.0.ebuild 538 BLAKE2B 81b539de039c200e076ade1fb1511069d10098e1bbff47c5c944d8fa4b9b991b585d569c178160920977977a2a6e56b54785b94363940d9202538984eb2edb35 SHA512 45c1e6962b51d0d906d42d6ab4aa175d02b4ee7595c5af24f201fdb8be2b1cb598ee7c13c1e755a96576d0b55137ebf386195b605e0770e7043c77c1a2cdd93d
-EBUILD rresult-0.7.0.ebuild 571 BLAKE2B 3c1f87d855633298a4454522f2981396aa06c32346b26213506f4f92a9ecf689ef33fbcbbd0e5b60d75887b3355480a54ed3ff4968bfc22f1ae8566ef46c4e94 SHA512 81502cbd10b2ebc3adef081b14aa930200a69b16ceb79dc3640caa9ca8f86819715e152a5b196bd2c5c3951503e8f90e70201729e94c7a59b7a6b93946a3146d
+EBUILD rresult-0.7.0.ebuild 570 BLAKE2B 6915df8213180ad867f4293d98b6fb05d92510a84f27bcda5de119462e162d32a518ef325bf604d4aa722e358519a0ef81c79df4b4155aeb55d53beffe701e8f SHA512 f160ce05f7ff3986dde002cf84804e1145fdbbf113bd1c964d1bcebb2843b6787743d13b7d0a8062755a8b137d367ef41cb83ec5d4582a402c071488b9a22c01
 MISC metadata.xml 314 BLAKE2B 3ec15d97bf35ceb3f76caa4268557f4a32cff0673c4dcc20376d2cf8f41eae93f154a77b2ab56f82a9b370e1ab51eaf09bcae142cd9b0fd5cb653f78f7bd9d5d SHA512 60a95e3a7fd8c3f4dfcb5c150630f2f0df58b129de1b69a6cbf29f9aafbbe7a9b03795ee9e9448c5ff14103f631dc85fd9689e2fa3a82bb1b7953b6b1ba171f7
diff --git a/dev-ml/rresult/rresult-0.7.0.ebuild b/dev-ml/rresult/rresult-0.7.0.ebuild
index bd8a01bec87a..80ad93979a37 100644
--- a/dev-ml/rresult/rresult-0.7.0.ebuild
+++ b/dev-ml/rresult/rresult-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 
 RDEPEND="dev-ml/result:=
 	>=dev-lang/ocaml-4.08:="
diff --git a/dev-ml/spawn/Manifest b/dev-ml/spawn/Manifest
index f1335b2f4ca7..74c6491972dd 100644
--- a/dev-ml/spawn/Manifest
+++ b/dev-ml/spawn/Manifest
@@ -3,5 +3,5 @@ DIST spawn-0.15.0.tar.gz 15808 BLAKE2B 72c29c012c3aa700b345e6c5b5a5b8bed4576c721
 DIST spawn-0.15.1.tar.gz 15861 BLAKE2B 95478f0f575688ba66dc69229463c6cf029c39e6edf8cead2d38dfa0fc01bacf85d63f09d6d084d96a2537c55b02184ce69166be12628a8046c7e007222f648c SHA512 efdb31d5ec5ea36d0bc80224d4ee04e46ce3428d1662870e6cebece92bc313d6eebee378802c0c059dd6e0cafea515308c31b7dfaf04a098eb4566583c1e9ed4
 EBUILD spawn-0.13.0.ebuild 454 BLAKE2B 1ac7c1ae0f9035e8a5ecd80ddfb8cd25dc89a3c9b993608fc1bf6cf6c84239657b10592256ad306b543aa81294187df78f04eb056d9825f7b2283c0f2c2c3df3 SHA512 89c3c6106eb3dcf4f913e67238c91b109ad45730c116d692988004df8401e38b929bd09327cf0b963b1780f2db395035a1d20de2f5ba684951b2607f879b62fb
 EBUILD spawn-0.15.0-r1.ebuild 475 BLAKE2B 2f5aa143ec534396b5bcd47a3b88598c088ec3738b1c9eca1d5edca48f51864a0352edc2f11411c979e11f1784270da004ed9a66acd80a499827f2db8cf55a5f SHA512 20f59b27ba7d9c32634b1aff137e8df2371afa62539b4f843bc8be1ad5842cba7656582b8779802c48b13f1e293cbc6ab25315fe0e9bce25bf8aeb7b8d0bde8e
-EBUILD spawn-0.15.1.ebuild 472 BLAKE2B cd6a255d6dc425e4c50f4a9a204b0a039f625a12498d7bca93f51a26a2ab77a2ad463dd00c086016f927b7ec1d5eacc9505aa3fab91e83a38e52397b434d1a1d SHA512 c405c93f4293a0ac8a99a4cb06e0fa301f386722e31683c45f82811fc600dd359e4990a9c474ea16ae1a6909c7b488e6c239b39432f6700145dea145bd873403
+EBUILD spawn-0.15.1.ebuild 471 BLAKE2B 7deae29ecdf40a36d15e967833b4f8ea63880a48650e475cbc3923737ad4dbe3220f45cb721933d9755228d9d485db4da175b7f04831f8e758d049c298b2e29a SHA512 6c6929a42174ce8877680f83c5c7200051537ba67fdd3e423a83b7b4e3af0052c998dbc59627e83905712714914ba088cac3a921b1b96cda33552e70de1ecbf8
 MISC metadata.xml 314 BLAKE2B 24e080f5ed71e296ae2f0009a34fbb934250f84a002dc06bb7ef471ef97bfe8c1a38ed518b04be7ac0321fee38aa4c5688661e5b635edcb4cd19b468a92582e7 SHA512 8d2d7910c38d0272244e16bc337c787f520786d22986904a736da319eaa2629b136c951147e190bbaeb8a161cd38578daedfcd3101fdc7376635ed3d2aa35417
diff --git a/dev-ml/spawn/spawn-0.15.1.ebuild b/dev-ml/spawn/spawn-0.15.1.ebuild
index b8faa9414e7c..33c2c6a8428c 100644
--- a/dev-ml/spawn/spawn-0.15.1.ebuild
+++ b/dev-ml/spawn/spawn-0.15.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/stdune/Manifest b/dev-ml/stdune/Manifest
index fe14a8a0b3bd..2a220ad1fd6d 100644
--- a/dev-ml/stdune/Manifest
+++ b/dev-ml/stdune/Manifest
@@ -6,6 +6,6 @@ DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b7
 EBUILD stdune-3.0.3-r1.ebuild 845 BLAKE2B 4011992b54716bd47eb10da5a4e09bd9da930ea75be0f6b4073b7410c3aebcbd56d542e391337af936cec2b8e240f5f53cc5fbdf693fb072a78d0bec6685696f SHA512 30d5e3cfb21628f9fa2846302e8e69e18f1b0f72af47399fb9e1b16faabac03549f2ee550a052468512550acf59a729aa445a31773def2a2bc465f58735d5290
 EBUILD stdune-3.2.0.ebuild 763 BLAKE2B 4634b9d4888a26a8b29fe94b392151b01b74e4e00dc02c47a8a52326af7f358ec30c459441ad6ae2aff8a0572c8914c51c0726011a5c9ae349e92b1e14adc605 SHA512 6e0ae98827b3144cb6d922ee5aec046b1384fd4c49b5b8ab71a9f58585b1197652648380905a656c33accaceb99bd83b708ab7976996f853ceb1a1b3fcbec2a7
 EBUILD stdune-3.6.1.ebuild 765 BLAKE2B e5e85dee353dbf93d01520f2f202ee1aaadfc1f08cd347b5940950a0147be3f3a0d658ddcc329e4f67c39f2f43976ee07b234f697989d6d3812fa5b1dd538534 SHA512 e64fc40b0972527719ef420f7f33906c02f9a4c623cede9ac88c907675586202c14e7b54bd686440e8f702289e8a167cdfd10c2fc78bb9a523e1c1e2123979f0
-EBUILD stdune-3.6.2.ebuild 770 BLAKE2B b7ce0957db2dc97796e5d48bf286042d1bc7642b3704ea46e8e749efa567d54621ca72bae0d2937552dea290c96037ec32799b32ea8c0179e4ad0dee61f4211d SHA512 45c34d1eec5bd0a2976f4acab468826cb4ebfeae4ab856c08d8daeaa5a68a8c035edf828b940f203bd7a0461a66b4cf19028fe4a5e02791737171e37842a653e
+EBUILD stdune-3.6.2.ebuild 769 BLAKE2B 83c174cfe1e9e91d77d69b73e31a861119c6cce7f61331203eaa1e7a47973ac565c2416f56a9a2a90b23f9c67f04904d94d2926f7b9969a3ba2aecc5f6694ba5 SHA512 803597cd486931cf3dd716aa6d1fd796cce4ab0818435822d7316b12d75a477e4859a9cbf40f5970b3ccd0971927a18bd21d96ac98bdf951fc3fa35e721e08a7
 EBUILD stdune-3.7.0.ebuild 770 BLAKE2B b7ce0957db2dc97796e5d48bf286042d1bc7642b3704ea46e8e749efa567d54621ca72bae0d2937552dea290c96037ec32799b32ea8c0179e4ad0dee61f4211d SHA512 45c34d1eec5bd0a2976f4acab468826cb4ebfeae4ab856c08d8daeaa5a68a8c035edf828b940f203bd7a0461a66b4cf19028fe4a5e02791737171e37842a653e
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/stdune/stdune-3.6.2.ebuild b/dev-ml/stdune/stdune-3.6.2.ebuild
index 7ee771448037..9ab1a59d2ae2 100644
--- a/dev-ml/stdune/stdune-3.6.2.ebuild
+++ b/dev-ml/stdune/stdune-3.6.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/uuidm/Manifest b/dev-ml/uuidm/Manifest
index 6adac458734b..135d3d5a2a0d 100644
--- a/dev-ml/uuidm/Manifest
+++ b/dev-ml/uuidm/Manifest
@@ -1,5 +1,5 @@
 DIST uuidm-0.9.7.tar.gz 9258 BLAKE2B 37867ee562fcf5c44e0f40df53707a5066d74c185037049b4b4034326e1efa93543d518f6c9d5d27e9663f18d824f951d27952c844e1169d951abb7b91caeebb SHA512 7048e467bbd9eefd19ca057caadcc8f634d4eae7642665a84df88f726df3fb849085613d75a485272b0d0e19c9041c560a8c864e780dbed29ff68e3cfa8ba3d4
 DIST uuidm-0.9.8.tar.gz 10079 BLAKE2B d441380dc3a4e326f777b2f9ed313cf3c27213ca5e1a02197fff40e3422df12a3451badf732b3dfae00eb8feb9fc72c137c9d5b0c20f7df4c17494d903e1b65c SHA512 af3ca7faa7eba04c4078ddc43eee6cd8a1e210127e18d1d97fbdd00b98729caab0b52a6a05c090061e05656ef321c5e07bab13113e656c5c8b5285f193f070a8
 EBUILD uuidm-0.9.7.ebuild 546 BLAKE2B f6a36e882f59f263841c0eeb1d40fb5a777bebd19915e2fd7b87e080bc4e25a56c956e0ef9153978fd2b4b4fbfd65f33aaccfa65e3de039b0298a469e4686ffa SHA512 68433e0d29a868b6a7c8f27dd525b029462c77628ab6915e857edbb45fe677b8b727780bfc4d82da25e0876ab32499214cf266234aae79342eac82d321d9710a
-EBUILD uuidm-0.9.8.ebuild 549 BLAKE2B afce1fd1d58110a25aa9f7881c50520d342c714c0cfd33e3921d5aeae4bc14f83053e0aef1011390d98e5cb404fa1f89a5e76c9efa25b9736a33563ce6ca1ff6 SHA512 d20988011b5913f1a77ea9272deda0e3139f6524701367370b4e6c0b6d2c327a44f3f0df8fe0577b3564a2173ca1494a4cba792c0bbbc65498f921f089645999
+EBUILD uuidm-0.9.8.ebuild 548 BLAKE2B ee554c63ba874da030d7171317e277a4c004d38eb2dbca18cf28e930ff022db7ae5e3b2f6b832a52e05218764c5623f700e928956eb8446cc34d4ca7a4d43ca0 SHA512 33afaaa88bcab7c5c91b73f3eac2ed744b2316759b94892e34f25f40f39ec8f3badef11572bff497dbdd7b9abeebce9ce513087e35a28962e955af5bced04d5f
 MISC metadata.xml 312 BLAKE2B e0ec12a7753192a4714bf02e3f7fe15f896292480956811794b35ccc39fe96368591671bf580d43bf82ccb2a469e2139a80261c7972384e4e0fe092ea0448161 SHA512 e8f7ad1b8ae5e05c092ceb939523dc2bcdddd843e030ebb40f41d3e06942b36d39cdef02201bd850ab7e7261f44249e6bb376f0f9fcd4135c38ca8478597be89
diff --git a/dev-ml/uuidm/uuidm-0.9.8.ebuild b/dev-ml/uuidm/uuidm-0.9.8.ebuild
index 67753c054bb6..f4f0b558a4a8 100644
--- a/dev-ml/uuidm/uuidm-0.9.8.ebuild
+++ b/dev-ml/uuidm/uuidm-0.9.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbuenzli/uuidm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 BDEPEND="
diff --git a/dev-python/CppHeaderParser/CppHeaderParser-2.7.4-r1.ebuild b/dev-python/CppHeaderParser/CppHeaderParser-2.7.4-r1.ebuild
index 3cf30d41e4ce..df7ec9b8c4ee 100644
--- a/dev-python/CppHeaderParser/CppHeaderParser-2.7.4-r1.ebuild
+++ b/dev-python/CppHeaderParser/CppHeaderParser-2.7.4-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Parse C++ header files and generate a data structure"
 HOMEPAGE="
 	https://senexcanis.com/open-source/cppheaderparser/
 	https://pypi.org/project/CppHeaderParser/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/CppHeaderParser/Manifest b/dev-python/CppHeaderParser/Manifest
index c8bc3ee6fe90..16857794c7df 100644
--- a/dev-python/CppHeaderParser/Manifest
+++ b/dev-python/CppHeaderParser/Manifest
@@ -1,3 +1,3 @@
 DIST CppHeaderParser-2.7.4.tar.gz 54445 BLAKE2B a089df97dcb9aed7821614bf354d0fcadd67dfb387bf5873c585683401d531e465bc05631147b4d5c5b47fe93eecbab1faa34fb517bb92bca6d6c39e07c316b9 SHA512 223550add1e391eb535d1b8be08a54b9d6fe97ca6dbfc54407cdc17a5530a91ef6be4ac920d6841b9f479bcbd6c823512b08565ad433f62a87e993cf393932a2
-EBUILD CppHeaderParser-2.7.4-r1.ebuild 519 BLAKE2B e43b07bde7db75a392b2309842e86d7d15bb446de7df84a458a731e2bdea45fa3d334b79eb0f385efd2800d83a0b9786ca20d57277e2eb149d2dd3cc48cdd8cd SHA512 431a091fa766b28b3756f5fa0383a6fa37c0166f41004bc7f3f1dac4f0485071f8f5824ce127d16293eb1045750ebdff383cdd16e94c89e3fc3b03f793fdf1f9
+EBUILD CppHeaderParser-2.7.4-r1.ebuild 492 BLAKE2B 0e129e758c70e994c1120073259d48c71a70164730ae6bf6f0f2bd0040979c6acb8fe7294908c22197a64269e8fbea9605a67391919618d445b47109a098d9e6 SHA512 53a0025da5620ba1d27a091cba898d18545a7cca89dbad64450973b7b28843012960426c630143b7be708926195ad5aafd9d47e5f709a26c32240b31d5e33dd6
 MISC metadata.xml 586 BLAKE2B cdbcb728f3bae64f2ffa9c3a663ddf9c69d8170522372996a9b9eb3cc4a5887847d46842356349934dcf01924751d40509e5bc53e91bab8d947f34de20c38a87 SHA512 c421502625773e6abfb839e9e58415237eb1473b420f38e3ad89fd7c995068c1e28127c0f4c0e8a92b2e88e3a6ec89f5a0a5400087555b841695b3a00b950be2
diff --git a/dev-python/DBUtils/DBUtils-3.0.2-r1.ebuild b/dev-python/DBUtils/DBUtils-3.0.2-r1.ebuild
index 2dac99445ae1..eb590124d5d4 100644
--- a/dev-python/DBUtils/DBUtils-3.0.2-r1.ebuild
+++ b/dev-python/DBUtils/DBUtils-3.0.2-r1.ebuild
@@ -4,9 +4,10 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Database connections for multi-threaded environments"
 HOMEPAGE="
@@ -14,7 +15,6 @@ HOMEPAGE="
 	https://github.com/WebwareForPython/DBUtils/
 	https://pypi.org/project/DBUtils/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/DBUtils/Manifest b/dev-python/DBUtils/Manifest
index 46d4480c5961..793a9e3b02da 100644
--- a/dev-python/DBUtils/Manifest
+++ b/dev-python/DBUtils/Manifest
@@ -1,3 +1,3 @@
 DIST DBUtils-3.0.2.tar.gz 92566 BLAKE2B ee63b252eedeba18ab1db68c10ebe7b2204bef4d2f7d07fc09a095d632dca97304280ed7f14994644e42835fd61717b88de6902feb97df04533979b2b82625ed SHA512 3e4631b8c30466e0f8be438b980fe98071535ea63e06c69161ffda89ed2716fd84c406ace1b3b78e7811bebbc7d0383f080a43b58ed073c37280a7282cb9ccb6
-EBUILD DBUtils-3.0.2-r1.ebuild 661 BLAKE2B 0179a2dd4724c48c2305f6c72a602afa9324d128ee2068fc3e3a95522d48b2d69a5bc30050d79947b3098416c4e29efec9ccbd6f3ef45837abf98d1c18e0605f SHA512 263c4c1c4b0d2fe8ca7b60170d05b639114c031a498bb574dee448a3b85f9e82b6f30cac80e8f4cf1b4f10ba732e87f59139965296a48cbc9971729a5553861a
+EBUILD DBUtils-3.0.2-r1.ebuild 635 BLAKE2B f6ee71be6273ee03b9724c3ba410290314f67d862e46654311cd66601dcdf118a435517aabb7c66c35197538a5019b4eed9ff819c5aebe1fa45f685af823dffe SHA512 c123abbb2d8ef7c63930ef3abd380c38ad030d74bf61e573bd82cd1c69051ce1d1f78263fdd8664ed5d4e17d73d40aa15adc78e65ec0c1622fe52015a3115df4
 MISC metadata.xml 1005 BLAKE2B e6d13ea0ffdc7d972db2bd8f5f0e2212937e36c1646e900f2eb76cf270ae840db7211d218e6900208bafab3fef0c5226128cebabeb52a51e8204b1981809683c SHA512 ba6884914df60365c4b085b56abcc3e927e780f4f8baa6e2cca745cdc53a1fb18917f1b1532d9e957e515a7d5b8e190d87e556547b98a094062f672b3a1b14cf
diff --git a/dev-python/Faker/Faker-16.8.1.ebuild b/dev-python/Faker/Faker-16.8.1.ebuild
deleted file mode 100644
index d3d0d7cfdc9a..000000000000
--- a/dev-python/Faker/Faker-16.8.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-17.0.0.ebuild b/dev-python/Faker/Faker-17.0.0.ebuild
deleted file mode 100644
index f1e5f5fe409a..000000000000
--- a/dev-python/Faker/Faker-17.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-17.3.0.ebuild b/dev-python/Faker/Faker-17.3.0.ebuild
deleted file mode 100644
index f1e5f5fe409a..000000000000
--- a/dev-python/Faker/Faker-17.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-17.4.0.ebuild b/dev-python/Faker/Faker-17.4.0.ebuild
deleted file mode 100644
index f1e5f5fe409a..000000000000
--- a/dev-python/Faker/Faker-17.4.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-17.5.0.ebuild b/dev-python/Faker/Faker-17.5.0.ebuild
deleted file mode 100644
index f1e5f5fe409a..000000000000
--- a/dev-python/Faker/Faker-17.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-17.6.0.ebuild b/dev-python/Faker/Faker-17.6.0.ebuild
index f1e5f5fe409a..d3d0d7cfdc9a 100644
--- a/dev-python/Faker/Faker-17.6.0.ebuild
+++ b/dev-python/Faker/Faker-17.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 170925d7e84a..ae727a11c0e6 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,13 +1,3 @@
-DIST Faker-16.8.1.tar.gz 1649844 BLAKE2B 3ec9b7566342e569580fa8db4df20708ef9b1b6ab0ccdb31b9a33dbe0c7ff3c77ff1b7698e1cf478254d3625d9c516b2b84bcda9bb1d1bdff2161b6d5fcb1056 SHA512 9ea00ec96af0de6a939b9ab3812c75627f2a76514ac6236614d7455b123e4909f9ffe12e9e84f161e0b0b0f2b0f0ddc4ff6661dce788653dd4b8c12098a871fa
-DIST Faker-17.0.0.tar.gz 1650338 BLAKE2B 4e3e9723d9016481e7b7d3e9a27060881833ab1e8309f93fffcade696679da64345bcc6fce12ce6bcb2a237b317ea697a5ff4344d929e66c2b6778ec39fdb282 SHA512 9fcd79a6e8a3db592edaa83c30d89d86a0018181d4c778c3c3566cb6d95181b033639eaf92a332539b4436138cc868192d5a21f1c12c9ba180da0dacd8bee493
-DIST Faker-17.3.0.tar.gz 1651539 BLAKE2B 5695edf10d246bd776f63f0a2d26d0e3b36f7c20a0553333359d91f013522256c93bfe967655003b61832132d38dcc5d1909468d391b2a017605df32c31f0d41 SHA512 685dedd1d73210d58008f8898c0a95a6616c16852c59e7993e33fbb187a63ba8db72ef2a6fc37f0cb8c0da2b4e1521f6f4b82a8674bbf843219b0ee25d88d950
-DIST Faker-17.4.0.tar.gz 1651645 BLAKE2B f4cde3f203e3d8abe0762f9b68785c495bc85080177d85610f023648b88b13c903a42e39eb0b1d86c120752aa683f6a399ea8377c492eb938742e883710d7f51 SHA512 58821d9fae04363508ffe1be58f8df9830772b6531958842633e9a6d3f88928d0927beaf978288ce96c269f66df61dc137efd3977f6746f0d374017b6f4c5b05
-DIST Faker-17.5.0.tar.gz 1653260 BLAKE2B 05a1abb8b99537758dfafbaab366f51c74ce5722af4f52a54374c0ff3ddf9abd0058bbc891843ef2b24e72505e5dad5e019453617ea70cf75c905ae8c817bfe4 SHA512 58bb42146dc4edc2512aa68b5fb1e2e0324159947935c157e8bb44782d70e14b2c23cbed9e2e6e86332da0f70acd7ab03a302a1826e44354077c6266ecf86df2
 DIST Faker-17.6.0.tar.gz 1654373 BLAKE2B 69a1d3bcd12188f7d9c0af61d57c62489434fc2fb6a4fea3c45a98d7395c3df83926d260672790d3b88f4b6bcf780e5b842e10b7efb500d503159869505bf4b2 SHA512 a879fb7e0c82693d4d3062b32382eb6d1f3c556c7d2e4c28168cba43c560bf17ebb84b94692ba7db738871251990feca8ccbf271c6e08c61847b76b84deb9680
-EBUILD Faker-16.8.1.ebuild 682 BLAKE2B 6e4f513383d927ae62995083ce32a75635a14844754fcaaa52313a7aaa98118e82f018a82c381a5347a2df0ddf9e7bc68f78438fbd4336b8cd51562bf335b9d8 SHA512 83e54f767935b0a45f0f50b4df871213cf7cd968fd73c9c1502895fe4fe1d0f533fb249c478aa89b78414f8198b6b2d123931c0096e1582fa5e8a76bf3767069
-EBUILD Faker-17.0.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
-EBUILD Faker-17.3.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
-EBUILD Faker-17.4.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
-EBUILD Faker-17.5.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
-EBUILD Faker-17.6.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
+EBUILD Faker-17.6.0.ebuild 682 BLAKE2B 6e4f513383d927ae62995083ce32a75635a14844754fcaaa52313a7aaa98118e82f018a82c381a5347a2df0ddf9e7bc68f78438fbd4336b8cd51562bf335b9d8 SHA512 83e54f767935b0a45f0f50b4df871213cf7cd968fd73c9c1502895fe4fe1d0f533fb249c478aa89b78414f8198b6b2d123931c0096e1582fa5e8a76bf3767069
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild b/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild
index 6aea5eb5df81..cd8e6a1b3a0f 100644
--- a/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild
+++ b/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( pypy3 python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Freezes a Flask application into a set of static files"
 HOMEPAGE="
 	https://github.com/Frozen-Flask/Frozen-Flask/
 	https://pypi.org/project/Frozen-Flask/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/Frozen-Flask/Manifest b/dev-python/Frozen-Flask/Manifest
index 9f63714e8eb6..e04eb9c03666 100644
--- a/dev-python/Frozen-Flask/Manifest
+++ b/dev-python/Frozen-Flask/Manifest
@@ -1,3 +1,3 @@
 DIST Frozen-Flask-0.18.tar.gz 179245 BLAKE2B a82695892aef9b6b4e3aeb91f12f78d7d661f2f2b0efc57c11f64524ed467b85d8d9e0e7b147cb78c3d0a641dfef0f683e0f77cfda560aada79e1b435424c0ce SHA512 6c2e4d900547cc5c0de4af23b96c5b9e1925101fb40f710bedc67ac52c303282aa223f6972f5b9cc813878bb15eb90cb0a007619dd5a9db2dec762f04dcc7ba0
-EBUILD Frozen-Flask-0.18-r1.ebuild 618 BLAKE2B 84c3d5ac0ca51c0d67536f7f7f7f61418f679a0f4b3597ebf2252c40c394633c8e12ee073dc81b832de8bb5e03781a1e230be26601d363ebb3b2d9b5cee19ad2 SHA512 7ba18b3ee389b061358699eacbfd88d2a03515835903e4048950e4d91ed428767c8fc42c950f25c4dae5f79afec4b65ec522f59d8a90cb2f0bf048cfd7a34905
+EBUILD Frozen-Flask-0.18-r1.ebuild 592 BLAKE2B 0ef679d20824ab05c2ffb262a32f591cf9c980a716c31becefad7e375ca78e76801ed891768ab7661ac13328c06d0a6f967ccdd8fc53e1196ae1a3374e7acaa8 SHA512 7c44e29de0fadd773376f01e74a61c53f26cc57bbfbc50d89ee15cb96f386fb87f23b9d4e675bfe053287db65682e60ee6ca14350383c33d24ccd08b8e1eb549
 MISC metadata.xml 418 BLAKE2B da73d29cda242f659f85fc281c49682670f0de29fb6d5edae6df2e2ed0bf7fafb080221f7512f27eb48b3210eaeb363371e70b8299aa650d5c901fbd7a6680f5 SHA512 95a895607e43532bb5e9e88499b86ca0d43aa3c9a310b960ff8ed7438548d62c1a2758e0ac97b7200399c6cef5ef317029dd4f56d5636175aa285880731e01a1
diff --git a/dev-python/GridDataFormats/GridDataFormats-1.0.1.ebuild b/dev-python/GridDataFormats/GridDataFormats-1.0.1.ebuild
index 30e6002a8255..6bd0ae4e460e 100644
--- a/dev-python/GridDataFormats/GridDataFormats-1.0.1.ebuild
+++ b/dev-python/GridDataFormats/GridDataFormats-1.0.1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Reading and writing of data on regular grids in Python"
 HOMEPAGE="
 	https://pypi.org/project/GridDataFormats/
 	https://github.com/MDAnalysis/GridDataFormats/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-3"
diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest
index b79095b35610..0d5affa1ddfe 100644
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@@ -1,5 +1,5 @@
 DIST GridDataFormats-0.6.0.tar.gz 1984859 BLAKE2B b53e6a43a06fdcb42fbef4c10dbdb1b5740fc04fff468b666c687ba5a839b8129b49358d54c6d7e4229ebaa67af01d897fe960f87a868950657bbcbb85ec7487 SHA512 b876eacd7b1d3a7dd6fe35e2092783183fb0ffadf7fbf583773e6a3401bef51bd33ebb2e73f8b4ec9cd404c153c30ce09dfb75d5e4aacba53915d085f090d0ea
 DIST GridDataFormats-1.0.1.tar.gz 2155370 BLAKE2B 8bf5ce65cefdcf490b75212bca8831957769118fbad7fdce42b5634ed67a1f5d4ac454f7429b984bafd89f5bc883fff1bca9dc71f529794cdd585e186e41e063 SHA512 2cfb8c50b4d17fa978924a0e65ae27f6e125bd1055bfdc9096ea35511f4c2a8a16f6bd9c652b9130fbdd66d4d464d8074b14f47c175f98df94c02fe973a0107b
 EBUILD GridDataFormats-0.6.0.ebuild 620 BLAKE2B 1b8ea8099d1a2840abf61c65775f7421de933a2466126958ee3e7521cac1ee72b52fdff41e056b1b062cdfc0a150b0ea1582281a82a8d30d30ac54bd5fe20810 SHA512 1d2b84d77f39c2ab33212a879dc1851c80bc31f2da21f653c436721a4c1c06ac5a01fca2b48c6145d2f590bcb7864b3486db6f71140854b7de1b49dfadab6213
-EBUILD GridDataFormats-1.0.1.ebuild 667 BLAKE2B 9f05439ce703f7118529ffcde81542af2edf4600242d3cf97cc03f74350814c331d9574cfe6fe93a331b3fad982bd2d24b73687182108222727ede716313bbef SHA512 f936c43f70de80bc61d1d2da6e9a30f3054cb6bd3d3760e0e674e792d0d243be724ca77d4f86e5a7c1d17f328642af7c1ba45f360eaad6b1132e4d576cc859ea
+EBUILD GridDataFormats-1.0.1.ebuild 641 BLAKE2B 01b81fd205262f4e0cb6f65af90d184c3c1abc8bcdec575355fc818d10118544b4c94c93df68d39a2c4653b86f48ae089fe3a0380bdf8223b758a70314545802 SHA512 a2d9b12c5d3a9c29fb1dbaf92559563853a9d735662dce508cffbc82bd4f7f46ab423638a7a03bb468b05b7ba807a51841b5f977456257e4c90cd4bd7b7ae563
 MISC metadata.xml 608 BLAKE2B 25b3e613ce6776ecc00b7ab3e65ba253be7715f167b37d4fc4d625b035e8d24706cd56bc14f2f0cac2b3f4da6b84c8bcd2b219914490b9e3bc9fab0cbbc2ddfc SHA512 48ca119e78978f100a3212a59d716d49766e6bd523813c5395d05f705f1258e1899183d52faabfef95162b82ccfa08b5b771c1a00c53d7c42a54aaa97eb9ae52
diff --git a/dev-python/IPy/IPy-1.01-r1.ebuild b/dev-python/IPy/IPy-1.01-r1.ebuild
index 8cab2087be13..e94cbe558fc0 100644
--- a/dev-python/IPy/IPy-1.01-r1.ebuild
+++ b/dev-python/IPy/IPy-1.01-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Class and tools for handling of IPv4 and IPv6 addresses and networks"
 HOMEPAGE="
 	https://github.com/autocracy/python-ipy/
 	https://pypi.org/project/IPy/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/IPy/Manifest b/dev-python/IPy/Manifest
index 17679e27f1a5..2abc80cc263d 100644
--- a/dev-python/IPy/Manifest
+++ b/dev-python/IPy/Manifest
@@ -1,3 +1,3 @@
 DIST IPy-1.01.tar.gz 33641 BLAKE2B 10d5ac5c3df00a562393ee762e9ad0f458ecf4745f894ab23e686b7112842adcbb3f25064c0010630745273fa72280ba5ef92a951d687d0f46f341acd6c041ad SHA512 f0983254523025a1819d543877d9651fb6a9e39dabd3b043488495f681b02e43b544a0121658a0430a418a1c39b360a59db1699af87a75a16a2bdc29fcb2b74c
-EBUILD IPy-1.01-r1.ebuild 844 BLAKE2B a455681629bae43e481c7e25997333a1699d5fbfbe1db488f5467c594c531feefcb89b385edff3dbd13950e34acc73a9616539f1b58ef2b1ea5454a316274be1 SHA512 90bf127a3e8f3b9eb3663b6fda9d886742a83d593484841e1b5be1fe2e41b97233aded86be4762fe0f0197f97d1f9f304f25d053951fac15b14716bb01fca849
+EBUILD IPy-1.01-r1.ebuild 818 BLAKE2B 602b9fa8ed5a7ffc6694baa43d15f7f119fe49ecd8e2935e0245482ce95d17501f645288f8ae7596cb8b3712b31719873a037b2db21d32ea860de1416f0271ce SHA512 ce2ab275f1eb6a86389b5ca34640697b936e4e4282f404c3951caa8fc6a701e93243988392f0a463248840a728e7dbca4fca371c617554ecf651969e0bf6adb4
 MISC metadata.xml 404 BLAKE2B 9b453bad2b9cc6b6f7b6bca5bd69afbc1c8181f8250d5889b8a192f6a242e94b546b650d0ca05acd7668cee160642d519d2eaa3f3d8755ffa228b43efbd3a6a0 SHA512 fb2d4c33ea00c87f1106ebf2ea4150476c62acd544f9c94cf28d5113cd272179df4710595135f5edd26cded036977fb7253e77c83d34ae362bd4b35eebbe356c
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3031930b662b..158ad33f95db 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
index 850dc2edb920..bc31b3a1618e 100644
--- a/dev-python/MechanicalSoup/Manifest
+++ b/dev-python/MechanicalSoup/Manifest
@@ -1,3 +1,3 @@
 DIST MechanicalSoup-1.2.0.tar.gz 49669 BLAKE2B a9791fd2d389c8a553ed0acce179094770651553b7aaf299ec6779509b4ffb1bb97a4a4afe01af3e4ccb56cf100b5bacc39e9aedf1143a9eb6f4b98dbb020062 SHA512 5857274e07c678dc0e19ad4fef828ccf41bb846edad566c2da9914144ced8802efd546265efac792acbb885b29cab5cde4ac3cd2002826a8bb31f91004eb2caa
-EBUILD MechanicalSoup-1.2.0.ebuild 1186 BLAKE2B 364c2a2789463c02e6c4b6f0303e68c9cd0b483d04fa5713faddd9405adaf5e61317e37e3d6364ee29fe9453e1f138e08eaa3db6c6613c2c1891513b49929ef6 SHA512 0c4241f5d2e9c6bd1e88538ba38179cb020eacd4442e440d6da05593a46634784a98b7dff593892068c0b54ba4416a1af4c40791984769777b7c9e08e92d997c
+EBUILD MechanicalSoup-1.2.0.ebuild 1159 BLAKE2B ea1ff71019b4e52700cd7f9a7f8493db74f01a4ae893abc21f52313c454eee51057a1038da8b68ca17be28720569b0b2a3de7cd89797d44edcc113842653a4d5 SHA512 6a4e4697f8d277fd41bad00c1df00cf6a41621327f669c923216c11b043fdb1d823b590a3c26c3391b54c5a3dbdda11b508ed081c6a84b4a4bf5bd466b59e505
 MISC metadata.xml 551 BLAKE2B dca0b67c8f618d76be9c14bd4123c1505ad167fc9852112da79d3db4dfc9824ff5dbbd88e250d945bbec08c12aa4cbd91ce87f6fbfe85764ad62ff575b82ed9c SHA512 2e9b6096a8e9824b0619bed3446d24499fd1a41521708c73a1e2c3788d4f924fa07ee9b00abb4b4b96f7d59d068c5e336a88a7c1951f7337bff12e600a49c4da
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-1.2.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-1.2.0.ebuild
index 290f18743214..28150c01bc1b 100644
--- a/dev-python/MechanicalSoup/MechanicalSoup-1.2.0.ebuild
+++ b/dev-python/MechanicalSoup/MechanicalSoup-1.2.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( pypy3 python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A Python library for automating interaction with websites"
 HOMEPAGE="
 	https://github.com/MechanicalSoup/MechanicalSoup/
 	https://pypi.org/project/MechanicalSoup/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index 03cde56db6d6..b58147710d7c 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -1,3 +1,5 @@
 DIST Nuitka-1.5.1.tar.gz 4167830 BLAKE2B 751784fac712149ccd180d391333d8431c6492f58a33296fc5f41c00d4908d65760216afefb626ac00b30a29c93acb767abe83a907756cbaa807706c0d9d2ef7 SHA512 ff02439556c193b2e40c6a7edfc42c9178fed4f04c4f1fe01a223f8b2243bc5f66784af5666887c9f07aafcc9428ae785a7174c4c88c73d7b62e56cf2aafde5e
+DIST Nuitka-1.5.3.tar.gz 4168230 BLAKE2B 668ba91a166504a6ed3b7b1b63cd836b7e344fc2fbcc35d4270bc797f18d5e391922a940326a24ae832b892914bf8d7b6c34a7b6f65a640600cb08a82ae40bcc SHA512 b2c478a950846e1492af07c64de835ad2fc56dc6a69ddb95402afcace2634ec5986422bc6af92cac1d833df278286f0b58918227b076fc17c32fc5d342efd7a7
 EBUILD Nuitka-1.5.1.ebuild 1171 BLAKE2B 1fcb2c87e62bdafa2e0994d0d655c1bc5ee7590a57523ce52c951baf34ae003636a12388be1ca17b51949020374b23ee93f314b34354b57ae7fd7b4e7778d56a SHA512 4afaa4adafd2aeead9b5e71718bf03069a27977d924b4640f1683fc284fd4591f15703a6c47cd459ce10a3e67a81d6cc6ce9a64179334a06b031906fd151810d
+EBUILD Nuitka-1.5.3.ebuild 1171 BLAKE2B 1fcb2c87e62bdafa2e0994d0d655c1bc5ee7590a57523ce52c951baf34ae003636a12388be1ca17b51949020374b23ee93f314b34354b57ae7fd7b4e7778d56a SHA512 4afaa4adafd2aeead9b5e71718bf03069a27977d924b4640f1683fc284fd4591f15703a6c47cd459ce10a3e67a81d6cc6ce9a64179334a06b031906fd151810d
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/Nuitka/Nuitka-1.5.3.ebuild b/dev-python/Nuitka/Nuitka-1.5.3.ebuild
new file mode 100644
index 000000000000..f1bec277226a
--- /dev/null
+++ b/dev-python/Nuitka/Nuitka-1.5.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 flag-o-matic optfeature pypi
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="
+	https://www.nuitka.net/
+	https://github.com/Nuitka/Nuitka/
+	https://pypi.org/project/Nuitka/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/scons[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index 308681363215..3f1ecfa079d2 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt-builder-1.12.2.tar.gz 5727071 BLAKE2B ca5d55989fec2a9a6f9d37abc307d4db7305bb06449cbf982aa3a2a3f210113319f7fb303ec0d77b513cce844b529e0e56f62c9d62ab3c51cf85a061ecd00c7a SHA512 022f2cd40c100543c4b442fc5b27bbf2ec853d94b531f8f6dc1d7f92b07bcc20e8f0a4eb64feb96d094ba0d5f01fddcc8aed23ddf67a61417e07983a73918230
 DIST PyQt-builder-1.14.1.tar.gz 3907982 BLAKE2B f2ac51b6af3b90d14e1acea1c292f71df6b84e4a6b930b70762a29d58e34303d9788911c99127ff15b85b4f7f7ae699ed2aa3094b7f187aeb92338feaaaadfb0 SHA512 4de9be2c42f38fbc22d46a31dd6da37c02620bb112a674ef846a4eb7f862715852e1d7328da1e0d0e33f78475166fe3c690e710e18bfeb48f840f137831a2182
 EBUILD PyQt-builder-1.12.2.ebuild 955 BLAKE2B 6e59e9564459e3dc564c84c94047daa6c0591fa8096e9a3215607294f42b5584fb9fff969f4a2ceba3eab040e1e014f001fdf4ec834917c04cb3f25b316012d8 SHA512 69f08016394eb4604c4a759e24378bfbb22fad3c8a58a63ef772f382f9efff037a19676cf6b62585647bdee493ca778921541ce98c9c57b4e6de9f6476938d7e
-EBUILD PyQt-builder-1.14.1.ebuild 962 BLAKE2B 1e6d6bf970cad055c749812abf313fb6123a5bb6d3d6c496dae23d9e9c020f66e2e57f914efdec218cc7ed6514bdefbdfc30f872b9f3ec0dd7f09a076fb726fc SHA512 a6a6e7f1d1ac2090b8e5db75d2fe1f15c48a04b78e694825adccd5e1200a89b95b330b297e7a9fdf71aa0bda08bf17b2cfd58d60ba828e6628ffef69ec031c2f
+EBUILD PyQt-builder-1.14.1.ebuild 928 BLAKE2B 76f2e09f2cb05f20011e925de1ca7728d8a9a411d47d108ebd30cfdb5eb523428016a79d3e885608b7b420af6803516dd166ada69653a18093d3276a052d7084 SHA512 4f6058ff45486d8bf25bb586c7d44f8fe9fb32e792e443a58216345308dca0894e9d2f240edf52234644ef1a5b894f92b5a4f4d992e287530e93651e76b8f698
 MISC metadata.xml 666 BLAKE2B 2602886cadc8244466e26c92178552ac1f618ace1dcd6eca9ced2c3e0f7a7777c435f842f1581d93ea7642dbcc278a4aa59a84305f5a825f39edb736e7d29f69 SHA512 42746ac242170047e0a44389c8d2e8eb5be60fbff1f5f1908802e5c3a04a0c740fe338c9b3049fc03bdb45a4182b388aad9b89a573e87d440a9a833443a1470c
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.14.1.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.14.1.ebuild
index e6a4c96790ac..260560a447aa 100644
--- a/dev-python/PyQt-builder/PyQt-builder-1.14.1.ebuild
+++ b/dev-python/PyQt-builder/PyQt-builder-1.14.1.ebuild
@@ -3,19 +3,18 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="The PEP 517 compliant PyQt build system"
 HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/"
 
-MY_P=${PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
+	MY_P=${PN}-${PV/_pre/.dev}
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
 fi
-S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index f5806af2d1d3..1fb812ffd591 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5-5.15.7.tar.gz 3238978 BLAKE2B 8e810444d9e4fe0c5af702161bc834848eefb6fdf04b282bbf42a9057d564aa778a01a5d40c249c10eecafb0dce8d160f032668f0d1fc87714fd874f002ec88a SHA512 815065f88454f767525fdd2caf97b0192eaf6095133c9c708ee4efa3d222742720a169856be65c84400a6e8d42d69ae65697d7f9dd17b9b4a347d75db93c5129
 DIST PyQt5-5.15.9.tar.gz 3241160 BLAKE2B 37d7227e09c48576a51030729217d2c0771b2f833cfac76ff05dd0c9315889548934ceb459e590a5a9bc3a9ea2b26200791e470788f7d5b28a80fbc21539aa2f SHA512 1c07d93aefe1c24e80851eb4631b80a99e7ba06e823181325456edb90285d3d22417a9f7d4c3ff9c6195bd801e7dc2bbabf0587af844a5e4b0a410c4611d119e
 EBUILD PyQt5-5.15.7.ebuild 5261 BLAKE2B d2e474ab79602bce66ec107092ff81736c847b3b1f28b140d018b0171bb569a0a4bc04aeb728ada782f067d26689350f7dadbc9ab2d274243265941939943212 SHA512 d1757ec5ee655fe92b1e9112ad2c6aa8c4e980b348afed88c4151da0b6b64fdf18781717b4de1a3ddcf95307cc6eaebf28d4264f53de4777a7e1705922572fce
-EBUILD PyQt5-5.15.9.ebuild 5268 BLAKE2B 963daae9521f4fa3be77977f1bb8e0fd17398cffb6ef6788dede259bc3f81580abc4d708019afdb2270c5fe9cf411c32553a8cfffdfec79b3eaa2db64deec10f SHA512 240be06f7f1c400aea9e5ff0276491887517c52f32d1a5520148742258aae7d7c212a4abc9efe9fd8fe304db637eda8a5c36bcf8609c51a5a83a8e93bad7858d
+EBUILD PyQt5-5.15.9.ebuild 5234 BLAKE2B 4328154bbfcfc879dd19f177a1cb91c1c530fd5733297b3e7346e77e412f109da927f496fe2391aad98e29e4df383ded5a0d17fafc7feac7ec3d65bceb2d25c3 SHA512 e1c0c8cc4861bf8f0698d97af8c40309293c5722e80c094259dbf46c217794de40278b7368afcaf0daa79698e4ae703bbced2509227d53bd29f26290e129d9f0
 MISC metadata.xml 2287 BLAKE2B b4090aa2c55d05554a152bc3adfa76c68dc78175d26bb4ea6d25858ce2db922c168cc4ded6c7fa9114cf651417e0a6e435baebe460c8efbbd94be17adafd6f43 SHA512 12e3559ff04c32ebce2a382bf3b01730b0b69829c77cdf75f0061143cc19000e126daebbf9014beeae8bd1fba2675ef2ecfe7943296a8dc66000439c104c1351
diff --git a/dev-python/PyQt5/PyQt5-5.15.9.ebuild b/dev-python/PyQt5/PyQt5-5.15.9.ebuild
index 80b8a0cb9d4d..936b389127ca 100644
--- a/dev-python/PyQt5/PyQt5-5.15.9.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.9.ebuild
@@ -3,19 +3,18 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit python-r1 qmake-utils
+inherit pypi python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
 HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/ https://pypi.org/project/PyQt5/"
 
-MY_P=${PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
+	MY_P=${PN}-${PV/_pre/.dev}
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
 fi
-S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index d807ff9e19bc..9198d819f4e1 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,3 +1,3 @@
 DIST PyQtWebEngine-5.15.6.tar.gz 48871 BLAKE2B af7c30a0d2e65e12a6eb4a2d3a40d72f94f16a5b4e509f9366be4bfb7d4358b27b3f9c0a7e4a2e7254d38950cbbd6bd4eb88e321949d4d9a44e6ea7e06c2f902 SHA512 f744fb0468ccbc79aad23d941c8e96d537ceeedfae215c7095dbf36b04b3dd042f0ff80aeca25a23715964b7d6db3bc80513f509d15c6dd6bd51e42a1a4e1975
-EBUILD PyQtWebEngine-5.15.6.ebuild 1705 BLAKE2B 8a25fd01211aaee90e81ed11e3ee21cf8ed4c8bd5a078779db8976067dba53f904db526a10f9382ce86a3e68ff423f8e42a1c1396f21fd3adcb289b476f3df56 SHA512 05692b46b05bfe0c2c6edf4d455d1c3d9a75ed2c4bd01ebce6070cae7647ef0214c8b517256974de2755de8f76718138a78411992330d01dde68a9e94a893c1d
+EBUILD PyQtWebEngine-5.15.6.ebuild 1671 BLAKE2B 2fa4b674b47cf8c2343045fe80b4ff7892a647836f2fecc4a7895e7a5096403709f9f965dec367765463233fe07e2686e0de7a59f46359d4f44fca956db8574a SHA512 9917fb9a1d4feab3d30428be8c71bdda1a50ba9c2740c03c1497dd0b8228126793139a7d4555bb3958733ae076ac260fd114dd9d02012e66598b1db820f4eecd
 MISC metadata.xml 959 BLAKE2B 00163e3954184867c30d8e0bf102bf2fc68bcbbefb4169b2aad2521bdfe5f7e505c71f1e5ff82eaa20f0789b12c6d2812557809abf500c05527afc68ab66d38b SHA512 1d58825dbdb183fe56222b25844daa3d1d0fba14aa77674b8f6c3ec683e3c43f7f3173799b97d7aa3d2410e7f874d7386ebf23f9524b27710646ef5d7d1f8148
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.6.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.6.ebuild
index 8ac077883076..58a9589c5a9a 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.6.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.6.ebuild
@@ -3,19 +3,18 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit python-r1 qmake-utils
+inherit pypi python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
 HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/ https://pypi.org/project/PyQtWebEngine/"
 
-MY_P=${PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
+	MY_P=${PN}-${PV/_pre/.dev}
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
 fi
-S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-python/PySDL2/Manifest b/dev-python/PySDL2/Manifest
index d2fcafc1fa84..9d9318f7269c 100644
--- a/dev-python/PySDL2/Manifest
+++ b/dev-python/PySDL2/Manifest
@@ -1,3 +1,3 @@
 DIST PySDL2-0.9.13.tar.gz 754811 BLAKE2B fe9d3fb32cac104303d67741c3b9e0d78d3d03198ed512464bbdf5bc487a5f4c9a92aafb100c53c02d8be87bb107034f67ebb72294ad67cc0a8b42ab7a678a31 SHA512 f866e7ed35e3ccfbb5b98f797e87d5b20c6f7dadbc3396b297cbb6c2d83a7f3290fde63940a4d8f190e40a4a9269d2df9efc1932d9578d3df1617e5fcbe6ecad
-EBUILD PySDL2-0.9.13.ebuild 1674 BLAKE2B b6a8b18ab0907588b3c9dfc9d98fe7dda2837abf6d9818affed680be5ae9531d5eb0b1d7e848b3d739108983050cce77530b598e708968ff2b7b15ff94cb3c17 SHA512 ec1187c6aaec90c4e2cf7c9baec32c7e8ea497b1494aa70827743324beb82e44b531be0ab970366675668c75eb3c7890e12d59d01af9e5bf814f2c4d7e18318b
+EBUILD PySDL2-0.9.13.ebuild 1648 BLAKE2B c2dc6b6b922fa4b206e8c2e3239c22daa3d534fad0e1a2d05ff115f53f2ea517a06bcfb3a4af2626306e2a801edaa47742072597b9540ddf1ae393f0a31e4251 SHA512 cf22ae9d778fa836477ba8d968a4599b05b99576aa892db1073881c079597e9aa901b29a660b45af9a9a3c34989c96cbebfd06b15592e61c8df2f54a1c7daf34
 MISC metadata.xml 450 BLAKE2B f92f2f7529e3a09d18c88a51f78ed520d7b4756a99776d70bb7ad4e452ae6cd9a67560ebfaafcacbd73e945282fc28ecdb48d54b2c2eb5b18d3f944401650349 SHA512 de7f757b195170ee865e34dcc214d0a57912e50631291045c485f58ba05fa87b7fc57878333021c7b9d3f8609e9afa4190f4c4062fb7a8136498875aecee615c
diff --git a/dev-python/PySDL2/PySDL2-0.9.13.ebuild b/dev-python/PySDL2/PySDL2-0.9.13.ebuild
index f3210381e39c..2d34a3934ab3 100644
--- a/dev-python/PySDL2/PySDL2-0.9.13.ebuild
+++ b/dev-python/PySDL2/PySDL2-0.9.13.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
 HOMEPAGE="
 	https://github.com/py-sdl/py-sdl2/
 	https://pypi.org/project/PySDL2/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
 SLOT="0"
diff --git a/dev-python/PySensors/Manifest b/dev-python/PySensors/Manifest
index cb2d7c38fba7..c99825c5073d 100644
--- a/dev-python/PySensors/Manifest
+++ b/dev-python/PySensors/Manifest
@@ -1,3 +1,3 @@
 DIST PySensors-0.0.4.tar.gz 10599 BLAKE2B be3a3692a846e5339758eff4f4396dd15bf96b3d20bc40df45436ce58381ac87503bca190fa215121506ecf9ce5175b254d93142ee881c4d5b8ef8e045854659 SHA512 8e6b2beee9bf282f073618c0b45e53330ce82c9fc9c6565a3c6b5f812231421c8c6e15ccc4fc92cda67ed08df5c482577d4a34720c920dbba7604f2b7c3ba21c
-EBUILD PySensors-0.0.4-r1.ebuild 439 BLAKE2B f341ab958a6846915b2c407b191ec7bf7f2ec8df9cab2143a599262025e21ee906736c710f42239b449eaa90dffb5030ab60851b535a758eecc4ff9baba85d53 SHA512 ddefd3d0ada51f320a4fdb07cd9cfe44e473905dc378312882e00ff2d0a016082e7cec488ebfb1416b27d411fca49f788472c0be745ca97ce0eb852c1a8e2bf1
+EBUILD PySensors-0.0.4-r1.ebuild 413 BLAKE2B 6025421282725a2f302cec9f92f1f93c0d1ec614bcc66287c238fc0ea2915337ca1c6c2d602843c76b602cc9833622a9ca355c9dac89aaa399a5a25d9e7182c5 SHA512 e8a4349d061f613c41fe96562333885492ed374f13ee8805d5b5c49478d0498a099b01470794764f2c1c8ab5bc458892f48bb7875cc4424ef7e4b90b7ce34a84
 MISC metadata.xml 438 BLAKE2B f707f9a436d664f74fea8507cfe835e7c404d37e3be7b0832d3d065a08c06a5a684d7e28ee6e6d4240404d5adbaa510215ef71700bfd70de3013510e7b7db37c SHA512 c8090a9cc1d08e2c79c0d0b95da739932b425eb86c16d15e91a6afd3991bcdda2f0624eabf1e7c0d59693c8ec944e809bce7e1f25d1f6be8eb453861b65009fa
diff --git a/dev-python/PySensors/PySensors-0.0.4-r1.ebuild b/dev-python/PySensors/PySensors-0.0.4-r1.ebuild
index 09611850f92a..954d8809546f 100644
--- a/dev-python/PySensors/PySensors-0.0.4-r1.ebuild
+++ b/dev-python/PySensors/PySensors-0.0.4-r1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python bindings to libsensors (via ctypes)"
 HOMEPAGE="https://pypi.org/project/PySensors/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index f709aae34e3d..f5a530a22161 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,3 +1,3 @@
 DIST PySocks-1.7.1.tar.gz 284429 BLAKE2B 8015e8a0a7ebfbb09ec542393aeb633a769701445c07f24bb9e62b07803d7bb605f22e79ad9ec83e47aa7fe843a1a057073d97e25482e742f42e18b2c7a2f1b3 SHA512 cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016
-EBUILD PySocks-1.7.1-r2.ebuild 759 BLAKE2B a2adc6569f251e39a4a72a980d2a545095537dfdd1b52fe82c8b5ea5e066c910ef2c614add1c9e66948f6a9469ad936c4857edc9dec266844d8ce9ade81eceaa SHA512 d0b978117530022b9195ea5b562679017f939f5b37af64be63a95ec648f3886150288a4cf9eb22646e2a8c26016f66697a9f6e3fb98a26dbd38db2dfb5b99044
+EBUILD PySocks-1.7.1-r2.ebuild 733 BLAKE2B 1d855e32f737d4f618597cfdd7bf5c5c9a97467dc6c6c0211eef9c0477b29184d4101076d86d2183a02ac05bac1a308584ed85d8dfa29d5834f6330f12fe4962 SHA512 e38bc1a3aafb2bc44eca059c82430f4c9b88e16eec64f13093184dc201c7e14559c95732457aac5dc27b26acb316908f3e76f98ea3898f8573a94ec700f5cdd4
 MISC metadata.xml 525 BLAKE2B 61d1c3a217ae1912a20e326a6aa00b003a0b6bb2d6d93e3fa361f21d2669c3d1a893d4d23641c3492388e8b671dee87f7c6d07c2df618910214786b999df3e74 SHA512 ce38eb19999a7b9bfbd9751fee536850c9d668f1f9ea3320cf9169714443bd19ad2d4a63097a00b66d6d379807064e21acb8a9c09988fbdcb98abba8f50ac802
diff --git a/dev-python/PySocks/PySocks-1.7.1-r2.ebuild b/dev-python/PySocks/PySocks-1.7.1-r2.ebuild
index 645f5f3994a1..fbf69c640a11 100644
--- a/dev-python/PySocks/PySocks-1.7.1-r2.ebuild
+++ b/dev-python/PySocks/PySocks-1.7.1-r2.ebuild
@@ -5,13 +5,13 @@
 EAPI=7
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="SOCKS client module"
 HOMEPAGE="https://github.com/Anorov/PySocks https://pypi.org/project/PySocks/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/Pyro4/Manifest b/dev-python/Pyro4/Manifest
index b52d06ff2bae..26335ecbc308 100644
--- a/dev-python/Pyro4/Manifest
+++ b/dev-python/Pyro4/Manifest
@@ -1,3 +1,3 @@
 DIST Pyro4-4.82.tar.gz 516110 BLAKE2B ecd7b5cf1469896acfec1db92d99784aa316db5cadbb7fc595a5f9916ac705619d070771549fb8ba7379a7395e4449eabcfc84aa131d4b23b587b7467f4bf196 SHA512 f5916ce37ec52d8cd23bece79325480140621ac8412febb4877a32b1ce54502ef17d20bf591dc30eb20e9619741548b30a78165937d5e69e8d1911d95a23b1e1
-EBUILD Pyro4-4.82-r1.ebuild 1573 BLAKE2B 5e17639676849ddc0c967dcc7161d4c08cd07ed372ddf1ab860dee00f73ccc91b77435a0f6ce8f76167afa0acc6aa5454d8a475b0510eda7cf45240218d7bdf8 SHA512 fc17d9aaa240554f7ede6289a07df63f402a3c3301ab838e367a2e3fc31443ab4c2fd899780a742be1c5837948ed9ca25d6be3f880fa9801435761f498d04468
+EBUILD Pyro4-4.82-r1.ebuild 1547 BLAKE2B 5b8088c06906796cd35b4459036646aad845dc5f586adbf111c8de943a7c4a438c79eb9c0790820919a783769e020fec1501fbe1b75e8eb0ce6d99db2b365e72 SHA512 ddca35dcc55d5a391e6bf033344610af5d29418a6f201074be1479d6f4d3603c153b13d4391c2d004c70af10370dd0ec80e5a41c8392d8b97733ba5089e062ef
 MISC metadata.xml 384 BLAKE2B e0dcf58b7db6287f6912e1ce549f52fb269eeac53def37ff75b8c30957c02eaef506a44bc15c3fdfdf01c2607e803b8706cc3be6b50585383f30edcd8c3cebf6 SHA512 9f4ed623a9e07d84fd61b3eccf65d80c883265b3de24d79b888c5d880498325dd268e4e5390f60ed67b19101e072276b1d7eb80724bf7a0cd6713fc20d374e33
diff --git a/dev-python/Pyro4/Pyro4-4.82-r1.ebuild b/dev-python/Pyro4/Pyro4-4.82-r1.ebuild
index 8f06b59759b4..6f082109842a 100644
--- a/dev-python/Pyro4/Pyro4-4.82-r1.ebuild
+++ b/dev-python/Pyro4/Pyro4-4.82-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Distributed object middleware for Python (RPC)"
 HOMEPAGE="
 	https://github.com/irmen/Pyro4/
 	https://pypi.org/project/Pyro4/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index cbdc07577502..e429b50dfbc6 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,3 @@
 DIST QtPy-2.3.0.tar.gz 53980 BLAKE2B 142694c3b10dc2ed46c168a063c0019928358d079dddfef0708ec8cabd782e206734bc0f680a7ee7309b483c56ecd739b3364061eaf190a1a9c9e41d940af202 SHA512 1fa3d52367fa70ca178a128f3cc95f333b1408dd88b9f9d15ef30b4c7f848a91df1626fa046667ce6bd6ee3f7a3909f1b3fb06b902eff26e1f058139eced73c6
-EBUILD QtPy-2.3.0.ebuild 8353 BLAKE2B 29de93db3256a456b0deee698ac983fecfa692b80c00e63968422ea825b80a0f6329fde726caa8a89898217a5a725b598835c78225b16f05a6e9305623667eff SHA512 ea9116fd0dcc916eb9d09393dfeaa4c9b169a5f240fd42648876af02418008c447d588ba947e341640a78422b92ce58f28db6e6eb4acf756b608b9647e0b0246
+EBUILD QtPy-2.3.0.ebuild 8326 BLAKE2B 08fe67f11f10cf1f41dbbf3eb48cecf4ec0b93efde7f39d7d04d4ccad527b2e906348bcd4861ac94a5e2e24cf0635fbe8e0f168eb1572a735b95877bb51cc372 SHA512 81d4aa3e55aede8a48733ada73bd754b78cf6058ec629c3965a81dc7cffafacf75f1155e951b240b38cebe8c562cf40ca2626ba794a70dbc538d3c25b4e32034
 MISC metadata.xml 2716 BLAKE2B 7c62f7b181608c56a8e9be69c05e2cb34e5f450682ea4e7ca6c4bff5f02cf4ff803d44dda356d2be3968464842d421b5ac7320fc4d08a430e7805f6e400a262f SHA512 62509ecf92f89453fea52a8c23accff778a5572b689428838d801470ab30f2e2cb85f9319a75afeb81c284d68fb2abe399714bb1410daa8ec896af1f17763347
diff --git a/dev-python/QtPy/QtPy-2.3.0.ebuild b/dev-python/QtPy/QtPy-2.3.0.ebuild
index 2f1b4e2fd828..b3033047630e 100644
--- a/dev-python/QtPy/QtPy-2.3.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.3.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1 virtualx
+inherit distutils-r1 virtualx pypi
 
 DESCRIPTION="Abstraction layer on top of PyQt and PySide with additional custom QWidgets"
 HOMEPAGE="
 	https://github.com/spyder-ide/qtpy/
 	https://pypi.org/project/QtPy/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/agate-excel/Manifest b/dev-python/agate-excel/Manifest
index 25681abe21e3..16ee91c25eb7 100644
--- a/dev-python/agate-excel/Manifest
+++ b/dev-python/agate-excel/Manifest
@@ -1,3 +1,3 @@
 DIST agate-excel-0.2.5.tar.gz 161131 BLAKE2B ed7306dabf8b5da722aec9005da9bdba74a9cc585ea72b429eecc4b1fcbdfed698af8e582c464081867c0d4a285b9bc892efc339f0a08c657d87e61fd1174496 SHA512 5686c3faf8b817589a62d9fac558bebe7f47124685be9f8146d74c206023530d0cec2ad88fa4ba7ac049516f5bec6783ce8f0ff47f8eb8b2ed8aad7316f1771b
-EBUILD agate-excel-0.2.5-r2.ebuild 775 BLAKE2B bf65d83e172310f1deef055de4c6e283ca517af3cb3de10fb2443ace4b2552a3e625f412279db390f06db35ab9f2a98b18b003e06752710c60c0892097cb28d3 SHA512 edb33bca512334cd8489fdddd7225f9711ce429f3e1fefdb2c8755a41ef8ee9f3458e04992c401db6407d1c831d4ccf23d5a14351698a29710c4a9dca72a1efd
+EBUILD agate-excel-0.2.5-r2.ebuild 748 BLAKE2B 776bb4f4aedcc5ac46856c72de14331a18341568780c1eb950aa0149d2c96fb6a4290eb98acbf355bd1bb17e9a322233ca9e78f0600cd49a185d8d40a67cbde0 SHA512 0580cc1aec7e9fc1808248531548f39759783539b54bbe4156abde196f183a32ca5386873fc04fee5ff8b90c955dbc4ec134653cce16c9fc8541b6145938500f
 MISC metadata.xml 646 BLAKE2B 5e94a191f3b80b83282d7f46fb79ec3f49d24aff665775387d60bd100c997ce2384598e497a836c93682133a3df5b6ea84d1a4706bc069760f1e8fb95200a49d SHA512 61f116294b6bfe310e98c6bfa4d9cdd87fc127b77954db4d7145f00a82e7779cdff4f52d3544e9e0deab1b493d70e7f498aed44e5d6486601885b218575da1b1
diff --git a/dev-python/agate-excel/agate-excel-0.2.5-r2.ebuild b/dev-python/agate-excel/agate-excel-0.2.5-r2.ebuild
index 86f1ddd6f6bd..56d3d732c99d 100644
--- a/dev-python/agate-excel/agate-excel-0.2.5-r2.ebuild
+++ b/dev-python/agate-excel/agate-excel-0.2.5-r2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Adds read support for Excel files (xls and xlsx) to agate"
 HOMEPAGE="
 	https://github.com/wireservice/agate-excel/
 	https://pypi.org/project/agate-excel/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/agate-sql/Manifest b/dev-python/agate-sql/Manifest
index 39da7339d9b0..ca235de1ba63 100644
--- a/dev-python/agate-sql/Manifest
+++ b/dev-python/agate-sql/Manifest
@@ -1,3 +1,3 @@
 DIST agate-sql-0.5.9.tar.gz 15434 BLAKE2B 4825bfc5d0f78e0cd1bf318fe8797bfe03deaff1ffc962e0f082128af9d05afad97b7488d66b76d59411eb5dd889229be1fe05cf5bf55db4084f3451b21440b2 SHA512 482f257bb16e142d9380b9ae7590f50909639729e229271843686d6316ebfba0e77daac47e809b7aad4ef89d6c3810382d0b6817a418406bf73f13e266e5bcca
-EBUILD agate-sql-0.5.9.ebuild 789 BLAKE2B a6bbe3ea302153645db4af5f57ff67296fe0436ac27dc62a4c3b25364fdac74a6ca7a8201d2c4741babb04737f6bab3ee5a41363ad544d6b23ccd3db1e54a543 SHA512 1b2e7426cb6f3bfca13bc41f304a4dcf792bf3ea7bb42d876a8ead04c88066a07f413472311ca22850440a77ec43e08a89c7ddbad5f070665910496db776c3c8
+EBUILD agate-sql-0.5.9.ebuild 762 BLAKE2B c5bde66f61f43901c31bc0e52135198d0b16bd91b9c9ceb95a33fd79f9f3b10ebea27faf802cd3d995c04436359defd889720fa8772b92ef02db7470fd69b6a0 SHA512 96aead1719e8c9877a1d04a7fde78632ff183d2830004172950d3f6c63bd0cf03855dd604651f6268628e2d893007ebd638d6812fdeab0eaf58a3a9dc4a5b257
 MISC metadata.xml 638 BLAKE2B aa62813cba6c3eb26352e63e05a9a5e00817049dec03befd4df97c6f7b1a01bc142440813c8ad5a67cdebc0e3cb72a8d272f96a59758547709bca11131092cee SHA512 916aea41b52015c5d57d052fc9908dc711a3e600b585dbb92f604846af9222243b7acddb04042e67567aefc9d7d976a69bbecf10e328691e04ac028dc58c5a08
diff --git a/dev-python/agate-sql/agate-sql-0.5.9.ebuild b/dev-python/agate-sql/agate-sql-0.5.9.ebuild
index d5bd8ecac63f..6fec0ae83d1f 100644
--- a/dev-python/agate-sql/agate-sql-0.5.9.ebuild
+++ b/dev-python/agate-sql/agate-sql-0.5.9.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Adds SQL read/write support to agate"
 HOMEPAGE="
 	https://github.com/wireservice/agate-sql/
 	https://pypi.org/project/agate-sql/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
index b45f3e7295cf..fc7ccf4b9da0 100644
--- a/dev-python/aiohttp-jinja2/Manifest
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-jinja2-1.5.tar.gz 54608 BLAKE2B 3271e159f1022023b3d9f96b0f534b04898e0774d6ceefa19bf8958a835d499a1598fd12cabab8206448a0e89a107816577d596bff0c45a4947fcb7289c35e5b SHA512 230fec6e54fa55e22be3bc09ae1896cd12834eda5721c1d698c8482f9529b443ccf13a4db24bd9ccd179c36b9cdc90abbb848f287e7ed79e621d6a2976b1fa32
-EBUILD aiohttp-jinja2-1.5.ebuild 837 BLAKE2B 182ac21a33d40acac6ba8ac6a473d293fce7d73539619eb2bb4f45610b3db71a07191b3a7e2982cd08745f3efe9a71ae994125f81b79090eecbfd72813abb1ac SHA512 d58c36b09dc3d2edb4166235cd824d4e85263cafc63f3d776a7d8384f6be39502b333c9117f5ce73951e03b7d5625cbcae9052def8292e688f496e2692fb0d11
+EBUILD aiohttp-jinja2-1.5.ebuild 811 BLAKE2B db9859c84a2de76fb9ba647e0cda2ecb5182adbc6a2c2724226b4bb9fffff8629467fef0f8413f9ecf0d03ded9fc80e4ce7e6abac39e7dab858e284a2200fa55 SHA512 8e0a50e34dad54fd5ae30c2645343ddb7f680eb462ff53f694ac2bd7dc940d91d6e8431eaff6ea71738f6de88db61e069b720f2ba10869b6ed0612ab3b318b26
 MISC metadata.xml 510 BLAKE2B 457c273ba13d29037a79881015007652f8f9f3e5956dc997fcbc5e38294ae8ce7df81f0f8cd10a9bf97d371633d93cc59887067dbdaac5b9b6421b147ba332c6 SHA512 34398a5c6e57b87803ac705807c33b5080d87439288bd658a1191587662922e28755fe58fc39d42d4f4680fc890bfe6ddca6d17bf2472fe70446e1aa5e0c7456
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.5.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.5.ebuild
index 9fede0d56ab6..c7c3f064c830 100644
--- a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.5.ebuild
+++ b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.5.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="jinja2 template renderer for aiohttp.web"
 HOMEPAGE="https://github.com/aio-libs/aiohttp-jinja2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 48c78e2f098e..45e10292af2e 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-3.8.3.tar.gz 7337480 BLAKE2B 28d2b5bf6dd6f19506127747511e006c22fcb59959ab090bdc53ca5ee0f7f186aedb0c8b4103c2ea52399dc998fa2e6d3f872239223cf72629a1168e3950f1f8 SHA512 248c232604c91442b2fc9fa55fbf7df8e3af56dcf4cd9c516414a3a738c5c60a8a06395cd9c6e2c8ea9884728aea757423735c7b9be889e6f17e3ee6395a2f64
 DIST aiohttp-3.8.4.tar.gz 7338512 BLAKE2B 019e39eab7cfafe4ca2781c5efe7cc63ed16b5400c548a9a5169a98b59f4014c79bf1a32def1071ac4e1890dcfa583354a227ed2a541449dc725726216b7750b SHA512 ee193320d57161ba9d96b22502cea4eddb05d9586bde5ba1ce813e0bd149f62286ab8a76f120ef2a69f8bf882ab0605ca42103c0811fe53c7a024682ee31aa1e
 EBUILD aiohttp-3.8.3-r1.ebuild 2753 BLAKE2B 013ea7ece6e4fa41641b193be0c1552eb75bc11ad432fae72593132134ed2fbb5f8f913b3f14b765565d45af16608166532a5ded7183b1c90a4a2d301ae15c67 SHA512 3299a253104e3100b315dc682f7a3903194f79fb31b83379142dc125ba087963a4fdd2d5d75a7c2b3acae96d2139e31a14cd0c962cda0778f50749443df25ad4
-EBUILD aiohttp-3.8.4.ebuild 2657 BLAKE2B 6df9c6aebf0faa360b7770f29a090e129cb1cba7080402261e0c209f1a404eeaba749c06780da16a906fac0f181aed00eb37d158cd694a8a891f69d10daf3c00 SHA512 2145593fb8f56fca9cc1082ff5dce7841e64f6c459d13ebdfbc6b3a7da2e647d305ef63519f99be481e25c64662fac99cf2c8c925f55765243fdba85fc6222e7
+EBUILD aiohttp-3.8.4.ebuild 2650 BLAKE2B 81efa0018e164c89e5b4ef3e8a9d88e29518a9cabd97d5ac78726b2d7f89b7b1d8bdad2fd6e0d37e94e68465a90d7e4f3aae3a139f39eac419d2a3fdd33bdda0 SHA512 873450b8fda1a226dd12581a47cd583b32b0fab032ebf2efaee9a449d192524f6102bd5fdfffb09b484bcdd60b11b2a90b5984361dc7d6d0a56e9c83e518e605
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.4.ebuild b/dev-python/aiohttp/aiohttp-3.8.4.ebuild
index 53c9f40f6771..05bb6579d189 100644
--- a/dev-python/aiohttp/aiohttp-3.8.4.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 6493d0ee381f..d5090447dd57 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,13 +1,5 @@
-DIST alembic-1.10.0.tar.gz 1146577 BLAKE2B 9063a62a10e3c8a2fc5c7b78d285d6526dd0a4b97775db7881e28667752ac9154a4867b7213ca9dde7df51c97317104cb66a8e42dde22d8678ac2da7b4e8994a SHA512 39deb7182660a4afbcfac4b32c1607ff7d97fe599fa99dc74c6dea41c26e298d3fa0618dbd7c3c8984264d54f6f2b00a0e9bde66dc1aa76a2a64eccc81e85a03
-DIST alembic-1.10.1.tar.gz 1147979 BLAKE2B 5fbcde2f86ad034e0d15825d02d8d1eddbea638953830f16ca9a4f54cb9ea7d1d2332651308c3437ad9bd5040e02749d940ae1d9da2fa3c6c2b8c50a13a4b8f1 SHA512 7b26752e8ac6236bf69d379b5852251c9508886a99e36730200dfe085b7d1af7157ef0b66c46c82ec97f22c10e5dbafa9ec135ead0656604401b4fa646ad2359
 DIST alembic-1.10.2.tar.gz 1148340 BLAKE2B e6882982d0c7f10aadce3118e0d7ec84de9ecd123b55351922876fedcd5e1debe8aacac57a4db25a0296c585569d6118b95aa5dc601841f5c4247f21fcfd917f SHA512 a0ebff90521a4358257892b840d3e623d35bc2c32408759b7d5ae25839a5314e58ea40457f79e766d1cfad467ebe8b663e073aebd89141e11aee1992b40ee1e9
-DIST alembic-1.9.2.tar.gz 1136929 BLAKE2B 26c4ad3185bc274aa4321a0860dc357566625abb51c951f2d0151bfd109f0e0bf7a37075d07ad2f0975127bdd327579f2d9a700f3cc130fbdd1c6458127b2e50 SHA512 d878d48d140be68facdaf0ec25f8582c9e10a369b23e9ee035ae63f8f2ad52d50464c5b8e9c666307edd1a797b6a2c495e56fa890f7dc8f46b3d75a726905ded
-DIST alembic-1.9.3.tar.gz 1137492 BLAKE2B 17dbc5513b7e15daa51f623bfa90febf356caad8d13e215c6007fd0330e569ea4ffddd374c1ab9b7954e38a136c27d2e5d0ff5db026a6c2ad04d242b3cfdbe7f SHA512 dcbde51c26a81f88b102979aa000c17d0af065e96c51484c94c138fc08099e229deb06f5934d499058f25ef87eb5a5de765225fb890a76eb030d1ad6649e57a4
 DIST alembic-1.9.4.tar.gz 1139210 BLAKE2B 5b740803b6bf5b715e9572a91d87d5403d64e665647776d28511704fa17ed81825fe6f5cdab2cec77a0806abb02ef2a7acf5f9702ff87639b90e74d9e22a4b1a SHA512 76e6f86e789cecff78f8e86c34d22a70615158833bc24a26f38fe2d0d5ccd098920e0fe4cbebaadd2c9a4a2e63152720945645000d46a2b6b8b6696ce873f899
-EBUILD alembic-1.10.0.ebuild 823 BLAKE2B 2e117a78be63af85010ec0f507aa0f90129b3fdb92c345b741a8beeadf9c19d634eba9f3072a3013c53dca7bb85d77553c75876460c0e3c8d74b5a6e89ba39fe SHA512 fcc103c9652dd9450d4810f96cfc56dc8462d234ca0d6b88c8814f9948917a8e3d241b331e8bd7ed46cfb3d04b7afb0c00b4241784886e23ce7c7b2eee04c861
-EBUILD alembic-1.10.1.ebuild 823 BLAKE2B 2e117a78be63af85010ec0f507aa0f90129b3fdb92c345b741a8beeadf9c19d634eba9f3072a3013c53dca7bb85d77553c75876460c0e3c8d74b5a6e89ba39fe SHA512 fcc103c9652dd9450d4810f96cfc56dc8462d234ca0d6b88c8814f9948917a8e3d241b331e8bd7ed46cfb3d04b7afb0c00b4241784886e23ce7c7b2eee04c861
 EBUILD alembic-1.10.2.ebuild 823 BLAKE2B 2e117a78be63af85010ec0f507aa0f90129b3fdb92c345b741a8beeadf9c19d634eba9f3072a3013c53dca7bb85d77553c75876460c0e3c8d74b5a6e89ba39fe SHA512 fcc103c9652dd9450d4810f96cfc56dc8462d234ca0d6b88c8814f9948917a8e3d241b331e8bd7ed46cfb3d04b7afb0c00b4241784886e23ce7c7b2eee04c861
-EBUILD alembic-1.9.2-r1.ebuild 816 BLAKE2B 276fcbe1882537e6f676b1389f734160582fe9d57c6426b06a587457c106d7289e0a5fc7f1a14f8907e5d00b46e6b0269742ae6e6150ccec11cde4894f07edaa SHA512 82fe07ae2973f53f913375751be600521c10ea653e88ec6885f59f044ea76d5782e9a9cfa8c2aef7b6f9577d1456fe840dfc2a3ac1b64cb241ac9fad47c09c89
-EBUILD alembic-1.9.3-r1.ebuild 771 BLAKE2B f904f3e3a70cde89fecab15c35c6ebe09a0e36fbd401294d9cf0dc1e2c6034f8bae6e88603fc58f8a3ae790a5db0116e5c3094171bd3726accb7fe286394a158 SHA512 05328ea27883bd3c8357ee2a4d0ccc21a6d0d8fac6f6b6654860d6f6f5e185482e7c08e50fc07669fbe217f51edc2a3ec4f4451183d3a06aaa79d5e242852334
-EBUILD alembic-1.9.4.ebuild 771 BLAKE2B f904f3e3a70cde89fecab15c35c6ebe09a0e36fbd401294d9cf0dc1e2c6034f8bae6e88603fc58f8a3ae790a5db0116e5c3094171bd3726accb7fe286394a158 SHA512 05328ea27883bd3c8357ee2a4d0ccc21a6d0d8fac6f6b6654860d6f6f5e185482e7c08e50fc07669fbe217f51edc2a3ec4f4451183d3a06aaa79d5e242852334
+EBUILD alembic-1.9.4.ebuild 769 BLAKE2B ba8c5fd187d28564d6742cf735891fd45b91b75c2aaf46b831263b35e308c682d5bf8811aa15cb8856f8858325e5af10af281cfb79d527c8c6f76f41b7af7998 SHA512 90bc88562d2b8494515a05e08837325ecef9aa0fae03b2427276b16a14e0898b49e2e947699cd995d6e1b90c0d2ee148b415102f21d88fcdec32bf614d4deefd
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.10.0.ebuild b/dev-python/alembic/alembic-1.10.0.ebuild
deleted file mode 100644
index 65822a6ad910..000000000000
--- a/dev-python/alembic/alembic-1.10.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="
-	https://github.com/sqlalchemy/alembic/
-	https://pypi.org/project/alembic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.10.1.ebuild b/dev-python/alembic/alembic-1.10.1.ebuild
deleted file mode 100644
index 65822a6ad910..000000000000
--- a/dev-python/alembic/alembic-1.10.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="
-	https://github.com/sqlalchemy/alembic/
-	https://pypi.org/project/alembic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.9.2-r1.ebuild b/dev-python/alembic/alembic-1.9.2-r1.ebuild
deleted file mode 100644
index fb2a745913fd..000000000000
--- a/dev-python/alembic/alembic-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="
-	https://github.com/sqlalchemy/alembic/
-	https://pypi.org/project/alembic/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.9.3-r1.ebuild b/dev-python/alembic/alembic-1.9.3-r1.ebuild
deleted file mode 100644
index c7ecdc042007..000000000000
--- a/dev-python/alembic/alembic-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="
-	https://github.com/sqlalchemy/alembic/
-	https://pypi.org/project/alembic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.9.4.ebuild b/dev-python/alembic/alembic-1.9.4.ebuild
index c7ecdc042007..393bbbe27933 100644
--- a/dev-python/alembic/alembic-1.9.4.ebuild
+++ b/dev-python/alembic/alembic-1.9.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/ansible-pygments/Manifest b/dev-python/ansible-pygments/Manifest
index eafe6043ebcf..ac9b4d50b6bc 100644
--- a/dev-python/ansible-pygments/Manifest
+++ b/dev-python/ansible-pygments/Manifest
@@ -1,4 +1,4 @@
 AUX ansible-pygments-0.1.1-tests_pygments2_14.patch 4663 BLAKE2B f198da4ffccc4acc7d64397e9e654407cff934a8764054154775c5e5208503096270a35fb712daeb2ff0d834b9638ffaab2f3fee3bbe5d902fde48e1de53a3ea SHA512 0ced02d842fac488a37015503bb1fe163bfe842f20717374ca5b87319e5f80bee6da11b0eef7c311cd750c89248ab5a92a44f402cd0b3fcedd86d26ac9d28679
 DIST ansible-pygments-0.1.1.tar.gz 8446 BLAKE2B ff631dd24c723035db7ab11a6c3fc0c90e8cebd72e6b0fa0d8b2c4bc4250ff5fb1e4180366e4ee084aab90bf24a8c3b2ecfad2c421b9f0cfdbf7675c94f0fcf7 SHA512 1ad2f4568d46d7fc617c6e674bcd9aea48e14307d91c476b51a04f778b452f18cb983d87d4872664d567b984193edee2af7964854fb2f3ae37ab4bce09c387d4
-EBUILD ansible-pygments-0.1.1-r1.ebuild 619 BLAKE2B c578599ff8ff7e89fabecaa3a8157815789e14e25e829adc7cfc7e4318decb7353a757a9f8f08cc88f9f2df2db5d57465be95a61a612b4097cf4bf131c1fac9a SHA512 bc14dd545061fbda5a9692fc998141ba8e7fe97fc83d8155674e1d782458077bc6f68ae89d10581beef76f2389fbc7b136890bb1d8b72ad601fb3f1dc2427528
+EBUILD ansible-pygments-0.1.1-r1.ebuild 592 BLAKE2B 983c8afe8dee6d4b7beac1c14ffa1d0e82be44561da4a9d04858e1c934052e61d5659b332546de0679091eb7d21dd9fd7bf53f5f800e0a6f5b7ac277019da760 SHA512 ab6f663193f1634e456df79bc1430e5617d9344890e758f1d72994d618ce4d7e78106dfdcb7ea2d92a43e24c975d1bbbf150b0e70384d6f3e23382b2873359b3
 MISC metadata.xml 786 BLAKE2B 5883f03ffc7b0850bc8ecc90c91a15a9498ced9ee196a4f8d2a97a77a41957cb05a40ebf671ddbdf226886b94e9a5e796376094924712544a07559e0858aa5a8 SHA512 c7736962fe565be524294a30630e7cfd2820d1e9ace6f6dbd307ad46a252947ce368057d5ea5d20889a5ccdbb7f3418496affad5f8ed345e0e0808bd4abbe4ed
diff --git a/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild b/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild
index 245c0808deda..acf6231a5358 100644
--- a/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild
+++ b/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild
@@ -5,12 +5,12 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517="poetry"
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Pygments lexer and style Ansible snippets"
 HOMEPAGE="https://github.com/ansible-community/ansible-pygments"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/ansible-runner/Manifest b/dev-python/ansible-runner/Manifest
index 740b5882b9a1..be14ada85e3e 100644
--- a/dev-python/ansible-runner/Manifest
+++ b/dev-python/ansible-runner/Manifest
@@ -1,3 +1,3 @@
 DIST ansible-runner-2.2.1.tar.gz 172121 BLAKE2B b4bb0917570b2b7ba4a7f44bf0276713eb3842ec8a9db62ec5bec8f90e91603b69cf2651f16dd150c8267b3ff25529d4c1bbcd628a26564b74362325b9c75ba8 SHA512 e9ba5c7afd3d8542af37bd9ef3ba7a417bd7ebb430b2dca6f2bb6289633dc89a14e7beb39236f75b75b802c6fc07501c6e6fa06102c69037e34568c396d6642d
-EBUILD ansible-runner-2.2.1.ebuild 912 BLAKE2B 99c199892dbbb22d248e010f4b5ba9c8a3a7d19aec76122ae565eb34332dc0ee3960904844283b0f1e6c13d3543fcdb720de1d42f20e2b79c67f8fffa6ce4f1e SHA512 9d74bcb9f05e7b79c859b7b7b9d9e055cb62a80a9700a991a0719fb635752c65e7fc66783e12a7af0b5ee20e489c1370a95989ae15085c5f652e3e0ad11dcf66
+EBUILD ansible-runner-2.2.1.ebuild 885 BLAKE2B 459ebf7ddcb463fe3cec05ac6013733b1b14dc904cd9565ffc462631c756476093d4454475353cc5f3f3d2eb62801bf554cbf28d709b46f8f015f4a35be9d654 SHA512 a424587b392d3687dcad8c0c9e7152fd4dcc5be812f1c931a453a962bf444fe1a11e86ec93b900e858905af6bb1d54298e1e209783c852d033e979a7c526e251
 MISC metadata.xml 919 BLAKE2B 4f08236cc9aa2a45279ec971c60e5d4f0a8f3695bc5cf4fac42d704682026b30b2ab0a6b0b408e313b3614da94de873256d146c4602598a762c59072f3c44d27 SHA512 f632561c44dfff6767bad8a8273776efe86b45feb7900ea07be4413f8779bec5c9ea1950a2ca1ebdaf7d17230f6839aafbd3c5fcc54cd6df3085b7e392605a6b
diff --git a/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild b/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild
index e2ba508c50f7..6b6113b49753 100644
--- a/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild
+++ b/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A tool and python library that helps when interfacing with Ansible"
 HOMEPAGE="https://github.com/ansible/ansible-runner"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # TODO: fix broken tests
 RESTRICT+=" test"
 
diff --git a/dev-python/argon2-cffi-bindings/Manifest b/dev-python/argon2-cffi-bindings/Manifest
index fa570abd8150..9141e0ddc934 100644
--- a/dev-python/argon2-cffi-bindings/Manifest
+++ b/dev-python/argon2-cffi-bindings/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-cffi-bindings-21.2.0.tar.gz 1779911 BLAKE2B 3e2e2252e37678661502ca15425196b91a7952d0bb5c7ae4ed35132e9085fbbe5d817c9c1bdec7d94eb583ab6baf9d1e1e454a24415bde1408287c5606745fb9 SHA512 71d023ae96073ed78599e4f4e42f8efcc985cc329adeea00b14b54eaac1e6a545e6ad9b7f4cfdc60a4e9c396f95053c0ccb6f6f67d92f70265f91315fff4a390
-EBUILD argon2-cffi-bindings-21.2.0-r1.ebuild 1077 BLAKE2B ff6ce6d85e099399adcd4b965f903ef7501cdcee28a3b10ddd26fc317af6e453e99504804c6cce283e21169fa869e5a40b1bbc7156df7e14f6106d739294bbd6 SHA512 bb1d582b153c4c6b398abb43b68583bab7eb388175e501c5e68ad32747a38050e20aa24593079cb20837e62c4f0eb835a32889a45070b11caddfbe7d82f83145
+EBUILD argon2-cffi-bindings-21.2.0-r1.ebuild 1051 BLAKE2B 3ece53b0944de9e4b6b4ef0a2af8bc570785bce8fe4420f93a7297fd7e5df734272de32c4a6374cdeeffbb6cc3c9b3518a18a319ad0409e80a8633b0517fb4e3 SHA512 70f95e0518096ebb168d452959e876bff5f6719f4f23122724f81bc19fd7f516cbad985c9b1b65c5118991e27c3bbdf58b468ae642d805da61f2cb4af33b0101
 MISC metadata.xml 684 BLAKE2B 80c3275f178c9972fe804e6965b62bda1caa24a3b4b66e985b372e6d587a6715821acedd63a06de10ac23b560bafe3b3c78a4fa78fcffabe55056b7429d74640 SHA512 e299e8d3f84c3d2c52508f182ba56ee350bd3b6d700c1fbe1fc87a13bf36a1b24b61b3f77e6f93c64e16312b306899460eb2cfcab0f972211ad6cc1791cecc39
diff --git a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
index 663147354297..30f578baf0fb 100644
--- a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
+++ b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Low-level CFFI bindings for the Argon2 password hashing library"
 HOMEPAGE="
 	https://github.com/hynek/argon2-cffi-bindings/
 	https://pypi.org/project/argon2-cffi-bindings/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index e4f71e2a42c0..b36abfcca4c0 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-cffi-21.3.0.tar.gz 38446 BLAKE2B e0464f501efcdfbf33d93e0c1c6dbc519ad6aee06c0b8692417156de608f6c6acf947f86b866c064601fe994087677e51d954ae2c1225cbbbba3534cf70c6296 SHA512 6cb2a075f3bb7040ee7f552d082bfa2f3df0854649d9c84fdfdb42bb4bee2133b8a35a20be2b3c887931efda12fbbb00815d8d88170b7e20b3ca19c86f97057e
-EBUILD argon2-cffi-21.3.0-r2.ebuild 827 BLAKE2B a3ce433d877ac0ecd68a5554c16b7aa6718b36f26618a70a4aa287edb387bb4afbd99513601f222176bcf0e72b0205a15819400b496c56ad16f4133e9085cb55 SHA512 4cb5ca075e9f5ea51d7e2dc60027327b6b2405ddd21333cb1660ae76b8daaa23fb0868152a819983e84dcc79f42dce135e20607985fe9c648a96c862c73d97c5
+EBUILD argon2-cffi-21.3.0-r2.ebuild 800 BLAKE2B dcd23c2e7fa8e230d2340a0378605d056d54c5281c72d133284b2207396027e85ea1211be8649b6fe61529853e78101893c2285f022ef44281c47ad808af1efc SHA512 42adcfa43f99c5e9a1f30950655eb0edf7291028b3deaab082ea3055a105d1a777fe62d2d5047c30a9922d235f10e5233a024dfe0c9086f5101a529fb05d68b4
 MISC metadata.xml 666 BLAKE2B 831fde25c0b52ed8610f39ab589f339783bace8dc2cc60ffa4736257c352bc82b89e110bf44181790e4a16db967e4c516f21fbc3cd1526a9975cc86b21f723f7 SHA512 543bb0e37fdf96b8c2fa4ec26eae837317dda4688b4293e82268100ce69e3f9987e91b2f141cac1be4becba9698f9806d22242801523bec825271b8fa4f14bc8
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
index 421d0f551145..e2883aa9064f 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="CFFI bindings to the Argon2 password hashing library"
 HOMEPAGE="
 	https://github.com/hynek/argon2-cffi/
 	https://pypi.org/project/argon2-cffi/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/async-timeout/Manifest b/dev-python/async-timeout/Manifest
index 66039e783db9..c63ccb36e7de 100644
--- a/dev-python/async-timeout/Manifest
+++ b/dev-python/async-timeout/Manifest
@@ -1,3 +1,3 @@
 DIST async-timeout-4.0.2.tar.gz 8221 BLAKE2B ebcb2ef956590e265bbdecc223a877e7260750aecf5b631c6af1f335ce57b51579467901e2344bfa8495010eb1e6e7a39adfd4b6311483d63e0674221888d1f7 SHA512 e9884a525b99bc1a3a15c958a1dbb25a92cb286bb7360b03b0be3198e61685970628c8fef6dc478beba3f031e0ff6f03b1fcc3c2c34032d7fea6f8b65850ac38
-EBUILD async-timeout-4.0.2-r1.ebuild 871 BLAKE2B c5d9ca6797f1a521248124737c23c572dd0af68792b5e7caaeeef3deabd06ab7e3f286eb8a50c0c7ad8458acb3cc6582ed4c20b5a0ef163b5b956fc325c38dfc SHA512 844ee3a940c448ea7f8ea7969fafa672622199b20386eecdc844530e634e8a70885e231a79f9e5260f855f02035cf73507ea365db289427aa872a3fad051acf7
+EBUILD async-timeout-4.0.2-r1.ebuild 844 BLAKE2B b59118e0537c60c1d6416c873654c73d0d2ee82496fd6f94bda96217523d3b75ce61e7dc6e923a439f307b6181b3b498f0159c4683faaa98e56bcfe612e95dd7 SHA512 555547c1acf53298e660547dfb07cce17a14954f8223565e3c787527968a053df51b3ec4699a6c3b507841ecf1a8c326e6c612baae2a79d9051527b39d354942
 MISC metadata.xml 460 BLAKE2B 33594e2b78abaae89f7cb0c953a432ead4c468e01d005d4a65aeb846030fa01b1544d8df393e9d73cc4af6e557f106f8077c3fc4b0b35aacec20033352564083 SHA512 47b1f783f49a63c17abcabcc73d350582297f5bdd266a3d57079f1a50e4a6e88680b73993d9efa3609fe9820decf7a4ea4b5b87f9db6e99509695286c50aab1c
diff --git a/dev-python/async-timeout/async-timeout-4.0.2-r1.ebuild b/dev-python/async-timeout/async-timeout-4.0.2-r1.ebuild
index 8fb6042617f2..080a9b77be95 100644
--- a/dev-python/async-timeout/async-timeout-4.0.2-r1.ebuild
+++ b/dev-python/async-timeout/async-timeout-4.0.2-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Timeout context manager for asyncio programs"
 HOMEPAGE="
 	https://github.com/aio-libs/async-timeout/
 	https://pypi.org/project/async-timeout/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index d8789e1a5527..8dac7be6870e 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,5 +1,3 @@
-DIST atomicwrites-1.4.0.tar.gz 11790 BLAKE2B 98a262f46acdfb94f56175368bebe3dbd5d46c1bd694362f5c9211c7be2016821c9a833f1061f41f77adadb3a26b6c6d3ac1761a13bec1f9ac2c3c0a35a58ad2 SHA512 493fd15174880917650643db1fe85e2703add730189c23fcff11ceb87175f546b9251050ade506d0b48300e0f2a39ee5a4dcd4da8cb3e27680fd05553d6662cb
 DIST atomicwrites-1.4.1.tar.gz 14227 BLAKE2B 189702d908fde9f7e3ba38abe94d874a9c27d9f6dcf50c635c31835aee9667679670134c68e48449d041c1e45d7775ddf9d3212f6ed4ac89dd100c3eda14ce4c SHA512 d02f58ba639a3ba677eedd78016d366a6e77c79d31903ad34f0a50202aba9b9616f933e9763c42da197ada124abd3510c54d0b10099159308c186bccc6270f32
-EBUILD atomicwrites-1.4.0-r2.ebuild 667 BLAKE2B fefbc029258c34666d8da4685debef5d687d6f83e7c338e81f10db1d7cfd8d61d4278bf547065bc883a04f2a5bc541c935bde4ebc078aa05768928d6b2a33080 SHA512 2ec4ed8f6c237e9ffaa427b40e9df0b74688fdef86f73312a5ff5adb14ed175d58dc1640d724a230610822c9ec80b3909472394c210c4f87805be6bd75cc43e4
-EBUILD atomicwrites-1.4.1.ebuild 628 BLAKE2B ac13c569216baa286a89a90a8663b5ec2fcf7fe26a1efa92f8584ee545a43fcfeca132cb7500d4e4b3695f0dae779e35bd70a427df15f837b50386883bd8ad10 SHA512 58f748c7c8c42daf8dfdf6740d095a1472ee3247df3323bcacc6f48624f1aca2fa1eee87c4e6d712065a396dd348493d029b775103043b9f3880caaf857d96e2
+EBUILD atomicwrites-1.4.1.ebuild 620 BLAKE2B 9ab115ce756e66aebe685e4c23906e0943ee634d6de2523320bccd28297aa0f40756b3eaccb5f7de5876c0d092c04c41d65d04be8d52b39a5aefd635f4ca71f4 SHA512 7ac5c7937b150d47abd7965f9a29305f58b970f356c9c9fd28fc2a8114cc222b69488a67dfb762cf3b0bd12cf11dea17ed8641f57a2a2e9e43e8e845cfc50e04
 MISC metadata.xml 564 BLAKE2B 9d6489b465beebebbe6105d545637321ab4dfb88353bf498f6f9f657097e521bbb7bc430681736301c42b0809cdf81e5d72fb30a51d46832bea2fba4acd58cb6 SHA512 ae0eb669d1b19924c4107fe4f23cc5a7f980496aa39cf9fbf70ff013bf0491440f4946a5a37a19919ee5148740f5c9abfefe3c59bfa3916b7dc9cc243484c3b0
diff --git a/dev-python/atomicwrites/atomicwrites-1.4.0-r2.ebuild b/dev-python/atomicwrites/atomicwrites-1.4.0-r2.ebuild
deleted file mode 100644
index 250d24e4fa4e..000000000000
--- a/dev-python/atomicwrites/atomicwrites-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Atomic file writes"
-HOMEPAGE="
-	https://github.com/untitaker/python-atomicwrites/
-	https://pypi.org/project/atomicwrites/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
diff --git a/dev-python/atomicwrites/atomicwrites-1.4.1.ebuild b/dev-python/atomicwrites/atomicwrites-1.4.1.ebuild
index 2adf1413568a..64d351a28fa7 100644
--- a/dev-python/atomicwrites/atomicwrites-1.4.1.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index b3018f4b256f..f2f01bd38c43 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,6 +1,3 @@
-AUX automat-20.2.0-ignore-m2r.patch 835 BLAKE2B 5ea7ced5d5dc65c0439ef3ada83359177f0625ef9b463148a63545784c0842cf2cfc24d04c58415ecb3071d88acf490aff4f774c163d3ca8e2e3bbdf0efa4e5d SHA512 f03ae46feb1d6e10b07168de5bf86cfbc07703e326c66606fca76bb077b9c547ad3356143e06842423255da72b191793734d5173fbb0d19b8a0c640cfad9f4af
-AUX automat-20.2.0-py311.patch 777 BLAKE2B fe26ab800644d6930a17690aa033c9b60ac9c50802c6fcab52bb13222dad34a356a1df03996e4b60c0b5af0d7a71668d8597c045bc7ea47129e25a1bef69b096 SHA512 0b06cee66e4193da7aed7caa007b2d89e1ab4bf6f29b22de5d85ada7e001f467847375a93a38a394d64d0dd716c696b403c5bafc4e84a1d7f0c75e4e8a7c8d6a
-AUX test_visualize-twisted-import-errors.patch 1999 BLAKE2B e551520aeb24b3df293eeda358fa3b9b3e33934af54ff6a7a205a0e1b5b7e916e34f8c81c103fa0fee93a22e7d0bc6ca3f7b8a17dedadeaccb02131ac23f94e4 SHA512 67f14d0b64333b872c0057eba32f77132a4bbf61c8867ec475c87552b3b553162c3e2a668ffeda0c75d85906273d50e4d80231213a3f46d1855316bb229fb6cb
 DIST Automat-22.10.0.tar.gz 59099 BLAKE2B 509e64b1312f87f09a60243a00b832c8b3da4b09ef75151e82c8c406faabd24a56378baade87bd98685fa22922d1892ec20d81579eaf13e0315af68bb7909ac4 SHA512 5819cfe0687bf391949891562f3657f449cf9a8e8ea90c1537e89509dc618da1160856f92ab52dc450e0a7d51d0e4644bfe2db3d4108126a42ee1bea2f06bb7a
 EBUILD automat-22.10.0.ebuild 1168 BLAKE2B 2e2b9ef0909acab4777d050aefeec106b946be11b20e271dd5832ace851e40a6932b73eba16c116838e7c2d5d70142c42ec00e34715c50eb7259c7a0743b2345 SHA512 f5bbea5f31c122b8b32912bb7d10d55c0eb28caa193fd2c08d4d5be2f79cde71e5aa0654e26b6942b4ab94206fd8b8389017c525d8d2fecb64ff814a1f54f241
 MISC metadata.xml 670 BLAKE2B a71e9da919b5a2d171c96df7f1de0f5ad0431fa6227d90fdf3a0ac47e5d0f9f56a4dbf7b247708c9f47a50756c5dfc78c90691ec38a6fbe543d4ce840c8c1ea6 SHA512 06362e4e337d503492b51d21164c858b071374cf8fe5a974bcf4b2f8bc870bfae21b1aa6e630f8b4c44ec5f900659b082b36a408e143e8d0e83916eb53f3ffd8
diff --git a/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch b/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch
deleted file mode 100644
index 5e3ef39f33e1..000000000000
--- a/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Completely ignore m2r (which is now last-rited) so we can drop the hard-blocker
-which makes world upgrades a pain (installed m2r would break b/c of newer
-mistune, and would break automat build).
-
-https://github.com/miyakogi/m2r/issues/66
-https://bugs.gentoo.org/848900
-https://bugs.gentoo.org/847532
---- a/setup.py
-+++ b/setup.py
-@@ -4,13 +4,8 @@ Setup file for automat
- 
- from setuptools import setup, find_packages
- 
--try:
--    from m2r import parse_from_file
--    long_description = parse_from_file('README.md')
--except(IOError, ImportError):
--    print("\n\n!!! m2r not found, long_description is bad, don't upload this to PyPI !!!\n\n")
--    import io
--    long_description = io.open('README.md', encoding="utf-8").read()
-+import io
-+long_description = io.open('README.md', encoding="utf-8").read()
- 
- setup(
-     name='Automat',
diff --git a/dev-python/automat/files/automat-20.2.0-py311.patch b/dev-python/automat/files/automat-20.2.0-py311.patch
deleted file mode 100644
index 14ca69e7235d..000000000000
--- a/dev-python/automat/files/automat-20.2.0-py311.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/glyph/automat/commit/d0c2845ead9b8f576042d42134bfb5c63086be39
-
-diff --git a/automat/_introspection.py b/automat/_introspection.py
-index 3f7307d..403cddb 100644
---- a/automat/_introspection.py
-+++ b/automat/_introspection.py
-@@ -6,6 +6,8 @@
- 
- 
- def copycode(template, changes):
-+    if hasattr(code, "replace"):
-+        return template.replace(**{"co_" + k : v for k, v in changes.items()})
-     names = [
-         "argcount", "nlocals", "stacksize", "flags", "code", "consts",
-         "names", "varnames", "filename", "name", "firstlineno", "lnotab",
-@@ -23,7 +25,6 @@ def copycode(template, changes):
-     return code(*values)
- 
- 
--
- def copyfunction(template, funcchanges, codechanges):
-     names = [
-         "globals", "name", "defaults", "closure",
diff --git a/dev-python/automat/files/test_visualize-twisted-import-errors.patch b/dev-python/automat/files/test_visualize-twisted-import-errors.patch
deleted file mode 100644
index b3d8938cf7de..000000000000
--- a/dev-python/automat/files/test_visualize-twisted-import-errors.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 9f6312e0c2504c27b72bb228a37ed5ac58776e94 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Wed, 10 Jun 2020 07:31:45 -0700
-Subject: [PATCH] Fix _test_visualize.py twisted import errors
-
-When graphviz modules are installed but not twisted, this creates test failures
-in _discover.py which hard depends on twisted being installed.
-
-Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
----
- automat/_test/test_visualize.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/automat/_test/test_visualize.py b/automat/_test/test_visualize.py
-index 987eb3c..142c4bf 100644
---- a/automat/_test/test_visualize.py
-+++ b/automat/_test/test_visualize.py
-@@ -62,6 +62,7 @@ def sampleMachine():
- 
- 
- @skipIf(not isGraphvizModuleInstalled(), "Graphviz module is not installed.")
-+@skipIf(not isTwistedInstalled(), "Twisted is not installed.")
- class ElementMakerTests(TestCase):
-     """
-     L{elementMaker} generates HTML representing the specified element.
-@@ -134,6 +135,7 @@ def isLeaf(element):
- 
- 
- @skipIf(not isGraphvizModuleInstalled(), "Graphviz module is not installed.")
-+@skipIf(not isTwistedInstalled(), "Twisted is not installed.")
- class TableMakerTests(TestCase):
-     """
-     Tests that ensure L{tableMaker} generates HTML tables usable as
-@@ -214,6 +216,7 @@ class TableMakerTests(TestCase):
- 
- @skipIf(not isGraphvizModuleInstalled(), "Graphviz module is not installed.")
- @skipIf(not isGraphvizInstalled(), "Graphviz tools are not installed.")
-+@skipIf(not isTwistedInstalled(), "Twisted is not installed.")
- class IntegrationTests(TestCase):
-     """
-     Tests which make sure Graphviz can understand the output produced by
-@@ -232,6 +235,7 @@ class IntegrationTests(TestCase):
- 
- 
- @skipIf(not isGraphvizModuleInstalled(), "Graphviz module is not installed.")
-+@skipIf(not isTwistedInstalled(), "Twisted is not installed.")
- class SpotChecks(TestCase):
-     """
-     Tests to make sure that the output contains salient features of the machine
---
-libgit2 0.99.0
-
diff --git a/dev-python/basho-erlastic/Manifest b/dev-python/basho-erlastic/Manifest
index 578eecc3056c..85890653ace8 100644
--- a/dev-python/basho-erlastic/Manifest
+++ b/dev-python/basho-erlastic/Manifest
@@ -1,3 +1,3 @@
 DIST basho-erlastic-2.1.1.tar.gz 9298 BLAKE2B a3cd69a77c2d75ccbc2494cf841563a075036ce2ecca4425b3e806463e080d87fc2ab6668bcb21dfe3b083ec51498113c641f033cf66b0fd6b1b00ddd9703349 SHA512 bc8666b2e9ffba3e5c7105d1502423a1b0861047218ad18524ad77853137dea5f17c64d6cbb9cdbc6ac6e207b0a2f9a57d65e5c4cac67172654c5eb92ac7ae2e
-EBUILD basho-erlastic-2.1.1-r1.ebuild 565 BLAKE2B 6ce691e2dd662aeab67cda02d6b589bfecb0c7b2fb8f49cae3af8303a13bb8036b94e3019c4a90f0af6e2b5442dae80012b89ec3f3a1f415e28d678d0c22191c SHA512 b63b4b2a1e93e97870c30f9b49e7232a09aa476c61930269f2659e6a24c4f97e9c84b269d61b469f19f370bc01d674745f59eb872d4ca1ccac809b9f829721a8
+EBUILD basho-erlastic-2.1.1-r1.ebuild 538 BLAKE2B 0cc28be943355041cb97db31a22757ce3f41d76db846dd9b4a9e3873cd8b8ce7f4697b5484b9c69bc6c9c1fa41a36ae2a6ac6175690a0e209daf93f9f67cdbf5 SHA512 b81312b2d42f881122e08423318a947bbb78394851cdf200db21aaa976eb3ecd97f1b2e7e77cb537756a385777e4f3ac9247fd873222477db9e9315ebc3c05eb
 MISC metadata.xml 357 BLAKE2B 2cfdbd3afd1ee7519e676e82224205cabc9dc9c1c1a1ac654ef595a75040baaa92125a82894c0b4a169d88f3d991998a2aed8486390b87f0d0ea9079a76a45ca SHA512 c7e7d3cd678c1738de2a132ef46fa55274cf639c790da6f2ca3f7a49dea24014250a2a268e1fd438eadfba83cf54ac560a3bf2dc082a8968007f987e9b2be3bd
diff --git a/dev-python/basho-erlastic/basho-erlastic-2.1.1-r1.ebuild b/dev-python/basho-erlastic/basho-erlastic-2.1.1-r1.ebuild
index 983e8fe7fba3..f7879dc1a593 100644
--- a/dev-python/basho-erlastic/basho-erlastic-2.1.1-r1.ebuild
+++ b/dev-python/basho-erlastic/basho-erlastic-2.1.1-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Erlang binary term codec and port interface"
 HOMEPAGE="
 	https://github.com/basho/python-erlastic/
 	https://pypi.org/project/basho-erlastic/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 416852671467..871e716facb9 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,26 +1,8 @@
-DIST boto3-1.26.74.gh.tar.gz 602525 BLAKE2B 6d9b397864649ecd9b3f46bcee832c57cdce809545522f3beaf0d2eb98ca1f99e5fcab132f3389a4b2edcd585d9f6759de961b1f83f5912420629b6b03092c36 SHA512 eba11711dbd77988deb1695b954b6eb931b8ad49f96971e221415355de9bd2f3015b5a58be34a7378180f59500f9c15135192ccb97454141dbcaa664f0183627
-DIST boto3-1.26.79.gh.tar.gz 605312 BLAKE2B c36b86ab289be9c08a1ab43274a4f4db71cede08598b6f8092af8404bc9994e345b263b144ee3a1974ea276fce63c330d7ffa6335bb889bea32e380e9003a8c7 SHA512 cfc789296b904c0c3bd3999153067f4fb174b323f0fbd22e8f4a49aed98338e20fd238876e2f55f608f5d6b60b584e15d370400e8d0a8a00b0689e0867d00f05
 DIST boto3-1.26.84.gh.tar.gz 612921 BLAKE2B cf98272681299aa11454d65a6bf8bc6aa28244803e3d448f01425e62bb5dc01d93e0790ecaf6b2949ea1978130782f5ac282766c8fea94682e33b0cec65e2148 SHA512 d72117cb2f258fccf4a25e201a2dad8e13e8a80a03859edec2f27da01209185cbbb2f02a7924819214a612c6f6d3758ba0aba0047fab1cced3312d1662a7482b
-DIST boto3-1.26.85.gh.tar.gz 613010 BLAKE2B 724ebf1264717652b2d671f96f34b546b1cc5663844454bd3925c985f4624e21370d90b4408f7d0ea7de151f8e9e6bdf11089db1836cf46eacc1d7fc671ff342 SHA512 d4ae39fd0be03ebe73d0ce7ab1467c93997c5d11b4409e6832ca40e292f7a0c7151519c3784d634157534546b84e208c529b785e4bce35c09bcbb2bb4aa76389
-DIST boto3-1.26.86.gh.tar.gz 613310 BLAKE2B 4b16a9d637af664331a1197324219e9e58ba3569636f1707f907f44ffca284948daa2c702cc95a6fc85bc2ccb00d12bd80ffd79eb562325a709c87d9d3181880 SHA512 1a6bb7b7d3e14611099e938def383c7444801702a401003a91f47dc95656c0fb22450d670b908902b85d6caa0f20c6572f891364b20a98ef0669fdb7cdcfeb62
-DIST boto3-1.26.87.gh.tar.gz 614323 BLAKE2B b2dab2b5850777e493d7b4df7bda8cce8bb4f3b316f9551489a1942caaa0deca915cf50e4dd3e910a4ceff0d0a49ec2539dfc8bdf955745a4d5b8018453f8280 SHA512 0577e56f4cef0386e113e0ee67796ddbd8084fdb1e2b4229525f7818a8d89f1177c875b0b80f9d3334fc774fd151805f673bc29211cf4ee6e08806a5917ec619
-DIST boto3-1.26.88.gh.tar.gz 615353 BLAKE2B eecc0bf96a8f6eadc2337de0a29f993f0a7e20c691fdbc170680f749be4988f6c91963f3089e9ef51376e5829bb8493a051d376bf1375137a31a9f864b677f5b SHA512 46a013179343ec9fb8973700bec74a998e08a7346f84812d2d938e3327f686690d12236f687c66b1cfd93010a986006ce8db040b8172241d55e097b3da4adf7a
 DIST boto3-1.26.89.gh.tar.gz 615718 BLAKE2B 3257e6efafaf139daf935385c252c10929be2a4277a8f0f192afc6dbd7cc32fa8f940a4e59ebbe25931c399dedb926a3c1848bd9cc0a7f0d377acb302eabe3b0 SHA512 02ee02b05023e9184f779ab8ff21afa6f7e56f7d2e883d021b2567676c5fc57cad6b475d55316a2017c2a837c41d2f5604824f440060e2f96804c5a61ccdd143
-DIST boto3-1.26.90.gh.tar.gz 616132 BLAKE2B 1c6fb20ca08c75fce5bc192cd49c8540fb5a702790f5abcdcafd4ee803e4967e55c97a99214cfae57701e6f808501d48e3bf3b5c73e1737ca3f3909af2522d4d SHA512 da438af104c3362e366785da71b9892f45b2238d280c0c39df27572afc076d4535e73fe58aa7cc7fb565b92ed8423938ddb0f16e3a5ed641231e5efadb1bf0b5
-DIST boto3-1.26.91.gh.tar.gz 616798 BLAKE2B 51e61db07beeb39d8fc4be88818a13e259bc71fe25d1a52df10f7ffb364ca5d42509f4cda526fa1eb41e97bb6db1a453ab8865d8032b279523c3a994ca28bb7a SHA512 e1bde413d836ae5e3332e84a73c2f687b0d6800dcaed16ef24354f95a5e39995aeeeba3ca4a82158a7752e1cfd61fb6e39c301d9156b94e021ec0794463d1f90
-DIST boto3-1.26.92.gh.tar.gz 617090 BLAKE2B ce559b42c3d1e0d0d79444d7c86e9b6451c9419625bc54ffe816c662df886169e086f2389acfa3e9c634c292eda186758e14df492deb06d09e077e750c350150 SHA512 8ec2b0f5d9b605d9e62ccaad442b6caeef6d0ba1f8b65e5276c96d9624e14e934391cce83619f68dc57c8c46b41d187521fe30aae19b6159dc69888a26ead10f
 DIST boto3-1.26.93.gh.tar.gz 617542 BLAKE2B 08f045cdac7c977d9a575ca7f487314baf6f358e82b13ff3a2063d85ed23aa98c38445d444ce78730b01381fe04eb5bd5909868a5e01a529d2028c065294714b SHA512 9af0dad9189030bbd310b634af80b731799166d89c561d640308ae913c1f81f0ce50e1a0c303bff974006281be03125e454495936cca30db3cf33a4d95d66783
-EBUILD boto3-1.26.74.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
-EBUILD boto3-1.26.79.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.84.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.85.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.86.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.87.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.88.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
+EBUILD boto3-1.26.84.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
 EBUILD boto3-1.26.89.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.90.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.91.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.92.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.93.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-9999.ebuild 1586 BLAKE2B 44b7d2804e4a484ed5fb864ca2c60348f4e4eb2265c1ba946adf27b31052dd9041f148c1ec935af0bdcabc66109ad3b479dac167613c679a2d9e42f689182734 SHA512 bf11d1114aaff8762b6162a7ba94223e2eb180868e8395aafd1f466c48683514a3ae755baac40d7e0e1afb26ab49e14d30f39266382661b01e8f7ec53d71f145
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.74.ebuild b/dev-python/boto3/boto3-1.26.74.ebuild
deleted file mode 100644
index d6d605bdb0c6..000000000000
--- a/dev-python/boto3/boto3-1.26.74.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.26.79.ebuild b/dev-python/boto3/boto3-1.26.79.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.79.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.26.84.ebuild b/dev-python/boto3/boto3-1.26.84.ebuild
index 9523f65d5fb9..d6d605bdb0c6 100644
--- a/dev-python/boto3/boto3-1.26.84.ebuild
+++ b/dev-python/boto3/boto3-1.26.84.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.26.85.ebuild b/dev-python/boto3/boto3-1.26.85.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.85.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.26.86.ebuild b/dev-python/boto3/boto3-1.26.86.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.86.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.26.87.ebuild b/dev-python/boto3/boto3-1.26.87.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.87.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.26.88.ebuild b/dev-python/boto3/boto3-1.26.88.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.88.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.26.90.ebuild b/dev-python/boto3/boto3-1.26.90.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.90.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.26.91.ebuild b/dev-python/boto3/boto3-1.26.91.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.91.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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.26.92.ebuild b/dev-python/boto3/boto3-1.26.92.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.92.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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/botocore/Manifest b/dev-python/botocore/Manifest
index 900e6f14cd9b..eaf2fa92ff9a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,26 +1,8 @@
-DIST botocore-1.29.74.gh.tar.gz 11153254 BLAKE2B b3d3b75643cd5e3fac54a09e971daa23a043ba9f7ab773c2fd57dc15417c1b30c6f503515bad8734332bc40c4210e4ac09566c0742649c6ac3592e81ae9f8d79 SHA512 944ebbf1268fa9e8bb68ce5960da347613bcab585bf54c2fd6dbecb499088c1dc426357cde0a0f0d1780ecbc06acc33d8587f37c7f3d13577283b4549a353406
-DIST botocore-1.29.79.gh.tar.gz 11184048 BLAKE2B 062326a477fb27844ec47af28b77424863d6ff407dbcfd95bc9aa26d4009f503364f3d438997fe437b4830b8ef8c7bfb7e026313364bb3e9429cd3b7c2eae261 SHA512 260cf6a533e32c6f514774e5c5ef6830feb77058e1074e730d7fa05fb7067dac093f1a612ed11e02db116671ca9f7301ed29e1625f6e47724301d25b03eb3c30
 DIST botocore-1.29.84.gh.tar.gz 11220100 BLAKE2B 588efd08ec38eee7e319ea6e1d41af3f8d96c8e71fa090e5d3e8c836d60be957c47b556a9ce18684d53cb415446a360006714501dfbfc77204b2822247e7bf35 SHA512 cee6066735b324d550b736224ce4a4cff207cb7494d14e599ff9606b7a530d3887636054b3d0457269234d83ec0078950e03f916cd834cf910680e7ca650167b
-DIST botocore-1.29.85.gh.tar.gz 11218800 BLAKE2B 801e86c9ce18e77b2e4c6c004ed1015369bf8b86ca3dca990865856e979a88dc37e9ce51d8bcab86375f152f44f2727ac1d1ced00fac6da1ba4eac348096ebb2 SHA512 5424e26ddab6b441bfdda1195aad4beb4d01fd976d8640a7707e3e8bc52347816937deff9d7f3ab4aba1704d192738eb5c26a46825efba854dcde7bfdc25a4dd
-DIST botocore-1.29.86.gh.tar.gz 11222402 BLAKE2B ceefb618f7156f93bd5a1ccb9addaec225e049922edc6120d34047805fe878a7fb89ee668d966f70e20c0935c0e5bf5f3085dadafebd0bf9f14a873996900740 SHA512 c7846133c86f470ffbc2a189776da5cb86a52ae46441d4abb21a94100383e96ecb50bda9702dcd25ba34fe9421d1f98b8a0b427a87c92d3d18168d306ae4b37d
-DIST botocore-1.29.87.gh.tar.gz 11221589 BLAKE2B c60ce2b4d58fa660aebc143f63848d871b2c0e9ad9ce234af3e23e7fc3eef64cc59186d687b844f1c767e569c263500cbb2ec1187bd14fb594eae28e3ed8e219 SHA512 2505f0c397257fb054c5a8808cbe807c2aa86015b71400b4ee7dafecddcef197ab89399df32eb8afc4761974490d65ae3524ee3b0ce7c1cdd9fa33bc1cdb95c4
-DIST botocore-1.29.88.gh.tar.gz 11227872 BLAKE2B 1fd9bf0f147ac87c92723d23b8bcefc8c22261932081aa4530b72de8b96ef964df293100a61940e2adb088f3b6ced4a64758f3c36dbf598676949fe84115083b SHA512 d71f2f7f453ecae000491acef22da701d12e0296154b3ba81cbc0821e9266f6e95e5adefbf94fdf98333775a03d7a6d255f28963c54278f22c5c888d15a291ef
 DIST botocore-1.29.89.gh.tar.gz 11227280 BLAKE2B 41a1243972e591ea23fb2eebaa5b5fb9547bbd8ccd72fc907c487fd56ebf90d8120ceee472e34a29cd2b036926bc93bda33b564b1b7083e8984daf366eced1f8 SHA512 356298fd3be39957dd60e6268cfd2652998e62950b9060e0774c68e158506dcfea8188059b588c08f520617af38b91eb6b71c16b92f7a71f75f33cb73e7786cf
-DIST botocore-1.29.90.gh.tar.gz 11234660 BLAKE2B 9472b843e9a36b59ffb8171a5148d07736690fef62a88a1853011b0fc6cfabe8588ea1e48b66696f1f9a5ade17c53261349249d20b704d91c1b8e0aac3528b12 SHA512 cdf20dbdac7146f2fb19ac8adce2d4b6605241cbfcbf15b5df7d7b8ccf1cf95f04e683de8bfc71322f2bdc467a15ada3502b19c43f0e5d1bd5c1a07996a1e731
-DIST botocore-1.29.91.gh.tar.gz 11238226 BLAKE2B b2bf854f37cc05f1c3bd873691bc0968f7bd2d7374479ce8b72ecbf168a7ba503b8e871212a8dd802e52a28f4913d70f2bfc42c19ebeff838466d7d5702640db SHA512 a1108a45f262716b955c7674e5098324727bcd17b130deed6cb7c88451a92f302272c55c767e7c1c6947be8f77eccece3eccc2ffb7d9da2f6649e21e87d9e5c6
-DIST botocore-1.29.92.gh.tar.gz 11238265 BLAKE2B 42afd2517fe251ba5d7f0d948fb7892d90809cc289681f47bceab76b6a29b10425e7e7967e9c2b267166f6cae949dfd3f4ac98824b843ea23d37fd6ff6f363ca SHA512 eb8b7e6daa759fecf387b3ca04acb43aa11fb3a614edaed4d4e55361d2270220bb3c30f06fdc736a3ee57c52cf07afb97471221ab2a2c9205c3033969b7673a6
 DIST botocore-1.29.93.gh.tar.gz 11239506 BLAKE2B 7a05d5c611cbeda21e62abbbe13ab18cceae2d8b28136fc8669b09e3ebdcad5e5e352b32e807af7f2f038b6d045f82cf1a9cb3ec854f37db1f3204725fd8971e SHA512 df4ba05c28323321eae25412b97eb9f48978563aad5a0c166515bac3193b0404ebe111565be3b1e42ea47439f749e339ce11cc21736d5403ffbbe689f6fd8da8
-EBUILD botocore-1.29.74.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
-EBUILD botocore-1.29.79.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.84.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.85.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.86.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.87.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.88.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
+EBUILD botocore-1.29.84.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
 EBUILD botocore-1.29.89.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.90.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.91.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.92.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.93.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-9999.ebuild 1808 BLAKE2B c88307d04e9daf86db23c54e39fb14931a6e60ab83593db191859652e67c90cfac45263f60c0211f81bfa10fe755b9023924713f2855324c929322d557b4ec17 SHA512 16e3144cef752302fa7ad350f5bb86301d41c0223f9ea41ed784083f2475d48efae095d82da95f93f77fadc86dea96b6aad1f1bce96bd926be01ef2d519fe230
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.74.ebuild b/dev-python/botocore/botocore-1.29.74.ebuild
deleted file mode 100644
index 5afa7a9459c5..000000000000
--- a/dev-python/botocore/botocore-1.29.74.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.79.ebuild b/dev-python/botocore/botocore-1.29.79.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.79.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.84.ebuild b/dev-python/botocore/botocore-1.29.84.ebuild
index 0f4daaa48e81..5afa7a9459c5 100644
--- a/dev-python/botocore/botocore-1.29.84.ebuild
+++ b/dev-python/botocore/botocore-1.29.84.ebuild
@@ -24,7 +24,7 @@ else
 		https://github.com/boto/botocore/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"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.29.85.ebuild b/dev-python/botocore/botocore-1.29.85.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.85.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.86.ebuild b/dev-python/botocore/botocore-1.29.86.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.86.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.87.ebuild b/dev-python/botocore/botocore-1.29.87.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.87.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.88.ebuild b/dev-python/botocore/botocore-1.29.88.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.88.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.90.ebuild b/dev-python/botocore/botocore-1.29.90.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.90.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.91.ebuild b/dev-python/botocore/botocore-1.29.91.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.91.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.92.ebuild b/dev-python/botocore/botocore-1.29.92.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.92.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..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="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index 1d09d8352c65..ab4897c5e05f 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -1,5 +1,5 @@
 AUX cached-property-1.5.1-test-failure.patch 366 BLAKE2B 1df343e43fb74df2913c222d2a1f37e703de34480e325df68feee7575682005be6d0f41f34e553c3ec2cde11c6907b1d79a73e67ac88c5691e366b7bc64d6970 SHA512 bf005bbb986140dab7949e015ee9453081b72a9c377b6f330f8ffac10f73d7ec0e2a2e20c9d65879c3c18b3c4b2735b3329b30f48e1e4bd01ece475833f2a58c
 AUX cached-property-1.5.2-python311.patch 4479 BLAKE2B 8ca6e2240a63b1681e2eb4e900628db952270d7ce40065a52fd6cd590ce5ae16cd3895554d85d82749d31535057cb25885c8df88db04f89e87ea5cd7c365ca19 SHA512 f4539bc2fa26cbee77beb62bc517ef454f538660e9c1e15bcd9fbaa4deaf97c1d2a357f060e3bb0d7d772f8db3f05d8501188c5d3dc2ebbbeb737f9d44305c9c
 DIST cached-property-1.5.2.tar.gz 12244 BLAKE2B 26981dcfa51925741962c60ad8659a165af6d7f242f4abd392932aac20e966ad6c1763a25184bbabdeb5bd75f8063a430c41f0241afdee8013ffcb437b3ff7da SHA512 626d98a8891a70d858269859cf4e49416464c836d073c1331c21033a4cd9e0e47dc89b53bf393375439992f4993972517dc3cdcbb2cc6f8286f282d3c973e600
-EBUILD cached-property-1.5.2-r1.ebuild 753 BLAKE2B 9750e8502153554abc5d1dd721fdaf401dea3c63a6ab5aec223d82a2eeb5ec3e4f19008f714e4ac3558b4f23326300df88c5cc7a03a718d6c2f68934d8f80ed8 SHA512 ff440bcdb4f2c1f95af5d592413055deb0aa67e24a9866d4629fc4762fc3da0bc9904e4e9db3f7a8e3ef1a7661667bb1d0e9cc8f535fffa1c289bb6c9642999b
+EBUILD cached-property-1.5.2-r1.ebuild 726 BLAKE2B 67151b69884de53d712f39fa6e957075695af9cf2b1bcf8d11a28b72a980a7d5be5310cbc24c8e56cb895b349cd8de8640e33d691b9c95e537157d88926c8f45 SHA512 785b748c65199e98d7cc61cf60cbb579f1f73bed7dce55c8200a784124062d44bac8369d6ede39281ed9e219f4628c2926a8606a5fd20692246ea7905e216ba8
 MISC metadata.xml 406 BLAKE2B 4c2879c4bc8a511a8646c11d560414dc55421e0e8761b0b1b40138ac19a5e4f6d1e13f96962eed8333791c53a09d611a959be7c8485561e030af43020abd6c2f SHA512 00f4ca0fd3ae8c2b6b7ee3f1b35f5b5a9d690d86ad2753f971c6d37c98fb95d66fbf3680a64cef44dca262e962cf5f53d2a34c44dc789f2ee6bad193280614e3
diff --git a/dev-python/cached-property/cached-property-1.5.2-r1.ebuild b/dev-python/cached-property/cached-property-1.5.2-r1.ebuild
index 618e82103cf1..b84961027fb2 100644
--- a/dev-python/cached-property/cached-property-1.5.2-r1.ebuild
+++ b/dev-python/cached-property/cached-property-1.5.2-r1.ebuild
@@ -5,12 +5,12 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A cached-property for decorating methods in classes"
 HOMEPAGE="https://github.com/pydanny/cached-property"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/click-log/Manifest b/dev-python/click-log/Manifest
index 4ac435d9b549..05c63af80049 100644
--- a/dev-python/click-log/Manifest
+++ b/dev-python/click-log/Manifest
@@ -1,3 +1,3 @@
 DIST click-log-0.4.0.tar.gz 9985 BLAKE2B 8a7ce0c2a7617253f08d011958bce158e987faa0008065c9dac382d46b905cc88cd5cb19d0d0859bf522da6448f7c9a20c0a8efe53b3feb5efc9ca3f64cfbc27 SHA512 95d3cb2fa9821e4f58b25072f39d34f21fe4a7600923f59f4b57b92dbcd9fa2584d710de1d4a1aa2a757c048398342aabbb1b5ab32cf4128ccecee10f9f15a5a
-EBUILD click-log-0.4.0.ebuild 560 BLAKE2B 9e7ef2d3d5e8d3395d212dfb02884516eaf99318c84b4766de63550eff19a5cf0ec11e657e9a4daa9f7ba7101b99fc98da7799d1278df9af6895bb1d4928a3d4 SHA512 dd783134c17c2a84e5a1ac0da5a1db2a49e0940af061922e671081182899b834de5d3e545f86993b2a5a3a4124faa15a52220bcdf03bd2f1939cfe9b4175a921
+EBUILD click-log-0.4.0.ebuild 533 BLAKE2B a43343dda0e53e23ab6a08703275e2c08a7886010c7a7154bd576378ab899c8e84c308c230862dd4704dca51f6f9e7c9e03adbb4a54c0daa56695e992c2bb5ca SHA512 99248358d10912c24dafcda30e4486132bda27acb23731dae00d435278e68f4292b272959ab1d45a18d7f250b56bf6fda9b18c2616bd9326eaa3df71b4f81631
 MISC metadata.xml 454 BLAKE2B 65f660ce0ec54eeefdda3a03fb806c1d80213db10e3641b91a15bf0628d0099f05311113ab5531ea9a931014c21437b9fd42a3a8d811782e503617c8dda2fc63 SHA512 f5cd97058ff64333f1504497d38effe6d530e47632633ec341847944eafae050caff68ca6aca9e3bcd5517ed420da6e5ea06829b42f3f9300b52862514e23afa
diff --git a/dev-python/click-log/click-log-0.4.0.ebuild b/dev-python/click-log/click-log-0.4.0.ebuild
index 82cad77c5f6b..6420dda0a0b7 100644
--- a/dev-python/click-log/click-log-0.4.0.ebuild
+++ b/dev-python/click-log/click-log-0.4.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Logging integration for Click"
 HOMEPAGE="
 	https://github.com/click-contrib/click-log/
 	https://pypi.org/project/click-log/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index d5903e24d332..4a867432aa1c 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,3 @@
-DIST cliff-4.1.0.tar.gz 82892 BLAKE2B 2d4da66ca6ba86c9f0f33fa36f637363a25ac0ea5c7a1561a4e682769e7ecc97525fca93fde0597062e8f23c4d3334fbf08a305f1c5bb15918e5752a45992d0e SHA512 4bab3404207d21cf8111a6dc1a0ece2c8da5d3bf5ee261b351b7b7ade73f162c4cea225be6fac7444ae95de70d3079e727086fd954fbf56b6d61fb1c7eb4c44a
 DIST cliff-4.2.0.tar.gz 83168 BLAKE2B ac2d288ac3728f4266d61edb9b6aedc897e9020d3f8a74ebba4721530942a27335564c2a95406a4d6b5374df49e38bc0aa303d3aff12f83c91e48c59f13aa45f SHA512 6f0c31b49603be5289e6d4c9b2572862e977264df21dc14d976289c627909102d672ee8ffa5b6cd79b3a349158ff8f36444a2d2061e18eeb7121ce79b2d5719b
-EBUILD cliff-4.1.0.ebuild 1167 BLAKE2B 9fb84a122ef09d0a3a1dd1d6636f26903a2345bd28b9539d82b42b1cf4a2ef16d067d7a0fceb113c2a8d61ac6077d1cba0c41caed0c4d8dc8a0f2e330cd3dd5f SHA512 1cf59fdccfc59c6b1d50dd925bc3459362525c7c404ea9ade959111d86a12f5cdb59f123d3c5d91c11ca8fa0031201df247d421b79870c826987010286286189
-EBUILD cliff-4.2.0.ebuild 1124 BLAKE2B aea92338757e1f61a224e791a77f9ae73bac17aed56452606e1f741620e99eb36e4cb0cc8df0d363860ebc0b979f7db89bad0e318d267b51ed58752bbb576b4b SHA512 ca4339e5d0bd02960f43ceba9e01cdeb7a49896fe4f9f2b90feafac174e908df5ce3eeeed891893e2f1eb40feb8ab430c59870c176ab3a3795ba92abfa4c564d
+EBUILD cliff-4.2.0.ebuild 1120 BLAKE2B cc270e274c76f5621069615eb3f00889d8138b0dbc69067371de88fae57b8c5e526d0891c2c5e6d3a2e81edca76952cc7f6959c113957b252dd10972883dac6c SHA512 0fd472d4464740f7b6dfcaf932d386809baf1c8f97a7f6e35b161f7c669e364fe7236c3663a346400919ffa3c1e8b6177d24c8938336ba8a14b7fd43ab9da409
 MISC metadata.xml 767 BLAKE2B d9d994960046172167f20f59073011b2defe84e94144386db5465a973050e48e05abccff88d7f84cbe9f20615eddc5b61a46920f8b27c4dc9b2587f762f3e368 SHA512 018a0bfac3f0126341207d16203fab4a666b17d8a5dcf9f101335c396797f2e724e2250910fca39e12cb6616614983a756a42dac03aa215d2a1b51af5246269b
diff --git a/dev-python/cliff/cliff-4.1.0.ebuild b/dev-python/cliff/cliff-4.1.0.ebuild
deleted file mode 100644
index bf1679cd321e..000000000000
--- a/dev-python/cliff/cliff-4.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 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="Command Line Interface Formulation Framework"
-HOMEPAGE="
-	https://opendev.org/openstack/cliff/
-	https://github.com/openstack/cliff/
-	https://pypi.org/project/cliff/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-4.2.0.ebuild b/dev-python/cliff/cliff-4.2.0.ebuild
index d6f9228178d6..05639f5c552a 100644
--- a/dev-python/cliff/cliff-4.2.0.ebuild
+++ b/dev-python/cliff/cliff-4.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/colored-traceback/Manifest b/dev-python/colored-traceback/Manifest
index 02d6ba17cb1a..5020a380aec2 100644
--- a/dev-python/colored-traceback/Manifest
+++ b/dev-python/colored-traceback/Manifest
@@ -1,3 +1,3 @@
 DIST colored-traceback-0.3.0.tar.gz 3837 BLAKE2B bf79942de0d0791b567dce21609be87319da11596b90e67018ee74069ea63b072b73778283112f9f52270fef046220eff355993d38f84ecd80d895da0401a010 SHA512 013d779df231295319c29a48fe81a5ddfd1b77b1734dedf630a914bdf0ea89e19a8ec028ae40c55125209e748f4027a74d04ec816f6c6d3c21aca52d2dd58e37
-EBUILD colored-traceback-0.3.0.ebuild 490 BLAKE2B bf0d67275d9d1c2fac97cbcaaa8bed244d527689a61fc95d8fcc157e266b2480dac604692c7bceacce8784cafc732e7f9be3ddfbf8f34d1c45ab0675a219b68a SHA512 c863fb6ec7c66091dde66a42d1b1d214e19415e1ed24766e492e8418fb740bdc397095ec0daa3bd497d2ebe9e449cfa20622b2d33432bd2b290616f59b645f3e
+EBUILD colored-traceback-0.3.0.ebuild 464 BLAKE2B b753ef9f4db9e794d7750fb0fc876ceeff36a60e5a052429d8e8fbe3a6f582986f67fbca8081308c80a7e25f831dbe938d5997e894b6ff022e87a1082947a75c SHA512 1b040555d6a387d31ee93e780d331545da45d87392e40c3c57a13ee8344dd47dd6fb4730fd90b7403999c6a08482ae26bca796a08a1702d61b2ec46fa7b3db2f
 MISC metadata.xml 688 BLAKE2B cb19e8c52ec09fdcbd3563f06535dcbd00506277dbb64d26f36333e4aaee415830f3a07a3ca3d332fed32941cb9bb367e865b8773f045be5c39ec7d929f0a294 SHA512 d4c17a08782f133dc0a16be3035a05ed0f2ba83818d8fd923a9be042f88b445fa29e07183e95abfded1b4dc68d086be40f3790daadff61d210831b02f3ddeff2
diff --git a/dev-python/colored-traceback/colored-traceback-0.3.0.ebuild b/dev-python/colored-traceback/colored-traceback-0.3.0.ebuild
index 4da6115229bb..63a2a392d6dd 100644
--- a/dev-python/colored-traceback/colored-traceback-0.3.0.ebuild
+++ b/dev-python/colored-traceback/colored-traceback-0.3.0.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Automatically color Python's uncaught exception tracebacks"
 HOMEPAGE="https://github.com/staticshock/colored-traceback.py"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/dev-python/cov-core/Manifest b/dev-python/cov-core/Manifest
index cee48aae4fef..0ab96c2e5481 100644
--- a/dev-python/cov-core/Manifest
+++ b/dev-python/cov-core/Manifest
@@ -1,3 +1,3 @@
 DIST cov-core-1.15.0.tar.gz 5890 BLAKE2B bddab94ae47ba19ecdee5aae0198d9086a423673362ac64f0885f773bd8b8ab3f4d6abf1203ee901e272161dfb4b64168f2aa5f2d0f4426ea279d6d7251e921e SHA512 1b962a6a7253c1f6530248f3a71058e7709ee5cca274166807f040163c9cc240e9e85e42820063476c1c0f6dfca81d45277738663ed818fe715b30db151ace16
-EBUILD cov-core-1.15.0-r3.ebuild 763 BLAKE2B d69414de41ae7fc8e111c5bce0097d8cccb3643655c8ef1f7253760fcc433a0998f0d9859e7a3d1b9dbb49863fdd58a23481a61f417dd32787ea462fc7194d42 SHA512 6eed6c6bf2e5d9955f06db393a4a9dae49410409e0dca61f68e3f04d6d8e0c81071b16b774f92420b5fb023053d1424ce71906bc086b2fed66705a5f3f4ea6cf
+EBUILD cov-core-1.15.0-r3.ebuild 736 BLAKE2B 513d79794a270a63bc5fbe9236d5cb2ad6c7f9a3aae44cecbd7b0742bfedac2cac158f0eb3da9224067eed5069716dbe26726c332063de379905c5ab7e57a4f3 SHA512 15013cbc5cc8e43e2d536a12c3120cf574a8e9bfbac16f0f1cf081a13958717722f2366fb9c630b29f57f77df07c6cce397596608b3761e282e205ab1fd09684
 MISC metadata.xml 390 BLAKE2B aab827988dd06e159c90e046b5512e3f8c0e5a2fc4ebc151753d6275bcb61f152a27dd77140bca513a45dd99292faf177c57d84bd414fde2cabcbc42d00ce8f3 SHA512 e323cc6408f939b8f49d2ad24f56b96dcf08c01a27cf6aa8e636fe913aa7adfd38de727ea337a1c9498062afb6f5c8d1a5f4cd2d78aec41d14ccb167b8ad41db
diff --git a/dev-python/cov-core/cov-core-1.15.0-r3.ebuild b/dev-python/cov-core/cov-core-1.15.0-r3.ebuild
index f845057763d9..244ce842a537 100644
--- a/dev-python/cov-core/cov-core-1.15.0-r3.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0-r3.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
 HOMEPAGE="https://github.com/schlamar/cov-core"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index 07665822dfef..96dcddbe0a43 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,3 +1,3 @@
 DIST css-parser-1.0.8.tar.gz 349363 BLAKE2B 2e67d74422cf87e1c593793f6acc9089a745d020cba18c63c70bc2099f53aad95bd5de1def49a3f5ab7cbff7f91efb3a60b3d2d9f1efa55244d99770f0d7baec SHA512 1b22665a172b8a29e277217f39bac1512867dbd5acdfe37ddf078eab71452467adc3dcdac68e424df32cc204f3e55da45d31663f8e7aa143c0243818df32487a
-EBUILD css-parser-1.0.8.ebuild 586 BLAKE2B 5c75d066c483eb7d09f9f2b4a262a648c3e6f4524c5accf04a15c229f124b52dbaf0e758eefe9e1c3c3970f2bf519b216112a456f32dace5f0673a2b6e91e71a SHA512 c91678f34400c4ec18cfa947e1bd344348aa1e1f07001237b6a00d50e30944cefa7554ee3db9ea643f5860c0aa34a76293e048f1ec952a219a12ec988096ec1a
+EBUILD css-parser-1.0.8.ebuild 559 BLAKE2B d855b18c7bd682f906b70a13b32453b3880eb4ece8c01286e357c3ed7575c974b26688bf41c8dd57efbfe996301a43f074487938307204259925d7d317e394c6 SHA512 242f128cdc4997fd64ff6d3d37919cf701acd9354ca48a4a0fc75eacd1d107d1d0b33da1b1751c31f1a22fec6031f564cbda6fbaa36afffea9a3deb1376f14c9
 MISC metadata.xml 479 BLAKE2B 117a5a889216d7f10d68f4f61a5787e5c921167a26d099e1f268916f5e96c8332a396d2a41d76411e48a67991473ac2dae158b8c978bbc6a88cc015e79d32f5a SHA512 339cb0d6b67f1aa92e4ebef1ffd1dd79975e92d67b91c0fb88a39ae6bd54a7e713964655d8e486b7107562cb5b186404714531c5b348985cbf8d598c00b29f75
diff --git a/dev-python/css-parser/css-parser-1.0.8.ebuild b/dev-python/css-parser/css-parser-1.0.8.ebuild
index de3c867741b3..293b38005f45 100644
--- a/dev-python/css-parser/css-parser-1.0.8.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.8.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A CSS Cascading Style Sheets library (fork of cssutils)"
 HOMEPAGE="
 	https://github.com/ebook-utils/css-parser/
 	https://pypi.org/project/css-parser/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
index 0b7e320c5824..38b893f2d7e3 100644
--- a/dev-python/diff-match-patch/Manifest
+++ b/dev-python/diff-match-patch/Manifest
@@ -1,3 +1,3 @@
 DIST diff-match-patch-20200713.tar.gz 60711 BLAKE2B 9108557050d0aced61e8073e0bfa1969e780e4350dba86e3cb159760d180b09ff2502e8b0a664370e0586bb0ca280f29cfebb983cddf051f10204e3cd1026d8f SHA512 f161efed3d87dd0693c98ee81aedb3868787f040f8f9f31015f9f1de04d50046be75b2351a65a4c26ae1d194b983dbc1420799cf70e7c25737ee4eb3cc78a183
-EBUILD diff-match-patch-20200713.ebuild 426 BLAKE2B 043d2a6731e3c87edfac7e5b73cab1cef1c8793eef52d62f2704e2161018a8e6f69bbf5cc3fb9d392b555a6ea6d190908ec56ea35ac9f86f4d680b423560c0d9 SHA512 575a3345e66a19819c3b27fc6296860aee3765634da479daa53d0f49b6c159b7a03cbde6ec3821ab633f1c912a891aef4f305c0ca4f71599c57e6ee268f4a1f6
+EBUILD diff-match-patch-20200713.ebuild 400 BLAKE2B f820250f4daf9469f7455e1c3afb7205a7bc00825902eb05590845b45f3186e88f9e278b8607edb15cba53fdafd6e4778ef65c0abf9d8efef04b4fb8a77aa07f SHA512 b0b5596798ef46246f7609613b912a14d4537380e2c7f60892736453755fd3ee2f3155192acda6e3c3b29e19a3a158a12974721a378f16dc5c8a04c85d7271b4
 MISC metadata.xml 1185 BLAKE2B f7be2dd5be0415434a378ab66383e4ea09bad3e6c4f4d90dd5aa06d00a0ccbcaec735489a2eaa9accb25a95203a7328895c76b98a15097971b921b9842548ed9 SHA512 c11a0ee2ec7ffeb30eb47050baeec4ac87681d31b2469446b9eca9387c278c716fcbd66e3d8807ba4ab6f070f26f02d0d6af87fb3857fd7df7ceb9da329cc851
diff --git a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
index be6febee8094..420c71c3614a 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Diff, match and patch algorithms for plain text"
 HOMEPAGE="https://pypi.org/project/diff-match-patch/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/dj-search-url/Manifest b/dev-python/dj-search-url/Manifest
index 517352b96774..e41f61ecd717 100644
--- a/dev-python/dj-search-url/Manifest
+++ b/dev-python/dj-search-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-search-url-0.1.tar.gz 2815 BLAKE2B 75abd5bcd0d4b39a40c2c1a28eb02e903a40198f111364774af53375c21424ce170dc4d5f2fe7b51e884849d7700efeb3c99d534272002f60397099ea27da898 SHA512 9b233a8dc1ec8d6a81154ddbf6966beeb8fe4b62c1c7faf5e623409403dc2d64db1749552878b2a1edab1d3264820840bf14e7fcc2e54fafe5ca4d68a207fa5d
-EBUILD dj-search-url-0.1-r1.ebuild 499 BLAKE2B ef8a10296319c3545bd06bad48f2495e0d126c6d0742c2e181403589274bf443158e96960dfa8ce564aef45260981ac69c16cd01724bb9086d1a10390c334621 SHA512 7208432df446c86d17eb9557248c6995757d6ca8b6fd7edc3d31038a35eb86071e3a089538a1838857c9fb45dfdf80896792849a4a962fc019e3ec95ea71652b
+EBUILD dj-search-url-0.1-r1.ebuild 473 BLAKE2B 736cbed974b6dbc93c91437e644d21bf88eb82406ab6977c7df0282276123c7916af3288fb7e23b7899b40dc86bcb3cdfb3eb9895063eacaf2dcca7977e70417 SHA512 90da1574aa3a4086e87d38dacc915eb8ba7f71561b96fa359127be1b9f0c38f14c2204366d1f04e828823a9a5be22916b0df99ad32b8c54dd4cf60c500470516
 MISC metadata.xml 380 BLAKE2B 7a9b7eca520f86c5a047286b9556513d719043b71f58266ae247e0477fdf01c7a11db14acd3a8769763f0044fb4aac14c1d6c542a3a1e64a4e26d8101a4ef823 SHA512 987cebd87fff24b8900502450523c6218b7d7c10a48ccbbb1b36fce6adc404d8d865503c10b2dbfc9872deeaf5ab1583db79034d091ddb08575c44baedfdea19
diff --git a/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild b/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
index 7d7ac29e0f09..3ac0c817ad4f 100644
--- a/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
+++ b/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Use Search URLs in your Django Haystack Application"
 HOMEPAGE="
 	https://github.com/dstufft/dj-search-url/
 	https://pypi.org/project/dj-search-url/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/django-redis/Manifest b/dev-python/django-redis/Manifest
index 52df15af24eb..6beb6272eec2 100644
--- a/dev-python/django-redis/Manifest
+++ b/dev-python/django-redis/Manifest
@@ -1,3 +1,3 @@
 DIST django-redis-5.2.0.tar.gz 44132 BLAKE2B 5d9680e43bfff506924b90cdce4fcbf40883a732af6b599c2e36d8549ce2aedbd69540b187152dc8fdc0d2a93b21c5fd2724d6386772f9b4af8632e38414b577 SHA512 65d3dc6b1d72c8b90908cf368cb66ac2eb74bdd32d0b42c8a5288b4448bd7444b21320251262627bc950eaf0d1a1ef0c3014761b690122bea9e5e20f744dd433
-EBUILD django-redis-5.2.0.ebuild 1694 BLAKE2B f0899667578b5379390f4c4d1d048ce5bd4f5ea907fbf4df9b4a611745c225035d12a52ffe8b9a4ab16f3439673b9ddb706c8f8b817677eac8687adc74168f6b SHA512 778cfa0cd700f2aa6f02d2a8485522678c6a1027b75a10869e14735e00edd39eaa2f75b748acbfd34c803c20196f7d8a6065c65e1d2dc22ba7ee5d39864e9a14
+EBUILD django-redis-5.2.0.ebuild 1667 BLAKE2B b142f46db92f6b04dcbd6f9e255f8b87a54fe5f04afffc91ea53861ef93cef17cf24f0a4d53b7124cc88cce0982cbbf4e80c884ea45135dbd01cd4d5117f826f SHA512 40eb7f34704ef3fcfe94d1eb78999c33619929180d0d2d62a3888a9263e77c0c2acf7b7abdfef254befd5e998f832f0b34efefe2b8887f0185dc3bc71a153321
 MISC metadata.xml 486 BLAKE2B 5bbffdb40a82538635cec1802d748bcf8c628390de12d19450486651f84f0c23ff7471354080aa51ae80790600d76f35a6fd37f720cb61cf410eab92bd15cbed SHA512 45cb2046312b95a3f9c87287e9a01015dc46b767de2dac060e79ee5457fa066f3229e815b313b4692128c88f6e13208f96048532ffe6554533427edc92286a2b
diff --git a/dev-python/django-redis/django-redis-5.2.0.ebuild b/dev-python/django-redis/django-redis-5.2.0.ebuild
index d4b717c47492..93fae35b6975 100644
--- a/dev-python/django-redis/django-redis-5.2.0.ebuild
+++ b/dev-python/django-redis/django-redis-5.2.0.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Full featured redis cache backend for Django"
 HOMEPAGE="https://github.com/jazzband/django-redis/"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/django-tagging/Manifest b/dev-python/django-tagging/Manifest
index b9dee6428dfd..92c73836a51e 100644
--- a/dev-python/django-tagging/Manifest
+++ b/dev-python/django-tagging/Manifest
@@ -1,3 +1,3 @@
 DIST django-tagging-0.5.0.tar.gz 42827 BLAKE2B 0889af1ca2943c3bd8e4ffe3aecf8ceec85d2546daf9cccba06bbf9d34943ac7de41240ee79ab77797c6af490dc8dc2d3d9c7249b1c83d71488116e3fb78c0d3 SHA512 7a740c24cb9674f3e9c7f98aeb46f99537ba7afc79bbfd810004b921786e1246fe2ea1f219a2a6c414189497e7b9409bc4f7170714c6c03bb163ccede77c3266
-EBUILD django-tagging-0.5.0-r1.ebuild 865 BLAKE2B 1cb5791290408ad93269e0d7cbdace7c5fafd22026a3b985388a1ab5f4786ff8dfcbe151f4137bda49644b83559f13074d48edaaa8aadb51d2bd64b0d2ab6551 SHA512 d2580503d10094ed4ca226be8320fb04d5014b2371854cc94291fab50a489962938f32b8eafcf40d5f17609708b7923361d008e463eda3558f94b55bcc0fe9d8
+EBUILD django-tagging-0.5.0-r1.ebuild 838 BLAKE2B 683798d39a8820639f6127ae89857f33a1120c808f8d1fd7ac5bbfa1fd58f081196033f6df169e39bfcf051289f4de8904a03b91246a15cb25849cca4f6cc2aa SHA512 a05ab32f5af07775f574056191571d11dece09603817087f6fe307136f501e9a2a2611368ab85009a85bfef26fba8eef746d3a05fa177495e5615e64244f2120
 MISC metadata.xml 420 BLAKE2B a94e07f5ca4b53fd55ef1efe42f1717f320e362fac35bae2934136953ef889cc8bb93eac97f0a4ef0e161d7dfdee4dd734f925f03de6b8f5806b89430d6eb3a8 SHA512 622a20fa728f8c946c5dfa0501d472a78b52660e23f89dc3d32384450e823777676d4918f45a744dd7647ff6e07941b5800f730813ab91fc87aefb2d7471a971
diff --git a/dev-python/django-tagging/django-tagging-0.5.0-r1.ebuild b/dev-python/django-tagging/django-tagging-0.5.0-r1.ebuild
index 1394a682ddb3..395cf2286647 100644
--- a/dev-python/django-tagging/django-tagging-0.5.0-r1.ebuild
+++ b/dev-python/django-tagging/django-tagging-0.5.0-r1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Generic tagging application for Django"
 HOMEPAGE="https://pypi.org/project/django-tagging/
 	https://github.com/Fantomas42/django-tagging"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index bef0c9f9f412..3be59fe3d43b 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1,3 +1,3 @@
 DIST django-taggit-3.1.0.tar.gz 58238 BLAKE2B ea5c90300383294daf80315b013dc1171d94fe4994cdf58a9364666a879672bd5af35f3c620673cb0a9139d2a224bc06d58f933ae94ccd8a65b947c76ab0a0ca SHA512 8654b703cb9b3848a5185f1b88826a80eed44f00993d6272e8fbec1145e6c30be4c0840a0d6e88544d2f927c7c288c2be94e3df61cbe34c37f1f213a1bf0780d
-EBUILD django-taggit-3.1.0.ebuild 683 BLAKE2B f98bf5ae7f787bcff25c20a5a1a216f0f4613f8d1e2a2fba469ce1ecb668eaec9f506ae6eb729278881da7b642b141d462635ced40c216d2511211c74b4024ec SHA512 7ac740eeeef2fc88f3ee275d2b007dd5afc8e6c1f46762ddcc1fce97fbf9c0ad4889c5caad4ebe217186eecbb648bb42706fce9356aa2e63912b8f394a51e0e0
+EBUILD django-taggit-3.1.0.ebuild 656 BLAKE2B 261c26c5f2bd1ee87166ae4d7ef835c1228a9402f8db88e5d711db2accaf98521c185991cf62004a4eeb8da8da387d0ddf60a50acad5885a3aabd74fe7d2db3b SHA512 6f770b2606dd0b092795ee6fb15361badd597002e13abc94b27822ba2220309ac2fc7d4af643fa180379d0fbbfa9abf88bc2272b233189982490cef91495e23f
 MISC metadata.xml 403 BLAKE2B efc93b9f0dc7eba3753e8c205a903f6873d1683b7e7c7a9558c1e561a9f4625bb7aaeb79e381c98ab160fe90b53d72f219981453ae3a4a48a53bcf17f079a1bd SHA512 aaab76dac654f034873a24bc13e0d448d67b865a9dceb706ea13bf9544b423b07e3246e7936f072b9664e7e62a6b6506df482a2197a3e165520a2cb77c766b9b
diff --git a/dev-python/django-taggit/django-taggit-3.1.0.ebuild b/dev-python/django-taggit/django-taggit-3.1.0.ebuild
index d4fb672d7059..5e8c8914b4e3 100644
--- a/dev-python/django-taggit/django-taggit-3.1.0.ebuild
+++ b/dev-python/django-taggit/django-taggit-3.1.0.ebuild
@@ -5,11 +5,11 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Simple tagging for Django"
 HOMEPAGE="https://github.com/jazzband/django-taggit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/doctest-ignore-unicode/Manifest b/dev-python/doctest-ignore-unicode/Manifest
index 5386832d60c3..f3f30cc4c155 100644
--- a/dev-python/doctest-ignore-unicode/Manifest
+++ b/dev-python/doctest-ignore-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST doctest-ignore-unicode-0.1.2.tar.gz 2270 BLAKE2B a114a1724445ed2c5c41f46098d5930da8b255e82256ef686fa8567dc305608363895655ede36f70b87896f0ed22f1c8e1047632cff5719ef7417159b0a691e6 SHA512 ac88d1cc90b1db21b21b121cddde246314d8a3e399ea0e96f1cd4f7812949cebdd0850566a90d47da01ea159bb8d69c8a73ee05c62cc40d0839d4701f2f330d3
-EBUILD doctest-ignore-unicode-0.1.2-r1.ebuild 576 BLAKE2B dbd9254d776b6b01ed39a92a2c13845786ed4b97dd005524fca41177689b24f0b65adff2e9dc1296fe8879346f8adf2731ad1d26739f31ac6d465758af2208f9 SHA512 280f0410b16292883c75a4e5ae9858adddebebab9d12528cf67d92bc28fdd01b1ec058686fac3fd143042d9b7a0dba91e6949f48640b2ce7a2151b9a583b48f6
+EBUILD doctest-ignore-unicode-0.1.2-r1.ebuild 549 BLAKE2B e2aac31b2dc38b3bbe296027a0d49b6f32e74e2e0731f6369748fe7e8afc9e877b84aff25bf78c6cb2469c82ab7ca8c2341cd5018a04a56c08f0bcbff4d2e76c SHA512 3ce6f28df13a77b7db1d8a2bbcddd98d9e7f826b61d99217bccceeee6b2592888020f30c8754608396a35cb0ffa7b32572d9a8479a9ac11bf97643aa7ef71099
 MISC metadata.xml 421 BLAKE2B 13ad3ff7af7d867811c5234a7253946e0cdd433548cbac9c8d9d432094501cd55091ecc2ba80a961e509740d460e93ca37519308f4f29f5084f2388ce0de603f SHA512 ce2a074239f45322a6d5deb632bea3024e3dda78173a9969b1eacb5713f36367b3a4be2a27b40d9b0ac4d2b8d1b17dd5fe2076a1cb7a5d94ea95d1676639efeb
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2-r1.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2-r1.ebuild
index e50d454d3b9f..e47c89f17d71 100644
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2-r1.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2-r1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Add flag to ignore unicode literal prefixes in doctests"
 HOMEPAGE="https://pypi.org/project/doctest-ignore-unicode/ https://github.com/gnublade/doctest-ignore-unicode"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/doublex-expects/Manifest b/dev-python/doublex-expects/Manifest
index e03ae612d200..5c27568c76ad 100644
--- a/dev-python/doublex-expects/Manifest
+++ b/dev-python/doublex-expects/Manifest
@@ -1,5 +1,3 @@
 DIST doublex-expects-0.7.1.gh.tar.gz 6315 BLAKE2B 4af2832244578237821ba29baec54ffe1f226dfb1c92a5a03122c1a30c0e78d472ab8f75e6412a9014b97265120b5c60a8b5674cb42be58b46397a537bd534bf SHA512 2aaff2e58556ed9eb91ebb418e65058367411e011e843afb5adb08ab69705b6bdfb478d3052aae093ad1c1a1b49ba1e084e4c5510acde4874182a658330e3448
-DIST doublex-expects-0.7.1.tar.gz 6315 BLAKE2B 4af2832244578237821ba29baec54ffe1f226dfb1c92a5a03122c1a30c0e78d472ab8f75e6412a9014b97265120b5c60a8b5674cb42be58b46397a537bd534bf SHA512 2aaff2e58556ed9eb91ebb418e65058367411e011e843afb5adb08ab69705b6bdfb478d3052aae093ad1c1a1b49ba1e084e4c5510acde4874182a658330e3448
-EBUILD doublex-expects-0.7.1-r1.ebuild 823 BLAKE2B a23efd019d986c680968785d6f0aca15237d74f10f8a79b4369e66d057baf3d4f20c3e62884cbc600deae99d3e56b33b345bae00572e6d10933ff84a5c417172 SHA512 0a74e9d77afcf0f6a88ac812cc2f56d1b782c76075d9c47bbe62445c936b39329ec8365c4288c25e86258cd6a997c08c860f4344871f78333dce00ca114cc552
-EBUILD doublex-expects-0.7.1.ebuild 743 BLAKE2B bf0ce0954b6838f175b86ba30d1490e1e59004d6bace927affb976ca8e7c704ddc775fb333b9249514acaff166d100ebc381e739b66fbb84685af8605559a606 SHA512 99fc716adfc0e4d196a92390b020e99aab5e703e17e1931ec50ee67f455b54218f40cee6276957e4f98dafa12027613762ac3a8b06dd3bfa0019f018ef722e09
+EBUILD doublex-expects-0.7.1-r1.ebuild 821 BLAKE2B b19b79d1f51b9d4b0b09b905b721db1fea42570fa5ffa37362a4ee5e7e8221880706e37ab83dd230ef2313784fde1a781a5b19c0143b52ea919155ef53532d12 SHA512 054fcc62017ae3c8803ae3dcefa6b8a340817f9becd681a1253372ac48bcd2d99913f9f9d458278e9fcb4e56e0c86921830f8f19a82724482e12eaed91c20831
 MISC metadata.xml 317 BLAKE2B 0f09791cd04735d24fff9dac60fa012fb5aa919231dc915f56142c8c2c9464f7eb0fe45c8f1b8392beffaa5cd93e4cad989d53fbc87d408a517b2760c53403a6 SHA512 1755a9a5c9a3734071c20f2e0f7db8d1139f03d1c3f758baa08a3eca99a8c0cd12b66d24b01238715a488a7bb9205dd5374c4195d6c4e5a9e2421772ee7a84bf
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.1-r1.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.1-r1.ebuild
index cf9fba83fe49..21e7ea96e3aa 100644
--- a/dev-python/doublex-expects/doublex-expects-0.7.1-r1.ebuild
+++ b/dev-python/doublex-expects/doublex-expects-0.7.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.1.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.1.ebuild
deleted file mode 100644
index cf2e7bf1c785..000000000000
--- a/dev-python/doublex-expects/doublex-expects-0.7.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Expects matchers for Doublex test doubles assertions"
-HOMEPAGE="https://github.com/jaimegildesagredo/doublex-expects"
-SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/doublex[${PYTHON_USEDEP}]
-	>=dev-python/expects-0.8.0_rc1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mamba[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	mamba || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/easy-thumbnails/Manifest b/dev-python/easy-thumbnails/Manifest
index 9ebd8e9dd440..530f754b3a56 100644
--- a/dev-python/easy-thumbnails/Manifest
+++ b/dev-python/easy-thumbnails/Manifest
@@ -1,3 +1,3 @@
 DIST easy-thumbnails-2.8.5.tar.gz 77401 BLAKE2B 625e01a5bf0af7a88dc965908c7e499bd57bc0860aad663e3dc341060d485885572dfb2b971499080659757eecd01bd3a479d3c2bc8b2bfdbf3ef79a4f1a7255 SHA512 0a659eb2a6067e2e2fa825a3c304ea57bf102902c92c662c6b38f6fc7b4a17883144aea10c67a3d6321c3911e6d5dd2633345d4f180f7f7854b3985772ad0273
-EBUILD easy-thumbnails-2.8.5.ebuild 1038 BLAKE2B 746b1b8ee8067b39626d4b119d45443b5c269c68c90a7b7a65c7da30a31fc70bb2d14e624f8ff06f63eee1acbb093fb626ad65a2d25a15581d8f6f32299b00c2 SHA512 0c7d6a07e37fffdd7c07aa392e3b92540df57d127c3d4831008a5b370117a55b9ece6e38deb1766928ef355320e53083a07913b9ef0d4278290891f2bac74413
+EBUILD easy-thumbnails-2.8.5.ebuild 1011 BLAKE2B d63a8a26a098be7d85854f9df0ee89fed2d10c1fb55486194e0010c7d20bf05ef0d11d1cea5db7c64c02aace6c1055dc2a5c135f418169409634e7915573f22d SHA512 2d5f20c9d715fda47a1a8fc375cafdf29e2878e1e2c61c5d18cc2865d5cf7ca7dd7036ebe0ac076f109bfcfb4e30bbe15e94d7bb9a84b937f5816dd40fd4eb1d
 MISC metadata.xml 398 BLAKE2B 3b68a86471764ec8147a2612b95e8f14721cf40c611bc287ac6f30f76556f8f368c998f5a700daaf8686cb6443a4a1e7b3c1844131a9f9afb3ad734278c0041d SHA512 2e1a012af3c5872f28fb513d9c2bee55b522375e66e516ce2c843db44b1110a6420c345e7e94bb5d3fd735a8abaf8fac79cd571e649332402bd612d96fe77e53
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.8.5.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.8.5.ebuild
index f186563401a1..e489c4e7079a 100644
--- a/dev-python/easy-thumbnails/easy-thumbnails-2.8.5.ebuild
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.8.5.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Easy thumbnails for Django"
 HOMEPAGE="
 	https://github.com/SmileyChris/easy-thumbnails/
 	https://pypi.org/project/easy-thumbnails/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/expects/Manifest b/dev-python/expects/Manifest
index ad28767d4da4..74a4c1532ad4 100644
--- a/dev-python/expects/Manifest
+++ b/dev-python/expects/Manifest
@@ -1,4 +1,3 @@
 DIST expects-0.9.0.tar.gz 27901 BLAKE2B b504f0d7dc91f76a2e036693873efaecdbe1e96a376d930924e00268d6374fad2bdc953e7f684f2ad44bf4d9ca962c377d753ef627304a036c1197b23230a2b0 SHA512 82465cfa48d2c28e6584bc05b9895bf5a0ebb90f43ac828c8e2888a10695c24da7833560880fcd8e7deef9996187ec7be7d993fc9973e2887a66b0b463125fff
-EBUILD expects-0.9.0-r1.ebuild 631 BLAKE2B 8b1859a908fcc2805bf35b3555af1bcc228dba0102fc6e5cae0ed8808aeae16b4d22d51fec1ed7530489a80cb5e98c76b18e1c9a24071840fc58ac349a3c3323 SHA512 b00581154bc7843667a1141424ead66f073def6d8601336c72b39a1577c6187236af0ffcfb5e24fa95f501ab6c5d5085a990acfa01dadd0169721ba8e4296232
-EBUILD expects-0.9.0.ebuild 599 BLAKE2B 4e5a9aba5055dff921a06504748e5d89e7c7770bfa01cdce148e1e88133d4d61e7e1b52f31a888fd5aa23943768180f19114fb0d63d29be9aa7309ab7c8bfc8b SHA512 33c04904c71f86e7dcf41e5b78dd37b5d1080a58ce06eebe4bde257044b729dad5a82b11cbda533b0db7cf433962039280fa07e3773e86438995ea9ee37e3748
+EBUILD expects-0.9.0-r1.ebuild 629 BLAKE2B ff3975add235b183072ba5cb0d8ac91ecbf9ab379ed43a7c068d3812e29076600cd06b2208bcc1edebdea878fbc4b2a06ead4ef9a168daa0b3bacdfb8fab477e SHA512 e02d9c5522c286bfdffa21b47d59e2801627d5a5f40763f14bf5079550e050ec8df670285c3e5fa2947bf2e6f3dcb7a463db1bb91ded08438a95d0085ab42167
 MISC metadata.xml 301 BLAKE2B ea9e8d62d7ec7b530f2eb77397eaf0d77dc501b043a01c5eb0df6076f0025e7816a55e7b8f8dcf163841690d01b0587324e88a9893a3e417a3c87ba18188d462 SHA512 bc68cee24b7a813199a4fd6c6c9965ef539bed9da7e954a7d9b9acd87d1b2fedc632cbab0ff86e63be2e93d7e74409c042ddcf16bbc722f3413e40bd86c141ea
diff --git a/dev-python/expects/expects-0.9.0-r1.ebuild b/dev-python/expects/expects-0.9.0-r1.ebuild
index dbd903d624a0..48020ba6f5fb 100644
--- a/dev-python/expects/expects-0.9.0-r1.ebuild
+++ b/dev-python/expects/expects-0.9.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/expects/expects-0.9.0.ebuild b/dev-python/expects/expects-0.9.0.ebuild
deleted file mode 100644
index a49e7b71d656..000000000000
--- a/dev-python/expects/expects-0.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
-HOMEPAGE="https://github.com/jaimegildesagredo/expects"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/mamba[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	mamba || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/flake8-polyfill/Manifest b/dev-python/flake8-polyfill/Manifest
index f570e9938b7b..fa1f3a1f1a92 100644
--- a/dev-python/flake8-polyfill/Manifest
+++ b/dev-python/flake8-polyfill/Manifest
@@ -1,3 +1,3 @@
 DIST flake8-polyfill-1.0.2.tar.gz 7591 BLAKE2B 59c55e054b04098ad2e1c95d3464f3582fdfe2a83da75c8cebf556e2e7e32abeccf1bf69ec2d0b5c9790179d1c905da21b27e60e1c9810b62502c455193851fe SHA512 767a599aacbe87328b3e36bd85e0841870760ed9bd95dd3a4a9084edc6f0ae89f8203d565c2b075f16f1db21b647c17b2aa59b08e4702109d7e5f79f36d9f3fa
-EBUILD flake8-polyfill-1.0.2-r1.ebuild 783 BLAKE2B 9be1d3ed492a40d74822d9a8ff0ab38285f6dfe82a7b3635e45c8cd96e753ae5d426be3891a8d83581a75055ef0aebf52768b7e538049ad6f71075f2094fca34 SHA512 3c87fc770c06b85029f11eb557d5c46c9e0eaab36ba458c5482f739d28587dced263ebf197c403765d126045c5a666e91f9fb6268ef74a0b78cde2350f9dc619
+EBUILD flake8-polyfill-1.0.2-r1.ebuild 756 BLAKE2B 5cbdf7443295a8ffc3374ef7e38a3702d09aba6edfad218193089be526c4bf09952f12aa7c6ab457fc43bbe2c473a78f243e127550950de41f0559a2e4c02b0e SHA512 9343236c23e45ea1958b4cc6308f3648ff4ea777954dbddb0f1685332ae431957b0ac22aff0b27339c98941f330d4ab66a7dd2d475be852454963175f1b5da6e
 MISC metadata.xml 382 BLAKE2B 500aa9900d66a01995a722b1874b16f8d0f3926bff3e007f79ebb7ac538ca14785a6a1196088bdd43524d804efc9863a7f564b208a6d2a29326caf24d3014d5d SHA512 af899ea40e06b94302407afd4afa0dc3aaa94d808b104ba5e38086617c12100a5c5867169650c8b523a893a876b5e5c803cbca293c8780ba75bb59bfe2720e82
diff --git a/dev-python/flake8-polyfill/flake8-polyfill-1.0.2-r1.ebuild b/dev-python/flake8-polyfill/flake8-polyfill-1.0.2-r1.ebuild
index 63521ac44d55..a9585c884520 100644
--- a/dev-python/flake8-polyfill/flake8-polyfill-1.0.2-r1.ebuild
+++ b/dev-python/flake8-polyfill/flake8-polyfill-1.0.2-r1.ebuild
@@ -4,12 +4,12 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Polyfill package for Flake8 plugins"
 HOMEPAGE="https://gitlab.com/pycqa/flake8-polyfill"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index f87df271408e..98487f24de8f 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST gcs-oauth2-boto-plugin-3.0.tar.gz 20908 BLAKE2B 85c20d8b39dde8ed8a0bad887572040b8eb1eab91b41558c57ef7c190fff9cc5e0502579881a08ed514de87d5fe91a393779e2de071a53bb21e2371f8f13c047 SHA512 84cef64c2b0cc5e38685bb39b3939c54ceced2c0995a67787bf3541bf8a93b91ffec3da83094b7d6957d5afb60833c5ba4ffe7fb688ba8aa943c5f72c719e93b
-EBUILD gcs-oauth2-boto-plugin-3.0.ebuild 1207 BLAKE2B 1d822134b612f170790ca85473305d508546b416555fd0d1689a10ecd54083f3da3e7c167037c92d7180095ed486fa9e2f8f5df182c77d9d6734851f08a82524 SHA512 2e9d00b4bc77c01e9f588400bf28ce6db9c0125c2c362150669e835988c5f81ac5118524b1f9252d28531d236cd29256cb149a1b553c0559669bf495b43e7702
+EBUILD gcs-oauth2-boto-plugin-3.0.ebuild 1180 BLAKE2B ea14a7d9e41ccf2135b2592898791114aa95323d6fed6f48d767e9e563eed3df6045f143a3d40278391bfae3ca10160f9fb3b1b174ae32f39c99e7d22f02f6fd SHA512 f6092dc89a64f9fade5d24d632bcc065c47c14e118dcc644d7801b62228698e27f2dcd33e435deb471a7b4bfd97888e7358fdfa5c69a586265991690c438383f
 MISC metadata.xml 456 BLAKE2B 5846fe15c17d14329e1f44eea25bd0528750cb92c5b0abb1c2413775f13e4a37470a0d03a8a96af4c05cee69d552e913746cef73c7379fb93511f9a1567e9294 SHA512 13c1f905b7e732be95f44268c176fe4e15c0a7b27d64f7581bafc4c0ce943f66d21f3d025b4001e7284404e354f61a6e08a1a2119295918981f7271cb6f04625
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild
index e394eb4ac592..e320e64b3231 100644
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_10 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
 HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
index 413c0782e478..e2d40e006633 100644
--- a/dev-python/ghp-import/Manifest
+++ b/dev-python/ghp-import/Manifest
@@ -1,3 +1,3 @@
 DIST ghp-import-2.1.0.tar.gz 10943 BLAKE2B bccff70a8ca6c58a3c768b143b0545a61080a577dbbef3021233134b8536df1788ec9a88aa8454865cfb83491b70fc6fb53caf04514af3d7845204cf2b893cad SHA512 10665a1a6392fe047d1e42d7f107511b1a31de02625200e7db1c637f33dc8dc41ec71c2db4f562c6e94a4efb4836efef8a29177d953d99fe17a889169074050c
-EBUILD ghp-import-2.1.0-r1.ebuild 496 BLAKE2B bf70b78b148731a6e68b83215a2ce08e08c0259d35cee93f66beedafb9b8802443a53d4416cab8932526d198899b6fd430987996d25080b4e101a51431c701dc SHA512 6507a86f8c375f927510ca69a26f85975483992e3e0904f7e380270fe6acb15c269c55a15517e5782c260f5e103de15194200d3057d67a8a2bd9eb5e907450fb
+EBUILD ghp-import-2.1.0-r1.ebuild 469 BLAKE2B 2944d33a9324e796f9cef0cefef7753d2a430a5fcf365b8a1af4f82fdbf37bf59598e99fc4a0198015db52f7d742d9067c6f5a7d8bab038ee26c5f16a49bde81 SHA512 309b4d7eb7d8816f337d1830a0ab1e1ad29a4a36d2bfcfd701a439947bafad3170d941447a0c4d9b60223f4a36819686bf0205dad28f15115431a9031c8f73aa
 MISC metadata.xml 410 BLAKE2B 0caeb18e5be64053ac585560860e830d7f8cb78ea6898f29c71457469000a7bca01fc07f48ae0ef4224925d73ffd7f3149c812d37d4d7f5d0003b6adb1c4650b SHA512 8bfccec4ffea700f9094231fb0adbbeb2575d3dc329a6bea4df391ccf3294a6386898307f77e127c76c9ea85a07acee0ec7e79e9a7d3725e9cc7fbe73cad67d3
diff --git a/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild b/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
index 388ea10acf14..1c203572de9a 100644
--- a/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
+++ b/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
@@ -5,12 +5,12 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Copy your docs directly to the gh-pages branch"
 HOMEPAGE="https://github.com/c-w/ghp-import"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index 50307f639e83..6e632ec86d25 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,4 +1,4 @@
 DIST git-review-2.3.1.tar.gz 66400 BLAKE2B 67b2bf60e91a127144995231b94a48eaa03cfe8cb8e27513183f21b4cae1fbe2eeaa00a23d21da2dd7258aa794ce4cb0ee06e91510d707116699da1702bbebac SHA512 b3fe0ab40c473c80da20c42b4104e82115c9ea02bda01580aedb69622e117d733160eb42027432eec12379250186ea7b6f9eb4cb86b128a591816243a0c0fadc
-EBUILD git-review-2.3.1-r1.ebuild 862 BLAKE2B 01a498e090337aab9664eefabd08cb1d40dbfc6046d90d4ee5e2e5d77368056ae6282712f23e5b75c449550fa4dcea11f6e2f0e2848632396cc2e7c03dbe5f02 SHA512 781e991329c027f736da2c911f53e54a51a56d14f82516164b4e073e72eae7c5f5b4243dedf6dd7f43f0d40774b5d37fb202fdb75d96881ade6f7ef500314dfa
-EBUILD git-review-9999.ebuild 864 BLAKE2B 547d36613bc8c6144d4dde2bde0b269fb02b8cf4be66d740470c34728f58c1cbed88fcbfbcf4858a0d5e635db3e28f154ada57117d1b6ea388b548766e08be0a SHA512 d87d2f38b385f9640891acfd543688bb526b29b409777b9302d576d44ae39c53c8c22e5a74d23e3e7d1e83785b68d1a70a3b6edc613c74291d5a106d2cc5d8f0
+EBUILD git-review-2.3.1-r1.ebuild 843 BLAKE2B 9f54c57143884c5bc0276738aaa208ac957a63f737a0dd3896d591cce4c71a5372b0995177bd09556c348514150d92ea9248c486a0dbb1234d6529ad61c78daa SHA512 97253c64b229d5529a59af4f3e9e6ff16fccc8c70a33610248d11d6c16eb81805a73311d3743507cc8872243bc4c556b9724d0a9dd2463b4acb628c936f65ebb
+EBUILD git-review-9999.ebuild 845 BLAKE2B 0f61c6fe7bb68436678debeeb11b01bc6192ed8420508f18669f5e5c302126c440d3fbb77eb411ce3d1f5ce08804c7af83c3cdb0f5f125fc2212aeff1c95d30b SHA512 65124788f83d9b2807251998ad8157b364590bec003384fc24518426168ba58dc8434481502153f48ee8271fde097869e02110e124d33cb4203aaac728363797
 MISC metadata.xml 338 BLAKE2B b891e2436716d179293d3a1844dc671cb2c4270887260921b04fa3674d999805d4845337b73d3e45a34b2105b900209c7630f85962ea59fa8b472946981b4b6d SHA512 b8e512c07502ddba83bd5012ca036fb364ecf433408e70f036290b4209f0f06bf085de7a7519f47f46f1e68df9e9c97349cc55454b48ccf9dbf57dddc1ec28fd
diff --git a/dev-python/git-review/git-review-2.3.1-r1.ebuild b/dev-python/git-review/git-review-2.3.1-r1.ebuild
index f8025bdc31f9..1155dfda6e08 100644
--- a/dev-python/git-review/git-review-2.3.1-r1.ebuild
+++ b/dev-python/git-review/git-review-2.3.1-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} )
 
 inherit distutils-r1
@@ -14,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://opendev.org/opendev/${PN}.git"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 	KEYWORDS="amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 fi
 
diff --git a/dev-python/git-review/git-review-9999.ebuild b/dev-python/git-review/git-review-9999.ebuild
index c2ae5e303560..217a63bc6d69 100644
--- a/dev-python/git-review/git-review-9999.ebuild
+++ b/dev-python/git-review/git-review-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} )
 
 inherit distutils-r1
@@ -14,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://opendev.org/opendev/${PN}.git"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 	KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 fi
 
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index c8d5ba7dfb5f..533a62799208 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,11 +1,5 @@
-DIST google-api-python-client-2.77.0.gh.tar.gz 38300787 BLAKE2B c7d147b9ae78fff5aa70b2ba219888296d414c1f7b498c93bb424d06c437a50d5a1a2284062e58defb29ba3aa89b225e4218d9acd303a0e17f3ec4ab0380a2f6 SHA512 24aa2b3d709de83b76be2d8030a419d0e3f8f447852d7f95c6cf735134270a7af94edd86bcc3d82cd25af2497f30ac6c365ac88494c227b19faecb8e3706c261
-DIST google-api-python-client-2.78.0.gh.tar.gz 38327369 BLAKE2B 291941a44a6fc9da7df2cbb108ba90babac33916f9c36aeae6e8b1575e9851f7c93aaea09340d36acd8f80dbe5ebe63820d60edc0aec14ee4859a47dcf66e344 SHA512 fff05aa981106aaccb689aeeace62734df77fefe7132481a11bc81b249a7793c1743c7c7c21116b3f5d4d59230ec7adac090d478969f8847bc201a2a23dd072d
-DIST google-api-python-client-2.79.0.gh.tar.gz 38537790 BLAKE2B 968a33a92bff0b7bc6e01e69df3b405b189df1560e1100de6bfb987ba5d87f1da9dafa184966f55f1d64b41912790f94a98d5160dd042661a2d5acc02c6d10e3 SHA512 c16e32306eb8660facbaa078fc76ad49692948f26d81d753977d1cfa49f76b4eacf2a5613c4bdb8f463ebd65c955d5edda415355d143ce1dd59ec7443eeb0a13
 DIST google-api-python-client-2.80.0.gh.tar.gz 38885627 BLAKE2B f81943e8c4179130bbd7f3d89cdd3c7c5c828c78b9cbed6a5c011c3a0751a19a223b6e52a5fe8f739a8170b6e0e186b5e6b56b4ac08c88a1bf167cb5652d0e18 SHA512 cabd955f730a2b9bf8e8e3579b28935cbbc16b0ac4534d4b841317ff86cec420dd2a5a7b5b319a6a765cce02258fb43cafd6165ae49a7b99e0e891d9ba86e198
 DIST google-api-python-client-2.81.0.gh.tar.gz 39081445 BLAKE2B 779b22f07b12834d649982a52491b567472af7fd83f49e6b9d4a20a991dd57e5bd11e32fdba05f004449733bf5cb2fd2a5ec4a3f012a558989563c88256c3199 SHA512 72e357d68314cda2cbb6d679ad22ecedf3a1ede87b94067bbaca886bd9a17ef3f881ca6060fc23c3c8848fba96668ff0b7ba9f4b44da625f3f34bed5f537e762
-EBUILD google-api-python-client-2.77.0.ebuild 1393 BLAKE2B d59f5c92683f668f82e760c1f1221cd87bdc836f3cf69ad70a2f38376b551f66c0fab981f3eabaf29db0695a3b7d3567af1fd996ee0c52a06efc710c3d5a00b9 SHA512 c90bbd23296a5a2127f55d79b7130770d91cd1d3fd69cfedbe92531bcde7b7a98364c3268aadcde813828802fc86c317bf00661382a94d5a57cf0a9ec5686b4b
-EBUILD google-api-python-client-2.78.0.ebuild 1401 BLAKE2B 69835c2562dc0f53faeb4a88a2f4a398734ad747db6676817fe23f952bf0d556433e8e456a3db1479c0da6671c654285a72dbca97b22659a727e0a5b595ad825 SHA512 032c90063955331493b55b4746bfbdbc26bb9de11dbd0aa51585bcadf9b5b656c9569976f03b3f3e2e5765a1f860a6d654aa6f8486ab52b1318c219e6bb791af
-EBUILD google-api-python-client-2.79.0.ebuild 1401 BLAKE2B 69835c2562dc0f53faeb4a88a2f4a398734ad747db6676817fe23f952bf0d556433e8e456a3db1479c0da6671c654285a72dbca97b22659a727e0a5b595ad825 SHA512 032c90063955331493b55b4746bfbdbc26bb9de11dbd0aa51585bcadf9b5b656c9569976f03b3f3e2e5765a1f860a6d654aa6f8486ab52b1318c219e6bb791af
-EBUILD google-api-python-client-2.80.0.ebuild 1401 BLAKE2B 69835c2562dc0f53faeb4a88a2f4a398734ad747db6676817fe23f952bf0d556433e8e456a3db1479c0da6671c654285a72dbca97b22659a727e0a5b595ad825 SHA512 032c90063955331493b55b4746bfbdbc26bb9de11dbd0aa51585bcadf9b5b656c9569976f03b3f3e2e5765a1f860a6d654aa6f8486ab52b1318c219e6bb791af
+EBUILD google-api-python-client-2.80.0.ebuild 1399 BLAKE2B 6fc4e421d99a3a617ae046f226dae680e2b44e1f80d29b30e4aabfbe1d8fbc55d7916ffda97c754e69f64b61a7b631237a1c7240d23f683f7b4db0797ca6affd SHA512 122cd23ad716177a236ca4a799461a15a6e4960abd455813f731b3263cb741198c679f46c35131eac91c43da913ada1a4d6f87945db5e145c476db156063f097
 EBUILD google-api-python-client-2.81.0.ebuild 1401 BLAKE2B 69835c2562dc0f53faeb4a88a2f4a398734ad747db6676817fe23f952bf0d556433e8e456a3db1479c0da6671c654285a72dbca97b22659a727e0a5b595ad825 SHA512 032c90063955331493b55b4746bfbdbc26bb9de11dbd0aa51585bcadf9b5b656c9569976f03b3f3e2e5765a1f860a6d654aa6f8486ab52b1318c219e6bb791af
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.77.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.77.0.ebuild
deleted file mode 100644
index 703ac440a7a0..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.77.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_10 )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.78.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.78.0.ebuild
deleted file mode 100644
index 65893f1d07cd..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.78.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.79.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.79.0.ebuild
deleted file mode 100644
index 65893f1d07cd..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.79.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.80.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.80.0.ebuild
index 65893f1d07cd..880af7996e6d 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.80.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.80.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-pasta/Manifest b/dev-python/google-pasta/Manifest
index 5767d8105555..7f5df285a62d 100644
--- a/dev-python/google-pasta/Manifest
+++ b/dev-python/google-pasta/Manifest
@@ -1,3 +1,3 @@
 DIST google-pasta-0.2.0.tar.gz 40430 BLAKE2B b3f068c0530149d6e8057a2e7edeb76b1912516a8227a837913783060e30f418159b38c77480248dc7a1586b46c9b5914e93c77a9430d963b3538e2197661922 SHA512 1d75d994a5120109677a58472459a632b31568e6ce79b205688913dc2a94e132fad818c73510b2f7d7adca3c757077543abd8b7f15be035a63fa15d38874c753
-EBUILD google-pasta-0.2.0-r2.ebuild 478 BLAKE2B 31bdf6d3223941935e59ca130fbfdf36bb68b670653371caa60b46f90ffb835c018292e4cbe21a4be00ea89077629084ccc754e5e584e35ff32272f165a9b600 SHA512 11eb36781e101681413f46f749f5596a22bd69c84f0ed3d0f4012a26c538f8aa6cb7642e8cf8527a59b006ee09c25779117e9b44603e22e0e79a862c52e8cc03
+EBUILD google-pasta-0.2.0-r2.ebuild 451 BLAKE2B a339291d735df967423c5963f083a1a6f9aea173c65a2daf959f79f907fc0a2434411b4604067ce4a24091acb87bc3b128b88614b3da1d7632b4abe9d9165229 SHA512 12be4baaf209033a56a6acc2a566a99e88415d450a3aced734b69ad7ee15155273e700c72f674d3f9fb3f5706b957418022da4fc344414803eadd671867969c0
 MISC metadata.xml 399 BLAKE2B f844e211efde5a2f65551431341e95da42efc481b12c88cd549f75e7a050409b67d931b9610556acb0bcce41fa1b387fbda690bac8d5369bf93284f376e9a4c1 SHA512 63aa92d0c3184025d83858ad189cd21a68b9c77e25f9a6b192da538400739e8b9f495db3a18c35273c83c47d957cc15ad6cec24f447ee279181de68843c10cfd
diff --git a/dev-python/google-pasta/google-pasta-0.2.0-r2.ebuild b/dev-python/google-pasta/google-pasta-0.2.0-r2.ebuild
index c76100e7e0a1..32fb175cc624 100644
--- a/dev-python/google-pasta/google-pasta-0.2.0-r2.ebuild
+++ b/dev-python/google-pasta/google-pasta-0.2.0-r2.ebuild
@@ -4,12 +4,12 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="AST-based Python refactoring library"
 HOMEPAGE="https://pypi.org/project/google-pasta/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index 3c855eb6e216..ff93e256c821 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,3 +1,3 @@
 DIST googleapis-common-protos-1.58.0.tar.gz 117015 BLAKE2B 7821d83e40c42196517e27f9340741deb2c04fe15129c6e6f9c90c884ce6c4ffae38d456494d5271ac42f680595f82941df70bb2d94c5c20743d99c237a29354 SHA512 3e057e8dce7898ebf5c63ea1ded4f336ad5235ee6e7595739efd4c005b34f63d88481242f2d5a38b8d531d79d1957c2b79918bf61eb3ebc52227ec20b204cc82
-EBUILD googleapis-common-protos-1.58.0.ebuild 821 BLAKE2B 621369cd08a7a4ff729f096884d0060cc916890c21a174fc73e681bd32e2f634093cda3b308fc8513f1fc2d48f60eec991a5f7aae0d9645ee159982ca1206e77 SHA512 4e192746732addfd4cf006d9abf403ef21387f03d0f39274f3e5b1495ac8fba1c4dea654b107338484df0807908107f5f87e1ada0d409453c90cf73f835db731
+EBUILD googleapis-common-protos-1.58.0.ebuild 794 BLAKE2B 29857d0dda37d3abec64e1cf2afd4f56e0045afaf3cbb8774ea9e6e0efe0ec0230597ffa8432b830ba0f70a47826fd63d927c376fa3ede0f74010e1b40aee358 SHA512 f4e25d543ffeeaad460aba7ca7e1b33b0895d67cd7cf3631871281142eeae1edfab5293790da067a7bda55532a0292af7f57587bbc61f321fa6f2d9d5acc9d71
 MISC metadata.xml 537 BLAKE2B 7b81f41f34a3c0fa53340ad298440f67727eb1830009899ffa10835485f66e727844735a88bed94b8a0bba14fa01a78d8a04f5ca3edf48a72781c7e1a797459e SHA512 6013da3540915e13a0cc60336bbefada12fbf71c04d4f40634f24015ada732d0d8b86600401bdadb2c7df2ea84f7097669f4efe6cf176ccca5efe46e9a3869d9
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.58.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.58.0.ebuild
index 834477462e47..6ac9250fb3e6 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.58.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.58.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python classes generated from the common protos in the googleapis repository"
 HOMEPAGE="
 	https://github.com/googleapis/python-api-common-protos/
 	https://pypi.org/project/googleapis-common-protos/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 3e29b4df242a..7b2e222ce4cf 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,3 +1,3 @@
 DIST grpcio-testing-1.51.0.tar.gz 22390 BLAKE2B 813ade1f3f44e3aeda7ca779f130897281036de111cb17f9297f267961a591e1fa3b88380ccbec42edd339487f1b3f1028dcd308c46ffd8fde5817e3909cfd41 SHA512 3fd9de9cd75aebcf1f6c3716bbacaf5cc9cc9aa74acb42dd128b5c158fa2d52549cdcc8f3ea9f2cb0b86d0b84c998acd55fa16e879ac9099a2348d889d35d837
-EBUILD grpcio-testing-1.51.0.ebuild 578 BLAKE2B fe47ebbec3d56e59dce721b5dd4b246be5f48b51b03954c77b3c8ec8fa058055c80b2ed6672c8a6b47a83d80851a5424839131e43d5d20073eb90d9cab59ebfd SHA512 acbb4348c514447bb20f6178b0f721fa35e4271410bf2cb53d4312ee3ba3846ccef8d28e48e03d705524260e7d868fff971feb5bc53a81318d69f18f5e4f154b
+EBUILD grpcio-testing-1.51.0.ebuild 552 BLAKE2B 77c4231569c0a9e65c69c8e30afa695abb957578b5cf2eafc7f752ab080764738654a8abef3c8ac2cefdbee51410701fb7c8407d6a8f08b5d47f802a97dfaf31 SHA512 a6fde867de0ad690c5ed847cd5fff699329e221031e8490a4a9b834086315c7af9acf254bdd6342fca31a3f84c25934bfb98402017a996ab3fa173ed0e559e39
 MISC metadata.xml 378 BLAKE2B bd4fcbd45d6b8892ced059de5457506a61573264ec9533ffa06f3076e0c72908e3565930e8cf200f87def824d26fb8e184dd358ad04e02b5642f7cc24b087e9f SHA512 73109d9926eb1dfa38add772e095d8765a8cfee436168cf6bb4541ed58cf441dbb84075c72d2d33e4535af3661948ace21657b7814456a5f708d6d612faa3386
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.51.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.51.0.ebuild
index 849836612a88..7dd1d26fa299 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.51.0.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.51.0.ebuild
@@ -5,12 +5,12 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Testing utilities for gRPC Python"
 HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index e0d7fe3a37e6..7a3ef969884b 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,3 +1,3 @@
 DIST grpcio-tools-1.51.0.tar.gz 2254565 BLAKE2B 7486c7c62d691cb3cbaf02a68e73d6d94ee48396b26c4d46c22776396ba7d637c9b6738c00e19a99101e189e7092b2240adbf53ae9d32188dc813a9b0a49c25d SHA512 fa76fd970c399aed7639d6ce343834a5e7d76f2247cc99e59d0bf29844fb2f366bc9b8e2124d7c9dd9163953741c06015ded7f400b8e77d0cdad8ac291a7af83
-EBUILD grpcio-tools-1.51.0.ebuild 848 BLAKE2B ec8ffec84382c8805bcba71b130dc2c3d5414663829120dfab164b1dbb34de6d3ea97b2a3c802755288e36782dc845c0e9a643f48718df33f5a0ab6b7decfe48 SHA512 1a8cb2f327a22b7a6249f0bdeb2283b6a235ec0c1f1dcaa1b567b15f8f933bd18c4c6f8842de886207309f49b24363af2f43a7ca4e4d9f9e0230acdbd16c100d
+EBUILD grpcio-tools-1.51.0.ebuild 822 BLAKE2B ea2cd034bab2e1d528275b7f601f01da4ba241b85fd0db42cdad7043cc37ff681236f5a78c235c38e218c46816d00d391c2992460491a92d971d3efa03b03e9e SHA512 c86f8b06ea39e4081d777280f8788f9fd6218487b74a81505720813f3e3d03f720b6da60019ceac458d74ac794ba24b5408bcad81dba7d17cc24b8f35c4421d3
 MISC metadata.xml 376 BLAKE2B e5cdaf58121264aa01fca1e7466b497ebdfccebcebef9ff8a6eab4378e5031115c3cf64469dfdd0902b8b1f76ab2ccbe460239627d3d0590e6ddd772c04d7639 SHA512 a55fa742c61014334fb41be9dba20bc42caf767bdddbcc92e227ac643d368668603a3b4f4402cb2393e0ae4af0fcb74fd5a6784c3a7be17afed8c21ab338b0bb
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.51.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.51.0.ebuild
index aacd0f046b71..92eb5d244d7a 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.51.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.51.0.ebuild
@@ -5,12 +5,12 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1 multiprocessing prefix
+inherit distutils-r1 multiprocessing prefix pypi
 
 DESCRIPTION="Protobuf code generator for gRPC"
 HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/h2/Manifest b/dev-python/h2/Manifest
index 47047b8f1415..0e8ef8867c70 100644
--- a/dev-python/h2/Manifest
+++ b/dev-python/h2/Manifest
@@ -1,4 +1,3 @@
-AUX hyper-h2-3.2.0-failed-healthcheck.patch 3381 BLAKE2B 0eef97897e58ca0b580371e1cd8dfeb4c85d3e333aea4566121bbabd08cee5a46070360e3f40f244058082c5949f3fc1ed8c5a9d80bdc6f9c7ce741a9dfa915f SHA512 0e5e9a6f3380e3a2b54f63c9894e3fd5c5987b7e55834200b051e6d8ed13219f9784340275ff136ba273eb5b989b5bed80e85460bc7b25049974150f0340911e
 DIST h2-4.1.0.tar.gz 2143812 BLAKE2B b9d9a771340b4bde1675b9fd65c242732a1a262456f84a409662cf2b57326e24e0583160ba0531c0b105b79342578714127dddb560d2a27de58af34d1052c698 SHA512 4e9cf88b3ae702a8a42bded775ad337809787fe8172d501c230d55abbf1edd764acf3b227f2e58756d882499661ffcf6bbdd4812a4d938c04fac3f1aa2390b28
 EBUILD h2-4.1.0-r1.ebuild 1293 BLAKE2B 82c48cb9ac61fc7e9e2994f301b54ebd495a617304cb0837fcb43730ed6efe915bb5239afa4c4c7e4fd8e2fbf35e9e6c24dfa56753fdde4c6016974e9fdd22e3 SHA512 92cfb22eaad826e2cdedf6c6ee2664d4adced713025423f17af8a07d7a8f76f3283207168f33530aa2c48fc41bd2bf867cefd3167ba2160c5400aa6089006857
 MISC metadata.xml 694 BLAKE2B 8e3c231ed6263fd0feba3f8f3ef0d5cf0345e2de092e4a50de3d6b9dc3b009570b896dc5a7804f9b99e9ffd75ae6a8387d139f0db1dc3ce213c4e7bca63061e2 SHA512 713b15d6f84180c861d1487f2ee7a377acd9403876385e064bfb103b5961cc53655953602dfc809cef648444ea9e201991e2de00203d0ab5a36c3d13b1764e2a
diff --git a/dev-python/h2/files/hyper-h2-3.2.0-failed-healthcheck.patch b/dev-python/h2/files/hyper-h2-3.2.0-failed-healthcheck.patch
deleted file mode 100644
index 04adc2748c21..000000000000
--- a/dev-python/h2/files/hyper-h2-3.2.0-failed-healthcheck.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/test/test_basic_logic.py b/test/test_basic_logic.py
-index fb54fe50..8c8f3b7d 100644
---- a/test/test_basic_logic.py
-+++ b/test/test_basic_logic.py
-@@ -21,7 +21,7 @@
- 
- from . import helpers
- 
--from hypothesis import given
-+from hypothesis import given, settings, HealthCheck
- from hypothesis.strategies import integers
- 
- 
-@@ -790,6 +790,7 @@ def test_headers_are_lowercase(self, frame_factory):
-         assert c.data_to_send() == expected_frame.serialize()
- 
-     @given(frame_size=integers(min_value=2**14, max_value=(2**24 - 1)))
-+    @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
-     def test_changing_max_frame_size(self, frame_factory, frame_size):
-         """
-         When the user changes the max frame size and the change is ACKed, the
-diff --git a/test/test_flow_control_window.py b/test/test_flow_control_window.py
-index 24b345aa..7a445af1 100644
---- a/test/test_flow_control_window.py
-+++ b/test/test_flow_control_window.py
-@@ -7,7 +7,7 @@
- """
- import pytest
- 
--from hypothesis import given
-+from hypothesis import given, settings, HealthCheck
- from hypothesis.strategies import integers
- 
- import h2.config
-@@ -715,6 +715,7 @@ def _setup_connection_and_send_headers(self, frame_factory):
-         return c
- 
-     @given(stream_id=integers(max_value=0))
-+    @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
-     def test_must_acknowledge_for_stream(self, frame_factory, stream_id):
-         """
-         Flow control acknowledgements must be done on a stream ID that is
-@@ -740,6 +741,7 @@ def test_must_acknowledge_for_stream(self, frame_factory, stream_id):
-             )
- 
-     @given(size=integers(max_value=-1))
-+    @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
-     def test_cannot_acknowledge_less_than_zero(self, frame_factory, size):
-         """
-         The user must acknowledge at least 0 bytes.
-@@ -837,6 +839,7 @@ def test_acknowledging_streams_we_never_saw(self, frame_factory):
-             c.acknowledge_received_data(2048, stream_id=101)
- 
-     @given(integers(min_value=1025, max_value=DEFAULT_FLOW_WINDOW))
-+    @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
-     def test_acknowledging_1024_bytes_when_empty_increments(self,
-                                                             frame_factory,
-                                                             increment):
-@@ -873,6 +876,7 @@ def test_acknowledging_1024_bytes_when_empty_increments(self,
-     # This test needs to use a lower cap, because otherwise the algo will
-     # increment the stream window anyway.
-     @given(integers(min_value=1025, max_value=(DEFAULT_FLOW_WINDOW // 4) - 1))
-+    @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
-     def test_connection_only_empty(self, frame_factory, increment):
-         """
-         If the connection flow control window is empty, but the stream flow
-@@ -916,5 +920,6 @@ def test_connection_only_empty(self, frame_factory, increment):
-         assert c.data_to_send() == expected_data
- 
-     @given(integers(min_value=1025, max_value=DEFAULT_FLOW_WINDOW))
-+    @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
-     def test_mixing_update_forms(self, frame_factory, increment):
-         """
-         If the user mixes ackowledging data with manually incrementing windows,
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 343c39c18407..cbfc73ef9031 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,4 +1,3 @@
-AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65a82f8cd7eb7ef6140224070c0680b6c4646c111a063ec6a8c7d51ed2e56455eede1696abf6fb82f9d6d14d5aa81d58619b0c802bd SHA512 a1510a688d000b8f45ac48c39ba46336859f952356cf776d5204b512496c523e5dc622d16b17b50d0d6318bd94b817d52683e5f56287f0053ced2508cbf23259
 DIST hpack-4.0.0.tar.gz 5301419 BLAKE2B 0164f6aafc0d1f17f6c397efe710503a22501faae3c7dbba4e57ca2dc76e4d373bc5e65bf55acda8bc61975d12f8a2084de0e0c4587539e5a3102e3cf66d562b SHA512 f482d086d7a82649393e3cfea55c98966ce57055cb1826bc4dec1ea334661c02708e7903f2e8e588ee1c30df41373e1de9fb960c2e7bbc18d0ace0b8f97b195b
 EBUILD hpack-4.0.0-r1.ebuild 806 BLAKE2B 56e31a112b14cdbcfa5c4e27c8fcca966325340b00c234d2911710a6b39c3504900356b5426aabb3f33547288d61d2f645f401737f3358c3e85b1755b1e063d6 SHA512 e34a9acc01c76b09c4acb4046440bb0eb43f9caf5736b3fa00ae1d1122dbbe6396eaefeaf6f917b93603a6095745a6fbccc5e8ff5ef7dd4fd5656f8d157fbfce
 MISC metadata.xml 702 BLAKE2B 55737d2ecb2b628a787b16858cba8fe6a1b5a2a2b5243445284f523797aed25fc6972f978d4348d8974409792629f7a399994b0189781efc8fc212a3c2b84e1a SHA512 2b60f701fa7ab80396a94e48dbed33c72dab3e3539355a20fe387dc2d5ea378bce5e3868a092da7d93604d1ef6422a4ae22c5ddb68d3dfc938920251186bdd1e
diff --git a/dev-python/hpack/files/hpack-3.0.0-hypothesis-healthcheck.patch b/dev-python/hpack/files/hpack-3.0.0-hypothesis-healthcheck.patch
deleted file mode 100644
index aaabac3b3046..000000000000
--- a/dev-python/hpack/files/hpack-3.0.0-hypothesis-healthcheck.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/test/conftest.py b/test/conftest.py
-index f5801da..c5e3c66 100644
---- a/test/conftest.py
-+++ b/test/conftest.py
-@@ -4,11 +4,16 @@ import os
- import json
- import sys
- 
-+from hypothesis import settings, HealthCheck
- from hypothesis.strategies import text
- 
- if sys.version_info[0] == 2:
-     from codecs import open
- 
-+settings.register_profile("gentoo",
-+        suppress_health_check=(HealthCheck.too_slow,))
-+settings.load_profile("gentoo")
-+
- # We need to grab one text example from hypothesis to prime its cache.
- text().example()
- 
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
index 9c80a953ca8b..7b9a33e98e63 100644
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@@ -1,3 +1,3 @@
 DIST html5-parser-0.4.10.tar.gz 272814 BLAKE2B 5759c872e65080ea059b81e632ed70a94e6677ef01af1e50ab1822128cc75ccbd3361c9d4e5e94fc4cc78996b3dbde97ffe435f083c492df2815c67d929cabc7 SHA512 45accb891261e1b82185de1cb0e06915e0ff487fe2cfc81b79f5653c8e9d7b9848349ab94657f8fb5eb116311b1d2b0d19f504f841ee8af0cf4a23601a5000aa
-EBUILD html5-parser-0.4.10-r1.ebuild 849 BLAKE2B 7b9d90a46849a6bcfa437f5b305f5a34a1c2b3456158079cc3c28b0d175fb43c95625e0b633f4de0c8c6688d5f91cce472832f7331c42b2b3485c9b359bf4ccd SHA512 c1946b393513afe111f59ebf4745bb5f0b233c343bf75c6d5de09522d19aac9edf6f8f714d5e14c24f53c4e483e5849e6b309fc3ff04588cb47d7738fb530761
+EBUILD html5-parser-0.4.10-r1.ebuild 822 BLAKE2B 3b935c17d963f036c0e550b9a69a40c07c13ce84b409ade12cb1de2edde334ffba7a1e07b05888a795e96be2b6cb8f4398d5c67a466096374d01095d75f225b3 SHA512 01f3297d4115cccbc19f97bcb8bd3d713dbcda11d8aa11fd404d59e5fdf041cbacab57c4a55a5d99eb7eec97c521326bda8133def825b3fd58b3bb143a531b46
 MISC metadata.xml 458 BLAKE2B 368218d3f5b16284b8d0bc3447efae89d833b7ac206f9b0719f88078f8e472a7b362a0843211189da3f273e0e689a40b5cda5d457ff4dedc51dc74b74960ec3e SHA512 40b3f0e265ac93e827eadc79a57f9b05a7b5adf9fb88d729613a7f2844fabc38e47d39843e039e27a412fd2d1aa1cc38345027a3c31c952873c5e38e899112b0
diff --git a/dev-python/html5-parser/html5-parser-0.4.10-r1.ebuild b/dev-python/html5-parser/html5-parser-0.4.10-r1.ebuild
index 058a3b4032eb..06bf9a6d6ad5 100644
--- a/dev-python/html5-parser/html5-parser-0.4.10-r1.ebuild
+++ b/dev-python/html5-parser/html5-parser-0.4.10-r1.ebuild
@@ -4,11 +4,11 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 toolchain-funcs
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 toolchain-funcs pypi
 
 DESCRIPTION="Fast C based HTML 5 parsing for python"
 HOMEPAGE="https://github.com/kovidgoyal/html5-parser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 8b0ed2bafc6b..a177d6fc9070 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,11 +1,7 @@
-DIST hypothesis-6.68.0.gh.tar.gz 9350032 BLAKE2B c122455b7f941eaba8b37b7c4bd4760b2ea0d7c5cf3e973544b80edfa17ea13870c9c5121a121178850154f0058e55c4051ff0ea98d35d3c312468202108a04d SHA512 7ca3e79c1c5e091ae829244e1f6b3563c61add0a5bbe7a7b254df85191778a4b05a21f82ca3f50ba6e77a5ec5c9ec06d7dd15c6cf423c1a2eb524a2aeb3f2c91
-DIST hypothesis-6.68.1.gh.tar.gz 9350091 BLAKE2B 5d6d6912b20d3badca440b668838f456239653c393d8f148ba5dd16227e078586167f0d7ff0adbdca0efe2a81ff27e0307d97b63492658dc28c9abd7c7691551 SHA512 6dbaefa411f7945081158b7d730dc1893dfe02ec4b45f7bdd645f6f2198d39b3f4313d1e18dbe9a82d13e36df5bc541f1b31539128f9de5480b82b916bd74c0c
 DIST hypothesis-6.68.2.gh.tar.gz 9350253 BLAKE2B 5f98aac845a2f4e1dd9f54809d3e7e1b201bdecdec1c5c9cff10a37851af7d8d9e8cb643c1a9b0545672862b3639a17aed5f4197653d48d3114edd0105668307 SHA512 c3507f99376af924e375c51e0d56d4e444204d2ebe147d813a3f33a69594f83493c499714567b127556ea620df7bde58f4a1ba662bb182907e5e0d14cf13ee81
 DIST hypothesis-6.69.0.gh.tar.gz 9350681 BLAKE2B e28bca5be08809d7f10723186957ab72a650d93403fc0c5ed91b329ca3c68b084a69aba093e8dc7fdc742316287dc585b7b8794403e0b3fa29adfc7bf2d76ee7 SHA512 b6a263a10f78841706f6fa58a237f2f1e7ef5efd4d859e0fb79bae0ad3eff86774bc0cb7bb581af89605f80514a08386b5f501a6154bcc5ae1f56e7eb2ba61b4
 DIST hypothesis-6.70.0.gh.tar.gz 9351669 BLAKE2B 04e6739a1e6cf5907486c5fc6e09d17996831fe7967df4a24e6fb3c3ab992ef0c1ade9f250a1776eed4d6880893db1e8f284df60465a81a9f14f4aa64b0b0fc9 SHA512 6fb15addd86f8737b5a99a5c4ae5f2899133772e25426cc8a9bd086ddc0246b8fd323a10213df45d5b13c0740df19597a2b7ee7566611d5d01e6897954ac0f4c
-EBUILD hypothesis-6.68.0.ebuild 2132 BLAKE2B be04a23a6cc71d17c7585c98d1df3e8bf9a32c84897a5328fba61561c756d8bbcbfdcf778debfa99d3555f430f697720a1bcf083e3422d55116f5649e901ae44 SHA512 61d1b1390b920c328bbafd1b80c7f1c934f5483972bfaba692ed95cd5478bbaa62bc65438665037b6bc10b0050477c02597f2fdc9536963d6769f23cdcd5f721
-EBUILD hypothesis-6.68.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
-EBUILD hypothesis-6.68.2.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
+EBUILD hypothesis-6.68.2.ebuild 2132 BLAKE2B be04a23a6cc71d17c7585c98d1df3e8bf9a32c84897a5328fba61561c756d8bbcbfdcf778debfa99d3555f430f697720a1bcf083e3422d55116f5649e901ae44 SHA512 61d1b1390b920c328bbafd1b80c7f1c934f5483972bfaba692ed95cd5478bbaa62bc65438665037b6bc10b0050477c02597f2fdc9536963d6769f23cdcd5f721
 EBUILD hypothesis-6.69.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.70.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.68.0.ebuild b/dev-python/hypothesis/hypothesis-6.68.0.ebuild
deleted file mode 100644
index 53e3bebd8313..000000000000
--- a/dev-python/hypothesis/hypothesis-6.68.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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.68.1.ebuild b/dev-python/hypothesis/hypothesis-6.68.1.ebuild
deleted file mode 100644
index c793a8a143d2..000000000000
--- a/dev-python/hypothesis/hypothesis-6.68.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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.68.2.ebuild b/dev-python/hypothesis/hypothesis-6.68.2.ebuild
index c793a8a143d2..53e3bebd8313 100644
--- a/dev-python/hypothesis/hypothesis-6.68.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.68.2.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index cc68e197ec85..0a801711b316 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,11 +1,5 @@
-DIST identify-2.5.17.gh.tar.gz 101448 BLAKE2B d9319bbbe67f8c2c7a0ed8b7db8efc64f7c90d5cb3706366a00e24a78afd76c0c5707514d660febf02397f95d02785ea52f65e09c239d83d82ef84488d9dbbd2 SHA512 c9baf22f6893802c83e302fabe3cd4ca46a3b64ae6ef4fd5c939b131545c260e24861e59a617b3e4c4812e1a250692a26e4f8febaa389eaf6958d5c2aa79aeb2
-DIST identify-2.5.18.gh.tar.gz 101457 BLAKE2B 4575b4084dc28678275704f44a02d171d79a02f015e6d2267545b18c4288b55609cc64af2f9eca866bc2d164ed534cac59d69915e23fd3100cb680fcb08ceae0 SHA512 c7c6998340b77ddb13c88df8dbcc9b72efb68bf3cbf8a7ab2b81a4bda1180d04d4bdd9db360b7203235e2ebd252852de2c806b73e6a7236786bffbd3f4d4a672
-DIST identify-2.5.19.gh.tar.gz 101475 BLAKE2B 12302ccfaeebd38cca84a530775e5acb2a6b9ef8a741a8d924c09a15f0d410058354e3725df31683a8d20f01767fe78745f60efba6f553b728bce089b463a9d5 SHA512 d188080a83cb26c45108d676dd47498c2a10caa4af02cae3c11950ebd3c1c9478c5e730b68d6a02297c6e563dbb9df41dd324627c6e5f28f60b337e439f7e3c7
 DIST identify-2.5.20.gh.tar.gz 101473 BLAKE2B eaf6994d7b2f8e0449b84fcb6eca14210b3a123ad48709cf9e7bc9557b116dc9fbb5103566b60bfda1a19f6428b8432b2ad6099c471b1f86b898d46dc2c0b4f1 SHA512 00905b2937766c3885b9a604cc55e6201ffcea486cfd553217659652d97632ed11cd12512ecbe2ddd3394e836fbab5ec439a55257dcccd6ed3a2f148df5ca92b
 DIST identify-2.5.21.gh.tar.gz 101486 BLAKE2B 9c70c401d37afa8689d39bc4df38ca2006ecb2f78d427c0e213319074c5d0ec8a3865fafcde70ab903e641ada100ef4207196fea78bda9e60f3aa8c9e345c30d SHA512 6760eb53e99e52f51d24499b240450e0f1d8e4faf0190a6c7768246bc2ec527bfd0b081113058be4ad7646212f8b4043479e83edf6021d36d483f3af672a4010
-EBUILD identify-2.5.17.ebuild 588 BLAKE2B 9c287b22e56d3d592e12009f8f200ef5771765d70f403323aa9ca54480f9d64fd16acafca460c7e30faf84409c105302d825fe0dcd66cc573a5c9ae877ee2038 SHA512 1458fffe14402c083921244f208ad0b8b5b168b96554a5ff33ac60c248307581bfa1df5e05ced73bb677d6d96279ef948d1e9b50d761e3d4e8c95d165091f4b6
-EBUILD identify-2.5.18.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
-EBUILD identify-2.5.19.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
-EBUILD identify-2.5.20.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
+EBUILD identify-2.5.20.ebuild 588 BLAKE2B 9c287b22e56d3d592e12009f8f200ef5771765d70f403323aa9ca54480f9d64fd16acafca460c7e30faf84409c105302d825fe0dcd66cc573a5c9ae877ee2038 SHA512 1458fffe14402c083921244f208ad0b8b5b168b96554a5ff33ac60c248307581bfa1df5e05ced73bb677d6d96279ef948d1e9b50d761e3d4e8c95d165091f4b6
 EBUILD identify-2.5.21.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
diff --git a/dev-python/identify/identify-2.5.17.ebuild b/dev-python/identify/identify-2.5.17.ebuild
deleted file mode 100644
index 5f8200bbe066..000000000000
--- a/dev-python/identify/identify-2.5.17.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 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="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.18.ebuild b/dev-python/identify/identify-2.5.18.ebuild
deleted file mode 100644
index a0d521fdd551..000000000000
--- a/dev-python/identify/identify-2.5.18.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 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="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.19.ebuild b/dev-python/identify/identify-2.5.19.ebuild
deleted file mode 100644
index a0d521fdd551..000000000000
--- a/dev-python/identify/identify-2.5.19.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 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="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.20.ebuild b/dev-python/identify/identify-2.5.20.ebuild
index a0d521fdd551..5f8200bbe066 100644
--- a/dev-python/identify/identify-2.5.20.ebuild
+++ b/dev-python/identify/identify-2.5.20.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]
diff --git a/dev-python/jinja2-time/Manifest b/dev-python/jinja2-time/Manifest
index 2a8a5378ee4b..32bf56abcfce 100644
--- a/dev-python/jinja2-time/Manifest
+++ b/dev-python/jinja2-time/Manifest
@@ -1,4 +1,4 @@
 AUX jinja2-time-0.2.0-arrow-compat.patch 1655 BLAKE2B 7285125450d338d4e4c927761b5eb93778f51bd5b260fcdf1ac720006d61faaee2b928a869337cd6f9e7905140810ebe6047fd3c954501c86e1185f85f1517d3 SHA512 0286a608702bb445cf29da7900ec04f5b1f64d1e9658b84f9a90018adf5fce5cc959832abff73fa017afcaf0a0f6be85060e52a79038bf770b8b37d8c96a5e7d
 DIST jinja2-time-0.2.0.tar.gz 5701 BLAKE2B 370318000b1c91bc3460861d389da667f6d7e840c4f9d9d1661491c9bf1b422b8ecff12d1da2467e7a9596d12832790e314c3298672d70b38b92a53198df0156 SHA512 8ac4686312cde689f7a431001833d5d477030c4f5e9470d949bd07a40fcb9521f6ddcde37a72468093121ff9451e352a0bb43d20a796d7a204cf94e8a7545f2c
-EBUILD jinja2-time-0.2.0-r1.ebuild 692 BLAKE2B e7619cc2b47327cbcf5544cc975fb9eabdabd4f404f1f079e13c9639b8b198a6832e353c42e9f23781db2743e76b647664bb2bbcc783c3cb8a93fb6d26e61098 SHA512 000bbd3f25639dd1f85f9b8a33a4ed03ff3eda550a6b3b9bd61f2b03211b453d274fdfa8cdd3d5641a942132ba3832c6a14eaeb8a4329a6047a4c601993813ec
+EBUILD jinja2-time-0.2.0-r1.ebuild 665 BLAKE2B dde9fbfc01e41031e99c345f492db53c33d2aa836190007b560bb64a49fca6109c744f1ad34a9f6c3c592fc0aa8a855c80f2713bfed22b2451544db09b3e47b0 SHA512 ce0ec2921cd86bff6025013e1394c9e5ac73a4f8ca5bfc38cdb9939b14591f20a0b605829ecfaaa09ca7277943e97fc14375e1a67aad0087d1281b654a5f94de
 MISC metadata.xml 400 BLAKE2B 1b41d34e0d32e03e8a012358f02460f7090d0f70fab1be6af4f91e55a22a35deceac8078d5f2723676171b4641594ea4fe58b614948dd9b7bf60bf6889b68ab3 SHA512 decfcdeeb4705a9f62c6fdd9a249b5a7363988faffc5758d9cd50da9db909bf792da78ba044bfbada5b6429a6a8139c833b12ccb8e0d7cb7bfbae4f8d16664c1
diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild
index b594958790b7..be6bbe7b2d00 100644
--- a/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild
+++ b/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Jinja2 Extension for Dates and Times"
 HOMEPAGE="
 	https://github.com/hackebrot/jinja2-time/
 	https://pypi.org/project/jinja2-time/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/json-rpc/Manifest b/dev-python/json-rpc/Manifest
index 9b48345eefb2..85e2119f70cf 100644
--- a/dev-python/json-rpc/Manifest
+++ b/dev-python/json-rpc/Manifest
@@ -1,3 +1,3 @@
 DIST json-rpc-1.14.0.tar.gz 28789 BLAKE2B 7d5c0677452481e39be2698a1d303eb0677dd31f0861aac5b0ddfe850aea6f612ce5cf07f85df8d3b02b29a3d31c5249f49138603d6842b1ca56e8dc0ddcf668 SHA512 01e6a27509eb694d26b64b634a17fd2d36124f1602469293541f4f48b9de8046dcd5dccdc2a6f3e413c47eac4ed245495ce3e4c41fab42074a13e11f52a5c79e
-EBUILD json-rpc-1.14.0.ebuild 736 BLAKE2B 64ad0d2301350834b35f0e8e44dfedd2b2d90321150a958ef37bfa8bf277583b2f8b0232da1d816a6a5b67774c793948a590c17bd0384ef2a04fa78fa7376a9b SHA512 1f2f81a252f5fdee4c35112f333c90bd9a0c52d33723e5a635b1203698e7152d0b7f5b2c66c0df7fca925db74550d583a8ad51f3339efb6e5ce7e3b965562cf0
+EBUILD json-rpc-1.14.0.ebuild 709 BLAKE2B 73a84d5b176ad49cff8f43543aa299b880af1177881f00419e856b659ef0459d7b79e4a62c2adfb56c37f4dec5967551d9190a4c84615ebbd99fd4a8d2e10f39 SHA512 ca3672f16e6fc3a8839a6f3713c013a5c1c0bfa161d89fbac37a28489f361daf3dfd9732cb359e66a87ac6315b154e932d065448357456789eec736063b9fde7
 MISC metadata.xml 917 BLAKE2B a46565463486cf7f97e1f92cafcad95939e195bcccdeadec5e8f27d3ec2d1534b65741719878f4f05d880b8207279c3fc42a8c0cf3968cf1482967f7637024d1 SHA512 997d5d434e156e7802b018579f01680fe876d59ce9926bbffec531d2b183fad31da3c39608d12a88aa956cb2ab279b9bbef461dde6e3b31c65909f17a155a503
diff --git a/dev-python/json-rpc/json-rpc-1.14.0.ebuild b/dev-python/json-rpc/json-rpc-1.14.0.ebuild
index add06ffaf9d3..308e92ae64e6 100644
--- a/dev-python/json-rpc/json-rpc-1.14.0.ebuild
+++ b/dev-python/json-rpc/json-rpc-1.14.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="JSON-RPC transport implementation for python"
 HOMEPAGE="
 	https://github.com/pavlov99/json-rpc/
 	https://pypi.org/project/json-rpc/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/jsonschema-spec/Manifest b/dev-python/jsonschema-spec/Manifest
index be2a6ee63db6..ec1cfb435ccd 100644
--- a/dev-python/jsonschema-spec/Manifest
+++ b/dev-python/jsonschema-spec/Manifest
@@ -1,3 +1,5 @@
 DIST jsonschema-spec-0.1.3.gh.tar.gz 30794 BLAKE2B 545eda0aef433eb62cd02bbcc4d07469b26c477bbf572d71bcb4eb126acc5ab912f5f80c0699305b37f7f526f36910bcb019d66a763e679846bb20a5b01eb813 SHA512 95465c43b842289ed28dd78ec06614d77b2bbf7d9d69e5dc4b89008740d0cc85e5b3319acd66d0142b533425e8f150c4edbbf15b7f8e3bdefb28b81193a13432
+DIST jsonschema-spec-0.1.4.gh.tar.gz 30903 BLAKE2B eae7ba8b811dfd14d9b2e33d3355bf8c98e088b1a8fa3314300dcc7edae31727cc5a01d0a06af412b8c7d59eca69ba816f6eb2683e997719fd300a3445e96cfd SHA512 6b3d1710fdd8c43a0f38d0687c95e4e70c55df964dc597e4a00abad3459610829bd90190b21c512c70d46498d98b80ecc2422eb73d7822539841ff10bc7c2c4f
 EBUILD jsonschema-spec-0.1.3.ebuild 836 BLAKE2B b7c5875215dd69aa6f229e962675b2d8554d432efbc0f4e4423a26d78862f2958320b7f12cd3fe370a3b2759d3abc2a6cd5995ef380f0a2f719aa2f15ee6cdf0 SHA512 7dbc5cb7e06453c222c54674c92378cc52ef4d8d44e1e48c4b912f84f4ee2ed19b64bcfe8e5b880ad584fc9273fe1da557040c315c14c13a9c3f407306d1aefb
+EBUILD jsonschema-spec-0.1.4.ebuild 885 BLAKE2B 85b46229c8c313665c6bc0152a8f139d1eac567af6941c8223da70978e7bf3d05d62c816d7a11507295f35ab2144ea3203dcd96d07a70d7329444e75c7eef293 SHA512 47cd58e6dc14054920b2da534a54265e55aab69bb7e0edc3f112cf497b2ac65e938160272a0db9f92ccbb97dad08e822d0872dfca311cf8df2f9d912eb9c541e
 MISC metadata.xml 404 BLAKE2B 2e76fe1eb441114cff26e2e60d36d2d38da053ca524a29f568d2b4af325021ab560545da43cdd0d5d3404e73ebcdb9b534da0b7de52c2acee5d3f2ed6511ee4e SHA512 58238e60fc20d210167afe2abcfdbbd826a693b5d587953437294c2c0e1ea9161486e2c583d29a7e2a0c8343e70e7688213ed011eacd155c53e232b336986701
diff --git a/dev-python/jsonschema-spec/jsonschema-spec-0.1.4.ebuild b/dev-python/jsonschema-spec/jsonschema-spec-0.1.4.ebuild
new file mode 100644
index 000000000000..66fd3efcb98b
--- /dev/null
+++ b/dev-python/jsonschema-spec/jsonschema-spec-0.1.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSONSchema Spec with object-oriented paths"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema-spec/
+	https://github.com/p1c2u/jsonschema-spec/
+"
+SRC_URI="
+	https://github.com/p1c2u/jsonschema-spec/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	<dev-python/jsonschema-4.18[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
+	dev-python/pathable[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	dev-python/pathable[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/--cov/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/jupyter-lsp/Manifest b/dev-python/jupyter-lsp/Manifest
index b9487e453aa2..af2154d10965 100644
--- a/dev-python/jupyter-lsp/Manifest
+++ b/dev-python/jupyter-lsp/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter-lsp-1.5.1.tar.gz 35907 BLAKE2B bc69791253bfcf40188fe2bae24a2681ce17835f5eb1d2640edf93a69285b33d426bffdf09c66308e6f79e33c4778e539fc2a7ed056fe64758e82acc6374b4cf SHA512 585c7b3b7ea87fd9d3ad27e3e4473f3bce56ad41d3b028173e2fcad4b0d2db5b1c0c89cd8c976c3f8b4d30ae7a63018dc1e19d4527b56eafe21ec0b5e89a538b
-EBUILD jupyter-lsp-1.5.1.ebuild 1099 BLAKE2B b615c9736984f19f6d5503381373a0bd032de0e0887775e42ec327922d0d0ce3593a5ffcacc9f79fbec9fc79a5879f93e4db21bcead6a05c5484737ce1524059 SHA512 4b055192a80d6397b462220c6de26fc81259249bc22638a4783761bf0040dce330522ffa56ee786c37fba221ce55dc7f76823f9eb7cc302275b2956105740567
+EBUILD jupyter-lsp-1.5.1.ebuild 1072 BLAKE2B f83446b8e824f4910b2c033564f14709c1449cb8543f6a3036eb266261f664575807be1f421af28954558adc23ad6308e4e6a1bc9a2ca544d87dcf33b9d1a9ae SHA512 9f706f2c53b1d1e6fc4be34cb4d96a57313f0c38d8c4bafb8e3c76f6f63dcf144831d58abde8a15dfb13e4c5cbfa7e5475d3b1346b6407e2a677dd4bfed7553b
 MISC metadata.xml 417 BLAKE2B 37e0faca144a5da718475df6e957d9664fa5a757735bf65985dba486180dce37621cf3c34cadef4dbefbdb5698192b601a8e0bb1c77f71ba5550e65e47cc5e9c SHA512 6b61ffc68a46993386baa1c1b95850edbfbdb8d4fa40c4111aaf4edbb7d8d4f8ed21960ee01e69e2a8b986f66c6ec4ff938392d7849e204936f05d62ce7e8531
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild
index 11dd9c072091..c6db33b0b8f9 100644
--- a/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild
+++ b/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1 optfeature
+inherit distutils-r1 optfeature pypi
 
 DESCRIPTION="Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab"
 HOMEPAGE="https://github.com/krassowski/jupyterlab-lsp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/jupyter-server-proxy/Manifest b/dev-python/jupyter-server-proxy/Manifest
index 8f0116cf69d0..3516adc8ff18 100644
--- a/dev-python/jupyter-server-proxy/Manifest
+++ b/dev-python/jupyter-server-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter-server-proxy-3.2.2.tar.gz 121353 BLAKE2B 4f7c8af14a149f13272ea2802e830b38a5167f1de80dab21e1d175cb96ba3b908bd268f6dbb02cfd4fb8991ffb3315c044405925358904f82b26d55f74f97dbe SHA512 320765a8a8b1c6f213bd9c8cf514aac44f40ce93fb27fa890d8c6a9ae158f92f1b3a7119b47067db1c4f38925815f647559b3c618a9a85553cdbf7d2dc0a3872
-EBUILD jupyter-server-proxy-3.2.2.ebuild 802 BLAKE2B 98e8cc44f4b70a6280a3627fbcc8effe8b33c729976dde2533118eada28dcfbb2bc1a17f720a14e4a3297b057bedb1ce036558823a99e6debcbc75a8224f0040 SHA512 a76a0fbaae97be024d12e1ad59009a2fb368b9ae0863c30b4f8135ad72fb1f6e1559061ec1d3d3ba1c6082395af12fdff561d67ca13b7bed0c21b112e2b5f13b
+EBUILD jupyter-server-proxy-3.2.2.ebuild 776 BLAKE2B e91b4206095e6f0b049c447c541e9daf2b4eeb1c3e4c126932f759f2da634294ab2a9574fd94cd273c231ddd123ec53cf860ab9d34da521f0d6c659dbc3f54a0 SHA512 5efd7646fe5a6ee5f24793095cb824ae6dc2376517d6cad17fd9fbe168a0552aea156566d8483b97172f5a90baeadb80ab2cb8f2867a6eb3a427e278e7099dda
 MISC metadata.xml 432 BLAKE2B 971dba91e8277c9ac0d7a9ca3c42d8c550bb072442021c9e0a9d8ff7cdb8f5f61cecf995a249451a9c95ccc5ee53108c2093de1fb6f5021a79238b35caf4b15d SHA512 3989d322d8b9165a6e2463c970176b71eb6c924b9baa489019ee84ba4826f5d522ba715947da72d3dfa7cf19b3124c550acb26f53d5e00f9473aacd8d8b4fdc8
diff --git a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild b/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild
index 4b1aef499b80..4233b55b9539 100644
--- a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild
+++ b/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild
@@ -4,12 +4,12 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Jupyter notebook server extension to proxy web services"
 HOMEPAGE="https://github.com/jupyterhub/jupyter-server-proxy"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 # The GitHub tarball includes the tests, but does not have the js stuff we need
 
 LICENSE="BSD"
diff --git a/dev-python/jupyterlab-lsp/Manifest b/dev-python/jupyterlab-lsp/Manifest
index 5bf534dc50d2..bffdf9a041a9 100644
--- a/dev-python/jupyterlab-lsp/Manifest
+++ b/dev-python/jupyterlab-lsp/Manifest
@@ -1,3 +1,3 @@
 DIST jupyterlab-lsp-3.10.2.tar.gz 269490 BLAKE2B 43e4c79e94f85497f83c8034d63164ae5e0820dba6a725048c7f11522d2ab98326e637c254251e96d72d35d7ff8962ab8750a2ba42681c4ef34a65bbb42240d4 SHA512 e154b1f382d2a70a3378f821b055d9a05e9ba748f3ca3e61974655ec3a06f73bc864ad18917171e1101692760fab44b830d2eb70676961a09e383b3544d8ba71
-EBUILD jupyterlab-lsp-3.10.2.ebuild 589 BLAKE2B dcf8d9567e76da4361a832801c4ac023ab6481c354240a0d8caa9ab99e235dd98171671e21603f548373d048ef96db60005c3f78f7804f554a8ce72b946d89be SHA512 34eb100b445130c3166a242f33ae7140016579cd81b5f84547b208a869f999fbe08d90d8161738f7acd7941bfddb4516004ec01f03056aa93d37c6ec1b2d5f71
+EBUILD jupyterlab-lsp-3.10.2.ebuild 562 BLAKE2B 56fd348be514b6f38f15d5a77ee38fcc3ccd7075ff767aa129adbebadc10776456213d78fceb58892f1a7d40601114622eff02731946ecbb5d303bd8410e9205 SHA512 cf76c6c2a83cc873354d062af6b6403189be172c816d13bf40bb848e1885d474e9de63b713f727b3023a48643808a897e762016605789aa279e88b989f85607b
 MISC metadata.xml 421 BLAKE2B cbd9c4e3ce5848ed3d0e57832082dd730d2d16a286070639602b8fcd49c49714e7f17b220251b9f16d9c5105248933390b152c060c68522d2c82b1958b09b116 SHA512 97ac68ac4e6920f23120a5818b4404fa0b510b165a44a6455a7bf76edfa298ca137f50bd9c1a87044253f5b873f881362c2667261a4c7fdb182a7d37325520b3
diff --git a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.10.2.ebuild b/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.10.2.ebuild
index 42280f81c237..b47017ddfb7a 100644
--- a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.10.2.ebuild
+++ b/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.10.2.ebuild
@@ -5,11 +5,11 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Coding assistance for JupyterLab with Language Server Protocol"
 HOMEPAGE="https://github.com/jupyter-lsp/jupyterlab-lsp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/keystoneauth1/Manifest b/dev-python/keystoneauth1/Manifest
index 0036b5600e7b..ec2098a12cfa 100644
--- a/dev-python/keystoneauth1/Manifest
+++ b/dev-python/keystoneauth1/Manifest
@@ -1,7 +1,3 @@
-DIST keystoneauth1-5.1.0.tar.gz 269600 BLAKE2B 5ea3885f34fe96f9a07f7bb5cbcadb1382ae5b06ae7afb627ad6b25b8b6d17ba5448f78cdcf1d89dd799d062950a8b66a1f58c5779fee7615db97557eb4ee9fa SHA512 1bb17818524256cf1a6a73d9bdd933451dae34f89be0fc6fb6a88f2207ce6b068e086b463abb904b0c9c20a9450b208321026c980e7af2cbbddc5bd75ee20d5b
-DIST keystoneauth1-5.1.1.tar.gz 269800 BLAKE2B 413149a14837ec4aebbb6e3a35ff3296ca0427a585262131373b57a53b6eddd1d61701a5eef705ab4db9e528c39a17e916b07615e7f41681cb4dd0f14583a851 SHA512 0c84e0e2bc251fdff54fb4fa7efa65e60865224c48da9a8b3f548101e828516d1cdb33d4a966015384a7107af7754017d6483c9d43a05788030a65766686ba48
 DIST keystoneauth1-5.1.2.tar.gz 269860 BLAKE2B 3c2d83c20991479b05675ce391357c26e4da2a2434f515a15aa900fe398f6fb5ae383cf6b4068a1205e49813406f632bdfe9490c435d5a8290b92c3dc0bdda8f SHA512 ff7e08114cc76d648c3879f44bb78b51e906fed2d34a9cf3e42199f1c5fc53394ad7b53f6cdfcb336436c482755d54891666369a0832ef9b846dd33dc4821791
-EBUILD keystoneauth1-5.1.0.ebuild 1970 BLAKE2B 1a60572345497904e33ea091b0e2e28f432f36722b4bd6f26d1e6def3159ede139189bf0e68e67beb5cf08254d3d62bbc8d317a566a758f893000f945e64224b SHA512 1ad032f5fa4202c329369d87231ff318dbbbc8514e01c1c569ae5c5fb4d3f7d6fc34cdfee6b1321cfa0488d320d73cfe95397dee82b230be43ddbbf9155299e6
-EBUILD keystoneauth1-5.1.1.ebuild 1973 BLAKE2B 1e6cf9a8667349bf4e0fdc69580d47347b769f9ab653c12564ce0cfb7ffa2a0bfe4f9a677c5d09145bdfb665422f6518d9834c853380f3f26cba9e5fdbc9d9eb SHA512 08b36aaae683849bbefe3be94a58e9386ecac48d2b304289b2964d9d3c13e8bcbf074b7f8ff2cf2e93149db649da0ed7c1580e94980c3a0b71cb8fd9a5810f54
-EBUILD keystoneauth1-5.1.2.ebuild 1868 BLAKE2B fb65122f772d7328510a49bb048ce413fbb92b25ce53e35356780b4fa07e8571527839ab8420ad83bf1bfa844c2d5ca6f1ed784f1becf0ad4a0c887557d3018c SHA512 205a9a207742286529ca1c491bd5a2ecd9f5806729ff3eee4cd83d685ac031a90e6dd42769c332372a70c3e968ca088bf1e51d64a9f375c4cc1b40336d3b0594
+EBUILD keystoneauth1-5.1.2.ebuild 1865 BLAKE2B c976ca945cbb7837eb84de589225cf1e96e07e1c8d8dcc6ea636560b9caaef26724eacb81fbeb3629ba0201e3ab27d8bd021f7a51c221762ee404f7e42478868 SHA512 4810a95890cdbc7a5f3ad81fb591868a07512fc32f0493b3e49338684543f01723d5346ce01c046aaf8f689b1d73128b261f8d09409cf4324915833e920ca839
 MISC metadata.xml 518 BLAKE2B 8a84b6a7146096e67c0517623f0680cbe7772a48d8167b1aaf34dd12f7f626c84e60c0a15b3d90ae9df6483c33d7b51fc5cbf51d35e4f409e04573eb8fe18d1b SHA512 9a5b7fe8f29deed8ed59d6b3a96cfbacd5b566d6aa6eabd55545f02521d3dcc7ef7347632cdbead0735d28004ffe55a18550ee45cf8634253900f0190f140434
diff --git a/dev-python/keystoneauth1/keystoneauth1-5.1.0.ebuild b/dev-python/keystoneauth1/keystoneauth1-5.1.0.ebuild
deleted file mode 100644
index 092b4dde4cb9..000000000000
--- a/dev-python/keystoneauth1/keystoneauth1-5.1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 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
-
-MY_P=keystoneauth1-${PV}
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-HOMEPAGE="
-	https://opendev.org/openstack/keystoneauth/
-	https://github.com/openstack/keystoneauth/
-	https://pypi.org/project/keystoneauth1/
-"
-SRC_URI="mirror://pypi/${MY_P::1}/keystoneauth1/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# relies on specific test runner name
-	sed -i -e 's:run\.py:unittest_or_fail.py:' \
-		keystoneauth1/tests/unit/test_session.py || die
-	# remove the test that requires hacking
-	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/keystoneauth1/keystoneauth1-5.1.1.ebuild b/dev-python/keystoneauth1/keystoneauth1-5.1.1.ebuild
deleted file mode 100644
index d454d61a3df0..000000000000
--- a/dev-python/keystoneauth1/keystoneauth1-5.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 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
-
-MY_P=keystoneauth1-${PV}
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-HOMEPAGE="
-	https://opendev.org/openstack/keystoneauth/
-	https://github.com/openstack/keystoneauth/
-	https://pypi.org/project/keystoneauth1/
-"
-SRC_URI="mirror://pypi/${MY_P::1}/keystoneauth1/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# relies on specific test runner name
-	sed -i -e 's:run\.py:unittest_or_fail.py:' \
-		keystoneauth1/tests/unit/test_session.py || die
-	# remove the test that requires hacking
-	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/keystoneauth1/keystoneauth1-5.1.2.ebuild b/dev-python/keystoneauth1/keystoneauth1-5.1.2.ebuild
index 241422ce6c5d..7ec23cb3e477 100644
--- a/dev-python/keystoneauth1/keystoneauth1-5.1.2.ebuild
+++ b/dev-python/keystoneauth1/keystoneauth1-5.1.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index fb199e966f35..ccbb1fdf50b0 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST lazy-object-proxy-1.9.0.tar.gz 42830 BLAKE2B 565315a3e855bc5335af717d1edc947fef57514c06036280d1f4666ab9642cf7e7b4bb145da87cbca14d9efa9f4869d7ad256031983a773580dc398fb7ce25e0 SHA512 2168254a71cf52ef406e5edf4653b9c8ae05392d4ad3c2e5e8e9f8db56152d968a77d14226acdf7d962f66d460c40add335615442f6f176d697c071f9cb137f5
-EBUILD lazy-object-proxy-1.9.0.ebuild 919 BLAKE2B 259f242fc98c6cf0531541c999cbfc437bb0670f2cacec25eb81970df1d4b181a66c63e5c07f00e3823eefc4d055e07b69fe182e2b85a709401a8e6286f20fd5 SHA512 8102c75e3d0b7f1f34f05a4b68df9b284927054f0c6a57e9f2f9ca713793bf7bfc1fb0ccdb4e2ab25e2ef8d22905f8b1436bf9b7d71bb06935bc038c08f1c395
+EBUILD lazy-object-proxy-1.9.0.ebuild 893 BLAKE2B 7b717dbb0b7306da46e1467ecde77b4d124fe62756c8234907d38ca9e021daa32c529de92403f5f75b53c020a67a216042898031a04829921aaae83d33d21439 SHA512 9e3381dabb5a9a89fdd736ad69d4e7139c2207231807bd28d8086c553e89689c3f735c90e84c7f6c0084429ec68a7a319d781d853dff3ba5c6539b4d311c869e
 MISC metadata.xml 540 BLAKE2B daf53065c3af28ec7316bab786a7ebfa6890de83bd6434d39052797a1d08d9e7e05fc437fd9994bc437ba0d38dc6ab1cb2e073c2c053fdf55817302800e97b19 SHA512 e66e27df4757f7d13912934551b7fb346d734789f1b0b17e5c875dd5261babf65188bd31966f502be19e953fd9bfd87a64d49ce8e1849b2122a30905d3639e9d
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
index 5161a0f1a01c..73480ddc1566 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
@@ -4,9 +4,10 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A fast and thorough lazy object proxy"
 HOMEPAGE="
@@ -14,7 +15,6 @@ HOMEPAGE="
 	https://pypi.org/project/lazy-object-proxy/
 	https://python-lazy-object-proxy.readthedocs.io/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
index 2de538ffbd25..61055b3f5e39 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,5 +1,3 @@
 DIST mamba-0.11.2.gh.tar.gz 37370 BLAKE2B 90228aa9668c5c79161aee79d92a9409e5df5d9d71b94f2ae8401ec5eea32ed45cf1b1a72eb596b6e24f140bf053bca4cec848830ae83c24b108ddb4a2bcd148 SHA512 8ca6207c9df7b3388db8ecabd13456e54d8811c24f695ccc638c90bb2c975268f9e803533808f9b099651ee4744376fad3b58eaa84a6c97605631368f979915c
-DIST mamba-0.11.2.tar.gz 37370 BLAKE2B 90228aa9668c5c79161aee79d92a9409e5df5d9d71b94f2ae8401ec5eea32ed45cf1b1a72eb596b6e24f140bf053bca4cec848830ae83c24b108ddb4a2bcd148 SHA512 8ca6207c9df7b3388db8ecabd13456e54d8811c24f695ccc638c90bb2c975268f9e803533808f9b099651ee4744376fad3b58eaa84a6c97605631368f979915c
-EBUILD mamba-0.11.2-r1.ebuild 970 BLAKE2B b21b36feeead22aea22d1c82e0b936e6f45983daf81a7beae1e5a7d39e7696af5d1194c0491c8b545867391002f13ddb59f4fdabbbe8ed18a84d6eef150946d2 SHA512 a43f538ef4fa64d37e8819ea882ac0c3afc2b0b768a48cf9968b97aa54d6ff11b2c2971fbb26d5cb16caed128f2b0c68ed4653710faf7b68030a64bac57f2af5
-EBUILD mamba-0.11.2.ebuild 851 BLAKE2B 6f794b3da798ec41da545993b92229de265f76c31ffc1aacf71b6a347a06452f67cb99440043dd3f665a612933c5ea46504414cdcce42f8f17935dea9cd55e3b SHA512 8e171baa641282857e0631fc04de7de2c48286293f5faffa42d0b9774e0b5c9959e4f707a259247fcf4f49993d499ed9abd938f5c77902af64b9348a3a112e5d
+EBUILD mamba-0.11.2-r1.ebuild 968 BLAKE2B 5bc33fcf6ed0a800375b4e247713a1d4f67028264803beef3a9598825c211932e90314669bc056418460b9e6ebaed5cf1f0bcef50649f1128470207cbe09aec8 SHA512 b4b9e13509b709259be6038daf41050d74ee6ba9fe671d68453f180235c0785f7f3bcdb48de6f17f0665b7216ec773b5af692853828401dadb5b8ceed9c62887
 MISC metadata.xml 300 BLAKE2B 890c49024db1a2ad04de3245e808924edce1e5007108c80523a1518318d92c5043945fb65324016853b583faff3a8cb03ab64a4d1aa421d3034ef54dd4f71a33 SHA512 0e1dc6cfd109165e1061f7156ddb366ec19a75e0bf5859970bb29eb3ed6dca659e9105975f27f086ce644bcf6342d7e53ef704545312c93f5de5af8fc45867e1
diff --git a/dev-python/mamba/mamba-0.11.2-r1.ebuild b/dev-python/mamba/mamba-0.11.2-r1.ebuild
index b266e06e2b44..0f5247cb1acf 100644
--- a/dev-python/mamba/mamba-0.11.2-r1.ebuild
+++ b/dev-python/mamba/mamba-0.11.2-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mamba/mamba-0.11.2.ebuild b/dev-python/mamba/mamba-0.11.2.ebuild
deleted file mode 100644
index 8f7dddc929b3..000000000000
--- a/dev-python/mamba/mamba-0.11.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python test runner born under the banner of Behavior Driven Development"
-HOMEPAGE="https://nestorsalceda.com/mamba/"
-SRC_URI="https://github.com/nestorsalceda/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/clint-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/doublex-expects-0.7.0_rc1[${PYTHON_USEDEP}]
-		>=dev-python/expects-0.8.0_rc2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs --no-autodoc
-
-python_test() {
-	"${EPYTHON}" -m mamba.cli || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/mkdocs-i18n/Manifest b/dev-python/mkdocs-i18n/Manifest
index 897bcb0a00fe..78e8ee5cf3e9 100644
--- a/dev-python/mkdocs-i18n/Manifest
+++ b/dev-python/mkdocs-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-i18n-0.4.4.tar.gz 17191 BLAKE2B 4ab926befac2c90b6b9ff55fd6887c8b78e88f801c820749df125ea97418fbfb0a8531b2168b508737e7dffbf426826433211ee80f25b80a42ae160f78a93670 SHA512 f9f27c0f274aa7ee5c64cee46d4165d51022cac0171f95a238b62c911e1be16b6a4ff227fea3b78de2ffa0095b9c95280e8919e207e6947db300a136fe16e659
-EBUILD mkdocs-i18n-0.4.4.ebuild 563 BLAKE2B ce8cf96dc4a90b351375379df130b4de2e9b5ae7cd8478eed0671664a8651136ff46de2774446ab5891959c6a72c6463ad6112d267247788f3d37099f80a8216 SHA512 e270ff9fb15dc71a5eda05e717e494f5e48ecf135be1e98e26d8cc8d5b388f67e71e455c7ab1694326ce68716def62c0e192726dec0f573394ec50610feb0dc2
+EBUILD mkdocs-i18n-0.4.4.ebuild 537 BLAKE2B 2156047cc5f60536a518d16bf0285609d9190a7dab876719f95ffb40add4812a0958286399a84e7c5a7485b2ff7f4a3a0826bc0ff89e60f68afe972651bdd75c SHA512 f844a7a8050d342cbe6df938add47fa26b2144df95a39449b851a4b3d99228614d3680941469c6f5255d953754d26969d87cc008948f4d6cb95e17297b22a3ba
 MISC metadata.xml 540 BLAKE2B 0b6e023e1903f143668642c8a150cb0610500b8ced2082fb31586a1157281fe21535c249e67dc19789cd36318e255efc914f7f5e29dc2af97e6f0866214b8523 SHA512 6bf089cea5ea6ce4547fd616ecfed754f68cc17d7caeed4f633ef41c4349cfca1c68585a1bab548db284dcfa672348b73e53a5e6610a73480913694df92cace6
diff --git a/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild b/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
index 4a279e04e725..55e8d4f9000c 100644
--- a/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
+++ b/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517="setuptools"
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="MkDocs i18n plugin"
 HOMEPAGE="
 	https://gitlab.com/mkdocs-i18n/mkdocs-i18n/-/tree/main
 	https://pypi.org/project/mkdocs-i18n/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
diff --git a/dev-python/mmtf-python/Manifest b/dev-python/mmtf-python/Manifest
index a5d83050e75b..60adb243d5ca 100644
--- a/dev-python/mmtf-python/Manifest
+++ b/dev-python/mmtf-python/Manifest
@@ -1,3 +1,3 @@
 DIST mmtf-python-1.1.3.tar.gz 46032 BLAKE2B a19d7e02b08bf7e4d0c820aa2fd06e0f01a10f807efcc0ebed8c2841dc82b0c27ff690934f941d360086217801c3722060a18805dc4144655b0707cc759b93e2 SHA512 44558ea3e38e8eb6431e597253473e49d4a4e3835f790f375f923d3c3702b3c096d5ecaac090a8fabc1cd285d6cfa8dbd3f7d6186d765b92d718ca6d34ad063b
-EBUILD mmtf-python-1.1.3.ebuild 681 BLAKE2B 641f8df3863d25fe2ada4ce853c5989d2b6512871e491f8a4d606acfa59bf5e1fda51a27ff7c047578127227f7321497fea5d90d8f5debf1fdd4ed7b1205dd9a SHA512 1ba71209388efc23edbdcc9ee2f7ce3a2d26f4911cf0dca89613563d50597d48886c88f7bfb4828c8974e8798abe5c0b8d0c62a848cd1aabf96ef8a247656551
+EBUILD mmtf-python-1.1.3.ebuild 654 BLAKE2B d9673acededba94f9435dfa4b3255900b6195995858be3b07c00014f079b8d8a8ac0db47a4eb15ac20290bd3393a9f39f6fb67284f3c1744ca367aaa1e0d6c74 SHA512 9fea30a96bee3819e75a653a7ece409dd23ad075d1e7a2fc9682614eeb96d9ffc642c1d367d65a82f38508371bf4a3f35727df418cb32f659ad53685912b5f62
 MISC metadata.xml 379 BLAKE2B 90b38a443c63992c8b0fc156013465ac50477ab361e5f2b09c25fd74d1440dc6380a917a27818aa5cb226224caee262dcee550ff658dd2273b546dcad5ef883a SHA512 a8b5f4777dfa84dd55cdba1195ccaecfa8063582d5b4759bfd6281b63769b22d80b214e508f0cdd0c54e8f8f011ed71195943fedfd668c39ad3e99084098d796
diff --git a/dev-python/mmtf-python/mmtf-python-1.1.3.ebuild b/dev-python/mmtf-python/mmtf-python-1.1.3.ebuild
index 832f3668a00c..4259745655ae 100644
--- a/dev-python/mmtf-python/mmtf-python-1.1.3.ebuild
+++ b/dev-python/mmtf-python/mmtf-python-1.1.3.ebuild
@@ -4,12 +4,12 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="The python implementation of the MMTF API, decoder and encoder"
 HOMEPAGE="http://mmtf.rcsb.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 37dd3abd389c..91581160db34 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,5 +1,7 @@
 DIST openapi-core-0.16.6.gh.tar.gz 104008 BLAKE2B bb1bdac98dfc5aef0961624488074363568f53a6c44cb0730be0d103d891d24bed86659f640e0d07da4072edc233c904c0ddcfd9e8b3960ace1af078c0d745e5 SHA512 556636a4698dcd7db6c656333849077abacdac1a440fe58210ad8f02c1f0220e46dea29962346dfb3f89d164ebc986ec750c184840be9a34a5e1dd98fbf8ef98
 DIST openapi-core-0.17.0.gh.tar.gz 129743 BLAKE2B 34b64f2c956218377d37c5f9e382aa503d50556d2a9ff292355831a39ff9632942b3dd6074cf91ba6cdb2fd93e12e4b3700232e720c71e814fde27f08052bb5a SHA512 6c284cbc8656b319291d81b73c3b714e1b9d8f85bbdf4b4636f8adcd0e47e59147f96a9cf117a6fcd49b7eeea4bbdbee28e3b60019add652e527c6af554d1cb7
+DIST openapi_core-0.17.1.tar.gz 85686 BLAKE2B f18b42fc496eaf4d6b82c15f66dd9c2eb9240402590b5a8e1f0e7b1e804c90aeef2db96d19683e9fea5846e776e95981ac52a38c47e2b56e6b5fd63d072b61f7 SHA512 0e2c673dbbfcce87ae7fbca6ec6c283d94c36376b1e17191d0bfa6c7001c62913381169b4614b5cd6131eaa67b729365036be3f1eb7641f634c0f3228de54897
 EBUILD openapi-core-0.16.6.ebuild 1846 BLAKE2B 73ce79257fb849664a63d4f0db159582f2926139119b1715498845b623f10b9acaeceafc0b6e95bf3631d02e3120c8f44e0d83e9b8eb76a5895531e848d4f8e9 SHA512 bdf757cf5d152b2bd0e56c1ff30f23293794e1f89a227b2ce322865d39fafe8068ae114e24ef59bc9467d73ab14486e237b4bb9e4fe059d529cfd1f4b2558066
 EBUILD openapi-core-0.17.0.ebuild 1848 BLAKE2B 26e6e6a14046f279d61db02c7f9dda8d7b4a5a6438e9d32e3e20c26bf4ead536dd88a9cf9c2e046bfeaa0d6b079183d710079d86f2614836fe95fe834bf222f8 SHA512 67e06e1a45c674b87a053be8a12dbf0a5ec3bcc01a104fb3553e0fa3c420993be800f0a0224dfa14a82dbdb6bf856701b2e4113dec217fe58a4edff3e32f0286
+EBUILD openapi-core-0.17.1.ebuild 1752 BLAKE2B 74de1a7c442f51ccea2099da31ba88496455bfc9636b7c6fa1c966b1ffc035199f1f33f5b449ac244281c066c5102e327ce94e2e19228f9451541d2aed4d1243 SHA512 33e3f1a9b16c20ed4f4e8360969c7e327c6501e2e6aa36baf2e8af1f8763b8814df59d39a3ed43e91da94e1c7711658925dbac55a635a1e3e6475ac46b0ff5da
 MISC metadata.xml 385 BLAKE2B a19f5b70529b6f0575e1196f3ffe0a7f38595fe7b01b43119f0f89c41a9ab5d6992f424a10f345a7407d279736a6091918b9ba1ead0daa92c9d244e4b27e4a18 SHA512 a8a39c8958ad11de5eb6896a74b3bfcb27e95c74a984a362032e4703d86f2831b6559a96a8eef80a7ef89f4687da325b3748f36b1df649cd29c2acb1ea0c9969
diff --git a/dev-python/openapi-core/openapi-core-0.17.1.ebuild b/dev-python/openapi-core/openapi-core-0.17.1.ebuild
new file mode 100644
index 000000000000..1db135f6e88e
--- /dev/null
+++ b/dev-python/openapi-core/openapi-core-0.17.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022-2023 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 pypi
+
+DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
+HOMEPAGE="
+	https://github.com/python-openapi/openapi-core/
+	https://pypi.org/project/openapi-core/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pathable-0.4.0[${PYTHON_USEDEP}]
+	dev-python/isodate[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	<dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
+	>=dev-python/openapi-schema-validator-0.4.2[${PYTHON_USEDEP}]
+	<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/asgiref[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/starlette-0.26.1[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# falcon is not packaged
+	tests/integration/contrib/falcon
+
+	# TODO: these tests fail to collect
+	tests/integration/validation/test_security_override.py
+	tests/integration/validation/test_read_only_write_only.py
+
+	# unhappy about modern django
+	tests/integration/contrib/django/test_django_project.py
+	tests/unit/contrib/django/test_django.py
+)
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index 4b896a676486..5e32040dfec7 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1,3 +1,5 @@
 DIST openapi-schema-validator-0.4.3.gh.tar.gz 30639 BLAKE2B 370e3cc4e6c9892912dc77114ca867752f46afd1555f91a3721f41a9c4516fdffc0416f2f1028f4717ca8cc1a1ef2ec47607b7ef2b6578a0b01afb8ddb6660c8 SHA512 a930ecafe2e4c1d4d021a71fe9b8f35c496320e5c5198e2ccb57d82e01570430c4904cae7bc44578bc95be63cf5c709c5bef1d96014c3a66fca3b4495c5e455c
+DIST openapi_schema_validator-0.4.4.tar.gz 11626 BLAKE2B e4247f07476d472761f46c98d9259383e960641b910334d967e61f55c63b855c752176e7217f8870016ec3767b0c1c45e8863ca600e354eb5aaa62bcacbe8d51 SHA512 273e3d7080c794ff277170e55e67e32d65211469642652437e59f985a002b20bd2cc8643d2b0214dc232980dd69c2f87ea748537552c66999a110b2e4be2125c
 EBUILD openapi-schema-validator-0.4.3.ebuild 795 BLAKE2B a16d35a1f7e38907ae3ca55ae6a7745abe416f3b776506f1cb96086ec6b9fcf0eb0920fe47be454ca15b53d14b389ef463ddf6f4f6d09e47222a7bc7e5010528 SHA512 bcefcd7d354627e6e379469eeea554e881413332f51d0d16e052bd5b68906df7f0ecf82c5b1e52af31656ca79dbe89bef73e2f797b2d55026d8724b13a9756e9
+EBUILD openapi-schema-validator-0.4.4.ebuild 736 BLAKE2B 2ac5b64542f1dc85d1341f05abd86ca8ea16f9ef3c3802341ca5f59fc3caaaaa4af375cf1aa72b2e9bc5767169cb6c5be2ff6548120e7f7dbc80ed300deef3f3 SHA512 4028fad4debb5ae9d5782f1991208ba3b58db24a089c7b0ba667cdc1e309058bd52bfa90687e88b145653ea2f85de1f6bf603cc9b7628215da41d926ce9e26fe
 MISC metadata.xml 409 BLAKE2B 601169266922e87a4fddde77d3528759d1f8470f28b865733ef6be57551f01675c9d5d694cfe9e7823dc9b360b9354c0bb74fb57a962e4f7155775e26b9fe3d7 SHA512 e4a29fd3c48b7b317b52354a64c7906f2ae87b1ebab275ec992bbfee421d677ea23a3310b1f9de44b75bf131738a308ce2a6d28712ea493b21c9760b43efe569
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.4.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.4.ebuild
new file mode 100644
index 000000000000..8fc31514fa27
--- /dev/null
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="OpenAPI schema validation for Python"
+HOMEPAGE="
+	https://github.com/python-openapi/openapi-schema-validator/
+	https://pypi.org/project/openapi-schema-validator/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	<dev-python/jsonschema-4.18[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/--cov/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/openapi-spec-validator/Manifest b/dev-python/openapi-spec-validator/Manifest
index fef7a9e02894..978befb41b5c 100644
--- a/dev-python/openapi-spec-validator/Manifest
+++ b/dev-python/openapi-spec-validator/Manifest
@@ -1,3 +1,5 @@
 DIST openapi-spec-validator-0.5.5.gh.tar.gz 57200 BLAKE2B 037566130546d2cc894dd12e0fc0d80fe9631f94085ec286a61ea810c58b48cd7837cc044388773798a7684fa4d73bb89eed643a164280433c1cd8d6a9cd42cc SHA512 4b5415216e74937a0c6f527850921f362a3183119a641d4d369cbf3e6aa19209ec7d8ff05697eed7dcd1ee6d0e8fbcc9cb8aaa0e3eb46e4da34bc7a0a4b78c00
+DIST openapi_spec_validator-0.5.6.tar.gz 33031 BLAKE2B a884ceb915f232232406bd880a7eef9e588e1a42ac9a78c2e23f91cbd71e9af471c764550a9dd214ef68ec24ede7ab0ba4624429e4fd8133011489d0039aeae7 SHA512 ea1e810ecf49ff3d237e3368cd2cbcc6b733e9657f101759860ef16d3e2f14c97ccfe52fae2897d12a50c803d709d61d7ef8b40b288e5f73265da9ac5c88280b
 EBUILD openapi-spec-validator-0.5.5.ebuild 1837 BLAKE2B 5655358dd185ec09be2892819bd0c30aef75060106f8626c23bd1892dacbda94cdc1fdfb93a5c0402f4af18b289920e21347afe4bf2005aec05f528f2736704e SHA512 54056463e40b755ef644c5b264de5e3264a842d77ac936b37d2f8ab865e841ec6cffe978a8d1a11d5eced48f398718a393a797829bdfb0addae9aa380f243975
+EBUILD openapi-spec-validator-0.5.6.ebuild 1780 BLAKE2B 86f5791a361edb1d791df0acd2d2821004ef297892911d9222b6e4b8b557fb3cde9604b09e91f6432d431942c6cfabcb1056809a55b4de76575397ccd22bc87d SHA512 8274c2a5a3919f71b1a8006577558cff42af635b2164d837ee610ca2c35ef6431ec62e84a49fb4cba3920abcace2f86deede9073c704e6aaef20df676dff757e
 MISC metadata.xml 405 BLAKE2B 82dfdb0a9a068a90ad245a33da95883f863571b12e3d354cee5b7e10b9c098f3635b25fc1871db3b384c5218c2305c90e9f185c97619ba142735b03de90bde01 SHA512 a3f926750e11ce7b8960fa7adef139a329b7dac777c78acfc2cf24225862d8f04a2bb8edba36f99aabd1ea44f93220afefafe060dce6418fa03f360c129a344c
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.6.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.6.ebuild
new file mode 100644
index 000000000000..851d3026ea8a
--- /dev/null
+++ b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
+HOMEPAGE="
+	https://github.com/python-openapi/openapi-spec-validator/
+	https://pypi.org/project/openapi-spec-validator/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	<dev-python/jsonschema-4.18[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/lazy-object-proxy-1.7.1[${PYTHON_USEDEP}]
+	<dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
+	>=dev-python/openapi-schema-validator-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/integration/test_shortcuts.py::TestPetstoreV2Example
+	tests/integration/test_shortcuts.py::TestApiV2WithExampe
+	tests/integration/test_shortcuts.py::TestPetstoreV2ExpandedExample
+	tests/integration/test_shortcuts.py::TestPetstoreExample
+	tests/integration/test_shortcuts.py::TestRemoteValidatev2SpecUrl
+	tests/integration/test_shortcuts.py::TestRemoteValidatev30SpecUrl
+	tests/integration/test_shortcuts.py::TestApiWithExample
+	tests/integration/test_shortcuts.py::TestPetstoreExpandedExample
+	tests/integration/test_validate.py::TestPetstoreExample
+	tests/integration/test_validate.py::TestApiWithExample
+	tests/integration/test_validate.py::TestPetstoreExpandedExample
+	tests/integration/validation/test_validators.py
+)
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/ordered-set/Manifest b/dev-python/ordered-set/Manifest
index 1b8fef25a651..fba7eb812148 100644
--- a/dev-python/ordered-set/Manifest
+++ b/dev-python/ordered-set/Manifest
@@ -1,3 +1,3 @@
 DIST ordered-set-4.1.0.tar.gz 12826 BLAKE2B 8e1d1510fec429c002062584cadb1dd64a1131889345629cb73f6fbc7dbd1ab06a4f97d43ae54c8dc1f21bb243ab0706cefe33cf4fd634fc5af28b10806cee1e SHA512 f12d19f7d9cf0ebcc414d97798f0959ff69a77146839cc6a9067c864f9e0be795795c4d648f736fd7448ddf89666ce37f23e7380d1c9b1678a4787961e4e1e79
-EBUILD ordered-set-4.1.0.ebuild 687 BLAKE2B aa03bb234ae4520165e5543b9326e63866156e65bd617951ca55475aa7fb0ca5b95ad206d957efe8f8e02a36a21cde28f78049f092a4e42798e7f55b87d4e1a5 SHA512 debf0c22a8d3054df58c06bd3d3ae3d94d206b99c2d878ae23c77f3f6eba8c449dc7e17374a08fb53417d1310af61a28067b2be99c304bf562e056c0b72c9f1e
+EBUILD ordered-set-4.1.0.ebuild 660 BLAKE2B 2aa0a036d017d99d518d84fc87de7c60224d460be806b0f554deda22c3307b1fa2e24acf0441a3cb91bc23e2543c6524cd0b6dd3a542dc40f4a0db4f50ca4a00 SHA512 47a1ba807a8fdf43f16bee0faafbda80c97f961b6f4b2cf33a424babd0c8c49205901f64ecfa5c15ba43b98287e5b6243b282fdcc3bde0e9edac957e1e90d52e
 MISC metadata.xml 721 BLAKE2B 045167f7fb929fc55fc96616209e965b7bc61e656a4ca1d396e825ee202056e0ddc4a5f0c6a84159a75349c34c8724a46687930df57b2deb78aadc33bbae3f7b SHA512 bedcb2a0bb8a61ba238359595ddf744f25832db24b11c8a64cd12cd37caa0dba3ed4bebf8c9f25f4defbe627432e0296f5195727220ba9a7fea4a7d5ee015f99
diff --git a/dev-python/ordered-set/ordered-set-4.1.0.ebuild b/dev-python/ordered-set/ordered-set-4.1.0.ebuild
index abf745626980..96c2e79683e0 100644
--- a/dev-python/ordered-set/ordered-set-4.1.0.ebuild
+++ b/dev-python/ordered-set/ordered-set-4.1.0.ebuild
@@ -5,13 +5,13 @@
 EAPI=7
 
 DISTUTILS_USE_PEP517=flit
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A mutable set that remembers the order of its entries"
 HOMEPAGE="https://github.com/rspeer/ordered-set"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index d753044db4fc..807af2a0d6a3 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,4 +1,4 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-2.1.0.tar.gz 48257 BLAKE2B c88d2c9c34103abfa60c3d983ed50309a2a552cf275f48e3c1dde9837b98849d09062546c5bc096d978a059afbae54eed9eadb8aa53375aae67f409bf3cf3e05 SHA512 31f53e5bafced1d7d57ac8818a7b889506b45347655ee41db6d5d9c0a6f2ead2a6d820553aec4a6ad9fd817abf9d6b666938a24ba85ab3745e06bb10b312e33a
-EBUILD os-client-config-2.1.0-r2.ebuild 1116 BLAKE2B 382094e29c1a87368840643fd481124c0ea95052c4c4464443882ea540d09f79315fbc49933adfcbba791fe15578ce04485757a1266f0efa9b321388fdac2e92 SHA512 35b51d954d0a75baf4c0d05fc6499e21e51440f681cc33ea5c989bec66d1753299480db9bd6fa0b0de143ef6eb283137ba6df8dabccaf722742a1f51dc253257
+EBUILD os-client-config-2.1.0-r2.ebuild 1089 BLAKE2B 109c8d36d3ea72966ea1fc01f34b691180f8abaf7ec2c85076b2e33166c3fdd8188fa273671c2d2b44e0b59ab24a3d1b103a03d81aa3b3abe9031df5e810c3be SHA512 8d7777e373f0885462e3586b922b554ca2d6040a2f0b20f8d0939e033e19f30c617afd3a8971a045037d2424671dc482e352e2b362d42e1a08da1a4a884331c9
 MISC metadata.xml 476 BLAKE2B 5522345b88cd6cb95631c8b391617d6c42ec4c32ccb78321caa7cfb6649d30dc20710ab0ff15d976b3cd3439483c08c44b354c44e2ea2f9e9dbbb72812f89975 SHA512 30b3055b7e24c72808c5c196e42eb755c9cf48e0be6ecd808c0725118c5de54634c36ff7d2972df59c240aaa129fa3032f8a1a5c372b1ef68f71fa2263211774
diff --git a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
index 71bd813e009f..c00b60280766 100644
--- a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
+++ b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="OpenStack Client Configuation Library"
 HOMEPAGE="https://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 21dbc35599be..c161252faa32 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,3 +1,3 @@
 DIST os-service-types-1.7.0.tar.gz 24474 BLAKE2B 8adf1cf29d61cc37d08e7282d5b07312345a59ed94898da71f13702f51d4f3651b18d34cb51789fbc560a10c5dfeb8d760aca0fe25f630c7c00fbfd0fd4072c1 SHA512 d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57
-EBUILD os-service-types-1.7.0-r2.ebuild 806 BLAKE2B 1eba34157a854c632b3e0d9e491abf228e5316455e88b3d7a01f47273f3959be81669a82c3d85740ba2c1ca7420778de7774e65a67c2af81af191d251ae587f4 SHA512 5a2329645cbc67587b1a6c80019bdbd1f72669ef1cdefc8669bcdd031c7955abc1be814cffb1ec9dcb06678c932283d74362003df009f574f2a701bbc5136dca
+EBUILD os-service-types-1.7.0-r2.ebuild 779 BLAKE2B fb99261143738362bd388669edfbfb24de75cee8e8b9a3a40f373ddc133b72fff615778a2a7d936dec1bc549bc1f6decf4b1e7a412e30f15b5015a61f5284861 SHA512 f9511fa3b35e21bbe4b5ede1702609ba0388d5e8fc99ca590ffe5c65f08af434b03e6c6ae918cc1290d14dc16092589121eb26b6dcdf8c7c02c3261629a40536
 MISC metadata.xml 479 BLAKE2B 4938f0bd922ecbb31533b39c79b0dd063ea3cf3516714a66fe60d3e683c0064d7d3fbc8dd0bef95ee6f701dac3d6a22ed0528b014626464ebc6b762c4ad96aa8 SHA512 a41c9dccd4965c90e599a5ef74687e33f334b4d6a2f5bc0949a30b3e8a71a3689973c34e4e4eb3ed048a6653ccddc81cd9ce9f6c18fdc4015ff4418794052e00
diff --git a/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild b/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
index d7a9e151110b..a81ae46db087 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A library to handle official service types for OpenStack and it's aliases"
 HOMEPAGE="https://github.com/openstack/os-service-types"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index bec400ac33e6..00bd6d870758 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,5 +1,3 @@
-DIST osc-lib-2.6.2.tar.gz 98556 BLAKE2B 69973ad3543ff16cea81d4dc3f749f147c62daa3d40d048acd3b39706a9a7d53f11de50c096511fc42d15db9d983e1085996fea5781fd5d17ac1f50d34de0a83 SHA512 5e310265dc0d77908bbe82a479ce55462d91393d09cf39732434fc52a4bcefab0a945aa5ceafe5a2c76a9214704f89509a667a85cf6f35210db8a48c35e2642d
 DIST osc-lib-2.7.0.tar.gz 98224 BLAKE2B 9b0d34b628ca413641413ccd92e2a712938eed5a7124e9bae78a281b705be9b4dd2e3c9f5e322f10712361b3e09cfd3edae593a1c4fec6108ba0e946546141ff SHA512 edeff7097e8869b9ef4c888043c44eabea281b89cdac26da4a54fac708a6c9b3c10c57ea3bc76b8ed735c9d803edbb52c77c13c97a07614ce102cdac24a8eb5a
-EBUILD osc-lib-2.6.2.ebuild 1539 BLAKE2B 2244accd743164b64c07d69d7d748940d595e843bb2fa5d62bcb97efd6111ee3bb523fe58cbec1bd30ad1e4b267d6a1b4fde00b5178bb1df6fc9921de6acd736 SHA512 f38c49404c73708f56c89f56546d1ac3b64b81e6111f9cb647d107d3bd6bb841fea9d3cc4449c782860b7017934fa1c4dd5edcf93fe8f2714440d074b775da94
-EBUILD osc-lib-2.7.0.ebuild 1514 BLAKE2B f027067ab7b8f077bdd88922db5504f1cf5b7034752c8f083bf0e19e35bd60ac3b36733521354368b0259a685b2a8fac92172fe8162104112494f9ae5bda24f2 SHA512 e6af9f5435bc75f93851eb72fbb6733f16886ccb0a817d4427ae8d2969894f928fbd14db87c4dee30c7460d8fbd2c0676b76eb2def508211030f69cb48271b78
+EBUILD osc-lib-2.7.0.ebuild 1512 BLAKE2B 4c8ae37b34e213b26b0aa2b19da3dc0da21b6878a0892e96129ea2344c9eee02cbe904b52123a2e03ae3368cc361ff924a6e57449fec47cd47b48de840a0d26a SHA512 bd9511d90bb264f950cd35295708ca881711d31555a79b5d5b4da1b9461d111325a352d43dd6b74aa0cbb2d597dae4dc5eef0c147680ef04300c87a76176a4f6
 MISC metadata.xml 836 BLAKE2B de71d2a55a0b65cdabf503321d91f3e708f50189e6a06e11ce96f0d273286e1a6b5a871726dfe33784b91e941463500c964cb85c583241b003d3742b1d91c92d SHA512 e132c2ed9283d65464a151c918ac4ca91793ce850c7bb0a7b63178ddd42cb59b69b036acce0a8d0078f4b1b778a2361ca6a6f6e01d83e12cdc76dd8682b5b281
diff --git a/dev-python/osc-lib/osc-lib-2.6.2.ebuild b/dev-python/osc-lib/osc-lib-2.6.2.ebuild
deleted file mode 100644
index ddd85ae5734f..000000000000
--- a/dev-python/osc-lib/osc-lib-2.6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 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="A package of common support modules for writing OSC plugins"
-HOMEPAGE="
-	https://opendev.org/openstack/osc-lib/
-	https://github.com/openstack/osc-lib/
-	https://pypi.org/project/osc-lib/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# need to skip all tests under TestTagHelps class
-	# checks exact help message, based on another unittest runner
-	sed -e '179,$s/test_add_tag_/_&/' -i osc_lib/tests/utils/test_tags.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/osc-lib/osc-lib-2.7.0.ebuild b/dev-python/osc-lib/osc-lib-2.7.0.ebuild
index 6ee6d1efc8c0..9fec8f9fac9c 100644
--- a/dev-python/osc-lib/osc-lib-2.7.0.ebuild
+++ b/dev-python/osc-lib/osc-lib-2.7.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 6086566d85c5..51a1612b5214 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,9 +1,3 @@
-DIST platformdirs-2.6.2.gh.tar.gz 21184 BLAKE2B 4acc85301f764d4457ace88f9fb409e4d2f8bb17b9133dc3316c4d265a7cf50019298f1ba4cef87f5999b48fd7060687f7008079de26ffe74740a4cefff9309e SHA512 704cc39ba1746055e0459139759e118bd6178fb13cc8ecf580f58d16073fbb8ade0bce8b5eb9230ccc45b19f622a41c84a06f8698ee722da9d5cec44c5f46e25
-DIST platformdirs-3.0.0.gh.tar.gz 21358 BLAKE2B b7dd6d55cc07d9e584d2e3f4a8a1e3bcd5b75eac6786c4225c9b249af9d98cbe0c8b1edc7a6180c147ad13d0a7d5c4fbc9f15cf71af03590c011f7fd4ae336a4 SHA512 36885fdb4767e2525eef48e8ede6cec8013d2e8767c7940381d642faa14382583885c2428ce7b27fc36d33048494354cb4d16b42eac2748ca4458b8c124ed01f
-DIST platformdirs-3.1.0.gh.tar.gz 21721 BLAKE2B 5f7334c0003d0dcd51473820239068dd441ecc18e7837822f824f8ca2e5f5915aa89363eee27740214b97c1c4bb258a4ffa2ab6b4963bf6e9346c13fed6dc0f0 SHA512 49ad7b15419aff2c5af5c63a8850378d688eb95aadcd0c489d26fe4eea8315caffb17136fa7cbdf4a945bebae2eb8154ddfb771ed6fdc47595eff590e0f32ccb
 DIST platformdirs-3.1.1.tar.gz 14712 BLAKE2B ddb070cc3c572b03eaa356599d2a0e408f7f0a650378e60b4a7b4fcd740fb9117c73491451588b26d42a4db9b971dbc690f9ddae34ec03e42248120ff5e4e64e SHA512 537557370a05f78279c88cdda4b5abfbe1d2e6d91d69c4dd4049c6b1a8ac3e44a830d787e2b86af85c346e0244a6ba26233db061d7c8d0a3fbd141962609930d
-EBUILD platformdirs-2.6.2-r1.ebuild 1375 BLAKE2B fdd1177dd124e5a3411eb86eeb0f251483df463137e0aa9a3dd61ffb8176b109e5837a039727b1b1a7eacc40f29c5cc1dbd6a7dd029c3a9c88a17fe64dd4eb6a SHA512 c8694385b07d5ea7bb5f185ffb0f5ec14cd4bed7e6c24371de2a50eb05d7b34a6d7d131825b80d409b9a179cd67a54d460c1f737535ce0a87bde7a170d59ec85
-EBUILD platformdirs-3.0.0.ebuild 1414 BLAKE2B 68954bd97f7ec0d195695c17a179b8030c7bd0f1149253cb15d8aad73835036faeffc611e64e160d55282060bc4bacbd949d472f5a684e5396e958b2db0a810d SHA512 79953dc5e4aa2a36c40b1cf9151ec1ad41a44591fd08d15f343cb1819e16088e361d1a5a8bc56f4c20d9e32410b52b6896913b905b4dcc2ad5eb3f4c0d376b9a
-EBUILD platformdirs-3.1.0.ebuild 1427 BLAKE2B 4edcbd6fe7eeb8f474fcd49f881953bfddf3ff21262b353d99ad514eca9e8a185ec53971c13449e5162daafe089bc04d8f2005f0d7e1a34a8fe730fe48e442da SHA512 c60f695597a45a31d3c102de0bd5311faba9f4f486ef5e3407fe43fed3b89d1a0b7e80925c60cb06a48eb1b99ae5f0a2bf9a3ba063ac57b3b60baa94303eb1fe
-EBUILD platformdirs-3.1.1.ebuild 1333 BLAKE2B 73b2af2bda5ef0ec53e82fc4d4d38643670d58e269b187998faa6f0fe22d66ac445f4d2df02ca63d7a4dd069b2e3aee22132087eaefa4a8aa3ecca0982935356 SHA512 a1fd7fb535455d11e64563f967f7251e1f0c7666372c0013e8e7788802febd51f429a01ba8204365fa0dd790ba744c7f280f6f345f8c1271b6a484b5151ea696
+EBUILD platformdirs-3.1.1.ebuild 1325 BLAKE2B 2b5b310d0ad321ca6e1120bed1eeb1c83c01329e217a41dad48c2ca70e677a38dafb426dbacd9c124fa96f98776883a3e57b09f4ca5da8bf1ad1a6338e8fe319 SHA512 aa00625d3b938c4560f67076a8a9061b0ec5c00aaa6e51beb33301d55a0c4b06160ba840269e6ab2bc5e1c8d4a4bae1982dd50808a9b23f6bec2e0b3efab1a28
 MISC metadata.xml 383 BLAKE2B b8c8c1593d154e7a38ca4bc450c14ca21f2411ea1d71f67e9631c1def0acace43ebb6e67adc0c4a1f5f14aadfbce44d0d815fc3696410bef66c826fd5fb00a45 SHA512 f4ba6722e1cf661b3febe10bb15755a9cbc30226a08bdcabfa3d80be87b42d662d6a1edb3412ad79e8f36836a6dd4fd91a83dae29725ec47041056dc1f1f9b75
diff --git a/dev-python/platformdirs/platformdirs-2.6.2-r1.ebuild b/dev-python/platformdirs/platformdirs-2.6.2-r1.ebuild
deleted file mode 100644
index f35c13ebc2f0..000000000000
--- a/dev-python/platformdirs/platformdirs-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/dev-python/platformdirs/platformdirs-3.0.0.ebuild b/dev-python/platformdirs/platformdirs-3.0.0.ebuild
deleted file mode 100644
index bb833077f5ae..000000000000
--- a/dev-python/platformdirs/platformdirs-3.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/dev-python/platformdirs/platformdirs-3.1.0.ebuild b/dev-python/platformdirs/platformdirs-3.1.0.ebuild
deleted file mode 100644
index b876a13536e6..000000000000
--- a/dev-python/platformdirs/platformdirs-3.1.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/dev-python/platformdirs/platformdirs-3.1.1.ebuild b/dev-python/platformdirs/platformdirs-3.1.1.ebuild
index 58e26b5de925..1ef6750de3f9 100644
--- a/dev-python/platformdirs/platformdirs-3.1.1.ebuild
+++ b/dev-python/platformdirs/platformdirs-3.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/precis-i18n/Manifest b/dev-python/precis-i18n/Manifest
index 90c492380f36..d4820fa6eef1 100644
--- a/dev-python/precis-i18n/Manifest
+++ b/dev-python/precis-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST precis_i18n-1.0.5.tar.gz 67710 BLAKE2B 7995c3cb74290524d70ecd75b052201df49ae7e9f4d0052c8176756866ba8533d164b057f0fc4c5c47b938a20e36898cb52bec411b56461cb9c4e4f7029db4ed SHA512 ba3b43d4a84de02e002f7e62a7fb75c4694f3c6a8963e5bdfd9927989c2ee84317fc5fa6f119e79bb1f88dc97a37a06930829daae3969d6a5b2f5ba57bedc3e9
-EBUILD precis-i18n-1.0.5.ebuild 595 BLAKE2B 992df0aa6fff57f934abadeeeac528f3cd7c767e6743cfc144b1bded027b9544285f2191ff5d571122ed0ba2b85e6cf4c8f954c00491130ab1fd39f4a8267a57 SHA512 6487480b6494b659c106c2a8a9e894b91df94933067bf668902e661af5b15ffd6e6bc1e61293d746f1fed98007266956bdc142d5351b4ee2fb3266155da228de
+EBUILD precis-i18n-1.0.5.ebuild 505 BLAKE2B 306f88a346a654f4ce05a17032bf9d0f27a599529e7c75b3dcad506b072cb16f545d538e83a1134ec9139a3f025a005b26b6d3a62967232f9a19f9b564701714 SHA512 e1da1bbf33bc00845186f54c5025c7199291024f0aa9b15b7ead525f82c42a2f6b173f10c36379baf9aedf5cb9a582a69e0ba0c58ac1c1d851bcc6d05c557961
 MISC metadata.xml 992 BLAKE2B eb9ed20de9967e142348667d23c3b81b0962a35b606806c1795abbbf1c1366b300673c30733eb8254a84518a05d5211356e1341dbe2d2ab56abc5e9a72520735 SHA512 22148b307c78c80b9363f00ca984431946a4d7275799f71a8151549b475d6671aced5ba790b050b8dc16d6136ca534c89f96c5ac8a49edc8267417fa39367cf9
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.5.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.5.ebuild
index 31c25af77de2..8576c88ad74b 100644
--- a/dev-python/precis-i18n/precis-i18n-1.0.5.ebuild
+++ b/dev-python/precis-i18n/precis-i18n-1.0.5.ebuild
@@ -6,16 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
-MY_P=${P/-/_}
 DESCRIPTION="Internationalized Usernames and Passwords"
 HOMEPAGE="
 	https://github.com/byllyfish/precis_i18n/
 	https://pypi.org/project/precis-i18n/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index c8c2af0b0b7c..674f1bf4025c 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,3 +1,3 @@
 DIST process-tests-2.1.2.tar.gz 11554 BLAKE2B bf4716f32b8d5e6cd8d5f8eef1156c09545fe22e48134fa0f98c47172141f0365f1995c2dad94c4e3a6f5a151883f92048bcd943fa07faeb7eff9c60f18555df SHA512 56a76d8467312de34413994e663eb63378ff179720b883037735eae9d8f23a5cc0ea32d4a9a2f9041af417b5ada07b7948fd481e3d5b2cb43db3c19183f6b263
-EBUILD process-tests-2.1.2-r1.ebuild 680 BLAKE2B 61b646cfb0f79329c45d6e90084f2865dd380d6ef63364c8b27cefa51e53cd3c0548403cf3eba53847659397d9aa18160af3581ab9a97d9895f65dd33d85b95c SHA512 f3f9edbd94d1a2f87e653038068cbe143f8d44e8a6c3c5d179a797ad21d43a2b866313a8ec64e9982fc25b1eabfca765d3f5425163644aeba92b1f8195f883f9
+EBUILD process-tests-2.1.2-r1.ebuild 653 BLAKE2B b74df1637e9e74323024bed33fc2bc5f1228605d6e9d64bccaff570b438dc656a5b9648062ba49bf79e4c67d6b3dbee45e04d6d69c299259c2de993f8ff4c528 SHA512 78d0072233d8a4637e9118ab3f96f85b29f194fb622db8ebad9c7a93756f595851070d951f0ceb80116307942e49445ab0ef6338c239909749fcf0bf81a65852
 MISC metadata.xml 409 BLAKE2B 7a2bae7ebc779208f6e0eee56ee22501bda63f16cf87e692db98bab91570cf7c34dde7f1a41212b15e4cf88e41882dd1208a8b95de4af8989f012564bcf7f6e5 SHA512 71b33097b25a8ab5b37c52ac641a4a14cb667f82601a0eac53e5e1758c9a45d7132ce280533be4b833ae34756de2992c11c0671f75ffc45e095055e704b84852
diff --git a/dev-python/process-tests/process-tests-2.1.2-r1.ebuild b/dev-python/process-tests/process-tests-2.1.2-r1.ebuild
index 3ec2645697b9..6bee6fcb6243 100644
--- a/dev-python/process-tests/process-tests-2.1.2-r1.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.2-r1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Tools for testing processes"
 HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index 6e3b75e2c5c0..82ad9000d961 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -1,3 +1,3 @@
 DIST py-cpuinfo-9.0.0.tar.gz 104716 BLAKE2B 667f5d420fd7eeff74e5047ee05220717585332c0b8b2a61422c3b4505f9c71c6b3091bbf3ebe29a3460b574a873cea423cffb5a83c49ceec3654a1558e435af SHA512 c7711137d60ad52bcbef8738a70fb48ceaa69e1e1632d135d0ee95c282b02df6170c3dd88a1e14b3e9a386d3286a15ca9722fcfb596107da022161a7cf84509a
-EBUILD py-cpuinfo-9.0.0.ebuild 533 BLAKE2B 5e9ac1e017d542526750aa557f4fa5ccdb2414775ccddf2f13b9a5f4d3701672f3a5785a877e8d6075259abd2294c4fa210c9c4a83423db123a67e1f7d6bdb43 SHA512 ece623027adcab22d8d9d550ede3f2e65b1f5f707323b61729c8abf5949eaffee120b8e69e03639e211bd446607e5f0b7cc379cce154e40510443bd5aa9c88c2
+EBUILD py-cpuinfo-9.0.0.ebuild 507 BLAKE2B cde652e081e1b8a337a8338cfb7e16ba4c7882b2f30cf4f1f47eefa824291232eee081beb2d9ec6692b31ab8b93f4835d049e9329653110ea9ef3bce2e7189da SHA512 94b2b7efe9f52b78a54c62671c6c9adbbbe4a71a443dcba041de644919900889d33c2d73c906cd09c96aa45c4acfaf1951d3c9ad405d5d5dff7a50d260ee3c1e
 MISC metadata.xml 532 BLAKE2B 32c0f690bf91102b46b486db560e99ee94400c0c1bfa5ae00d4dff415d92d9c57931571d6f4c233221c1a8ea82c1f16629ba68dfa76abd462d953152643d098a SHA512 88a5a900b83df3680f1f437329758489d0de63da450921397b4c3256decd455ad134da5a1311fddee4bf9843b3466a6c6e70b0e6bad6bb7d90de9b73c8e67dcb
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild
index 9e31f5523103..6602ecf04977 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( pypy3 python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Get CPU info with pure Python 2 & 3"
 HOMEPAGE="
 	https://github.com/workhorsy/py-cpuinfo/
 	https://pypi.org/project/py-cpuinfo/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index 45236d4d3555..eb42dc75faa3 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -1,3 +1,3 @@
 DIST py-ubjson-0.16.1.tar.gz 50316 BLAKE2B 442894a7c010d1ba4a836827ca17e7cb10b34a6f5488851ce13a3c3ab02d8173250a664da4504bca9fd2d9377631e249127c789a4824930f8b35db2225902e9d SHA512 5c5e48fa236571832fbcd100ebe0efd7522a8f5773b74475e7b102fadc4e2917549640d12c5afb2aadbe65a6973b75540681da1df8febbf47f84844bc9337fb0
-EBUILD py-ubjson-0.16.1-r1.ebuild 568 BLAKE2B 3f0b70fd1837d8608129900533fa93a41d9bfc2ed5a79a7733500289652955974198d2315524c292fef6b0e9cfc138cfac429019640f6f51ab37645a11c13f08 SHA512 cb96bc28ab53ef02e378b05d1e4597d7c95d2ea74625e8c076897df6f708296644ab486d7dfea98a4c4bb3092f67554b3f678bcf9ff317d323e44853cdef9b36
+EBUILD py-ubjson-0.16.1-r1.ebuild 542 BLAKE2B 4dd3ba6d3cccf1539ce368f816d54b1b5832af468e344ffff638d5c5885a23272fd40e92ff26e3e83ff603bd94bbe5000c71ee3d96bf1ca31d7df950a181e9bd SHA512 8172e359c8ed298b526a9e189629768f344bbef043ff72034b4d172ec72978f3ab86c87ec322a12471adc655becb229cb162b4c52b48d207f9c250e4e69204ac
 MISC metadata.xml 635 BLAKE2B 3d35f4fa84fed8d035d41dfcdc25ac5c520abf0eb564f1cb815e066c1bfbd03d29b5cc3a2742deb9ae13641f234155d2dea8505139723e87fa1eb7e95230fa52 SHA512 3037619d567221865da91b597164574437ef07b51c2d690760bd55a4406d838470eb272600c92264e5248ff4b347c7084fb3b498cc98003f6abf02259b8cdc7a
diff --git a/dev-python/py-ubjson/py-ubjson-0.16.1-r1.ebuild b/dev-python/py-ubjson/py-ubjson-0.16.1-r1.ebuild
index 5da37708acde..ee99e2d85014 100644
--- a/dev-python/py-ubjson/py-ubjson-0.16.1-r1.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.16.1-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Universal Binary JSON encoder/decoder"
 HOMEPAGE="
 	https://github.com/Iotic-Labs/py-ubjson/
 	https://pypi.org/project/py-ubjson/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/py-zabbix/Manifest b/dev-python/py-zabbix/Manifest
index 25b314b9b3ed..360a5865f1d6 100644
--- a/dev-python/py-zabbix/Manifest
+++ b/dev-python/py-zabbix/Manifest
@@ -1,3 +1,3 @@
 DIST py-zabbix-1.1.7.tar.gz 11447 BLAKE2B a61450f4d1783bbf6879b94300ae71fbecded5f232c234402d19c59af9bea5f1ef164c549a433a4b221032b6105d4ecd0f3515104ed8f02d3da8888ee3c45a90 SHA512 eaa8c5e5ad5604ad4ad41de439ab7856f6907346caa56bed67520df3316f313038e300cbf96f8389dca5be30079392406bcbb26f3ba40d2ef39ccd2fc99c11b6
-EBUILD py-zabbix-1.1.7.ebuild 394 BLAKE2B 2f3073c2074ff80b6866dbd3ba40d4f7a43ed5ce5c26a5720e9c8e9c124381bd9d381999a00e6d5cda8d12dd86a1dd67bdc5731bbba8cd360ab1dae4347c145f SHA512 c7a33d6aa2335a6d397ddb015ec91df1484858241ffd2d680000d8aedb6462dd3d7af515c0be56ff006432c155285233fc73fc87d2ea5cd0c1123e1ad43066ba
+EBUILD py-zabbix-1.1.7.ebuild 367 BLAKE2B c6981d422777b9f16aae9603c84ad3550cda5e0e347bb051aa94d828060b451ce48ddedece0d19f0fcc7e4045dd2a09a128b4b752c2c653b5941efd9657b3b21 SHA512 7e13908a1f2fd77c28c0c0c72fe9bfac5e85346dba8ffb4ef9065754bdb5409ec20709d3628dc408dea92f9973d2b4ecfdba11bc430ea77f006a414587e95d3f
 MISC metadata.xml 415 BLAKE2B c6b256c5c180ca8757bbe50011098fe7b9caf7a2fe1e28c2e0f587a4c157b9c3e7c0fd8f2c8760f518916050a1c9ebf3a3f959b4d7044342e5fd1c135cea925c SHA512 0476ad17f1066eaaa770ee7101bfd0ef927deafa2290c1fff00437d75ea72518620700f689294d8774780e1198c5ecccfb98c1a7124954726c6e9a53d3d59be7
diff --git a/dev-python/py-zabbix/py-zabbix-1.1.7.ebuild b/dev-python/py-zabbix/py-zabbix-1.1.7.ebuild
index f3ca445cac16..183830d6c8d8 100644
--- a/dev-python/py-zabbix/py-zabbix-1.1.7.ebuild
+++ b/dev-python/py-zabbix/py-zabbix-1.1.7.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Zabbix module for Python"
 HOMEPAGE="https://pypi.org/project/py-zabbix https://github.com/adubkov/py-zabbix"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/pyClamd/Manifest b/dev-python/pyClamd/Manifest
index 942761d7e065..7db272b26289 100644
--- a/dev-python/pyClamd/Manifest
+++ b/dev-python/pyClamd/Manifest
@@ -1,5 +1,5 @@
 AUX pyClamd-0.4.0-remove-obsolete-bugtrack_url.diff 827 BLAKE2B 785e75cf5094fd32e205eb1db5749ebf6fea1fb415aee3a1fe587864147ab6a81340b85d24313e17c5ea1d6467beb8392fe5c5c3c30ce6a9afc50f38e6d04520 SHA512 23fb59f17a498a6f10da49eb23e728366c0e6101ce588c76eec818658fad75390c6437b094bbec42b10dcca4465793862e511d311d4b3ba020f4c13f85f767ec
 DIST pyClamd-0.4.0.tar.gz 11177 BLAKE2B cb69c9e1fec936d416a18658a2c3e9df4dc4684cf56c19e8a02ad9929b4c86d9985395c38a8f88f7053f81fe08fa3574c6a206bcc519a9494c2a61caf6b995b1 SHA512 b96e26729e0fe2600572534c0fa22a01238761589f1771e72a054dde9c1b8f122493c83ca04cffda167f7a0e44fbf309bdf76b8fe1de499ec50d56c677923bd4
 EBUILD pyClamd-0.4.0-r3.ebuild 538 BLAKE2B 7d89a864ee11bd3b1130533323149331ad2034413832082f5e39c0eb1b1210083e919e52572473fd1d00cc66208acca5a29a2def8390ac747b03713169cf4337 SHA512 1f9df464decab577a15a6456be41a43c18aa26a29972c5e1859d5ac5ddd64bffacca879cb166f336a57b8a06de074f0a819f756a7b6be956bc180efcb5621a62
-EBUILD pyClamd-0.4.0-r4.ebuild 640 BLAKE2B 53863e074c3ca2d6523f540e0342166bb23213cdcbbcc24a636bf291538860a5cabcfcfbc5020ed8d3517f8e21a72a7d9f1d1feaafc13a7cab793840f3be562d SHA512 dd75b00654b4aea0746a07ce813cde7020eec0d1fe9bdecce2f916c7114fe1227f3d387dda6588fac39affc0b4e5be3c6d12c94b4a5447b59a74e924099b4d46
+EBUILD pyClamd-0.4.0-r4.ebuild 621 BLAKE2B 28dc2bcd63247c472dd001f9640ffc966c9680dedeabf93cb3ed2d41dfb680be963432eef2ca6ca9927ab72d2761df3219b668fc5148c06354a33c29416bbc70 SHA512 109eb5bc33454bbe228df70d94cd070f331839004d5729ab5839f9d7325063aa9aa729b0a0fc610a17046b2ae860a9d7753b54755a7b846baf8aaec332b75ed6
 MISC metadata.xml 295 BLAKE2B cda80e8a0e2125cf0a97ab3ea3c63f588fb57afc25d1559cea145e09676c7708f2c7aa271a7cccabde61927f8a6e5e3200b6ce5b4597eb9a8065f7938fe9201a SHA512 54f6204e9620ddfa126858fd5c5ae7400245759999362f355287276df4d6a255d34322bd70e08b875bbbfceec7099b39db214008a6ea5458a74845d3a39e3952
diff --git a/dev-python/pyClamd/pyClamd-0.4.0-r4.ebuild b/dev-python/pyClamd/pyClamd-0.4.0-r4.ebuild
index 34ab2e3d7a34..84e48e7e0184 100644
--- a/dev-python/pyClamd/pyClamd-0.4.0-r4.ebuild
+++ b/dev-python/pyClamd/pyClamd-0.4.0-r4.ebuild
@@ -5,14 +5,14 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 PATCHES=( "${FILESDIR}/${P}-remove-obsolete-bugtrack_url.diff" )
 
 DESCRIPTION="python interface to Clamd (Clamav daemon)"
 HOMEPAGE="https://xael.org/pages/pyclamd-en.html"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-python/pyDes/Manifest b/dev-python/pyDes/Manifest
index 24e3a2b30544..9c4c98f7e2ae 100644
--- a/dev-python/pyDes/Manifest
+++ b/dev-python/pyDes/Manifest
@@ -1,3 +1,3 @@
 DIST pyDes-2.0.1.tar.gz 9878 BLAKE2B 45a2d0575519afc389abe080f2c3a6751c5ee1f973e9e4370f24c5dbf9d85882e875682005eae3d749a2e11bffc3cd46868f83baa58f9e7e4feb7a25db641a14 SHA512 9d2a048dd6f629713d93d5cfcf5eaccb45a28fd3942f6837baf492bc6d9f0fcd16a1611e467231e9abfa6756d1684b0848c2190195e9e772bed2e6574327885c
-EBUILD pyDes-2.0.1.ebuild 409 BLAKE2B c14c219923878555afdf6b543ccba4ef2a4d195edfacbe945ddeb24b194dd6ff6ffdbf7f3c97eeeb290724a4ac1d1ca59712c3d7d678f761764b5ea80a8ee8c2 SHA512 d8a3a96fcf3187c81c8b9e94b3c4f923012f3eeb9cba9976c15c41f2b68167e4a2499f55551d8fb62a2d767261db54584c4380c467469f2cf1f48ea5f2eb5a4c
+EBUILD pyDes-2.0.1.ebuild 382 BLAKE2B fa6e288f35ab60e5d6ba37eac5f0f4d86467259e3cc785d35d65cf3f3edd463bc8028bb7fa9c1d072e3672d52566edb4dc5e75325fcca29947d736f7702d7f27 SHA512 d2c03012c8d1a87a72c2dee92f01523832233d9f4d894625b73a9fe5e440c570ed1b088df2e0265c794815eafc4412f53982596e6a2c26f65d940819854383df
 MISC metadata.xml 553 BLAKE2B 3b9ae242198ec6f8454f95de79914a6a78d8c38e7bb6d101f3912ad73d3564eee03608406a5c21f59622e835739f932f73b551ee144e0f7d87bfede983ade363 SHA512 3c5b0542e9dd74c09ba1412c8b0823f933f4b06cb6013cfedbb0f3d7b4ec7e80abce3a93888d046b61e5cc072f8a23f2ddd9fd64c8b25d0166df9d17e5ea5823
diff --git a/dev-python/pyDes/pyDes-2.0.1.ebuild b/dev-python/pyDes/pyDes-2.0.1.ebuild
index 0220ed413584..c0711df34d23 100644
--- a/dev-python/pyDes/pyDes-2.0.1.ebuild
+++ b/dev-python/pyDes/pyDes-2.0.1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python implementation of DES and TRIPLE DES"
 HOMEPAGE="https://twhiteman.netfirms.com/des.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 43a0564fde3d..766a745fd9a7 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,3 +1,3 @@
 DIST pyasn1-modules-0.2.8.tar.gz 242864 BLAKE2B 22b6cc27d45d19d8e7f5b12c8aeff1fa379bd567fda6b1dc0fafd00c0f4367d32f21cd48cf3cba140f2f11ba7d258140e8014c8420300451ab1acff475d28da7 SHA512 fdfcaa065deffdd732deaa1fa30dec2fc4a90ffe15bd12de40636ce0212f447611096d2f4e652ed786b5c47544439e6a93721fabe121f3320f13965692a1ca5b
-EBUILD pyasn1-modules-0.2.8-r2.ebuild 737 BLAKE2B e55c52cdae9c7238b5c85400e8cefb75ca860c241c2b18723d1114513a517c8ae22f0976f1073788e9777e788f8a96e2bcb03aa06510f0903d768d8db0ecac58 SHA512 c7669d258d59bec57887e462004561df9472986b10d54755e694e119008667b45c3a7922a938aea9376b20442cf13f590ba9c637b7081fb651691125da2d0b48
+EBUILD pyasn1-modules-0.2.8-r2.ebuild 710 BLAKE2B f34ef1392d3590c62c16a6cef73c0317cfb989f5834cdf960ba520dcffaa3ef7a1f8aaaabbb0e2fbfdc5c85b3402f7d4a2695182657a9f51ada761390b767b8b SHA512 c7aaa157aa60e9fcd28a99eb1a475c05e9c79498185800c9a68b09580186d980e1848f322a569391d0b8b85e628b2d8d7e53078aef24745e4b9e3bdd67d3d9f9
 MISC metadata.xml 404 BLAKE2B b5d3c68b942e6c2ff5a1cf31cc0b43ca1570e1d4280a85f376d7b81abbe540ca889f87039dd26fe1f595a2ca8b47acc4ec03bfc5598ba06a8e651c60c2277c93 SHA512 c4784ac61152a9d609e337f7c186b214b2e3add22d54ea7cfaaa0c8fc4fb9e0895617d0b73692aa7326088dd7b7e1ced8a871ac8312abc1f6b09fb558a4d385b
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r2.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r2.ebuild
index 2ddd9d47cc07..e10a8f685e32 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r2.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="pyasn1 modules"
 HOMEPAGE="
 	https://pypi.org/project/pyasn1-modules/
 	https://github.com/etingof/pyasn1-modules/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
index e665ddbb5643..4e3049f3cabd 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -1,3 +1,3 @@
 DIST pybtex-docutils-1.0.2.tar.gz 18450 BLAKE2B 84521d36994e3ca5bfdcebd308e6aaeb17f7202d024799612d34dbf58b1b1e58d42b898a4c792815a472b0a7008e28558fd722f39462cd3b1ee24b921f746a4d SHA512 1190fcbdfb89b858a1164dd2c99a5da7afb76a23f5b314963babd894e7578d75e80f2552319c6621e9c7738018fd1b8f4a3772057ed65466f2d9fc3e15c57e2b
-EBUILD pybtex-docutils-1.0.2.ebuild 564 BLAKE2B dd13d46ca13f7674cb25e48b230c2b961ac5df5d35252bfbf304f9d1413de9ccb516652a1ae4767965d95c2e94f84677ced1223eee5fb2f8335156f6dc3ce908 SHA512 2e49a56ed1a6eb86c990600576bc80acc63ba56068052e988395d002584d9c64c82cf54bbd7a64cf03e5afbba4649594e3aac2983fd3a93d99f9476037536d24
+EBUILD pybtex-docutils-1.0.2.ebuild 537 BLAKE2B 95d4c66511e6eac431cdd5bdc30e573188975b9cb7a4a3bb7d98412d79dc59c0f9802a832820d0a8e2fe3252e98e37d479415fc4b282eb5f9ac337467ffa0859 SHA512 947c34abd8c8413c1b19308ea5668e4ce4ee3576dd3f33f4ea159285b15de7d4469481ff7bf3599e2996393439f8a32d296d7afb78c24243cbf9f39bfee6970a
 MISC metadata.xml 529 BLAKE2B af193891d1d709d75fa2f89fa828ff5c946ebdff0b405ce06582e1222a7c3b32ec47ece3dbc96337ca11e6c3d510710954c256da58d7a171bdfcedce3e3c28da SHA512 990fa90122af363d3ed1af301c37ac1c5b3ece06e8712982cbc514d8ec7826a1ac174488b174cdd617bb820c0db269ebf515fdedf636181940af759ecb190916
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-1.0.2.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-1.0.2.ebuild
index 2c757a0b9114..4766f006b40d 100644
--- a/dev-python/pybtex-docutils/pybtex-docutils-1.0.2.ebuild
+++ b/dev-python/pybtex-docutils/pybtex-docutils-1.0.2.ebuild
@@ -5,11 +5,11 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A docutils backend for pybtex"
 HOMEPAGE="https://github.com/mcmtroffaes/pybtex-docutils"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index 748994979239..d91d567d71d8 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,5 +1,3 @@
-DIST pyproject-fmt-0.6.0.gh.tar.gz 15082 BLAKE2B 9ec7126530c98b984c5346bfd65fa817967dc7def60d16eb93e63ff690eaad53209d49483e19b5e87caf7b879f6661862a68606a0adb3b4513ff119262ff99a6 SHA512 50c9dcb468213de62e86edd500ae001815a83d8374ac1d36467fd7c560a5774862b001414f687d588fc0622ba5896c83338d6833ac4c248d2b4aa111fefe33ce
 DIST pyproject-fmt-0.9.1.gh.tar.gz 15434 BLAKE2B f9dd55b4106e875c80127ac60b3a54d4bdadf3555266a74cfd811ab96500879a7efb8eac71a041b2c33486bfcbc1f818a26a3ae3c50685f35cc3712691a85bb9 SHA512 ade87f43927c74e0328ffa8ac542bad204cc283d694f6921c40c86ae0a941ae50cc43fa4078ddcec28ff0d6003ac34a54232ea23d2820b5b2582482b22ac2a7e
-EBUILD pyproject-fmt-0.6.0.ebuild 861 BLAKE2B 8d4b076b7b2af9273591b0022f86c15aa97ad14b62d345305bcddd3f59a964e44756ed10a55dee26b867dc002b3f04ba81488ae4b624b347fb549d197e79d54d SHA512 2cfc68b195fccbd3baa2b6a3d9911b226fd501daaf260996d420ac612045d51d193eb70659dee44c00c9dddb59946a4064198fb3b6b35bc2b87a72439d10f93c
-EBUILD pyproject-fmt-0.9.1.ebuild 869 BLAKE2B a0539489724d2079740af64ef020f0e69d50851c4bedcb0ab7dac5c41418391ff5f4d973e71ef71ba16109667d2168cfdd425970e99a7db413d0d2950388f3b0 SHA512 b6f4da4bbc9187e8843408b0b83704bed7547f03627aa957f99508aa1329789fc4d0188245b3e57994b38a0f1e3f1fdd4885aacbd043c9e77b9f01fda3028543
+EBUILD pyproject-fmt-0.9.1.ebuild 861 BLAKE2B 8d4b076b7b2af9273591b0022f86c15aa97ad14b62d345305bcddd3f59a964e44756ed10a55dee26b867dc002b3f04ba81488ae4b624b347fb549d197e79d54d SHA512 2cfc68b195fccbd3baa2b6a3d9911b226fd501daaf260996d420ac612045d51d193eb70659dee44c00c9dddb59946a4064198fb3b6b35bc2b87a72439d10f93c
 MISC metadata.xml 380 BLAKE2B f139b3f6c22d40d7c91b9b35db262813e299d1a3c1a1f8d6129e457fac62e3e7029a05315a3bddd9c4542764a33160c89b58b3b62f457efb088a7ae7cd86a936 SHA512 38bd0633defb67ee1831480c8b3896e158d0735ec74057b13b3c389cf26bd6ecb878f21d172f83293789d81ca2c30afedab8eaeb4ab1774b39972fdd5f805a81
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.6.0.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.6.0.ebuild
deleted file mode 100644
index 18ae3f04023d..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-SRC_URI="
-	https://github.com/tox-dev/pyproject-fmt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-23[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.9.1.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.9.1.ebuild
index a802c14c305f..18ae3f04023d 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.9.1.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.9.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-23[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index 199fb3490abf..7c4bb6d8a89b 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-aiohttp-1.0.4.tar.gz 11868 BLAKE2B d964fe29ebe10e80391ebcbe4fc73bf37e2d8568c4d7679493ce68392b5722d75735798a78f388134d60b9c922bac116b0d453cabae5a95fc06c4288cc5d4c8e SHA512 baf87e3aa229e8a4ab6746d277a923436ad2e0625825581c94a2fb0a9bbcd309bfc55186f8866589b65a75ccfd7d5b494d71554359724c0b2c9541ea94a177d8
-EBUILD pytest-aiohttp-1.0.4.ebuild 945 BLAKE2B 94c8fb90bd636f13760646fa42c4093f9adeb7d6c6f94699798d76397b4fd8324c3778d956a001be2f0fe506d9b8246ffcc01c1636499277f08024b0619c0606 SHA512 f0b5d649f28d9c5e46e9c6f66ee4690a548c67e7ad53a8f9f3654ad2b2d20b8c5b4cc9c2e557038c734299a426217bb68a5002e27088c29bdd6cb99c2983af1b
+EBUILD pytest-aiohttp-1.0.4.ebuild 919 BLAKE2B 7517518a0a99da6a9addaff3b864a4fcc5a9feda8e316ebd4fe0425c5dd3183669c4133410bd766a1d693c0b87c5b0d1b3fd7c9f5cba4aaa003073b84342a9d3 SHA512 8c5d10dd918f97c9c81e51ffc3a7291256b66646f7cd31193d3f15f60a4ea518fb97208c1acb8f1111b37672f8c42f0af83f64ddaa96b6c9c0b423d79b043797
 MISC metadata.xml 383 BLAKE2B aef07c31a48de61fffa14c250aac7d1de63b652f94d83c52d32df2100da3bc5be19f224078b1b984520cc7e0b3d80838379388aa4c0e9531317a79dca178370c SHA512 b73d692782a9eae48022738bbcf3771605c8d00bf73ab2499cc27f309069bb80a402cd1ce618df29de7dfd11c226514aa3ec7d78df1ea784c7221691febf06f9
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
index 1d3b7946d0fb..f16f1f72a8f8 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="pytest plugin for aiohttp support"
 HOMEPAGE="
 	https://github.com/aio-libs/pytest-aiohttp/
 	https://pypi.org/project/pytest-aiohttp/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index 30b96769e743..6d36f6b932c7 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-check-2.1.3.gh.tar.gz 21570 BLAKE2B 8873d649e63ffca1fc8ab04383467f4cfb6c34f3970db95f1d439a3526d2a8b3482524ec2eda6a09fb2d166a781ff94895b976685ee8846d8e80ff5de6fd47e8 SHA512 bfd3975d93e27ccda71944e66b57e7628c5efbbbb6d9ac137fd58c96de760a1a4059fbdaf67d9c8844d2e5f0d7c671f2768fe1ced26f9a5406b872627238f664
 DIST pytest-check-2.1.4.tar.gz 24770 BLAKE2B 72973951e900276e771c083ad8869afbff5305c922c4cbc3fa02b302c6c72f24616ec89f25c2cbc7a2fbe333a4a8c00e2436a2f55345cc8b9791a1e5c2e64125 SHA512 8bf110f7c8e7d76c394ece5b6ba83cdf4ebc459d3a79541c5077237a1caecd0ecc82a74ebc796de9cbc921f48d1c739d1c40dcbd9c2efa3b1ab01f0234238bed
-EBUILD pytest-check-2.1.3.ebuild 685 BLAKE2B 23880ae46ce4efbc11122f6d23688ed3b02d65f75cb304918cb33025d9cf43ccca02d10e086e96174dde8833db50f5412aac03afd54caf7de2038638e2703f01 SHA512 2c7d5f1f72b349770e11fd37b11f0620bfcadbef80be094f91fc12eb1ecdcd55e7e823d7de6088780a72588fa703a0126a2bb75939769269da0ba7cc7fb0c0ed
-EBUILD pytest-check-2.1.4.ebuild 625 BLAKE2B 3f3cf9e094bd52902dbcfaafc199e48b3283d8b0e1c0339c90dff8b2c7469b53735487a459df26929e0e6fd4ab0d24695da53d4e48a0de2ad4f78fd1ecd1ca9c SHA512 8b57faa2a0df2e1c732668c427faad77a77e924ce29fe042e16be2084f4cb433a4d806636324a823621611b4e4fd2317a4d03cb96c26af20874f487aaf2ea9ae
+EBUILD pytest-check-2.1.4.ebuild 618 BLAKE2B 66cae1ba11a7f10d0808cd69954e11f769c9a9f68e4538ad0d45da67577472718d4e4c4bb4a0e8476d5a4912f486782d9c90da15a5632cc1e1d1bc256447bd14 SHA512 b79e1f2bb340f65bcddc7a0d4d20709a909794e34a91fcf7116bd5c8bb0a8a0193a140e5a97eba83705e9f39f72b0ccae335f1bc59999795e78702e61bc719fb
 MISC metadata.xml 509 BLAKE2B 85ec27b195520ffaf65e8f9a0fe166f0ba07aa22bb8981d558f96d2d89cb00441478eacc47a482bf2243d26b015ff42a1058c2e90a58d7cfbb20bc521b5722f5 SHA512 8d9082c66dde73cd751e3b42fc08ddd3c1815f6a7882d1b659972e5fff64506de79265df97161d63f05e3106c818b0155c2c3e21c861a44d330ff57506bd64a3
diff --git a/dev-python/pytest-check/pytest-check-2.1.3.ebuild b/dev-python/pytest-check/pytest-check-2.1.3.ebuild
deleted file mode 100644
index 9c49d116eec1..000000000000
--- a/dev-python/pytest-check/pytest-check-2.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest-check/
-"
-SRC_URI="
-	https://github.com/okken/pytest-check/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-check/pytest-check-2.1.4.ebuild b/dev-python/pytest-check/pytest-check-2.1.4.ebuild
index c6cff2ff6c09..417168c0b477 100644
--- a/dev-python/pytest-check/pytest-check-2.1.4.ebuild
+++ b/dev-python/pytest-check/pytest-check-2.1.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-console-scripts/Manifest b/dev-python/pytest-console-scripts/Manifest
index 2f890c1c5646..cd2f96c2cbea 100644
--- a/dev-python/pytest-console-scripts/Manifest
+++ b/dev-python/pytest-console-scripts/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-console-scripts-1.3.1.tar.gz 14238 BLAKE2B 2c00af468d19500078f48ca38d20430ed426e66b2277b7ad233356969d2a72d51cf60e90a46ae7808e6d33172fa053cc34d45b1f618d866dd14e917e6b225935 SHA512 344e9379976d9a7541f9683f7646b47f7fc25d2ab8d941351811ada7fddd77497cc24f4bc6a6d5ab9388dd5b289ed125bcbfad869009fb3b80aaaa1b951d656d
-EBUILD pytest-console-scripts-1.3.1.ebuild 882 BLAKE2B 6a941dfa4a53efd4c3d5ac6fe2962bba49a2e4556685c461987f13f2039ec57017776758cde88748c16076aad0e2f0bd5c416357be8d18978450cb3187d57a8b SHA512 55b592a4be5bd002d57ce548f28eb54e847678560dbbe3d5892c1cbd259c66aadadad37d2d8dde8aaf9ea621f8464553afd917b07c6a28213b5084bc6aadc796
+EBUILD pytest-console-scripts-1.3.1.ebuild 855 BLAKE2B dece7d319e50f7bd92f2ae021b5d8958161e5ca6c4c3c075d40c77a2f542a1aedb6f3719512099bbbcbebabd22aa60dac2fb4ec7f80dee0261ffe232633d8a84 SHA512 503c4b072747974dd75dd5f415e3ee5cc1adb21d8129a046f9e09bd18f3d567a12951100c50041cd6cb36e70e25320f7544e114e6b8c4fecf33c8f1624134d72
 MISC metadata.xml 534 BLAKE2B 9d795cc21a80ef3c90b9b9a0eda1c124b77a8e91f786edfa56ac368cb68f6a33712b5041a3ed635da970f494282fcfe939312fdb688a5cb55dd6d3489f6321e6 SHA512 f3568e76d4699d0f97a5b26b2d381d064f60f72c4ef7de42c1994be98a6cd21b4971241dbcf3c324af2fed617438a238ec5ecfa03c00b37a93dc2d91bfc82250
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
index de4e12ca19e5..e07dc8975164 100644
--- a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
+++ b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Pytest plugin for testing console scripts"
 HOMEPAGE="https://github.com/kvas-it/pytest-console-scripts"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-datadir/Manifest b/dev-python/pytest-datadir/Manifest
index 5fc4672f8bef..dae45cf73b7f 100644
--- a/dev-python/pytest-datadir/Manifest
+++ b/dev-python/pytest-datadir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-datadir-1.4.1.tar.gz 7862 BLAKE2B 6ecd0ba76706c2fedf5964b3f6476176b2eb858fff9207b6286f6235d13c173f62fd03abeab2f5e5fd31506ee436c731d9786fe7937620bb1de08bb50f7b492d SHA512 e9a301004275235787de11242fe987665e4fcc89ca2d1168b27686f4d1506e506bdd517658edcbf2aca97b28dcb1869653e16412157b8ef313c1d4146f8cf4d8
-EBUILD pytest-datadir-1.4.1.ebuild 692 BLAKE2B 4335534a09580ca8c8cfec7c17c1064cd4b0039e730806f2d2edf6fe65144bd4c8ea053b2599aa1fd219fa0361a21215a4ed040903b9ed84dd8a5bf53a892375 SHA512 0619cdf8f7dcea70b28eb8ab9bdf30ad8ff71d1ff80aec58ab1f274e18810433c554645e23de3249f562091c90abc8c2ac644389587d9e8a8a147b4c519b4138
+EBUILD pytest-datadir-1.4.1.ebuild 665 BLAKE2B 0dfcccf68e189d9ce021a043260b0ec6451f93b6d9e9b500b05e041dc3652aaab4210e86994a2293c58dbdda76a57b598b93ac3a5824d6773c01fe42b2235c85 SHA512 ea5b0f5d8390ce5597fe75e8dec7f807468987085fb3ffc893667d25678069992ffa34f2411eaaff289bc7fe2dec36734522516a064360ed8264cdfa71295e8f
 MISC metadata.xml 526 BLAKE2B 6d56a6e24c9651bdd537a6a16b61db79a654caea9af3c777116f895e778ae079e3eddc2548eede6c2cc00502ad739b5b0c4b1066083b143f252b560f7dd56f7d SHA512 c0381a25a6665d2453868d2b4cc4d071cbec3f2a1c283d1e4b7361136ee223186e29cffb3c46f61633d7ef87878b95450c2dbb2c78676d7e97ddc6c8703337de
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild
index d39986b863c1..886d17c001cf 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Pytest plugin for manipulating test data directories and files"
 HOMEPAGE="
 	https://github.com/gabrielcnr/pytest-datadir/
 	https://pypi.org/project/pytest-datadir/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
index a9a96f651a1c..cb6d29a5f958 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-describe-2.0.1.tar.gz 9793 BLAKE2B e7816cbc68e1ed1e2686ce3437cd0f59a52191d5413dbc9e0d6f9530a57728ad0917d86680b91228aa55ce689bc16c4da83595f87d82f9be9c4ce222c46fefea SHA512 c74362d5f1b0f3ff6d35d9049e82b7dc54be6755f1daa13366c47dee1ab9f1b1085d8c9719952d75c3c6c58b76a2c5f6b0162c78e53da71fe09bd91ed27f6bf2
-EBUILD pytest-describe-2.0.1-r1.ebuild 797 BLAKE2B 172427c7fe15f8759cdd26cc8a126b849e079abec10f8b31903e983ba3196b9013be1db4b97044c745f19016751c12f9095154fdc5b993b7ecbfaa0f3949b3a4 SHA512 345c9f979dacbf8034847461e685bdb5020a8325ec2b1a30ee983675ec7722c4c0799053d1439426750c018f56dd9b65b91b7923fa741af2dab6efa6c37f8069
+EBUILD pytest-describe-2.0.1-r1.ebuild 770 BLAKE2B e0ac28db7e4432cd1d2c9434eb99ed2cbe71f0a40acff2993c8bf085a4160014a8721222a58db1b68e47541cbc4e1e537efa088d47a793e598ae95b6768da04b SHA512 091b09ac1291a7f228be92d940a1613e02db4b4b3e310d3fb6d4c680f013ac3bbad8bf959ba6db66739e68de4eb0909653a0a8e6ebec0e662f3035f30f44a1fc
 MISC metadata.xml 409 BLAKE2B 00d21d44dc08a1a7166d85d5be7ce30b7af5d36e3e28bdcebb5f4495f9a5508bb7bc7f534aae9c242b0708a5e7c8bda4e693a2b05efac94e4283b1c8172ac5d0 SHA512 60e89b39de96adf0c7b80aa46b67544bce41c95eb2076e6f546f04ae46cf7d69709f89b9475c8e5b821b52afa9b3c344f2f5d7789fb2ceeba49facadc5d4c56b
diff --git a/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild b/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
index 3cb8977a42b0..7f67046b0cb4 100644
--- a/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Describe-style plugin for pytest"
 HOMEPAGE="
 	https://github.com/pytest-dev/pytest-describe/
 	https://pypi.org/project/pytest-describe/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index 8243d14c5b5a..d4a45208b927 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0-r2.ebuild 697 BLAKE2B c48dd34d445ade02dd8faeef377b156ecb5935b31292eadfe8e4ac71dc66d59a9023800bf0e0cf2a5ea077451677821c984b675bc78e70c79864b314f2cb0d7f SHA512 3cbaa257b8491a9b9b3a5568d7ebc7a6e992006e4abef47027447e0650f3508ff11a522283d9e40eb6eb082cb123c22b0caba859ece928de58bb72eefaf2e230
+EBUILD pytest-expect-1.1.0-r2.ebuild 670 BLAKE2B 90433000d5013d672c64eec903bb74d237d5f19457c3fc4b27b24467a3fa1e16e19135f93ea12542e1c71f92c64af1d1e987c3da1c877e50620f65ede4e9f207 SHA512 23e54a1f7d7a887b63b7d7686cd6b16bb79c810571e1f0705b99bdf91bf4bd966079116473c1e86b61e85391a3cb84071ef1cf2dfaa6be5509fc069449637da9
 MISC metadata.xml 509 BLAKE2B 1b9d7d7de1d9c71841b14d37d912d52e68cf24e3a1cfb2c1091bfe42461a824d5c5255cda0e7815157a2b213ecb765f22f471ef71a8d1bd7830b5381a676adcf SHA512 2ac21f6b29012b417025b9c377a02c36db6c6fc7753fa4c278f9c597dcd5da8dcb5f9c7b926c3a03ad64893eb6ea0c14e6409e867d88906e94392023c218df74
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r2.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r2.ebuild
index 2e18371e4583..d13e58975a47 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r2.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0-r2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="pytest plugin that stores test expectations by saving the set of failing tests"
 HOMEPAGE="
 	https://github.com/gsnedders/pytest-expect/
 	https://pypi.org/project/pytest-expect/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index 92e9e791589c..e9b7b7fc969b 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-fixture-config-1.7.0.tar.gz 9884 BLAKE2B d844b07a8b7d59f6761ee71147a0945225a3f30bdd9b0751972bf6149b444ad95c49f3d5001d6414c535c1a230ed1e47ceb90b26c50324ec21165430e633cc21 SHA512 c861bbbb91efff338255734ddb4a8b615880c32a12c981160e9e7575d38adff8c5febad46bb9b4208634e39d4cfa73dec342265ccc1951168c1b12fd334cd746
-EBUILD pytest-fixture-config-1.7.0-r2.ebuild 770 BLAKE2B 0250d5ee2599900c3dc8e439652f3766757da64a57eef1ef773e0df49cfbf4b24b137c77d985ec6e9bab9b93bdc49239f3eec4c60c813133859a01fdadcd03cb SHA512 d29c743a56eb985bc5cd036a145f89fe2b336d5a69bc53f7c7e58d6faf42d2fc9052910c104a8f1b668b0476fc59b3452a9ec24d5d94e4967681e817b6d7e00c
+EBUILD pytest-fixture-config-1.7.0-r2.ebuild 744 BLAKE2B c325b4a8013b55eb1fdbebd1d845d88412df010b502e9fd7ff6e6dea504ca4c5c88edd77b36c35eba36492433d5ed8c25b5e9a89671ca9b2e9d9f60d596ec323 SHA512 5d4820e2befa8ef4c0e5a4615b37b17d7a3f2c986977653368e330504872ebeb5ef4e385268616cbe7d767a9da9cc236479f3b733484a05ca2f4e06a5b7b2f29
 MISC metadata.xml 679 BLAKE2B 23a9fd64a55fbcfc0cf51c23fc76615611c8e9dae4b1f349e210cecaaf80a5c08518e00e99b5f20928bbce9a8ed5d179b2228b0e88eed94309cb805d477df6d8 SHA512 907d88b5b91aede0deff69f42d6fce39a79f18ee8e510feb2772cc940b5f55e52152fc95aa2e542867dfa6c6dd36e7cf96c91ffc618ae0cfed287256d288598e
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild
index 4ac4ef588178..acfe021202d4 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Virtualenv fixture for py.test"
 HOMEPAGE="
 	https://github.com/man-group/pytest-plugins/
 	https://pypi.org/project/pytest-fixture-config/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-flake8/Manifest b/dev-python/pytest-flake8/Manifest
index a7b0395ca07d..70a94056e9b6 100644
--- a/dev-python/pytest-flake8/Manifest
+++ b/dev-python/pytest-flake8/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-flake8-1.1.1.tar.gz 9144 BLAKE2B 4f9984181cbadf1d14f2bfaa39a801eb40506457d5178e04a80d49afbd2e54ef10feef0c6cf99ac888442ee75df15663b4f7fa86ff392f34ee4615cbf12f7d13 SHA512 c6fed2228520501bc0c007c90b189d43953391c10fe93fdd7c4c68203ddfc64937b9919730f25ebcba0c1003ed266fbcb35d3ab12ed49fb63503bf27615286c0
-EBUILD pytest-flake8-1.1.1.ebuild 643 BLAKE2B 2527a6faff3df318113775ca97c4a93194c56479db8e07324cfa316443b3337ffe5404e41dca87f69eb7afcbb8929c938ab074fccaa54f091c6a6ceb7c578c4c SHA512 1e426dfc0f309ebd3112c747b9e6e7342633f55b8a93cd5d3de590b3e738493167a7f69a090d69d0b6b2f13d0572161d31d0676d7dda62eafa82045fb7215f3b
+EBUILD pytest-flake8-1.1.1.ebuild 616 BLAKE2B 4184eff7c1f5b39a5295108029c7a17f6538132319d2725debbcf3042ad6e7a95ee9d9248267bb113cbf5a080fdf3ccedd918f69e088f085dea6cb170bc462af SHA512 7274b226dd94cbd78dffc8b059648209795a04643d6784917d903bd2a9aa93f68752c973d204da688bcdf01f70c6719cab75d6a49c6e0a1c8e4d5fc5ddefca41
 MISC metadata.xml 533 BLAKE2B f5c41488f4252fbe9e61d38c3441f90eeda799092f7b4a42a6a87285a69141f9d56ed614d7e21df6cf5017d92464657976936106c2de5581db71b244e2a361fd SHA512 979159321b69d9ffe9ebc7a30b51c613a8d113b897b14b781ff71772769067b3fc3af37066cfd4d00542f5fe71e0b1a50a8c1028d36100538ead09c4f3d9859f
diff --git a/dev-python/pytest-flake8/pytest-flake8-1.1.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-1.1.1.ebuild
index 06e430e6d1c6..37558791b48b 100644
--- a/dev-python/pytest-flake8/pytest-flake8-1.1.1.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-1.1.1.ebuild
@@ -4,15 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="pytest plugin for flake8"
 HOMEPAGE="
 	https://github.com/tholo/pytest-flake8/
 	https://pypi.org/project/pytest-flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-lazy-fixture/Manifest b/dev-python/pytest-lazy-fixture/Manifest
index 17428c07485c..3342682f7b55 100644
--- a/dev-python/pytest-lazy-fixture/Manifest
+++ b/dev-python/pytest-lazy-fixture/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-lazy-fixture-0.6.3.tar.gz 7878 BLAKE2B f3a034678f590090a453b44b9fea938ced040c80922f139f3321ec20db856be219d039c7f4199ef67af79b5008d37425b5c08a0edaf71fdd7c8f248702acf488 SHA512 3281edc516f21f23104d7fc188b5c9aecf364f55109dab52865cbfef4a540727eb2bd42fb9806a7e8be728b249bc7a224ffdbab96473f043bef9a7aea1e4baa8
-EBUILD pytest-lazy-fixture-0.6.3.ebuild 566 BLAKE2B 3621358c086fb1074273a67a92cc1be54ed0fa2d520043e030667ba7e32f3d432f6bb5059495a0e59f7ac36765794e7e58e0d14e9f4a481668c84610a6cffac4 SHA512 d7be978a090a427519fe4121b19994b75b5dc38b617e9d34240857e8beed884fd8221a6b9f606d9dc22d66577cdf1c625d23454516a15e0e254e2928b6ed084d
+EBUILD pytest-lazy-fixture-0.6.3.ebuild 539 BLAKE2B df18ffc9f77e044f0d02acf622cf82df0d762ccde20b1592ddc27873a240cdb1de34553751a3a3beef09f15010e449d44b285eb11984e301c0dc899219b6c1da SHA512 03541f6f552ab254e36832b764bd8ccad25d2b80c310cf2e1a85bc35f3a98b9ac410e30c0a14a17f96ac14a4ae7bd7bc8d28df3e4f912f2bdc3197c1e681d451
 MISC metadata.xml 466 BLAKE2B ed3b8b14f649b2bd165f688ceddcb7c75846e3ec75c5629678d1777d9d2df8e784b0c076d497a38dcf457607d739710c8d6f7069643d802d175ca8dae5f955d5 SHA512 09173c651b8b9ee5ac5928117da08ec7a318402bc76e94c14c27116f6a44c07a8a85f83d222de9a5fd09f1224fa256ae2338c5021e6d4893cc8ce6a1b1540b39
diff --git a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
index 7bc6dceb159e..8355f1b2f2e0 100644
--- a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
+++ b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
@@ -5,11 +5,11 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
 
 DESCRIPTION="It helps to use fixtures in pytest.mark.parametrize"
 HOMEPAGE="https://github.com/tvorog/pytest-lazy-fixture"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-markdown/Manifest b/dev-python/pytest-markdown/Manifest
index 6d294238affc..e2d69ff67f4a 100644
--- a/dev-python/pytest-markdown/Manifest
+++ b/dev-python/pytest-markdown/Manifest
@@ -1,3 +1,3 @@
-DIST pytest-markdown-1.0.2.tar.gz 2991 BLAKE2B 489bd1ccd6060b9588515772ff1f269dc57c328b3695405d0dd755340968899a2b912644e325ce5792528da90e5eac828314dbb9d1396eb34dffe0da04261848 SHA512 a2d5b38982f004a362ec2bda7aec45a6fb9e0b33dfd212647d8eab38fdadf6501b7fec8ad8838b286d81a156429aeb0ad3aa63361a580c2c7528fe19e474a7f6
-EBUILD pytest-markdown-1.0.2-r1.ebuild 592 BLAKE2B 720b7b232043459d222bea28d75505c17cfccd342f4f9341974ec849ffbb8a1e07be13563f8e96aab5d808fc5e540d2ae401adb89c7b14b10edd2be652f30ada SHA512 9e9164ef95de9c9de56396475b8002669f1176faf9586e964c9bca55b8fb8886bce565751076c94fabaa12dac2f8a418b47e2fa26296871078a48a0a0218bf00
+DIST pytest_markdown-1.0.2.tar.gz 2991 BLAKE2B 489bd1ccd6060b9588515772ff1f269dc57c328b3695405d0dd755340968899a2b912644e325ce5792528da90e5eac828314dbb9d1396eb34dffe0da04261848 SHA512 a2d5b38982f004a362ec2bda7aec45a6fb9e0b33dfd212647d8eab38fdadf6501b7fec8ad8838b286d81a156429aeb0ad3aa63361a580c2c7528fe19e474a7f6
+EBUILD pytest-markdown-1.0.2-r1.ebuild 503 BLAKE2B cae8472cd919e7014fb83f574f118f923384ef99eba0c10bf27abf7b4a90f33ad4eaf1a450f129e869c847b46ef6be63a5b0f012e86b33746e6444c26cc10738 SHA512 9fa094114e19151fdc70525752ef1a33afc92bb250f553d1e29f6d3df32c21dfe07466cba805beb9e79ed47f4856b4969b747889c63386241a44b74e6b5200f7
 MISC metadata.xml 408 BLAKE2B 5bf707e04d11ff64f66112fb2a097ff7791ba883fd96492ccf59856d7840e2de34e6945f04943effa82b4f60b6b48c29b75de310c395da989bd82dbc7088154b SHA512 4c381e16ede235dff63ab6b5525900b66ad160c3e5fd3dfd013358c55266a799c2e10a310ca673ea4a931d671908f28e3e284a44b2fe3f9fbfaabb162ff39ea1
diff --git a/dev-python/pytest-markdown/pytest-markdown-1.0.2-r1.ebuild b/dev-python/pytest-markdown/pytest-markdown-1.0.2-r1.ebuild
index b85b86ac4657..beb81872926f 100644
--- a/dev-python/pytest-markdown/pytest-markdown-1.0.2-r1.ebuild
+++ b/dev-python/pytest-markdown/pytest-markdown-1.0.2-r1.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517="poetry"
 
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
+inherit distutils-r1 pypi
 
 DESCRIPTION="Run tests in your markdown"
-HOMEPAGE="https://github.com/Jc2k/pytest-markdown"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/Jc2k/pytest-markdown/
+	https://pypi.org/project/pytest-markdown/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -21,5 +20,3 @@ KEYWORDS="amd64 ~riscv"
 
 RDEPEND=">=dev-python/commonmark-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 8a9683d246f8..e441f4fc65a6 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-mock-3.10.0.tar.gz 28384 BLAKE2B 2f51f8be34094054b8f7864eb083dde00800adb73af668444d21c95d8f159594bed0f68694e7ffb0e24da402a4865f37c07d85622ad00f130ccdb4e3d189bf9a SHA512 2ad6866d581a2999899e399ef5516d478a6172f52923f03703e3e3708229fb3b1178c91225b5cc90734c96abcb48fea517b11e0fc193da6fb592295395c14cd3
-EBUILD pytest-mock-3.10.0.ebuild 1229 BLAKE2B a7ab3a8eedd88b41b5589079a3248150087aa4e6aa54626e1ec36838ca894964dd7400a8b0af8f3d59c1153a620eeadcdaeab64606ed3e0d88c49654d34aecda SHA512 2764b27db07f836e888fffb03c2e02e5344a0a3d3b074d1cd919e408faba9f381977e95b0fbf6dcd92839227e7ccbc2518f2067b2a1f672fbd8ee9848c6928e2
+EBUILD pytest-mock-3.10.0.ebuild 1202 BLAKE2B b6e5a2927700359219acd159d7e6379b051a0dc071cf3dbd91b0a39217321fec69b0df13cef49c3a77f5140e585fdc657b980f350ae71dc2871c2100b108d76c SHA512 38794e7ba16249ca6d8aef2bfb81567a836f72821a8ec41cda4637d08ac72cc70a3f4a53b6952f92114c956002ff9f1213fcd9ee907fb4f5b68b7bc24eee3687
 MISC metadata.xml 379 BLAKE2B 47a45606cecad3ecc9b902d9ec690c33a89728ce93038433f11ab8c3369089ef12e86c793ab06dedeef7a816dc973ae8ea2a6b717b13085c7912d69bcd68db65 SHA512 b5e43e5e0a1cfba50868ca542b00d40084aeb38f764f203ed112a9359e966e94d34a99bbb072b98f9401a0383d3fbf834b8b87572e073592263f18d73f09db2e
diff --git a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
index 76c71cda9a6d..3d5766a44bf3 100644
--- a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
 HOMEPAGE="
 	https://github.com/pytest-dev/pytest-mock/
 	https://pypi.org/project/pytest-mock/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-mpl/Manifest b/dev-python/pytest-mpl/Manifest
index 9a54cbad4583..584aa60230ec 100644
--- a/dev-python/pytest-mpl/Manifest
+++ b/dev-python/pytest-mpl/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-mpl-0.16.1.tar.gz 663585 BLAKE2B aad171260a10417aab15e7e55115c2fe02aa33dcf8336634281e1a1dad4d1c5ff08293fd9a67be025ec6cbb18c42bc9eb7ccb86275c0fcc7f4bf33a035fc0927 SHA512 64c1689f1698f9223082bc5c6817a1d4f9b413cb193894c23b1e0302254a6358cb3e354ac92ec47677acf460a41d05b2b527c834fd0fbbde04c070b0af8f46e1
-EBUILD pytest-mpl-0.16.1.ebuild 1080 BLAKE2B 0e2afd4e103ab692b54f3c6d8fdd9951c720938718cd1d665acc652e7fd4a3e841aa7d30ffbbc0d8e5673735664646c5138cd4676c6e0bb3645ed7b4da6975fb SHA512 fd3adb925458c2da8688bd8b72bac7249c527514af760438f1ee5f37f30922c536fa8de6041215469ad98a97d0b79507c31d50652ad6e2f6254dba856c211b22
+EBUILD pytest-mpl-0.16.1.ebuild 1053 BLAKE2B b75eb7ed2d8e42b78c2625722a7e5a33b5e2ee0299ea65c444f124462ad61a6eb558268c38726bdfc16c8065b6b94a7e00a6b28d91a42ae8c7993fa1032056a3 SHA512 9f17892739ac099f366cb4eaab8d6fcfa98c231c1d5d0b0623a21951f9082adac3d1e04a741daef736be5c83448d03e472623e38780c1e1d27664e79369a4c9a
 MISC metadata.xml 399 BLAKE2B b2dd8993ce1e55737997ac3e6c0d26edecad7721c319073b8bc12117b1387dd3b6a1049837b5f97d97f5539d1253bf888f00caca6f0bbb46a73292ee6bd08f0f SHA512 5e3c8b4c47771acf6fe345f3e1d1ae59e66a2bd028ff57969cd3a93aef971b7103a7b0d847f1e53af54075603f9868d5c09895f4ea3a1d93009b07449496d317
diff --git a/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild b/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
index 3c954c69bdf3..95e7bea1cd98 100644
--- a/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
+++ b/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Facilitate image comparison for Matplotlib figures"
 HOMEPAGE="
 	https://pypi.org/project/pytest-mpl/
 	https://github.com/matplotlib/pytest-mpl
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-plus/Manifest b/dev-python/pytest-plus/Manifest
index cdffd5475e1e..17fa02ecfe84 100644
--- a/dev-python/pytest-plus/Manifest
+++ b/dev-python/pytest-plus/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-plus-0.4.0.tar.gz 9987 BLAKE2B 11b8f17630601f52ebae11b7a660c8d97b4c9f1699096a376c162952a03b9f1b580ead6ac0b040b15c267eec1123bffe07d128eb00aec7414e996275ebc4c4e3 SHA512 4f4258853280cac8e03c0477763fd588d2b3cf11e7746d2b8e7d3cf5774b845412bc8779d74d232e4b3473470c39753dc788ac09faf8e8b7c9fee22d7164bab7
-EBUILD pytest-plus-0.4.0.ebuild 616 BLAKE2B 6394c5cc605f669dc35583696a357ec26eae3517d0d1d512687c729734e87404473d4e50b1c7a0e3608bbe9976ded9c1e6f6e17efe197c159351118931869fbe SHA512 5328532fb810cf578d7080616cc449e22ee8a3e23e5fa7e9fd09a8ff2a1e37aab0f74dc3bda512e181615f3d14dc3c78091054476f5e0c9bb35263045e93c3fd
+EBUILD pytest-plus-0.4.0.ebuild 589 BLAKE2B 9c8c1e4dc851a351ae72f0f1cab42e0c518b9ce00fb06dddbf7d57296c74aa1d7aca6ef4ba4e112b02bc841c0e5452edece2f88acd69e442d34cae5176c9f029 SHA512 65f3da0ca3583911d35ca5fb1354d83229728eaa0a1e14a62a1ac6f924cf3ee5b1dd13e0f96339b3a0799f4a2aabe808eb0a6c8cf5109c01fda42b253599d03d
 MISC metadata.xml 406 BLAKE2B ae1b1a2c28f45b4dd7f752125161396de88cf2ed3881f37f72dc7938cd2ea6485c995d0409c6fbaebeb7b1d4cf59736496549702d7a9d825a2ee5eb1e6a65fdf SHA512 33668115e05810055fa79f5d74c5d3b6eca5bb53e0108a257cb57bb496ebd0292c1dd3f5b33feee58c20c2c381a926c870f9576355171a91106c21fea41d6ab3
diff --git a/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild b/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
index c395bb83ee14..9d487aa6e00b 100644
--- a/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
+++ b/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="PyTest Plus Plugin - extends pytest functionality"
 HOMEPAGE="
 	https://github.com/pytest-dev/pytest-plus/
 	https://pypi.org/project/pytest-plus/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 514ce2e9cc5d..cba9cf1a0c48 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-qt-4.2.0.tar.gz 120749 BLAKE2B 1986bbf4ebc578ad548d2fcc8888b0d0fb42f75ad8a03f315f51c04ae466587d3299fca8ec3a49bc5d023fc8ca76cbe6c45728bc88609e20d6f68ea8c6ea204e SHA512 57e175bada0e33101eeb7d85579f6e804658d74168714b117b3a1ba564826405e70860b258caf28c917ddca7acd1842de2133a55b342862762fc37ca1a758b69
-EBUILD pytest-qt-4.2.0.ebuild 1693 BLAKE2B f4ad35049d90d401054492bc4b3eff7e1517eef63bbb0838971e5f5593d16a833e68822da6eeb152c62e13bdd200e2b16f805c74996076388681a0af59e3322f SHA512 18cbb23d3eaf34a3c930ef0d639c25f6e06e69e19834834c97813e75a003476031ca97c3f1c30a9c1f384bc7cbb11bd0ff0d47418864e47d589765cc1a6c6aad
+EBUILD pytest-qt-4.2.0.ebuild 1666 BLAKE2B ec78b5f1932e250c78fd18efc17cdbb2cf19a39d4db1c9a730dc4293a8fc8631dd4cf3d06202a0e15e211feae00a85aac9ee82a02d83b4ed82e7c1aa27797490 SHA512 efa987e878b227b383b30d8a06788f1fe1c9c5152201b1df3a9e5f3373c1f59a2b19b97e73e60342ec503ba3c956dd5b5672d2971bdafa5b82ad33b25ff85f8e
 MISC metadata.xml 516 BLAKE2B be5241e39f672681b27a003d02eca0e047644cad7da57de6b3393f58760c094c1661b9d168e44bea4efd56b38225d49abd5be6e71031a0d854b878716286d3ed SHA512 77981d63d3214fd2c052f8a7eac1a439899318973807299237a9105730893ce01d4423b060f532bd4f4496418683fc5128508c7d8747ba6ee6ed0eae67e5569f
diff --git a/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild b/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild
index ec8fe32a9120..81b76782132f 100644
--- a/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild
@@ -4,17 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 PYSIDE2_COMPAT=( python3_{8..10} )
 
-inherit distutils-r1 virtualx
+inherit distutils-r1 virtualx pypi
 
 DESCRIPTION="Pytest plugin for PyQt5 and PySide2 applications"
 HOMEPAGE="
 	https://pypi.org/project/pytest-qt/
 	https://github.com/pytest-dev/pytest-qt/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index 792a47738e4f..e565a7ff83cb 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-regressions-2.4.2.tar.gz 111030 BLAKE2B 4c1d3ce9a210b6156e046b91688aec6ecab53d4719b5b556cdf6773a6af891352f7f213259140fdb7234f2528dbad5bf5c4ed43431aee94bfd373dd1839c1231 SHA512 f5abcc09da7a466e446329737d4926d3c7c9ac274e1087e6f746fe263b4cfd1b0f4b8870eea3d22b1209a0d5ead7b7169e700d10f3f29bb978e12a33511b1f51
-EBUILD pytest-regressions-2.4.2.ebuild 1579 BLAKE2B a5da2bfb3c5574bffee48b1c5d04cf23f08fc8bd8bead460432f0e227bf80139f5aea9bf52df06748acc44a526a13d54a2a22110aa0d908848f69fca7931154e SHA512 589271db60631ed01dddef01d002651fd52cc82ae92eca3c0b1143224a7fe8054e34ce93ade29045409fc7d17a5dbfb5072e5fbb8641bf0110639314ee6bd420
+EBUILD pytest-regressions-2.4.2.ebuild 1552 BLAKE2B 67035a456c2760b8d8f2957b5320d652b525aa450c49dfa76fc7b7848c2e00a4670a3667f4416ba0cbe867df340a5bbd43c6eaaefef7dfb597256d7d31616b40 SHA512 f1010d26715efed226b0fecb1197d5e858515fbbc22e81139a23b76497054d348f6db5dcf6a05a63cf844ec8b53c706e6042121c93541ea5e8109f031332dc70
 MISC metadata.xml 465 BLAKE2B ae41a884052ebc7399af62f7c8375c1f32088f7ebc23625b521b1dedb31a9844b86fd05a55008178d248f2c9e2a552868301bc35649418cc0a767038f4a484ed SHA512 b698190fc24eff3235795959a1b165860a21a001bb0e05cfefca7d0fa6ee7e987b1b31bea3c69c8dad82ffd9df24ef665a57f8c39a6f17e872b9d2946a69c010
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.4.2.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.4.2.ebuild
index 1bb73472804e..34119a45eb0f 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.4.2.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.4.2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Easy to use fixtures to write regression tests"
 HOMEPAGE="
 	https://github.com/ESSS/pytest-regressions/
 	https://pypi.org/project/pytest-regressions/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 72d8256a6333..db0b283e3e03 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
-EBUILD pytest-shutil-1.7.0-r3.ebuild 1082 BLAKE2B bed9121a27114477e459905c7af6acf648b8af8c5082609ad9552489506cbecd468c42f369600da52a0e6d2e8c88a927b362a5910fda881f3ef38ec56f1aa725 SHA512 dd585277871b2caa32588b68830a8360db9179aaf96d472931fb08e0aa1043042221a838c11604f069a56b513f88101c9d43ca1d067f6e7b2ec4e2ed47cea685
+EBUILD pytest-shutil-1.7.0-r3.ebuild 1056 BLAKE2B 75489d095c6d0f9f438d8b7fa26a4e811bc75296dd763fca6b4d91f86d3d8f7472f5427dcbdb9bdee03d9d8be06092f88f9bb83a18f08dcc9a01551217f5f3d5 SHA512 97e1ce0bdb17883afb79f1399e85b42db1a6ae2364b338d3ad6fbafd1e8f687de52405a902de14b52b037cef623d772721fa3cc254eee38b963db07946d449b8
 MISC metadata.xml 733 BLAKE2B f5f17136e92ebe6188aa94910e3b58c33198bf65b9de5cd70de16ec5d9d205afb46e1c73508b56367ca972d55e69e4c746297106eb7ef5f3e9e9a7ff1a5f7f83 SHA512 af24c62c04e5f1dda2fe559436658172be8b280463e1fa1bc078eca03900e4949660b4ceade8d78fef387f16b3630762181824b3bce2a50c3ad76092dcffe9a5
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
index d56be41d5ecb..5565a52b63e9 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
 HOMEPAGE="
 	https://github.com/man-group/pytest-plugins/
 	https://pypi.org/project/pytest-shutil/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-sugar/Manifest b/dev-python/pytest-sugar/Manifest
index 5793c05b3883..050c74813401 100644
--- a/dev-python/pytest-sugar/Manifest
+++ b/dev-python/pytest-sugar/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-sugar-0.9.6.tar.gz 13702 BLAKE2B 72a48d501ba5bd597ec2561817179cd50213d1de80a3281823033d9d1a1c62f37367353885d805a6e212380ddaa934b1e0887814742e26cd1b809b4ef629cf19 SHA512 955e28478854c6751e7470b49f130bce2904c1f74d46caa2a6e212c132e3f1f0565f2f31ac360a32d2d9c4999f4dcdd19e7373508660bfd7da530981aef9cd62
-EBUILD pytest-sugar-0.9.6.ebuild 711 BLAKE2B e372813605f7e55ae31904d898addc92a45ae816b70d960c4fc319014cfdc7bf35fbe8253976c9be772c918baac631e3349c041a2c8d4a6c6ba9a9ee57a2dc1a SHA512 82443f5e52797d14a84d275abde78c56922228903ba70c02a010e15f4c8025c0b237ec483ad19c3361248d29d381146895acead8c4e3eddf0131be1b85272ace
+EBUILD pytest-sugar-0.9.6.ebuild 684 BLAKE2B ac5322a6270868bea7c34ddd0efee1aa4b8bd35d60f8fb011e9356a04e01452da7041f1707d1f5026ce158c40712eb97a2c826045196c496201050735f60e1ef SHA512 7be0ad0badea8f565633db2fed58439dbcb091b6423028e95e3a68536922583df27485764d8dd3f254f6f4bfe488dd99878da29dbee5b45d76df3e07ac773829
 MISC metadata.xml 408 BLAKE2B 85f1b0ab3459c14c25ed5da0e2f458094e76c22d442f4e32d2496da42c66daf473e7301dadb6fbf5041bf3b167a8e24d3755c1ac61f48e91fd88cf28ad25de74 SHA512 19e8b2f5cee8223178d9e5de58e8d048515857755600d4d0d2c4381e83c679a939ba67a48daf3ca16e1895808512f4882b37afd71f8cbfd5f4c15f67a30e7ab5
diff --git a/dev-python/pytest-sugar/pytest-sugar-0.9.6.ebuild b/dev-python/pytest-sugar/pytest-sugar-0.9.6.ebuild
index 7f343a2aadb5..72302e187636 100644
--- a/dev-python/pytest-sugar/pytest-sugar-0.9.6.ebuild
+++ b/dev-python/pytest-sugar/pytest-sugar-0.9.6.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Plugin that changes the default look and feel of pytest"
 HOMEPAGE="
 	https://github.com/Teemu/pytest-sugar/
 	https://pypi.org/project/pytest-sugar/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index 38ea27352801..73d9fb8156a3 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-testinfra-7.0.0.tar.gz 79296 BLAKE2B b0870cbf466627daff0ed6a3063c15c9b725fab4009fc24c3779b56765901e6b8d3a42fce429f1e42151b78d61f52c38955772e562c74d78c717a61a5fe74f04 SHA512 507d7a434c2eb159e2c36b1be3d447e386d3a4e614f2717ed8add456358f644c18f801db6774a4854e4ec7936643febd332aa4096ab26ae0080aceeff420c78e
-EBUILD pytest-testinfra-7.0.0.ebuild 1479 BLAKE2B 1f1ae87b46db66016c52359647be494ebef5908ff9ed5c71bf778bb59664470accd2084c9d0c1b1a206a7af2e4bbb846f4a852bcdb817142d0be6fc25b00d8f1 SHA512 fe7b3e9d4fb931ffa4dabc44777a83b327f228f452a7c48c52861ea9671465ba0b146495d4619a92b07bca9e2822187a87b034aea283f4e33cbd7c09909fdb40
+EBUILD pytest-testinfra-7.0.0.ebuild 1454 BLAKE2B 99d367bbee7868a9b20bc690ad8398ddce1c03c6ccf4ab78a53e95a704f1d2a7054fc7f123d7fbd66db0d668b30fb4bb25c8bdf1c829287ced0cdc34071210f8 SHA512 4a3d9f22069599696f8c594057a793e4cc87b9640a96a2290baba54fd11aa435efd0edd4e7146d9bb76f62e6c282158ce45466525fb02a3729a3c0222ce6bec1
 MISC metadata.xml 781 BLAKE2B e38dd6fa967258affb201d6474524e22124a1b8848cff08f3da88e97ff3e13597770c494ee040481967028ee4d82112fb3d38f1034cb7982288d859efe540a21 SHA512 b6c868e77d1202622086340ae284071eaf1b95948c84a8a00f06e819e72325346d7aa226931d1bb5a3f782f23656c1e65f4b21a74ee0cb70deabfd602f774e99
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
index 42ee65bafd4e..893b60562184 100644
--- a/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
+++ b/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Write unit tests in Python to test actual state of your servers"
 HOMEPAGE="
 	https://github.com/pytest-dev/pytest-testinfra/
 	https://pypi.org/project/pytest-testinfra/
 "
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index de7005728630..5a121beb1f4e 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-timeout-2.1.0.tar.gz 18386 BLAKE2B 1c84b67e8d07056f9c5b188e467832d4aa292ce1047da6cb13b2939962d2599853db134b16ff3a1a953cbdc1c1772be961eadc9925b32f8dbe514938ede90d40 SHA512 5750e5183669ed9b83fbb76bd7fc9fc1f5f6eef3d9b675dc44f6c7edfd2c6d15739d71e845ededaa192c93da73026ac3376a3295be9f7d3f3eac325660ce7bf3
-EBUILD pytest-timeout-2.1.0.ebuild 819 BLAKE2B 7083c3328cb9dda3b1497d751466d78fa99d95ff326fb29d111b7852d77b607dd0ffed1349c0456c874e725bf8330b2a80d12bb41a0292e7755b9c16a9f1d03a SHA512 259109b08e586e96b6d641941c330964d94ad42ce406e48d6ffbc49dee90d28eaf2b48a149ab8f860eac75365d5c21ee27bfc1c9c2d7bf822d0fffbe762e0eb2
+EBUILD pytest-timeout-2.1.0.ebuild 792 BLAKE2B 90c89ae48a349d6ea5c86f253aea953e38aaad591c838f4f0453c7575349e327935878a18b9ab4dcbc0babb5c11c5e8108b52c8693decf6fde52973d2acc1b68 SHA512 f44cd84d4bb3e8b6280eb0b3ead7091dc2a37297850923524ea510f49ea01891fa0f0521c712c57539b53713f6ca95546741014173da166d55ea68927262f20f
 MISC metadata.xml 353 BLAKE2B 4865119ec7c91f6d9ac1ab4ce5b1cb73b784f29f7efd669c629062cca2d433eaabb51af1d0ddb3275d414a99413eb8aa76c8639d484c7846ea33c4f53a013bad SHA512 764118890125a80df18e5d9a1bbf6bb35261c0cbcc04e6c9c67ee7b307cdbc31979b831910022a1caef97deee6830d7236f258f524a95a9494229dcd4a14c8ad
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.1.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.1.0.ebuild
index b8dab62d32a0..fe6b7947381e 100644
--- a/dev-python/pytest-timeout/pytest-timeout-2.1.0.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-2.1.0.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="pytest plugin to abort hanging tests"
 HOMEPAGE="https://pypi.org/project/pytest-timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
diff --git a/dev-python/pytest-tornasync/Manifest b/dev-python/pytest-tornasync/Manifest
index 03633533ee0d..7b37fe9b44e9 100644
--- a/dev-python/pytest-tornasync/Manifest
+++ b/dev-python/pytest-tornasync/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-tornasync-0.6.0.post2.tar.gz 6201 BLAKE2B 6b6a2f941e649fb33373ef39b9d848d68a8af0f5e0d1a5e4496a9160e8e63ea108832437e87382c8203bb2c75673fad37b4ebd76157913199eb1661cd0216591 SHA512 2e258913b17a5442d18928833ee7e9771b6dbd148dbf251a7661432a54d4b9f9f3a7c396134eb544c0e3ce0af48c99d2d632399ac6ebdcf148187a7a523f4974
-EBUILD pytest-tornasync-0.6.0_p2.ebuild 846 BLAKE2B 1e6022584e9f00cfb06e2f6b77afe2a51b18a98c345914251af75308d65076101487f1ab9f3265123ea557594d8c3076f5c5b9fc5966bb9524f5202b8b940174 SHA512 2e34656a3b03bb9a5c77a8982799677d2202d60d03e34c496739b895ae14ded71d31502d16551209e3a50b0bd17ceb51d2c3bdd89befdfed22203df0f770ca49
+EBUILD pytest-tornasync-0.6.0_p2.ebuild 779 BLAKE2B 078ac52fd3923e49313d2e0e41bac3ab77b9dccb54c9793011580aa9d605fd73da67d71b11fdb271638c8b00499f010cc4f27e40f54e3431b015a6e63fb37acb SHA512 4fc4dfd194f5f5623d6b7e428e1923fd0a9a92264d350dcad43eea26d9575d06569b8bc1c519a555cae71a36db1b1c50b7e1e84820a2a298258906794d212ab6
 MISC metadata.xml 423 BLAKE2B 5f62fb4f40fb223be599f7ad934bc2c23d2fd843cd90708eed0042e464c89c1385375d7217707646ea4b5d98903f7fbace04c465eebcfef102805346b2fe9cbd SHA512 22ad021af9cce23bfe4eb799cf015beb26fd042daddf0f8b6e6adb03365b850f2a3a3aa623c5f3c5b9b56a8149d6d53cb254b0f9730e0cbf55ef2d0400981d08
diff --git a/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild b/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild
index d64e74154df7..dd1049337978 100644
--- a/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild
+++ b/dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Pytest plugin for testing Python 3.5+ Tornado code"
 HOMEPAGE="https://github.com/eukaryote/pytest-tornasync"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P//_p/.post}.tar.gz"
-S="${WORKDIR}/${P//_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-trio/Manifest b/dev-python/pytest-trio/Manifest
index f18760eade3b..2c5b00c60a06 100644
--- a/dev-python/pytest-trio/Manifest
+++ b/dev-python/pytest-trio/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-trio-0.8.0.tar.gz 46525 BLAKE2B 54660dc9b021af0ec18eace72f053223d16e89635c74d71329a005e5fee3bf6e2055cc29412d9de7443b2594ee53d68890d1e30ed7c94560c355d4342bb3d035 SHA512 79141021633b7b2d8a840d7eaf6a3447bccd59d1bd4909e7feba88a9ae8244376f281b64fde4333b5a575957e3f73028e389a9abf0d19a35417f15c47eeccd05
-EBUILD pytest-trio-0.8.0.ebuild 1350 BLAKE2B 010f27508f05fb00e5437790706011b7803c8a3c5b658176d24d73859cadea9990ff471c4011cd92498212babd22488e342ebce2d641a2ff9ab4f7340fe9c9e1 SHA512 20ab8b49f7afb2d893681f506181eda9d1228b72dc83741443231b8119c4722b632376d73f9728873b41b54484a20f4ea3b51a4f5b7855dc23d08d2247bb6985
+EBUILD pytest-trio-0.8.0.ebuild 1324 BLAKE2B 5195a8b5dbbc8c8a927c6d1cf78e409b2e4ef48f51e0e7a176e9d3abec9617cc8d04ce1112f4dc2ec4271a0ce8301e861e7be1d1d47180438e60cb3bd76f8be1 SHA512 8ff80403f473c003287c139d725cfa804f5589fe5ad12d7ecfe859b8f048563c798e33e983f1d891d0756b269fc1488c2a4827dfd6c2a16d65f8a4aba0da2b6c
 MISC metadata.xml 420 BLAKE2B 42bae65fb9b23797c96bdc057faebc577f89f0c83f27031079176c2a122cb15e70eb5937a8cd52d09b3d7c5a7d16f62768452c87523fdb0fad876b63836c171d SHA512 5dd3d9e96df753347ccdf41428b5faa1df217985d7cfda1d7bd933fdf755f8f254fd9fa80e7cbeedff318327c4ff4257d8598a17def8ee6144d27aa89305cc3d
diff --git a/dev-python/pytest-trio/pytest-trio-0.8.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.8.0.ebuild
index 66698a701e21..a1053abd0ff8 100644
--- a/dev-python/pytest-trio/pytest-trio-0.8.0.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.8.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( pypy3 python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="This is a pytest plugin to help you test projects that use Trio"
 HOMEPAGE="
 	https://github.com/python-trio/pytest-trio
 	https://pypi.org/project/pytest-trio/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
diff --git a/dev-python/pytest-verbose-parametrize/Manifest b/dev-python/pytest-verbose-parametrize/Manifest
index a616eb726b87..fb766a0ed022 100644
--- a/dev-python/pytest-verbose-parametrize/Manifest
+++ b/dev-python/pytest-verbose-parametrize/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-verbose-parametrize-1.7.0_collections-abc.patch 205 BLAKE2B e884904bba85f2873d61d3a946ac8f8f521aab3a38814bc1d0412c37331c439e9b22d5c4dd8129422c8d1d9293352742d506f13118f2d1b2055a71c3d140742a SHA512 45318b475d70fb4e8eb9eba4c087a6a47fe30460166571d272c7cefcd7ac3ec8356cf448114ba3b58b360f22b0a7bbfcc9c349ccf091cb99e1f9aff6f0563edb
 DIST pytest-verbose-parametrize-1.7.0.tar.gz 12301 BLAKE2B 908d8c9d82861783931dc25c6b522e13f252e4b04e01a2f6a0e646cd63720816242ef143041abf0aa6b67fb574d5f84d05029edd11e589728b0e5b63f92f898e SHA512 ac81cdf002d60b4af916c4beb4c832c9c39dc9dcfa3eea7385b093f9ea18391cbf968a4e908abdb23523a7cb1e294dce2017083414e61eef6762f157319e2cf4
-EBUILD pytest-verbose-parametrize-1.7.0.ebuild 1020 BLAKE2B 02716a3fed8c64f43e03aa7a2a5c59466810c2308afee260a9b549952f6e4ac67534bf4c5e608c273ef5c5fb816f8aa39eddd0987112b485d80d478bf02b3b87 SHA512 38fd2e0e49aa5bc1db2210019246fe8b5b96100ed7e99e09a732aece3f6716f0a77ee57ff52d943164166bb2576ad42162eefc847aabe60710f00e6502a87b6c
+EBUILD pytest-verbose-parametrize-1.7.0.ebuild 994 BLAKE2B 14056510c21a932b4664887e2181b57f6e56f415e36430fdb0615f0e3d2cb964c4556e2b54d1d261fecef5d38d131ef928fbbf2649e9c64f5100cc43058278a4 SHA512 ab5099f49c38246682dedfa08ca998c4cfe22f5af70049e14a3f312d09cf0ef317b519e8f45cb84ad97f880e215ce5fd9787f870a0805ef311b8701a8a2dd7a5
 MISC metadata.xml 423 BLAKE2B b5a526d2a86e90e9298b3314083255abbd049f9ed168630e8cbd5fff23c7932f27b0629131b0863711fa25f8a39a7190d1deecdca99a1b1481b46d683b1338b1 SHA512 b0e5ccb327c700f7041b33bfd136fd4f360c4b862101a1440abccab51d82598e00c1435fcb1cdf47427f8c67390f30b763671ef0b76f77431645b1bfff0ed85c
diff --git a/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild b/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild
index 6fdc73564714..120b433960d3 100644
--- a/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild
+++ b/dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="More descriptive parametrized-test IDs for py.test"
 HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-verbose-parametrize/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index ad12fd689669..e9de5c7b5495 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-virtualenv-1.7.0.tar.gz 15767 BLAKE2B 5ee65aff72c50c8facef682827f58a8053d658aa072f3a69d50d13335dda2da37ffc29af009b52a50349647a4a38e149ba1b9847115fc4b4c4f54f063198b14f SHA512 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474
-EBUILD pytest-virtualenv-1.7.0-r2.ebuild 863 BLAKE2B f1d186ba411c69ec3f6330a92af59d6fdba8c05723cd3594e87b3a4c43ccc722fe2b8e21a9f6a65ecc1ddd38a352ad2ff1d5985caef50177c506d62f14080145 SHA512 4bc23af3a7607ffc509167ea6ef2d0183c3e8c6c263d144defafe205802dfe1f92e67bb45954ecbb66c9c03e76373e57444f0383693e876f1f33a220fda8e53b
+EBUILD pytest-virtualenv-1.7.0-r2.ebuild 837 BLAKE2B a6e8ad326e5ab2e87242c9e0cdf5a7ede0fa12a3ed29607bf7326a5ab0bc59e68fbd55947072fd6aa81e9b1648b054d0c2ab1cb16ba8dc5241c6da6dc435b5e3 SHA512 c9c161ac8fd865220d9ff006aaf1ae5f50f62e76bc266100bbfbb6ed25225366de0898061dda506725b3e20b2565a36f3c3b3e5307c93cf05dc808d7597d30f8
 MISC metadata.xml 707 BLAKE2B c206e0d54a4248c62d845417e497ef069eae4e0897efc5d7ea8e96f2809c65c0ea10db14d8aaf3c2a7d76b713b12a08492146f121c7ed0789d4273992fae8530 SHA512 a4d9f18b9c9141031d751542f7e57af57a7c32fc5f787636349975d9c7f32da33676abc58c97c3d8e7b292fad600be3fe6272ea6a3214c46f044ff641abaa6ab
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r2.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r2.ebuild
index 48ca3155b25e..4fb299661f81 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r2.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Virtualenv fixture for py.test"
 HOMEPAGE="
 	https://github.com/man-group/pytest-plugins/
 	https://pypi.org/project/pytest-virtualenv/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 12128354553a..2b15caf4b606 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-xdist-3.1.0.tar.gz 71977 BLAKE2B c29622377743aec0a90f0e92af866a63106b9c37abee379222fd2b5c40f0607c33010bb5d2cb5212fc90a438d787ecb435f07c31e0db7a10599696c33b309a32 SHA512 884cdd85754b36338666cbdd71575ef18465730cfc4ab7333b93aa46823c1dc33e8055117241f4c87e1b8c82492881cc0f91ef1bb2ddc164aa00bfa1e5e2d245
-DIST pytest-xdist-3.2.0.tar.gz 76199 BLAKE2B 462d6af54ba599f506a51ae2e91ab0c08fdb8a6b3e47ba4541c0fe2c19a9aa8a38dee0621e130d23a2daecdc9509b1020eb05d550a50d6de233e185a8108872c SHA512 dd22c2e525681ddabc1df75e8eadcf0d3c52936cefafb7308771e37cfe9023cb4ecbbaf4e437668666f5319e379e7b6c5c7665912b59c5d10890c32da7546433
 DIST pytest-xdist-3.2.1.tar.gz 76362 BLAKE2B a5cea5bab1176554bd0d1ebfff5400f60bd43964ae13c7f77ad77fc257db32ba0a0d6f2f3ec16211e48852a6bfd02a0949d618c7f2f6a8da11dd2843d88565a4 SHA512 ea42bea8b4df3d77ef680cba81f76f9f79d0ffcaad6f5f879cc82c53203d36ffe26f233dd6c5d1cbea22b43d257f0f4e6be793116bb281956316c44fc412f9b7
-EBUILD pytest-xdist-3.1.0.ebuild 1123 BLAKE2B 7b511dc74ad8af94061a987c7b890c9804a2a962394138679f674be6213922d3a5f31be4230f4dbc1c617f8b8b1538e1edb30fbd2b57a21ce7ff12b77cc16974 SHA512 8a7129d190b1cfa8447f1c9e5fce9536d87385e75828333e00330a698eea98f22f96424268f96a9eddbe3d8e5aadfeb03f7f1de2782a271f607c4d1eee849c95
-EBUILD pytest-xdist-3.2.0.ebuild 1104 BLAKE2B 18604032d8eeb812e4a005794eaeed43a3ac6433df75f877cae01929306eeed51abb17f55dbfa079c759f34463cbcbcb43fb0851328e1c24136594c314d0aa8e SHA512 22094bc669a552acd1677e16e398db1d64bb57f6b82a826b3ddff86edeaeebdd9de53ec787baeaf8d1125d676e53c4d98fc6b5c083b3e327aa41171a5738dc62
-EBUILD pytest-xdist-3.2.1.ebuild 1104 BLAKE2B 18604032d8eeb812e4a005794eaeed43a3ac6433df75f877cae01929306eeed51abb17f55dbfa079c759f34463cbcbcb43fb0851328e1c24136594c314d0aa8e SHA512 22094bc669a552acd1677e16e398db1d64bb57f6b82a826b3ddff86edeaeebdd9de53ec787baeaf8d1125d676e53c4d98fc6b5c083b3e327aa41171a5738dc62
+EBUILD pytest-xdist-3.2.1.ebuild 1096 BLAKE2B b42416c7d6da43b546ced93b46208b071688358cf3a201c5d9fd0689d5a6189c139842fd11c47a6226c26ac6f07752392c59239ace24b89676603bc45e1eddfa SHA512 239d131fdf0d4c7d68d522ca10b77ae3626421d4da5923fb12bc8998ab1b92e2fcacaa26617030bbd4aac2adfd33fc481c919c0f55175a22541cfe9ae423e935
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.1.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.1.0.ebuild
deleted file mode 100644
index 95d4d9ebd5ea..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-3.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="
-	https://pypi.org/project/pytest-xdist/
-	https://github.com/pytest-dev/pytest-xdist/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6.2.0[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# disable autoloading plugins in nested pytest calls
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, force loading necessary plugins
-	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
-
-	epytest
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.2.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.2.0.ebuild
deleted file mode 100644
index c3bc7d37a95e..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-3.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="
-	https://pypi.org/project/pytest-xdist/
-	https://github.com/pytest-dev/pytest-xdist/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6.2.0[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# disable autoloading plugins in nested pytest calls
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, force loading necessary plugins
-	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
-
-	epytest
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.2.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.2.1.ebuild
index c3bc7d37a95e..24f0b4f18638 100644
--- a/dev-python/pytest-xdist/pytest-xdist-3.2.1.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-3.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/execnet[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index b074e1ef55f7..12179978fcf9 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-xprocess-0.22.2.tar.gz 31346 BLAKE2B 07b9fdfea2ecd3d3aaf4115c2f7ecd41c864b4490694cedc54460d0f16397ebdda0ac88fd9bd1613dcaec1cb9c36571b8ab2febc8d151f8f6c4e19fe3abd0821 SHA512 2051be110dfda8063c31bb9555bff569f5d7a1332a62f8ce57fd799dfc7d8551ba1227df12f44fccc1ec62d9fcc0face104a77c9c5cc1abb583b74cd1d8a9ff7
-EBUILD pytest-xprocess-0.22.2.ebuild 717 BLAKE2B b94e5e6904cb8e55dcc07039efe46152c28993a374743ba4b4b105ab9a1fe862ab7b9245065f03bb611ffc781eab294e167795bfaf5182c46b933b6c0dfa6de5 SHA512 a690126a057d18361c047e40f8f3f8ed0da1f14f4dcd12cedb30b81230c9d47d1abc2f382649994a416ad51b5ee8ff1a5c112cf36eba26fafb1c0e7362011601
+EBUILD pytest-xprocess-0.22.2.ebuild 690 BLAKE2B d8a97619717e79d70347cec9e484728db4e72047b22a356f59f33ec23e44f586869d33fd62e39dd5f05bfd283c0f8b1a9a26add073c607480efe67e85ed8960d SHA512 eddf2312dfa6e8f6467b857df429780b3ee26c8382d497a63ba67d7420b744305928cffca03230eb2f72237ef3e5934e987fd2d29bbeb54a5b361d9e179ccb12
 MISC metadata.xml 422 BLAKE2B fb18d498d2325613b4ddb9262d90108aca85cc28c4dc298359adc0cb589565df894b5c48bfdc7a7f83cf30421f324fa1af93333ae20fc793910993e0a93db90b SHA512 19e96fb0695284d9adfd71eccee8f3ab0661d5e0231f3f55db0456a3dfe797fb683985cb776e45a183a710462e990f539f75a764dca68d0c2e631abf68d8344e
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.22.2.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.22.2.ebuild
index c26be2e854e5..863251f734a8 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.22.2.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.22.2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Manage external processes across test runs"
 HOMEPAGE="
 	https://pypi.org/project/pytest-xprocess/
 	https://github.com/pytest-dev/pytest-xprocess/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index 22648ee6d425..7899c81204ac 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -1,4 +1,4 @@
 AUX remove-tests.patch 417 BLAKE2B e3a0e4b3fdb42b395fa336461f84feea4dac252399ff266231121a48e659fbfad671d318e9a3212f77939f7e609b3df71363abf8f9f2450e087479869731720a SHA512 3b399e3e85cf12bc5ee2db3d53594b2eee5ba8809bfaa950738730194c2dab16c8b776100b009bdbb520020b0ae276c8b13291139dcb1d48e0887bec72c80679
 DIST python-augeas-1.1.0.tar.gz 93657 BLAKE2B 21d2713d8e11552cc7f0191d2b8f7805b223f5dc9478b89b39dcbd325ab354cef0bfc0314852dc2b071b3b061319b4e27904c0514eb6d6ffd4e39cf7ca33d1f9 SHA512 34e4e98219b9146ef843d94c2e854e951a9b7e81409e603e77e7defdbb8765c013a2c869a4f5db2244352ca35656e18667a0210dd24099cb3e4552a04b23aef8
-EBUILD python-augeas-1.1.0-r1.ebuild 624 BLAKE2B 81e834b24177ffc3007bc30ebca1d5645304b936fa4bbfad7b06fb6f1896f57cc381b2d6ea7a4bdeab6b8717d19c3b2a3efc911212a6aa182e91a6d5f2ccce20 SHA512 334581a68a3edea1fd6f79ba64b5b4a0f6519bc3a4072d2089cca8a0eb46dbb31c5beb9c88e9bb6791a3eaeb44872383c5dd2a0fa1d50b7c84116a612c2e7062
+EBUILD python-augeas-1.1.0-r1.ebuild 597 BLAKE2B 86cbcf2d4968e075e26ff30259ef89bbf88c97f9467ee8f40601c8776635726bd209b0219f89d52b8a9a97944a4dac75a56f2ed14e0b6d6af1284228ec55c744 SHA512 43b6b51e837762b850776f28a2d277b0d0ccc2a304aedfe689833dcaed53200c669056890a971cbf4f076da3d9cb40a5f08c2e72b8887a4758fef50e393f2445
 MISC metadata.xml 423 BLAKE2B 0caa39c52d7e83a0955531808d9bc2abb0ca3d5a1d81d0c1258d209debed472e55c96f93f6e6474beef75ce6b0691195c0b1092154eb463ffdb4190b4c59f0fc SHA512 53e90a9adbf82e9e3f7671b7de404fa4e32050aa9316b226efd782ad49628eeb3a407d6ad45a71bce698eafd60ac3bb46b6289df094fccfd2196d9d33ae290a2
diff --git a/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild b/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild
index 1ed10b5cae5e..75a88f6b1902 100644
--- a/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild
+++ b/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python bindings for Augeas"
 HOMEPAGE="http://augeas.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 787a57fc7d06..fb3c970ed7c1 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,3 +1,3 @@
 DIST python-bugzilla-3.2.0.tar.gz 114279 BLAKE2B 4d2d7bfaab08dfeb4334462334f23f952b43255e656b0e39eff29bfc206529062c86c79b8c83110fbc5c3970bba40663318b65e208c1b10fb04ab6fb474eeb95 SHA512 215945a0ffd637be5567839303a738a0eef74427838bf0074a5f0ab6022306f47fc0dd5c43a3513b627fb458711f38046321ee9c2c3d43b61ffc577d6dd12375
-EBUILD python-bugzilla-3.2.0-r1.ebuild 750 BLAKE2B d44fc3924d8b270d82b132120a93a91b86a19debafa750d14bf6f91a9f20b6757b65137888db83084d61e039f6c0049d68b783a1242e66e48fa7b2f3d8d1b848 SHA512 6d29ea448be4b38d3c0bff63ae9bc3178d5e1b224f854d32048496ae636e938d7daab169d978f397bd4b939e6e7fe12a3f08094735fa751d9f7e23635a36bfa7
+EBUILD python-bugzilla-3.2.0-r1.ebuild 723 BLAKE2B 15698f7d7e30908881578afa100f26b4cd89381dafc3b1ab55de28681abe2995acb29b9a551c444a6d0c105f9762c3c96153e8c387b70cf473256ec6ce5e9d8f SHA512 1b859fa9e1da5b4449547be357928f6cbe39ee1e5cfff2cac14f753abce7bd505493fb1ae544d1fe2c313c37f845810c9c649186ec7f819fca8cd47d3db86a35
 MISC metadata.xml 662 BLAKE2B ef0a5692d9d4f3ca0f474eb012ef97cccba5fa9c8737ac85852d9bb3214160d69fc95eca8239de8d08bf6ea04b5004097ce6b192c2276bc574f441766042c7b3 SHA512 e4ce0016e9ab606c8233759992ea2daa8b20df9b60f129c0b3e210536f0697b46469828de321fa7a09e56889747da67cb38242b739aed227d4a60657207e7f8b
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
index 8fff40284f13..3f93f0ced781 100644
--- a/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
 HOMEPAGE="
 	https://github.com/python-bugzilla/python-bugzilla/
 	https://pypi.org/project/python-bugzilla/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 LICENSE="GPL-2+"
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index a3499d652b85..d54887a7c9a8 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1,3 +1,3 @@
 DIST python-daemon-2.3.2.tar.gz 83127 BLAKE2B bce00867850e8451bcaf5a51864bdd751fa3b5e7be8ae1d36d724a915680713fc66c0fc6c8499bce03e0eb86465f5806fb8645376e600b8eac579fee3c24a087 SHA512 d9f6e6c376a496fae96bd9efed0a56d00a137617a3d1d5ef74802ef176bc813bb1d49bbb9164cdbec03213529f944b32b257bcc64283abfa4a3522ff00826bfd
-EBUILD python-daemon-2.3.2.ebuild 816 BLAKE2B ef5ff596dbd862ed4c8f9b262166f6c0136421aa8f7d08f042d971d16ed6b908b552f4ff8b944c956cbb9b0df6b9e2fa238bc110d600bac7d172b58059858e2a SHA512 a23a8ab038284fa6ebc589bebaa1c23b2694bc49ba0eb5fc7b589ce02e1a63ae97dbfbff78e93f73149e164d516a4a71bff1b0787b1f00af00a176eeb0aa3b6e
+EBUILD python-daemon-2.3.2.ebuild 789 BLAKE2B 72febe0c35a6d71290dc9954e07a6c75a175e9d2662592522f3336b0de9e5bcdccb14f2d1f6a78436dff5ea0b7647b407e7587cd479edff9cbbfb0ba8c6524f5 SHA512 71b937ccd95f39f53182118a278003b75f5c4dab9346bb48f71429cf7df5f908748d1d4278ff2762d61a543c0a744bf58f4210c8c51b39742393ccc58bdfe3d5
 MISC metadata.xml 341 BLAKE2B 62d37c28a9bf9e9fc6e2dd9fc5295558eb395dac54a45e548ec7d6738fdebe42053cd2f85b160135fe8fe5828eb065bf7d95b17f3c76697ab6ca2f0e664ffb8b SHA512 83badd112e5e5ed2584cd883abc20b43a18585e7c1d006c4d4861f555e633225f251d7c5b05e2e8f94f74107e32a5eeffcdd3f1265feb463f7c521c7c7141752
diff --git a/dev-python/python-daemon/python-daemon-2.3.2.ebuild b/dev-python/python-daemon/python-daemon-2.3.2.ebuild
index d1a4abe34253..1e5e70723db1 100644
--- a/dev-python/python-daemon/python-daemon-2.3.2.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.3.2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Library to implement a well-behaved Unix daemon process"
 HOMEPAGE="
 	https://pagure.io/python-daemon/
 	https://pypi.org/project/python-daemon/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 # build system and tests use GPL-3.0+ but none of these files are installed
 LICENSE="Apache-2.0"
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index fc902063ba98..0906adeb4ff0 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,5 +1,5 @@
 AUX python-dateutil-2.8.1-no-pytest-cov.patch 687 BLAKE2B 97eb6d653a013b6fb279209804d7a82b4599ed672eb7a6b94654dc789ae3ad5e2978c9684439d94e405423c0a022ff70155c7d50f5d03a5e74cfe111a665ff7c SHA512 f4e90ed1d1cdab509a574319ae6cf0b646c2741eb05459c408caa29e1a6ca512e71a258ca8119c8e1f59948276c9e14e726b6f53cea868709bd89dea2280b700
 AUX python-dateutil-2.8.2-system-tzdata.patch 3495 BLAKE2B b3d5ca203731932044f16bcde48f8f981f6907ce8a9319423d41eb0baf62331d472c1a5dd72ec3ac1f059296423adaea18bd4ea6d660add56cfd73ea86f26bf2 SHA512 44d2f3f9f0c04401cb545dc0a757b682eb3a9a66e63cf64121e75243cebdfa53945c6ae9bf197cb6b754c9732e9407fc9384aa45b2d7181740bb1ae23af718fe
 DIST python-dateutil-2.8.2.tar.gz 357324 BLAKE2B 060f97280b63ed70e6d83fa5696af6dc3c729cdf5bc48c7a90e3e59eb0cc0360e5205536685550330d64ecc9b6e40ca12888409d6819dd136b17a67add2ec4e8 SHA512 6538858e4a3e2d1de1bf25b6d8b25e3a8d20bf60fb85e32d07ac491c90ce193e268bb5641371b8a79fb0f033a184bac9896b3bc643c1aca9ee9c6478286ac20c
-EBUILD python-dateutil-2.8.2-r1.ebuild 1144 BLAKE2B d0a8cf897965f11a5e70ad21cf50e25248491f5610692f4a09228a323775626e04209ebfa25224ff79449a20da66918281f4048d5e0c5d2c8ca1204860e004bc SHA512 40ae958fa6484fd9790012622e42587505e82fab8b36e0d739fbaff9a5aec653de5ea363f634e2f8d0a5399e3544e3a45ec0de0024b4aa2aff16b31b5ab543cf
+EBUILD python-dateutil-2.8.2-r1.ebuild 1117 BLAKE2B e12b0df734dbf09a77d66108f7e1ad37ae4dd91417db17d5e9c9f4c64b1a154279d46e2f06ab261fa5c53ba325b39a0e0c0f3dde0b722de4792c545e02fd8aea SHA512 dd7e5765cf8243442d4f3cbad89e956633d1260369cbbb5edfcde8cea2fda419f5a6a68d5a8804b980ef7a6b4537ea586796562460b979cd36f028b9f103c1de
 MISC metadata.xml 629 BLAKE2B 214855770bf1b160328f6a862bc1e3fd2d0e27a36c8ad240d494e8d8a54e5be4bac6abb7c2b94b1d8cccd7cc1026a100c8cc092203de3fd4c4173139d4722385 SHA512 ae326caea99b731c8ba2a162b2ea7e9441381777c9be8dd021caf12e04d2ec068215f61bbe2dd1baa6d4710defcd2dbc4ec5ee8b15f1c1817aaba1f8c841eda5
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
index c04c839172e0..5ad76c61f9bc 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
@@ -4,9 +4,10 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Extensions to the standard Python datetime module"
 HOMEPAGE="
@@ -14,7 +15,6 @@ HOMEPAGE="
 	https://pypi.org/project/python-dateutil/
 	https://github.com/dateutil/dateutil/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
index cefbd087148a..2c755abc890f 100644
--- a/dev-python/python-editor/Manifest
+++ b/dev-python/python-editor/Manifest
@@ -1,3 +1,3 @@
 DIST python-editor-1.0.4.tar.gz 7132 BLAKE2B c955a2e3d2f607133781ef17146b20c13a409def6397e9698a8bc19c5a9f40af002a0f772455fb96e60088a732013ea6c471c198be0ac4c6c881724e762844c2 SHA512 c8ce2403bfe6c93935c7f4c384a8618a39cdaefe1ff5b1ff2cf4562866d8b3caa616e428c0a1634a56db934caeb474e7f84f8d5e009b9ed664189fdece8146f6
-EBUILD python-editor-1.0.4-r2.ebuild 491 BLAKE2B f619808a970d41a40ef5b40c7d7b4649ef1cf150e89682908aa44de1d1f5612e5ccbde473e7348cc0d00b5647cc68726121a78bfb10914b4187cbbe72c6518bf SHA512 84d10d3659b4bb941ee33b5fb103b8a81da49e6e5dcc48740fb6bb5859f1332938e52ef3c7590c74efc2f61108cbccdc7badef5459ecee59f32a8224181fb7c6
+EBUILD python-editor-1.0.4-r2.ebuild 464 BLAKE2B a375b5400e3feeb63846830d8afa0127e72e541824fdb9e74551959a3fa21f2ef9b123db77b8eca84c84b2d3dfd7dd1fcd7a55f5fd3f67c9e403402ac1de48ab SHA512 87d213a593f699bcbc25d53f70f47c7a86adb58b411fd7da1e9caad32dd2ce6cc3f63b7a4d97a9c5cad4b6c55f606e8225f1b04543023590ad8e65d0cdc44246
 MISC metadata.xml 479 BLAKE2B f34e8a8eddc2cf672c14027217798582df17f1a396d9b29bdcbc31dc523e718364ae0cf8254c2145e80ead1a8c1433eed0da7999fdb7bc0a952d6bfa8ec231c9 SHA512 d9a8cfa2722de34a33cf6db2f512e3407dc9aff72b7525cd798ac33efe26550f21e1db5ccda9610799d64e3fc5e9d4e02f0151200369f3c661e44e2a7aa3e71e
diff --git a/dev-python/python-editor/python-editor-1.0.4-r2.ebuild b/dev-python/python-editor/python-editor-1.0.4-r2.ebuild
index 2f469dd0ad55..1ec9feb7425d 100644
--- a/dev-python/python-editor/python-editor-1.0.4-r2.ebuild
+++ b/dev-python/python-editor/python-editor-1.0.4-r2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( pypy3 python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Programmatically open an editor, capture the result"
 HOMEPAGE="
 	https://github.com/fmoo/python-editor/
 	https://pypi.org/project/python-editor/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index 3bd3184161e5..cbc36a25838b 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1,4 +1,4 @@
 AUX python-gflags-3.1.1-script-install.patch 1178 BLAKE2B 26f5694548762a2d6b8e6787027862edba91e8baf39a7c8dfc573be61af48cebf7a280646c948c0b59fab48d3b46fd4049d8422f8d4e6d9a57afe6e363c63999 SHA512 7247303c33a845949b1db7104f3170497da980334cb02155501d194eb53eb61ae2231cd4ece06194ca64514271252f8f1fc7c7683cbff2bb8f96d6d4e88123d5
 DIST python-gflags-3.1.2.tar.gz 52093 BLAKE2B 4275b43ecf2c58f76fee0b1ff4645eb3176a9ae3b68fdd4a059c2f6f659ca1d9b6e4fad152a2fa48f1eb22c467dbc006835c241c21f89c0ca92367e484f34c6f SHA512 7a3c08b6b212cdb9cb7feaa48e3875d1204a4b3a57182508a078331565f70509d00c315400fa0316dbf61ed4d6a6a04ca8c1a2303567d37650d8dfbb329e2f6c
-EBUILD python-gflags-3.1.2-r2.ebuild 828 BLAKE2B d2f2c5a7fdfd05ba34741f0cfac5968e0515520cf88c38beb0ada0361c32aa29159e70fc56cea071d83d37940243b0246a2f9c4e198d3dccff2c9760a7b33fa3 SHA512 014d86700614c9c92f28c4ee81ce75a2be15eb24544920e18dc9c9bd096e1b8b50ded052002a45a7f2df2611a1ce60d644ee7fc68eca35e54ee963eb31886311
+EBUILD python-gflags-3.1.2-r2.ebuild 801 BLAKE2B 2d3aa1a2105264ccbd3dbbe4a552a44b50e6d419ff9183927104f71fdf78c7db4f1a2d413a04a9603d915338fd4b5744c91de3f88df9b0c4c1d9de43034a2ae2 SHA512 d30f8e87317152b0c5e1ca70838587e8d955c536def9b7666c8c81e930beb19e208dde2b786410e2eaf6a902b4855ad8dce8a36b4a018103d0f214004cb0ffde
 MISC metadata.xml 401 BLAKE2B eae24da2b1e8099693b44fe2aea5f124cb8d4ec8a3e3b2caca54687325b8340f3f449b3c5d65aecb3d526c40d804c42d97d42b0afefeae8105fc33193835cd90 SHA512 dc651536c02078847ee2c24ed88d0fb4c24852224c3a1832b2420fac6ef15e9431917c238524030d28267cdefa65f491dc1496094b1dae1df32b604712d8c1f1
diff --git a/dev-python/python-gflags/python-gflags-3.1.2-r2.ebuild b/dev-python/python-gflags/python-gflags-3.1.2-r2.ebuild
index d42226ed7f90..372c286e3710 100644
--- a/dev-python/python-gflags/python-gflags-3.1.2-r2.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.2-r2.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Google's Python argument parsing library"
 HOMEPAGE="https://github.com/google/python-gflags"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/python-lsp-jsonrpc/Manifest b/dev-python/python-lsp-jsonrpc/Manifest
index 762e3c80d3f5..ac21f53b11f2 100644
--- a/dev-python/python-lsp-jsonrpc/Manifest
+++ b/dev-python/python-lsp-jsonrpc/Manifest
@@ -1,4 +1,4 @@
 AUX python-lsp-jsonrpc-1.0.0-fix-test-with-ujson-3-and-up.patch 342 BLAKE2B aafe30896b88531102ff79900d845a24a506ff8d0649699311e77f9ba6742f591500e2cb83a2e5aff3118a1174819b2745a8f9ca6919af8b84d379422c7e06b7 SHA512 baaa0105df9906d451a9870c7f0ca5980c6b667b7d8c4fb4f57a0fb3bfbd3f2b7502cfeea7f2abb041c2dcb344f6f5ef69822d82daed3de1ebe4564c812c7430
 DIST python-lsp-jsonrpc-1.0.0.tar.gz 10011 BLAKE2B 671490d439f10eebf2d05f221adad25be6f881f4a0f4fa975d4574937a951d4d0bc51264a9ec67d3ef5d112b6e025b551685d3e3c2b959c4a6bcef92d46c5ff3 SHA512 447835fc6c3810f486d80f85295089c021b792843bdf88d461c021b8b04407d8f7e6a99c07351a23658a5dff46eb475bc64e51bdec029787cd33330b54d4dfec
-EBUILD python-lsp-jsonrpc-1.0.0.ebuild 768 BLAKE2B da1f8d4409ba077efd35b0dff5535c0df804f06d92c1cb439e1ed55ea87612f3145ff45cb75d8b3f6853021b2bba27e97d105f6514b789dd71ec9203a149cfeb SHA512 df8477b98ed819068ae0781cdcf4fe9486858b26d3d097d6ed938d500f25f921cfa89eb88dcd8910f6101593c89b038eece52c55e3a2b482fcb9bc87bfab38b4
+EBUILD python-lsp-jsonrpc-1.0.0.ebuild 741 BLAKE2B 03454ef44ad56ecea266471ea2d70159ec8d4faf78a02089eac663f415d946a7014954e73d4bb65b056304e27665dde317b9b0c5a00f305dce995b75ed597c1b SHA512 21ec7cf35e3bf786cd9c662b05dfa107bbb7d09f0a90d48cc92ff4fb4913634133ec126108fce41e69d8cf8e3cf6659ccedfdc21a3aa0ab081cec56b64383bee
 MISC metadata.xml 465 BLAKE2B c1c85dc7e2694420f8fcb80c4de578d159fa124b3cf7388d66220b6425ca6a11bad88b3ed91f5272f81a2604dd68009e4076a5d800585a2e4e6f9c448eb25a8e SHA512 16456c751af90b7169978398771635459406029275332d569304f9369ecd0ee5b4cb1e269c9a22c5b636d72e6c5f685f55e5f6b73a62b730c2b8c8734ba971bd
diff --git a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
index 6319c7914137..c44717193343 100644
--- a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
+++ b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="JSON RPC 2.0 server library"
 HOMEPAGE="https://github.com/python-lsp/python-lsp-jsonrpc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index d7e9d4dba085..086ef01762e9 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,4 +1,4 @@
 AUX python-lsp-server-1.7.1-unpin-all-the-deps.patch 1699 BLAKE2B 0b996ff8590cb3e68007077e2ddda23f64d5ddc9ea272794aee4a9c23dc74bcd44cae65702aa4f03dfe5988c58d90d8dc21b9e249a5c7b3e80083aa0786cf330 SHA512 d46be45443f0e4282104f1e702f8ea5c9f3848f2ea3c63d7007db6876e3abd93f063aa181b2bd4916fb6ddecc6f00da0d8cafccd0eba79657b9bfce051fa735d
 DIST python-lsp-server-1.7.1.tar.gz 95731 BLAKE2B 0cdcda04ef849cb0c5fa83f1f701e986e22fb1228112eaf355bfedc52cca4fcc5927352c71b74fa3903526d8a1fc80fa57ac3e6ee7bcc2609556c2398dd2bbb8 SHA512 36c90f45071f35d0aeb0a57795eb6e9fb531baf9e8b468031b0d3e9eb2d53bee439893a333c6bf5f9d5b0818ec53675a3824850abef3e866e8ebdcd4a6142c48
-EBUILD python-lsp-server-1.7.1.ebuild 3091 BLAKE2B bb9df4af1b7e4edadb07d9e4b8e3e2cfc33e5d1a8725bdb4569ff268fba3f2220f41bfd975d5c524dbe0354aaeabd8336ecf9ad472fcf472fabee9419632c01b SHA512 5c72968d64183b7c3dcef5f0149970d8bfc4ae52f9db5e549e3b196be58e08897a1c363a2a914036b22ce19951fe0b856d22b53e3a8473fbd61d567dce8d2f76
+EBUILD python-lsp-server-1.7.1.ebuild 3064 BLAKE2B 0e1d1948808a23ded46e0aea73acb4cb88acb156f50d5dc13fd6d05a6a1dcae8cba6b19e6f556abf67d87b3cbbc512eb5adba7aa859b1be67f680e7cca89b1bc SHA512 87b4c80dfb290c7cd12d0b9da6f5086e7a778e5096eb489610ff65f71b19242dbb7ff78a8c3b84bdd46958384981f639d5fb7648bffa54e99f0dc904e0b8b4d5
 MISC metadata.xml 610 BLAKE2B e111007adc2612409df72955babe0c4725fd5726449435988cf13c1142049d78089d38e54783712e2c70c74437157ffb2049bd9d63322cec084204eb5038e724 SHA512 5e1e4b43a5bfacb6a2fcae57413ebf79c6aed917b00022140d855acd773d82e56b2d73ae8270d42675a34d9f37f9ad53c8f61930c3f447d8a9e45a521a20e9bb
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.7.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.7.1.ebuild
index 7a9c2d8d1ade..7094a8bfd84c 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.7.1.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.7.1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1 optfeature
+inherit distutils-r1 optfeature pypi
 
 DESCRIPTION="Python Language Server for the Language Server Protocol"
 HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
index 4de35256e270..8697f4b1d5af 100644
--- a/dev-python/python-lzo/Manifest
+++ b/dev-python/python-lzo/Manifest
@@ -1,4 +1,4 @@
 AUX python-lzo-1.14-pytest.patch 2080 BLAKE2B 00b9fd5d242fba39a57b53c1c4c2af32c6a6457e787616f019b861d3bfb96582eb61668f3bbf51794d2b9c4f8d7d08f5a637e39a1e39b58d69299c4e66acde00 SHA512 9c6b1f9743dfca25832d225e2e0d46aaacf0a6f591a5d430349c972a80888e4d5bed8752970a7dc46813fddb3887a30cf2dbe8a66aa098e71b003f5c9ea0eff5
 DIST python-lzo-1.14.tar.gz 14050 BLAKE2B e1df6b842562064ca13ddbacb194047ca343694d480a5a65e7d2876ec98a4215b4badb3b2a839f308dea8624c162a0536f363c093bcb2e5b48c68b69fb472729 SHA512 036cf7199afe12cec8b9c7ee92134f58357e1f892870ade3a619541a69c9cc92155892d53bd43330732b848016c2997e096a9a492e52f15d04fa516ca7645b93
-EBUILD python-lzo-1.14-r1.ebuild 769 BLAKE2B 19698d14693b93d97527b75a62f1463840da7f55396ff8058e139dbe948357192ab2ca43018bee32f221092e0ca3f80b597b94ee9857b4486a18ba8cc0ba15f2 SHA512 82336c98e6e4b7ac58928227eb02e43a1d0659824f7916875a48b2491f2fc31f6b192abc9cd7266465ab1ffdce6023f1b6bbe55f25b94cbfc9e731e83b7e1e7b
+EBUILD python-lzo-1.14-r1.ebuild 742 BLAKE2B 483a61ec83c49ea1fdcbb7c7867b29f18f5fa5ad1c51b59e2bb831b55f3c89f7d3d0f11bbe11c4695ea97c5feb6fdf514158a388ee664b3deff1183e6901d03c SHA512 86807c5fedc6364f660a6e4fe0e5d08dfe4a5ef60fe4843ed9a0f5747084c22cdcab7396b4c92d3995c47246771a8f103e1bdcb010a56b556f0855e2a42c610a
 MISC metadata.xml 386 BLAKE2B d9e750b2ca0a3d46a031a5fab249197e73847ee5997a12c71f441eb5e386821818df07dadb272d5a726255a9310afecafa34b5f2196b49095a5ddd768054f5b4 SHA512 d98f79fd1e62456f1603ba412cdfb14e986c6d7831b6c88d9b561da24d36924aa3a979411f1d216cbbaf4740af2db733f61dd13f64ef94fe0e6d8e5e80545630
diff --git a/dev-python/python-lzo/python-lzo-1.14-r1.ebuild b/dev-python/python-lzo/python-lzo-1.14-r1.ebuild
index d98565f153fb..20182f883e18 100644
--- a/dev-python/python-lzo/python-lzo-1.14-r1.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.14-r1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1 prefix
+inherit distutils-r1 prefix pypi
 
 DESCRIPTION="Python interface to lzo"
 HOMEPAGE="https://github.com/jd-boyd/python-lzo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/python-mimeparse/Manifest b/dev-python/python-mimeparse/Manifest
index 134ed6e934ac..006b2635fc5d 100644
--- a/dev-python/python-mimeparse/Manifest
+++ b/dev-python/python-mimeparse/Manifest
@@ -1,3 +1,3 @@
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
-EBUILD python-mimeparse-1.6.0-r3.ebuild 592 BLAKE2B 570c2bb444791cd429d2e63a2a64e0f37af7ad23c6635f6d80faeab078b7e6424f6020b0ecee5e045bd160b84a0bbcdb119392d327005f6fd62d15a782340c8c SHA512 0c5fad2c13dfdc507192ee739a387011742517d35a5d6b9708dfbca0b638e9490622f20defe5a5a1737e79e629f6411564be10afc31c1334b759ff075bf5f3ae
+EBUILD python-mimeparse-1.6.0-r3.ebuild 565 BLAKE2B 799d5d494df739b9fbf0af7dacfa358e60390aec2a96a71c2395aacdc71575c4b27f229104968ea8952fe0daa58628fe7c882911a63f7b9214d3f9b03a796bb3 SHA512 3cb1a782eacce5908a12f8eb096cdca927e707af938e6a6f2a394021a826c1bcc5ce6833b02f2282ca1b3d3388ab1848a69e58cf9be2bd368268d83319eb3a86
 MISC metadata.xml 420 BLAKE2B 908782d7a4e94706f35fb8a2b802ea10866e9cc87af3556a548e133cc2d31ee39284861bc6bd3652ba99437fac82a7c2fc23eefc7294092910438723930d2c11 SHA512 7548eb1027e03bc129d97aba45c2418832fc2676f618e42b648e03de7544e65d34eabd65067da44c7190aa4652d623e70796a0b02433a0741988c08813673966
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
index 1b62c0932a42..17c068963632 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Basic functions for handling mime-types in python"
 HOMEPAGE="https://github.com/dbtsai/python-mimeparse"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/python-redmine/Manifest b/dev-python/python-redmine/Manifest
index 63910e8e85d0..073c92290be5 100644
--- a/dev-python/python-redmine/Manifest
+++ b/dev-python/python-redmine/Manifest
@@ -1,3 +1,3 @@
 DIST python-redmine-2.4.0.tar.gz 67730 BLAKE2B 22c74ad194af9b56affab39de38b13a8f5a46e79b8ea8d9f9f47eb12c4ad4c91156db9ef0e8dfd013602b8cc06e0636a724ae34969f385dc9f8ffc63514ccc63 SHA512 afb03ca8a3bdacace3c12b7295ba08953ab2040971b57988deb9955df24e5ac1782a9b3fbf0f5070eb22c640e88f489cda12cdec38449f9e3bcf7189dc422642
-EBUILD python-redmine-2.4.0.ebuild 596 BLAKE2B e74fd7f8423b8e6b1a36bb3c15fa3095414acfe70796b6b5354062e99f6f2bc75b105b9f26dcd28b26413061d086f71f95ac53415cae90a3400dfc9fbd5ec536 SHA512 c5015b2ced3c22ac7c5e1ac6874fc0621887d0c8e3098f4017af99d8cf4fdb38f0a77d482e82db98d90c259b07fa4c04004cfc11da1007bc259f60a18b5a527b
+EBUILD python-redmine-2.4.0.ebuild 570 BLAKE2B 04a7065f9d8a355f4669fc992f888348235e8b370d7133a3503bff0801c9ff369dc5b34c8cb417b34ad4b8ca51f80d7ad69f7f4bdf97d4ea77652f0625598172 SHA512 cc4c9dc3c6703cadf3566630cbfa61a5845a9c8a451b8fc17cc8f7f4aa204c1861ee23e43abf39da8583a30ecc097ea7a1a467af8e04b31338a5956265a1a5cf
 MISC metadata.xml 426 BLAKE2B 4b854d12e2cd5977800ee0ba114e1e8cf3895afc412d50b7ca9101842c3430a076e8daa07ae58624e3ae25163cf49de5924f9df7735550903f79ffbebbdd3763 SHA512 e56e41d36e3fbb82ec4b592ec3c6b4a69669bf79c159a97045b7643676361208885ec18a0dfd2462a8f456435d5ec51250b893693f9411c727e8bd44c8a4ae92
diff --git a/dev-python/python-redmine/python-redmine-2.4.0.ebuild b/dev-python/python-redmine/python-redmine-2.4.0.ebuild
index b2161c074c88..da55d3bf3c50 100644
--- a/dev-python/python-redmine/python-redmine-2.4.0.ebuild
+++ b/dev-python/python-redmine/python-redmine-2.4.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python interface to the Redmine REST API"
 HOMEPAGE="
 	https://github.com/maxtepkeev/python-redmine/
 	https://pypi.org/project/python-redmine/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/python-rtmidi/Manifest b/dev-python/python-rtmidi/Manifest
index e247227c0383..29aeaefa886c 100644
--- a/dev-python/python-rtmidi/Manifest
+++ b/dev-python/python-rtmidi/Manifest
@@ -1,4 +1,4 @@
 AUX python-rtmidi-1.4.9-unbundle_rtmidi.patch 2137 BLAKE2B b27c438fa93c00fd458fd8083302838ad0ca96c09c89f0993c6fdc09681f8eccddca53445925c1b437860faa488115d2bc33076a202a5dd730f44cef298c9831 SHA512 6d42f2fe1d533d85ae7ac32b903fc087d4932904905fd778e1979aaed3d4dd6e45db4a49ab87089d67a68ac24b724ef0c7e52eb815badb98d972d3de8cd70677
 DIST python-rtmidi-1.4.9.tar.gz 251238 BLAKE2B dda4052e893839f88a6756306f8ff4e89ee66ad9716d374efbb7b92a8e9074e98c8d5df0cc82aa3c6e0c77a78fe9b997079623a5147c03eeea9128dfb7605215 SHA512 91c5a0f807549fbe9d87df6e40b8c3db0f9be753616ba51804900195d02120cd972e39c69dd99e60e4ea1b1d9831d0b956b64ce71b2fe03422efc57bccf5cb70
-EBUILD python-rtmidi-1.4.9.ebuild 1174 BLAKE2B 1b4627080aaa0757c742f672aacbf9ba173dcac23693c807720e9140ec02eeaabf8d210218bb7745fc90f7d6610415dfaa855550d759af4338343007f043ff36 SHA512 135bf21c9534771372eec2dbe638c1825359d0d937cdb02ef7a900462ff004ab11f0f627791e02d5fa18ff586bf2b9bc4b0eec25a2dcda2599dbc060e0cbd8cc
+EBUILD python-rtmidi-1.4.9.ebuild 1147 BLAKE2B 7a49aced93d0a8aad757f57d91790f49fe61d78bafbd06685f96fcb76ad4b3499ebc4bf36188867a221f4e240d0212f89da47a6b23f498aa18085bec705ac819 SHA512 fb429d92746f974c6b23ac275389b00a331685e89ff4d76c85535f4e4967bf9b5752688b4cb7020197647bf43eb7d02d9c1796bb614b39a4ca6b96c72c7e817d
 MISC metadata.xml 388 BLAKE2B b1bce0f609aae5a298c26c80c3dc3aa33eadf32c9de9da22f4a4f808d1cfd8c769b095d12f2264cf9dd04cdbec8a0fb7202b10c04bb43f9112146023aadd398d SHA512 012ad743d364b9266bef852d159235f27b172ec7fceff43737fe8a67478f991dc53532b021c02d8ffc2eea19cdc568046cf90e440afefb46dcdad275a33f71e3
diff --git a/dev-python/python-rtmidi/python-rtmidi-1.4.9.ebuild b/dev-python/python-rtmidi/python-rtmidi-1.4.9.ebuild
index a659ecf1c70b..69f7947f93cd 100644
--- a/dev-python/python-rtmidi/python-rtmidi-1.4.9.ebuild
+++ b/dev-python/python-rtmidi/python-rtmidi-1.4.9.ebuild
@@ -5,15 +5,15 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python bindings for media-libs/rtmidi implemented using Cython"
 HOMEPAGE="
 	https://pypi.org/project/python-rtmidi/
 	https://spotlightkid.github.io/python-rtmidi/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/python-snappy/Manifest b/dev-python/python-snappy/Manifest
index 8c37641aa390..3a6b5d7839fe 100644
--- a/dev-python/python-snappy/Manifest
+++ b/dev-python/python-snappy/Manifest
@@ -1,3 +1,3 @@
 DIST python-snappy-0.6.1.tar.gz 24110 BLAKE2B 66ba24aa1768084c87188dde6eb6c98daf90da39e49902bbc283226aaf28b8d267bbc69f3cb9f30d9aaf64b3e25cc0fae47113bcc65f18dbec2128294c0dbe4b SHA512 43301f568633068bbdcb3dc318f37efcabbb5bd3f61a06b3a3a476006c3cbc1dfddea4ac2de0876bb127b354aa81ccc55dc44631dc8fba06036a0b6c7dfbdb9b
-EBUILD python-snappy-0.6.1.ebuild 725 BLAKE2B 4cd1a75e9dda9d6474abc633ba5c89b465ce30a6f69adcb4670b6c017c665b2894b225fbc533399809032daa494489955b414d883fdbac1227635828c6e28317 SHA512 1d1d7f5101fdde08f5e49aa2b5a27ede523b3030aba7ee604a9cba09d591a914ff36d0c34f05e6f630ae57e0027a9d1b2b11fa3889bd43e10bbe6e5214f6ebb3
+EBUILD python-snappy-0.6.1.ebuild 699 BLAKE2B 092fde3155a4db355543bf0634a13964eefdd1205c05ff1df8b34e3d981c7c1b028d11771874bec61cc04723718bf389f4ff9256a5c622e429ed9fbe9fc95fb3 SHA512 1d02f5eca28cba6eadf38ca998363fef634b15076b6c6bd6bb94674737e2d71c6b72f83abb088bfcdaa452e73fe77756dc593c11447b51f19cd0de12546a10bb
 MISC metadata.xml 377 BLAKE2B 5f5e3a28de9581661a02df12064d6682c05849ff7e4c5a26cbada7cdea562bc6c4b086f6d68382d962cfe23e1b250e0a87873229f406d0cb52dff1df5606aa65 SHA512 1cd283f4145af830191d8658c7ccbcfe7866cc5d2c6861171320a5990e4e0de402ffb6b221013ebbf844b9022654c230040153f77d0bf2c77e92e427ea7b7021
diff --git a/dev-python/python-snappy/python-snappy-0.6.1.ebuild b/dev-python/python-snappy/python-snappy-0.6.1.ebuild
index 4e781106a794..43c1f704281d 100644
--- a/dev-python/python-snappy/python-snappy-0.6.1.ebuild
+++ b/dev-python/python-snappy/python-snappy-0.6.1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python library for the snappy compression library from Google"
 HOMEPAGE="
 	https://github.com/andrix/python-snappy/
 	https://pypi.org/project/python-snappy/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index a88475fbcdda..ddcb486f3940 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,7 +1,3 @@
-DIST python-utils-3.4.5.tar.gz 28608 BLAKE2B c933bf358ad61563fc35bc87329367946a64216afaddb3cd5bff861e0e1fadcc4d18c7a8ff7820bfee5938bc7ede3cea9d450ecc5b7c0825f917c59576d7195c SHA512 35b4b49dfce56e9e530fe979c070889296079d3a1fd548186bf6dbd6fdbce5363818b52a5d7559b7af3bd32561d87639565298386883351168a267fa88e1ff7f
-DIST python-utils-3.5.1.tar.gz 26753 BLAKE2B f6a6f84883671e4e17938bf8a70332766b3e61f77bd86eda976915a5967710c4c8a6bdd295b6ca9d46bed98b30866bbaabd67ac3d4311dfe061fbc3c5a41e4af SHA512 427660db279b438ce30218bea72f96b952f6cd37c99184f04d458814500f056b16ed4f2fa743f94499a996366c162006c771e9523491afb2a7ee0f666ab98718
 DIST python-utils-3.5.2.tar.gz 26883 BLAKE2B 9532d8fecd8d57a9a9f50e2e7e67386e4c5922f4ec316851544147f6da82586bb01796bb3e3fc95c894a790c57711c983d8da9abc5edc5a722089a0d86d7fb61 SHA512 2e36bbb2e43591744c63ea972b7f361138694eb32510643ea88e8d757882379e3aec247c2fc4d5c67876939b71d564570a975700728c79f9db0cc4fcbc1605e7
-EBUILD python-utils-3.4.5.ebuild 762 BLAKE2B 506433911e055bfd82cf4832c9938ea9867c5bcc0558365a51842958aef0083a644fed621679f573d5882fc030139895eeddc3df32b44a9a8520df2bbd1929fc SHA512 4a4326178f7d948a37726cee5684086d3de847678025e6c8771f6075c4cdbfab90d7050c5bade86d4688f127fb2d653b0b629bf464c56989c050d928b3709e6e
-EBUILD python-utils-3.5.1.ebuild 736 BLAKE2B 5f089b0ee5c2de5e825988d24d063c6ca8b54851abbee02fdb73c598a17eb8ba45cba1015e87f4af3b25b9e7c52021d7540ed49a2ad5ba6d0dc17ca6be145cfd SHA512 edc755c323b082b7fda63ddc994874e90f8cea3cc4d415d5162f49bbe0ff1e0e3b8c8ea951c3434ad6471678ce5ff57a599a643ff158ab4fa3879ef236d824ec
-EBUILD python-utils-3.5.2.ebuild 736 BLAKE2B 5f089b0ee5c2de5e825988d24d063c6ca8b54851abbee02fdb73c598a17eb8ba45cba1015e87f4af3b25b9e7c52021d7540ed49a2ad5ba6d0dc17ca6be145cfd SHA512 edc755c323b082b7fda63ddc994874e90f8cea3cc4d415d5162f49bbe0ff1e0e3b8c8ea951c3434ad6471678ce5ff57a599a643ff158ab4fa3879ef236d824ec
-MISC metadata.xml 340 BLAKE2B dc9b0299a4b93a0e53cc8e8e5ab494a8bf04ea54da4c2f9a658ca485925f86b5a765299c6680ecbff1e29a4e94a88dcac1891e440c788ada76b2123e352ac6f2 SHA512 68222ff7625c88a73f918e1864b67a2a44ef128023668b2a8706e873b4a8703928f1961baa0b304fe8fa075261edcd183bae02a2416813b283aa57c16bf6e200
+EBUILD python-utils-3.5.2.ebuild 735 BLAKE2B ca117316e18466936ee0d891a6346400643c9373dad660ad3f784efeaf911d5c76b0e46cd9c623dbfc26f1e0d6e1efd8213029f0d06bb25b8c08ec096abdc8bc SHA512 2a99a45b265d022b36be2a13106f5209c9c72eb479c09a2511a39179c17a351cbfd3f812b132c2435572026463e4d73af9b9a4c06179e171e7016f74b5e058fe
+MISC metadata.xml 398 BLAKE2B 40018dd39311868fe5b37b6e03d6f6115427b84ca4cf4643b227dec910a193b547384c6cac4a97ed0f06a81c453c12ae57612e279e44a8a671b7f36a3ebc3128 SHA512 aaed2dfc1a9802d6d6d2d28d13fd478e0cee7c422992cde7994c4408690baba6c9e99ed77a55b0d3c5d966bb18cbc76c579b50f9d388a84ae204137b33c81a92
diff --git a/dev-python/python-utils/metadata.xml b/dev-python/python-utils/metadata.xml
index b417f7302667..66715ce0b930 100644
--- a/dev-python/python-utils/metadata.xml
+++ b/dev-python/python-utils/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">WoLpH/python-utils</remote-id>
 		<remote-id type="pypi">python-utils</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-utils/python-utils-3.4.5.ebuild b/dev-python/python-utils/python-utils-3.4.5.ebuild
deleted file mode 100644
index 3c96a18359fc..000000000000
--- a/dev-python/python-utils/python-utils-3.4.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="
-	https://github.com/WoLpH/python-utils/
-	https://pypi.org/project/python-utils/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	docs
-	_python_utils_tests/test_logger.py
-	python_utils/loguru.py
-)
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-3.5.1.ebuild b/dev-python/python-utils/python-utils-3.5.1.ebuild
deleted file mode 100644
index 8cde3a4222e4..000000000000
--- a/dev-python/python-utils/python-utils-3.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="
-	https://github.com/WoLpH/python-utils/
-	https://pypi.org/project/python-utils/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	docs
-	_python_utils_tests/test_logger.py
-	python_utils/loguru.py
-)
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-3.5.2.ebuild b/dev-python/python-utils/python-utils-3.5.2.ebuild
index 8cde3a4222e4..0d1e8a55eba0 100644
--- a/dev-python/python-utils/python-utils-3.5.2.ebuild
+++ b/dev-python/python-utils/python-utils-3.5.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-vlc/Manifest b/dev-python/python-vlc/Manifest
index e2d451137497..fc64edb82b4f 100644
--- a/dev-python/python-vlc/Manifest
+++ b/dev-python/python-vlc/Manifest
@@ -1,3 +1,3 @@
 DIST python-vlc-3.0.18121.tar.gz 152638 BLAKE2B 4b6fb51809bb1ee79cb4e1a5ccbd3db330c5d443b14171b75b6c762b59a62816a87a6b8d6fe5c47641c2b72d875fece41adc257c41ee9bf484b3a5df36dfa939 SHA512 3b5d44142c073dc5a98b6c62bbd4f675434aef9a5eb24f0c80ab19bc29a63877b6c4ab5cf56233c5f2fa0a5b40cc9c48583a8868fea5c351a8d751e32f51d807
-EBUILD python-vlc-3.0.18121.ebuild 478 BLAKE2B 290233ef1353f5528524f5bc56285ea68ee3059547a3510855f5c9441c948be3c3665559be17a7e430a9283df0e291a70d7705f92441b039334483a96dbc1614 SHA512 3df4de9f6b135a397bbce8b947d17b97c455a91b899f695ac9d885fb2f3530c97531b53c20f4604973c22e0acbe2bf0f1e4eec395faf14f1a5efca798f6615d9
+EBUILD python-vlc-3.0.18121.ebuild 451 BLAKE2B 8e37f4f88d81693341290093120a65c87416c20ab79120c8771cd5b17725e4a1fff662bdbe4b72777f19891253f8e7d15279e6783e8b4c2ffc50de627ac4cd24 SHA512 204cbb5f9e52bbd0a515fa3bbc954747de852f9c1b9a595f57452e1ccbc3dcea1a6272e748b4af5d5048070df7689531605e6e7808aa32b3f0bf0e3e53e09c8b
 MISC metadata.xml 357 BLAKE2B 0c56f8cfe0e66e7c73e7c353426c1f12ea56884391034d5f0664decbbffa57f176b2d516ddc8a2ca890f729bed1c74de393049c3cddff188f1d5d7c2bb1dd78c SHA512 57e362121d3249fa2a8bc6a4b5cfd4da89c31e12a72ad1adc03e25e7d4a7ccaa2341396f91975ff822d517b09c1878f719b9293f284488510185c8658408093d
diff --git a/dev-python/python-vlc/python-vlc-3.0.18121.ebuild b/dev-python/python-vlc/python-vlc-3.0.18121.ebuild
index 347b4b0f876e..b2f7d18b3207 100644
--- a/dev-python/python-vlc/python-vlc-3.0.18121.ebuild
+++ b/dev-python/python-vlc/python-vlc-3.0.18121.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python ctypes-based bindings for libvlc"
 HOMEPAGE="https://github.com/oaubert/python-vlc
 	https://wiki.videolan.org/Python_bindings/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index f7215b5b6bb5..cdb3e6a6ad66 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,3 +1,3 @@
 DIST readthedocs-sphinx-ext-2.2.0.tar.gz 12721 BLAKE2B 3ac02a96a059e6d6b94af4318a5e816f8664e1164edb315d7540d1bfcce3b0edbbe9d567b0dc2931179cb309714175c64a3684b9d568551cc240ccbefc77a10a SHA512 8f7009a0716751de2fe2fed726aa08bb382d15ef6c4fb66e6c29537f985a92ab7cc137f81a4f6200e794cb7f495ebf561356194f57c694509b67e7686bef52c5
-EBUILD readthedocs-sphinx-ext-2.2.0.ebuild 823 BLAKE2B b78f4f8775360979113b963f1104b7fd9b86295cec66e32ea43fb41dc6b3dabdd98f34bbd06ad184b93d6997d54030faa48c1c5111f0eb07989d650971b303a6 SHA512 dab84d3dcede4ec517a6be5cdd04b691ff17e2f98c1ae9d5f8c7a789537b844b2fa39a2805a7bec6a0bb53e4e272c735d4e2c704e637abed516555bb25e40f39
+EBUILD readthedocs-sphinx-ext-2.2.0.ebuild 797 BLAKE2B 813f2091a5e740e99d737a4cd666469b107856944446b3a76ac45af80d4ced33e35adc192571b742335b5b6e1dca888a9cde6000c2274f41dbcc70a98626b9a4 SHA512 9cf34e193b658417ad4a01fb6f76f8b11b547eec712ec7b1723e988c09a4fc16eeb92ffb3cbb02c63fa7a7b6948b97c0f3cbc9e7d2b9ad01befb3f81e6b2ec82
 MISC metadata.xml 350 BLAKE2B 39fca03d3a995a65683f45a330e386123ae2efaa952f3bc0a6153708008941ddabff9045b480b85551c3fc26166db3aec9daafbe87a91d18dbb4041015d7ec66 SHA512 c116ddd2f8b70bb1c5d0bfc876e60ce35dff1fa7ee2c83a26992f96960beef17c0fb743a7ac5b5c41a3028422c2f342dd683ed503752f7f6390d9987ff8a3057
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild
index 7e463831724d..6efd16f28b58 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Code specific for Read the Docs and Sphinx"
 HOMEPAGE="
 	https://github.com/readthedocs/readthedocs-sphinx-ext/
 	https://pypi.org/project/readthedocs-sphinx-ext/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/requests-file/Manifest b/dev-python/requests-file/Manifest
index 312147c6028c..aa92d184c516 100644
--- a/dev-python/requests-file/Manifest
+++ b/dev-python/requests-file/Manifest
@@ -1,3 +1,3 @@
 DIST requests-file-1.5.1.tar.gz 5668 BLAKE2B 4060ab3728e32d87252d1bb25e310937dad0a6e790a9633f8932d45c1d791343ea6813509d15a24c9787736ef6b9992d236b06a504efce6c3d5fcfc04176ae87 SHA512 e671bba8de63d3fa5665f928734f1a152d95ac9973c99f3a09d2dcbb9c9c16334c54a4f0824a5ebe63e262a4cc5d4990f08244ff0b84af11fa475dd416b1e2bc
-EBUILD requests-file-1.5.1-r2.ebuild 531 BLAKE2B 7cb238d5c5772e274a3ce805296d485477feb25a810c813600d626177f73619f6456953a57d8db10e55d74fbb1ab9568d040cbdd21522973be116b0b9e36cf62 SHA512 3c66aab296f64622eec242a20e6940478800b10dd3a839271c3d4e5096f549923d030fce4368a45758329d7731e463eebd7dfee6981bf05376f6e625d24dc960
+EBUILD requests-file-1.5.1-r2.ebuild 504 BLAKE2B 1d9076b47f6ff9eb5f3da6ccf5d40bbd62dc49226661dee80e3766cca80a2c7198fa3282f556471b6c509d03ed0953f4ccd58f0999c1b1144636da8edb139f19 SHA512 dd9f6e6d613ede0b4a4f0d0250e384a753ac85fe63fb79609a69bc5384fa4ac09bcd8845c76925cb9e89c026e3ed113a05a3a429eaca14ac4ef2b84c88aa7a4a
 MISC metadata.xml 476 BLAKE2B eb2da8f47418e2152568b9888b3fae9a87350ab45f310b6d21179b4a707b7d112bb175dabeffb6eddd0835d9d82eb8c3514d5512ef6d375ad1454017f6b4b5f5 SHA512 23dca887bbd51d5fdda6270693faea3d598f1d376800511293927500e221c3fbc9233e96b1880e9ce1f8bff9b0b2f9f6ff78a35376ed0d2ddd81f2636cc50542
diff --git a/dev-python/requests-file/requests-file-1.5.1-r2.ebuild b/dev-python/requests-file/requests-file-1.5.1-r2.ebuild
index e6b38f87d007..dea83eed258e 100644
--- a/dev-python/requests-file/requests-file-1.5.1-r2.ebuild
+++ b/dev-python/requests-file/requests-file-1.5.1-r2.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="File transport adapter for Requests"
 HOMEPAGE="https://pypi.org/project/requests-file/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/requests-futures/Manifest b/dev-python/requests-futures/Manifest
index 8cd5865785dc..05da62b557d8 100644
--- a/dev-python/requests-futures/Manifest
+++ b/dev-python/requests-futures/Manifest
@@ -1,3 +1,3 @@
 DIST requests-futures-1.0.0.tar.gz 10897 BLAKE2B deccf99ffecf3dd04eaaa7692b93b046b027109346555ca9b4172f29600615fb78bd46528c2ae925587d06f24e5b52dc2f02f5d5da04eda18cd97037e1b28440 SHA512 64b39ed99712df8f1be74b2de97500d89711c0d5d3ba0f2b64e3bab755d0bf82029d7ced13b755ce12a2b86f3b673305b651ba6ff4cfb60aed40c8d5876f202c
-EBUILD requests-futures-1.0.0-r1.ebuild 1002 BLAKE2B 379c45a8a8694c5f083ac7b8ef417478cb069cf2d7944ecbd6f5bdaa9025eb2c24c5dc250572a565f7d8ff937062b6386db624203f06cfd394e53e787bc5d85b SHA512 d2fe2cc0bcc1d910f29ae04a65316fd50cda11c533b9957e44e1d4e815435dcdefdc9afae8e2fdd7958d530466ab156e6521eb086ecd25ce65d305a77728e810
+EBUILD requests-futures-1.0.0-r1.ebuild 976 BLAKE2B cbbeccdf698b4a74635a4ec881635aed4d69a09aaa12997435ab612da47ab74f90fa74e2ab64a57bc64df157c4ec9a6ea1d117cc60e856c0f2fad7550660a25d SHA512 1322f114bae191c56c43a5e333c7239f5568d8f4d63f04fedccbcce899afea9effff6b701851ac41b24a8bb96b76630fd4bf7aad026cf038180c0e9dd2ec0906
 MISC metadata.xml 562 BLAKE2B 116ce554daf71a47d20efa98708554d50185eca1272c26556666152459feb42ef8187fb74da72a5b365f360ea397ed1056b932e9339ca4c3fdb82b2f12983278 SHA512 fc998b8ee8cf4a4d01b02db9890632eb793c8f3ffa021c3eb2466e1ec221c5d36aa5875804989c6ec0897ed243019673e0b185a371d728a86d2d5238fdcaa25f
diff --git a/dev-python/requests-futures/requests-futures-1.0.0-r1.ebuild b/dev-python/requests-futures/requests-futures-1.0.0-r1.ebuild
index b223c42c9f4a..b83e39964223 100644
--- a/dev-python/requests-futures/requests-futures-1.0.0-r1.ebuild
+++ b/dev-python/requests-futures/requests-futures-1.0.0-r1.ebuild
@@ -4,14 +4,14 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Asynchronous Python HTTP for Humans"
 HOMEPAGE="https://github.com/ross/requests-futures"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index 496283c194e9..c19a868d41c4 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,3 +1,3 @@
 DIST requests-mock-1.10.0.tar.gz 72627 BLAKE2B 4ce1838f03b732de4007c2e9b700876dcf8dba0f5eafef1292e0e40ae75e08f9b3bf74c3620d2d762944ccf9af248304929f57a337122b1a69d13355dc3f290e SHA512 873c9b219e2a2360872fac22c83371ce40f4dee45e6a0d40365f4f551271c2168a662dced6e8baad890b1dadfc03d21d4ce013f149d25a42d998af4f4fca2a79
-EBUILD requests-mock-1.10.0.ebuild 1364 BLAKE2B 47fa456fede405bb2b58aec3f58b8e0481b19131e857e7bc4ebb9f4df3fb4f5d87c405e4e9ed8a0a2d4bcd118ea83600d6cba510b4d79a5c5d7447daebda2465 SHA512 5f9b8be5b14187da764097bb74cf01f0fb2f9df09216dbf3e8627e0950e4d122dcb98ec6639bcb552decca04c583e6590a7f9ba64b8ed69a7169031289b1904c
+EBUILD requests-mock-1.10.0.ebuild 1337 BLAKE2B 2aa3b4350bfd4ca176e5df6bfa61510302aa9960e89fc646da41ae4156d6ebfa631b76cbb23f6f463a62e230e67b5519c72114774c0adb35a163a810784c6e35 SHA512 5e58231bf2aaf486216b9c88a6899267106181c73399bba16d984900f8557270b52532fcd73e39f723c3807f955c2680e9b28d31112d573ca026fc852d58b457
 MISC metadata.xml 479 BLAKE2B ddd64d016f85e6960f2d8a10d53591c6ffa5c0f61ebc4074f5867a03c0d8f533468351b87cb10e662391aa3d8fdd61b07bcf607c1d5b07a13fe85cf600def424 SHA512 341437e0fb7b532b7845d000e0647ed9858efe1336e8b6f57f55f677483eae4985ac0f54016da09d22d007895f3450a5e1fa6cf5d20fa715f74466a4cdf43cfa
diff --git a/dev-python/requests-mock/requests-mock-1.10.0.ebuild b/dev-python/requests-mock/requests-mock-1.10.0.ebuild
index 6efcf478a312..39c7bfbeceb3 100644
--- a/dev-python/requests-mock/requests-mock-1.10.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.10.0.ebuild
@@ -5,11 +5,11 @@ EAPI=8
 
 PYTHON_COMPAT=( pypy3 python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Mock out responses from the requests package"
 HOMEPAGE="https://github.com/jamielennox/requests-mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/requests-unixsocket/Manifest b/dev-python/requests-unixsocket/Manifest
index fb977dde62d7..7f2cb479e1ae 100644
--- a/dev-python/requests-unixsocket/Manifest
+++ b/dev-python/requests-unixsocket/Manifest
@@ -1,3 +1,3 @@
 DIST requests-unixsocket-0.3.0.tar.gz 14478 BLAKE2B 5b46ea051729326498f50ba7a952429d271deb102060f8e3019d259ddc21dbffdca8960e140c7ccb25898034cf37fb90dd143c970e75bdc6e6442e9515f14d6e SHA512 21c887b0c3fa526a2debb3960e0ea4dc3b3015cdd517459b6484501176321408d1b4c87dd2840c7d8b71d08fa9114f655ae03f8bc9ff1fca33c914900ef82f5b
-EBUILD requests-unixsocket-0.3.0-r2.ebuild 743 BLAKE2B 29b23a64ea96367fe4fa022613aa1d252b88e256f3be5844d8337815466827c513da53d93a9e2535308aaff18a5084cbf57ad1c856869de813082fc181f015cd SHA512 f151089f7bf3dd7dc25aa95230017a9768bab4cfe226998f53061c7b95a3c7e46f53d505771aced750737d4aca8b026ceaa80c913c7a74a6200245398dab9cda
+EBUILD requests-unixsocket-0.3.0-r2.ebuild 717 BLAKE2B 2090680f603ca55316d96d2d6a70a2d3450533f7784dd00fc4cb42f61efe88e0c0b5d74363d0fd72a107169a3b21f7f887b702930cc5242be07776195d01d6bb SHA512 cdd6a7bd7a76de8fe4409e03f1ab59fff85bf8aeabada6e2218d20c73b14b1ca9026763d68595b4e6551bfcafbc9609621168ac8f173089a3ce0d9a1102f0a2b
 MISC metadata.xml 325 BLAKE2B 46a5e54f9d40724197835a3b7b096cb8e79a0909ba761c6821256d7fd12994c8d9c6b01510b707ca84cb38ff1b0f62f0293d50c66303860903d785e4e65650d9 SHA512 dee0ea5e9dc5994c5d93a311f98561d2346e8e48aef4871102b8f75e4e40147c187bee52b5106351fd043bed9fc2d32de23038f62c6b90d2b1b4d60ffdc42ac2
diff --git a/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r2.ebuild b/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r2.ebuild
index a9faec8b94aa..6ad0cb32118f 100644
--- a/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r2.ebuild
+++ b/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Use requests to talk HTTP via a UNIX domain socket"
 HOMEPAGE="
 	https://github.com/msabramo/requests-unixsocket/
 	https://pypi.org/project/requests-unixsocket/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
index 14dd5d39554e..40fd622ec0ab 100644
--- a/dev-python/restructuredtext-lint/Manifest
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -1,3 +1,3 @@
 DIST restructuredtext_lint-1.4.0.tar.gz 16723 BLAKE2B 2beaa565391fd1a130f8ef998b140e0ebb4695759a61c0526f066e71c3bd42e981115f267c48d30e19eb45c240907ea71d9f49a03d74e9ce1d4b80a2c0b511c9 SHA512 8e16e2a43cb1e52bb3b4ac60da53130bd4a8d0b823fc95b32e62068bed95728084de3b55820cfcaba70eecaaa93bdf3f956b8bb6c55155115b40c7151ef58a2c
-EBUILD restructuredtext-lint-1.4.0.ebuild 610 BLAKE2B e0c9a7fb84663977f788a336df68ae2cec3975c3ce31dc7a0b9f81087e9372915f05261362a66edd276c2877dc8c35ee41b54f8f6e78f6b1cc2720ce99bf96da SHA512 2903709190256829b859a22d9ad7edb5f68d445219fbebddf454327ada13e7f6d790293f30e5d09b40e3aec0b4d2bc20d2f2595ae83338ec54ee5663a73f6210
+EBUILD restructuredtext-lint-1.4.0.ebuild 519 BLAKE2B e6b41a560fce9d59683f9f0a318010110fdfb39976508f6c7890dee2b624d3132ba55803634bc72ebcc0c217f060aa50a7a39ded7cb2cf8df1d03b54db54a966 SHA512 582d40c1880284dd8914a9139e187bdfb640211519159dafdee8196bc9aa86c4bc493f33c75b8cfe661302a5256ddc88f43ed179d3c8378ad0102e37405dd833
 MISC metadata.xml 464 BLAKE2B 25d6d2cbc0a5fa141d5102f0065fd2a1edb3027d75b93cbd421dc732b24c350ca04c4286abf324ce8bb86af9b48e1805cd737b8987852661942043749b818dd6 SHA512 71919795b1be966904361cf818dc689bfec9db3c48b03d30a8b13817fc3dbe0ada1b898c34bd5fb1859018f079f9cd3ca35a478ca0390d51a3da2baae703c337
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
index 6809135a9916..d854750b9b2f 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
@@ -6,13 +6,10 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
-MY_P="${P/-/_}"
 DESCRIPTION="Checks PyPI validity of reStructuredText"
 HOMEPAGE="https://pypi.org/project/restructuredtext-lint/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
 
 LICENSE="Unlicense"
 SLOT="0"
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index cad32e8435c6..644eacb4f908 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1-r1.ebuild 903 BLAKE2B bd91149291819f0935878544ec22f9202a64f8f74dec913562f8f2c788aff9a97907ae37c790356527e968af5a352dd3ce6e46af9933d333f7e1032392d812a0 SHA512 53363d21c19254d72da8bf188c6cc08020e459e4ba25e4af53bfd00b3174fc24add5738deb5d4c46b08854efe4aee01c0e11f4adf01cb7db55db77572f799235
+EBUILD rfc3986-validator-0.1.1-r1.ebuild 784 BLAKE2B 22d8a705886bde1d7880aea6e4eb167ad7c7a05b53a326b70aacc271a90df2932ab771cb632a7d7b5303024a7ec89b3f9fab7e69c048be7c6735fb496efbc80c SHA512 5ae6ed04b98b497a8c21c3c3bec030c19415c2412ddebcc5a9506a6e81d4d365143d175d110d69e44ca3ce13b6f1724ee23313c2bbaf387a89b2110f8aa99624
 MISC metadata.xml 400 BLAKE2B 7ed04a3d74a354977cd63c1b835de7ae1c051f96171925eec55e221ef2d3d2a0f0bfd44f40107b04abe5e6025435213be849f4b9a72fb2077bbcdae36a3067c6 SHA512 357323ee0a4be15a9e18c539e6c75eb03224822b7190c37ac658aca46da1b162b1f5afe03337c656a0335f830bc0e5463dc1bb7316f91d2265dbe1baa72b15aa
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild
index 834ec396986c..e6fe5fc4d92b 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild
@@ -6,18 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
-
-MY_PN="${PN//-/_}"
-MY_P="${MY_PN}-${PV}"
+inherit distutils-r1 pypi
 
 DESCRIPTION="Pure python RFC3986 validator"
 HOMEPAGE="
 	https://pypi.org/project/rfc3986-validator/
 	https://github.com/naimetti/rfc3986-validator
 "
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index e746aebbaa12..5519967fd2f7 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1,4 +1,4 @@
 AUX target.service 330 BLAKE2B 81d01885925feeef2a1fe9214b520d0d4035b971fea22f4efcbe295a7316568cc6b6e152aa53a7e7defa602e55df61c3a06f3c028ef20301bb0032a4c919a43a SHA512 3c634f1c466d0a8c3dd2b57a230438aaeeb0e66324863a2ded57dd69a2ca5946f83c4ab511766f510f3e63b43aedcf7e368bcf5bc325ee69c016bb0bb2612de5
 DIST rtslib-fb-2.1.74.tar.gz 73919 BLAKE2B d16527ed1efae379aa976929d8e6dd8a13cb1d47eb8efe8897ee495b0864225f520b42bd27fe502a1fad11369d20690b9751e54ae7a328c60917144114358d24 SHA512 b0b0722a5a7e10af698ae0570a65b51d7f091bfcc370850dacb3087471ca98bd229b4a5ed73760b7ed5bbee1b53dae4781cc2b3d5e7a1ff8ce37c5c144477852
-EBUILD rtslib-fb-2.1.74.ebuild 662 BLAKE2B 6caa1bec76f87130acc976f6b5ad6afd3e1ab10be7f0e8aedf4653557020decabdafaeedd7cb8e923181341f31d7e518d28237a136ad20b8fce20d699187e2bf SHA512 626a024f42a6b6a8f48215713e3f846af59f210a6592afd09435267a27a547d54598d470d4e0e0e7d3953f33b11a5c6f43065f62b01292c5afa7b03bf0fd6bb1
+EBUILD rtslib-fb-2.1.74.ebuild 635 BLAKE2B 58d96d7c997d06d2a7e74c322270726756ebd27aaf721888d9e05a3d0855552ad7e51803de157e84c7d9023260b2f09b57309bb0ddb179e06ee3a6b8cb87d676 SHA512 34706816c11c1ca0ab2a3f939abb81bece463da46c0510980de4ffc2c563b685913deb2b59285941e21c550d827ceb72c3e45e879f7caf0341f8469a0b8abe8b
 MISC metadata.xml 736 BLAKE2B 64b99b472db20ec267f4aa40915fe347e1e74d18ff8914707714cf73cadf7999bb81521b4a801b17bfd4bb4463c63419792e1b9c869deed9181de540a9c8e30b SHA512 fdec71348b4f944de9f009571f8097a1758ef0a6072571b3fac21b6dea7330626a06cc9e72447a8efe0425bbf7a24d08fe10b193653cffef9195c1acdc997a42
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
index b5c09226970b..d3bff0e48967 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit distutils-r1 systemd
+inherit distutils-r1 systemd pypi
 
 DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
 HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 6bf636ae01c2..bb058f876755 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -5,5 +5,5 @@ DIST scikit-build-0.16.7.tar.gz 274287 BLAKE2B 8a5064c021d904312ccf89a396ab794b8
 EBUILD scikit-build-0.16.4.ebuild 2019 BLAKE2B 195961eadbd48ad1e2a52f958833e35b9067452633389486027016a6a540e61d2e36490386c33fc13c9be1bc8da9b6346c4cb68f3b9a3f373ead0b61a6735436 SHA512 1a2d36f67ed0d01e05b30d3c5f477f191aa26ee428a86b2a06db6b662daf540c626b44886630a02ed94853b3b81308d1fee212ad4cb4b56afeceb24c96ef691e
 EBUILD scikit-build-0.16.5.ebuild 2035 BLAKE2B b67bce0202e5501bc3c9e6943501bc62443c5237769c60940d970eeed613a77cbd16c19c62d7d29024155c4c74a3aa0ef0773920dad2c6a715294414f3292de5 SHA512 196539e28b4c5522d6d84fbc7c221a05eb9450ec5d8afbac35ade23f1d5250d244ee829fb90e21ff0fde9277571ea4bcd6942e85cef49e80f98d926c8397fe13
 EBUILD scikit-build-0.16.6.ebuild 2035 BLAKE2B b67bce0202e5501bc3c9e6943501bc62443c5237769c60940d970eeed613a77cbd16c19c62d7d29024155c4c74a3aa0ef0773920dad2c6a715294414f3292de5 SHA512 196539e28b4c5522d6d84fbc7c221a05eb9450ec5d8afbac35ade23f1d5250d244ee829fb90e21ff0fde9277571ea4bcd6942e85cef49e80f98d926c8397fe13
-EBUILD scikit-build-0.16.7.ebuild 2092 BLAKE2B 1de80d56b17eb236ee1ba976b084ef944dc69a94df739e94c5757cb5893117f6b098ef83eee87e93c8e678b56fb0ee8914932f0f245ba7e10a1c2eda7fe7c9d8 SHA512 52549dd4b241a87f7b906a62a52f2eb356c493fde5e9c1f2e1b0be453c038cafd23fa16455f199ec47580e821677291c0dff4ed2a32cf1ba8797e13025bec759
+EBUILD scikit-build-0.16.7.ebuild 2087 BLAKE2B 4514f714a41c571c431d2d9fff4abb426ddf9a7abc4d6476f2ffce28b8c7c0ca5418b1416f2969a0cc14af96aeaabab20c2b0f6a0befe323e963b07444c4a19d SHA512 c13083c11b93fbe3a11011c764f13547c5cf804739f5aabcf9c28258e3f18c0e98a4825648a5e70f311e65ee5a77a62ed54c2cb917ffe9cdff2446e70a661403
 MISC metadata.xml 473 BLAKE2B 9d02a79439618fa413f74e4a617b8af042879be7a44c8f1c33e254e985d4f24057321fb2ec0b73074be1f6b67af3984190e48669e19985d6297411c0c5b61a79 SHA512 afc398c6287ce67eb85402832684fd006385e70d28a738ca8c5f1e2d008526621121cd9107a7fbc217a1a5857b54fa1dce3de69c47db58fc76990764b814a36d
diff --git a/dev-python/scikit-build/scikit-build-0.16.7.ebuild b/dev-python/scikit-build/scikit-build-0.16.7.ebuild
index bc753e7fb796..576cc23dc77b 100644
--- a/dev-python/scikit-build/scikit-build-0.16.7.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.16.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
index 0070c78fa4dd..4b45ce43a7ce 100644
--- a/dev-python/setuptools-git/Manifest
+++ b/dev-python/setuptools-git/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools-git-1.2.tar.gz 10546 BLAKE2B 52b7cd8387037b1eaee91e9df7de9944ea08bf02f4cf9ea74fa9d0febf85d930af989e9a07289935d8886f0fa4439c4cb46556ff81343981153ca35314703a9b SHA512 c070911618b6b92c862fb0bd40f1daeaf79e2ba10389fa1e69e4c50cfdd39c8e57a612082cbc7d932f8cea12a769e13451e35e1c8fe34f170d4817fd0d44f156
-EBUILD setuptools-git-1.2-r3.ebuild 820 BLAKE2B ecd07c926d6f40c93ba7c9e33352a548eaabdcfb306ab987dc00cf61e17a4345ffd8be91972938d032fec598f6aafc2e953ad2c245b4c25a5601e439f434c055 SHA512 14907cfb087988b9f83c1ef9aca5a24d995cba3ed5a4a75bba287e1f644ef8c20a78106f9a05ffd8dc14215a296663e5a6f6156988d8155f0ad3c4de96b6272d
+EBUILD setuptools-git-1.2-r3.ebuild 793 BLAKE2B f80b802176f18dcaf9cd2b0318751225bd7d45421bb90ad6c99689642e702cdd6e2b04513ded26e9d6a87a2298b8be42134b630e5d2c460e86f8f1f8613b865b SHA512 a913e22c3da4d904af82ad82d5c7e589ab35e479060acd2fb4569e68ac34ce017a8f192b79168c9aebcd4f121bf5099fb7dc5fe57fbef305c5c8594c13e5d7b5
 MISC metadata.xml 539 BLAKE2B 532a6ed2ca3b252f7a5b6eb30fff3866c472d7f1a8adf87acea940783400d380e58e099d6565e5092eb6df5667c2623e1cbc2d2498bb266cdb48238807cae128 SHA512 b8aa2b4053880fa52bc64492f19993039ae384912c6f43bd093b98e3817757aa2fa32d0a1a9b586736487da112d65a162b7a466c79b1601e12b408c93c89527d
diff --git a/dev-python/setuptools-git/setuptools-git-1.2-r3.ebuild b/dev-python/setuptools-git/setuptools-git-1.2-r3.ebuild
index 594e0434435a..5db1096a4e02 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2-r3.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2-r3.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Setuptools revision control system plugin for Git"
 HOMEPAGE="
 	https://github.com/msabramo/setuptools-git/
 	https://pypi.org/project/setuptools-git/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 84f27cf50cdd..66b852f2d32a 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,5 +1,3 @@
-AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
-AUX sh-1.14.0-skip-unreliable-test.patch 237 BLAKE2B 55b600d9426f127704cb698bb4df90b103b0ee08d29165f4d45e3fa56f1c0e20d3ab63b404cfa8d2bc372549a77474a2396903081c606516837ff295990eb47d SHA512 632f195df6a85cd65890d093400f4fed099c2344fe4e7f9d46f3decd817405ea587a18b271da3449088cc23519b5f16b30a2030a81d3bfcee30d4d55c591d5fe
 DIST sh-2.0.2.tar.gz 345351 BLAKE2B 7b1cd213f097b0893b96fbe7c5dd96a3716b6e8fcac5da49a091bbeb4f75ea2c9f7a23237d91e1a6df9fe2c1ba8ea778dad505981cfcc1ef1893404cdb030500 SHA512 dc02a69366d1140112ccf26093bbfd7d719671caf5dd6e093a5f7ef9de3428b44e9aa539e857ef72981a688cb4b40eb47aa2060c18e6074b614a1a5c2c430d83
 EBUILD sh-2.0.2.ebuild 504 BLAKE2B d7712a8b9bde33e09ec603c0e93e44f1c49edd1e64a6f8708417f0d89e8b31cf5c7e9455904e7d5f7e4e6236c76c13adf83eec60f350225c303136abe894089b SHA512 d5df52a84734c5c2fec67ab60c8fe19efce8ca33354817533f2431f8885ed3a8e8bdbfca89062c7d1fed5f13f18e25c96b6edc06fb76ce11bbb55a723d3ee063
 MISC metadata.xml 803 BLAKE2B 086d1696b7c03a1a4ac9d89164b507fd7caeed3163c15b4263772399641a3f82ca364a277fef6ede78bb3d8776ec7181f316ee8070ac5bb9290e7233f69514b0 SHA512 bceee86f0df9e0042815b9d24dd75659c7548f345dee2e1e1f586cf28f605d59a7ffe759f2cdbc8da6f6fb620b7f66b1763992b35e943ed47c3e1b739eaa3a2c
diff --git a/dev-python/sh/files/sh-1.12.14-skip-unreliable-test.patch b/dev-python/sh/files/sh-1.12.14-skip-unreliable-test.patch
deleted file mode 100644
index aa4f75727a17..000000000000
--- a/dev-python/sh/files/sh-1.12.14-skip-unreliable-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test.py b/test.py
-index 68ef40c..e5d48da 100644
---- a/test.py
-+++ b/test.py
-@@ -500,2 +500,3 @@ while True:
- 
-+    @unittest.skip("Test is unreliable")
-     def test_environment(self):
-@@ -587,2 +588,3 @@ exit(2)
- 
-+    @unittest.skip("Test seems to be unreliable")
-     def test_piped_exception1(self):
diff --git a/dev-python/sh/files/sh-1.14.0-skip-unreliable-test.patch b/dev-python/sh/files/sh-1.14.0-skip-unreliable-test.patch
deleted file mode 100644
index ea79229459ec..000000000000
--- a/dev-python/sh/files/sh-1.14.0-skip-unreliable-test.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/test.py b/test.py
-index a4b9915..fb2ffdd 100644
---- a/test.py
-+++ b/test.py
-@@ -2799,2 +2799,3 @@ print("cool")
-     @requires_progs("lsof")
-+    @unittest.skip("Test seems to be unreliable")
-     def test_no_fd_leak(self):
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 25a462fc9df7..4f06d81aabf2 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,5 +1,3 @@
-DIST soupsieve-2.3.2.post1.gh.tar.gz 104120 BLAKE2B ddeeb357753981a55676a59285161a03759fd548a11950e87ff53df9433b7cb054084afe6dd4de01c316dc0a013e6f429e6e0868c140ec11a19627b0e1cb0177 SHA512 80eae1e7256cbcf2f2b8520779a5bdb68798e9813ed738ee933204ff1c23ad52553e21f3aa89ad61b900b906dcaa7a1eebd819300417304df782cda9e2d79c4a
 DIST soupsieve-2.4.gh.tar.gz 104437 BLAKE2B cca6185980473245e2c08181142f497584ae01928b4a8569f9436d30df339b93b92c33818dab93b6646f6e1dbeb52242822fffa193be87c18a25324cc03b9e1a SHA512 68885307d8e6731d47372af5130f2fb88567c7d5b5995c84fb11116007b2360dea88aac1b5c8cadc41f99ef71704c4fe710c45318be0be727ed9145ce009e4fd
-EBUILD soupsieve-2.3.2_p1.ebuild 813 BLAKE2B 68a3edec7b76b9198893f5112cb9c5a85232f33cb2e2138cd6de085e4a189c843a47433850da5f4cd72c32a8871c0143eff5adf6b9df6d063eae81e25b96010e SHA512 15c561a01e6e42cb1f126ea7aeaf1da92ca10a95ad0fe5826abdedf6234a684ef5c21002bd82afab275b3c7457f6daf0bb90382c5b1a8a0d6b5289bddac10f57
-EBUILD soupsieve-2.4.ebuild 769 BLAKE2B a091fe26be6dc83a3630b03cf3e03adec26e21e3baefae17f5cf66f5ae4c433214db389d7160fbeed695cae05809fa892d4f47b38bc1165d7a5e1c3d98275e94 SHA512 db4258b1c50cbde3e24303a463a448ab8203cf4d7027591f0bd13c85558c9dfdfea9b196dd34cb2be14bfbe9730bc093c7e5161091299dc768fb3c2b2c875c52
+EBUILD soupsieve-2.4.ebuild 761 BLAKE2B 0b1d728a34515f33d69647a041014a74ab9f52fe8e831c0b89052e837980c08c0e646bd4b0f3dd8e39cca610ada8a058d0ec0b9b0bbea375cfd9a7e31b2c5c19 SHA512 c95714a0896e25f44a65708b74749601f86d1ccd8c478ac527f5c73ec58c2508a7686164054f3270b3990a27aa5f56841b8d40a103009bdf1bf05491bb36fe40
 MISC metadata.xml 399 BLAKE2B de09909e906d138c664a0926eca614abf7953e16d5fb0bb0babed691906360cdb8c87b9a79ea5ddd2492b4e8cee561e5433d02ba47be5cf670fbde9e70dfed9f SHA512 0ca6cbc294f232ae9d0f5f0de3cb1c133f5742435d523a0481bd7449dd9a75aa950f08a668b4e1900e520461410e0eb864dc913361204909524805f1cb9e0a2c
diff --git a/dev-python/soupsieve/soupsieve-2.3.2_p1.ebuild b/dev-python/soupsieve/soupsieve-2.3.2_p1.ebuild
deleted file mode 100644
index 5391f6203f3a..000000000000
--- a/dev-python/soupsieve/soupsieve-2.3.2_p1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
-HOMEPAGE="
-	https://github.com/facelessuser/soupsieve/
-	https://pypi.org/project/soupsieve/
-"
-SRC_URI="
-	https://github.com/facelessuser/${PN}/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/soupsieve/soupsieve-2.4.ebuild b/dev-python/soupsieve/soupsieve-2.4.ebuild
index 97f0a6c4a683..6df6743818e0 100644
--- a/dev-python/soupsieve/soupsieve-2.4.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/sphinx-epytext/Manifest b/dev-python/sphinx-epytext/Manifest
index 09b6473045f6..2745ac4f31e8 100644
--- a/dev-python/sphinx-epytext/Manifest
+++ b/dev-python/sphinx-epytext/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-epytext-0.0.4.tar.gz 3590 BLAKE2B 28e0243a65c3c6e31e5cd3ddb3fce22c2930f8cde564713585e097f55e30a96ab5a16970f57bed6df5cef6f5d12957b7162d036968a467e0aa658a8c5de1a5e8 SHA512 ba56bfcc7d299c6b5498b0823bedab75875b750a596f69a17d4ee278b33f4b51716dd2ba9c5766903af99d9701ba37069b3748fb57ec0697c6871138a7f57638
-EBUILD sphinx-epytext-0.0.4.ebuild 536 BLAKE2B 61016be24ea055bda11f42bcb897ede38fff32e3442bb450b0580efa17fb9ea221897837dd0296a0751899ef0925fab035d10cdf655e1bd9a891f6ac9abc00b4 SHA512 85ebdf40c7abe709226703f415df3808ac0226389d281416925f7d03b52cea04162717375b88daa64b5b66f9bb61a1075befa4379ea3802a7cc09ab5aeaa1337
+EBUILD sphinx-epytext-0.0.4.ebuild 509 BLAKE2B 9cbc98eb05b1ad15570e0c93c26a0deac1d967c0d6f90be0288678b79c9f52d30bd026bfa071cfb0b144ddfefe15b7e82ec0e0461b7a4828502d9c03f14d429a SHA512 5e90b8a36592a077ae53a61935ea96aff92b9b2a823497f17091d586644c8bbb07e6bace049b8825adcf1cb2b8d4de1d930f403223c38e2320982dcb8f29074e
 MISC metadata.xml 357 BLAKE2B 49d809900f8dbf0a7f8bf567c70c905556c36d0114fbbb78690cf7e2c312fedba8d386cb134e16e3f741a5b2b26bff99dc79d4c1818fd606954509bef852855e SHA512 7e23e07fb614fad124adb366bb05b457fa49b3c32f9e2e5a3fcd974e1be239075cb4600cb4bbf43fe843433c9c48248fde26b7221a319192cbbb846e4f97f4d7
diff --git a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
index 3d0ed28cb037..c0e2425e60a1 100644
--- a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
+++ b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( pypy3 python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Sphinx epytext extension"
 HOMEPAGE="https://pypi.org/project/sphinx-epytext/ https://github.com/jayvdb/sphinx-epytext"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-apidoc/Manifest b/dev-python/sphinxcontrib-apidoc/Manifest
index 0900d4aa24b3..f28e5f2b5168 100644
--- a/dev-python/sphinxcontrib-apidoc/Manifest
+++ b/dev-python/sphinxcontrib-apidoc/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-apidoc-0.3.0.tar.gz 15396 BLAKE2B de726316daa81eae1a8012c8be4acf3850f910af562d23dc17194afc86b40daf632bd5cdd61153299f35f3326b181c3b67e75925f0d95ce4cea81e1766c7828d SHA512 043f9b36eaff7b3f6d23c834dd3947e2b029c66010b3862f1658f03e0fb6c4aac3304f49465dd515a30107a685dc704a0e319675c9d7b27897445a2c315d07a1
-EBUILD sphinxcontrib-apidoc-0.3.0-r1.ebuild 834 BLAKE2B de7098b33153eaf6080f053685d1eb60fb4d96044649197655d8f59a8a1cb08709f8d96ca29d55c11a042e3c1c44fecb7dc72f31dac2f020a272cf35b3aa3efb SHA512 4b3528fa04cff66188c64c61723e7826f26118699690ec891dc3561e5ea5502dc3f2c4b27ac7caf36ca8875304f849cf3acb6b47e58e48e22d97b2cb83386574
+EBUILD sphinxcontrib-apidoc-0.3.0-r1.ebuild 808 BLAKE2B b74649ab4b0540aa5256879dbdc4d5cad0b2b3877dfa6895fa0154e67ecd4c27d59b7c9b7fe934839c1e24b87c358fc8e1b4719a8fd928cce9994eb4ab3a6d51 SHA512 89ea61e9f9ed0a5f38d932059e6b7f86704a940cf028ea161293ce761aed750ed64c7b44025543d47a96d0df5eb81936f0269cefba220cc859daf9778a5e762e
 MISC metadata.xml 409 BLAKE2B 4a1905b020761f1b3e3ffa69e80ca1fc04cb1e9b8fabff5bb92e8f0d95b1d1e47c5bfb337bfe61d6cd0fd5963971370c20ebc751809f218da66b0f30df6c23eb SHA512 832d5ea299a022f6cc60557f5fb433c72a83026cf3b997ca2fd43c278d86e84afdc39db12fbce0811846b44f65ed09397e0b5adcb9221f780d8c98b51b22bbd7
diff --git a/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0-r1.ebuild b/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0-r1.ebuild
index 04518d2cd968..67af8f7ab629 100644
--- a/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Sphinx extension for running sphinx-apidoc on each build"
 HOMEPAGE="
 	https://pypi.org/project/sphinxcontrib-apidoc/
 	https://github.com/sphinx-contrib/apidoc/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index fa98ddf27444..21967a1c557a 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-asyncio-0.3.0.tar.gz 11622 BLAKE2B 8c3358ad191e12e79767be6e6f3800e5de423d9a5ad005bdb416aa7a601cddc5f115db3e9b27213c06dbc341b671cbacd00217b65496baada40bfe257069abfa SHA512 fa66a2a9b5f89327686481f46d8e5be0b674f6355c8c0eeb862bf0ca0b5bb848121c5ed153780f653242faf1b82debc6917c3f6046244cce0f1423303a324f29
-EBUILD sphinxcontrib-asyncio-0.3.0-r1.ebuild 739 BLAKE2B ab3daa3ee957617a4c2e41408a3031721358a1a3917865ff0acf8cc7ecdce35c85b2c5faafc713d266c5217e3439a87d55efaa0eecd42296c704e133c7319da3 SHA512 61cbe1e9a1d63b5175f6fee9bb2d261e01f2f7b05aa05134c530986a087967bba07ced61f98e021f35b5abb906094a5d280b106daca0147e62a4a571ef0a91e4
+EBUILD sphinxcontrib-asyncio-0.3.0-r1.ebuild 712 BLAKE2B c19f32dc3303631d126cd2b28293bd91728f9b41488cec30dbb0f110d286f6ab0973b1742f6acf67ce00d6c8df45c1286722669d8dea1e25d763160ef6ea16ec SHA512 69448e34029b80716c972a4267e951acca66b9963412dd0b3b96cf4e886932838a6b3feea8803000e0f7f0ec3467a7c047b41a511dcdb0a5f017fe6a8bf668d9
 MISC metadata.xml 397 BLAKE2B 357224874a9e2de147a2cc2a85350092fcd6189b1a3cb6cd1934c7eb922a9e0fb289776b65189dac007be1e663c3f98c73e656b5ab3677524bfac9329d41a542 SHA512 558c76f15358bb40e1c0a68750772487a3176b44f4f8ab046c0c8173d2fc0535516bd5dc4606646467785014a3e879ed7e31d5ccd10097741b02009c53042afe
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0-r1.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0-r1.ebuild
index af40fd782572..ac205e0d364a 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="sphinx extension to support coroutines in markup"
 HOMEPAGE="
 	https://github.com/aio-libs/sphinxcontrib-asyncio/
 	https://pypi.org/project/sphinxcontrib-asyncio/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-autoprogram/Manifest b/dev-python/sphinxcontrib-autoprogram/Manifest
index 084a9138615f..8098e37b07ac 100644
--- a/dev-python/sphinxcontrib-autoprogram/Manifest
+++ b/dev-python/sphinxcontrib-autoprogram/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-autoprogram-0.1.8.tar.gz 18656 BLAKE2B a1334b0d9717f59ffb67c8a60e03b34c1fb0168cc86500ee14c06c44bef5bec1b484997d00be6586832e21e8a97662628636766558af9f79d40eb3da0ae21122 SHA512 a73d52a6195e3b637758b36f86afe07090bab09a655a86dbde3fefaee59f634c3fc880d436c3b14d9d7d4fb58f74765bd13457d0fc9192f1ffd4d654dc6efcd5
-EBUILD sphinxcontrib-autoprogram-0.1.8.ebuild 642 BLAKE2B c7b71816d178c24ce8d4777b57609f9fb5a4fcdf77575f63a9f0d7a9b6e850155a7964f7ee3106ea474f1c57f903dc1d8ac5d00c7beda9ee97d92827c018a855 SHA512 b4659558312eefa9c5e55970276ecaed3fcd3496cebb87cbfade9450797b9c92b611bd3bacf9cfa66c5be2699dfeed2cea1ace5fa8af1b37f1c88c8be7272753
+EBUILD sphinxcontrib-autoprogram-0.1.8.ebuild 615 BLAKE2B eb7278b1fe25b318c9c243b21c5ccf49cfb093a616960b2a3390cb2be5fc511f6923a7e5a37455bb3821b656193914f3000bbc2fc4eb67c2a5875ee8b528a374 SHA512 424e6640d7b9c3a50423ca88b75893385730ae48a8765da9c411ac8ed34f88be726a28024c69cf7c7ac9d718442bfb5e4f3b7a2826dd0402a94fdc8f5aa950ef
 MISC metadata.xml 437 BLAKE2B 9e39af7803966fa76096217ad37df0ce8ff795bbfad2a20a0bc58485d4292626f7ad334c0e2918993f3c6a03a791c8f7ea7e4a3e68e75fd8bab3c5b4a7a00bd8 SHA512 7a3a8412639455ff004479bc6862312fdf17cde00905c4fc7a2eab839b6a26ad09facc879519b024d33d04ac62c16ed60e35719e89a7a75f3452ad55c0dc0dc5
diff --git a/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.8.ebuild b/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.8.ebuild
index 9a6e63d88a0f..db8164e96833 100644
--- a/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.8.ebuild
+++ b/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.8.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Documenting CLI programs"
 HOMEPAGE="
 	https://github.com/sphinx-contrib/autoprogram/
 	https://pypi.org/project/sphinxcontrib-autoprogram/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-bibtex/Manifest b/dev-python/sphinxcontrib-bibtex/Manifest
index 65cbcd71f606..ba54df784813 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-bibtex-2.5.0.tar.gz 113310 BLAKE2B 5bd39fccf33897bbbf8359a09f07a6e7146d4fb3c1ccb63ad96d3980cc4a256e0b9b37bbf6ceadf65eb01937741934e1f30841587eb6246b50774c81e8428998 SHA512 c99b4bf8cbc73e94e7e4486b4cb58de0dc928079b320ee7d7a473ee27b7f1e349a4765a30059aadc3fb0c6161940c6f2eaf7afdf5ac1c64ba73ed80fba5b5e45
-EBUILD sphinxcontrib-bibtex-2.5.0.ebuild 1123 BLAKE2B 5ed5014a4bb804025ec3b4d50461d92072c5329bef8a3b73eb42d6d72b8e63d9e3bdbbe883a42a40141d55d4660c1198530a4b112c0d32651d597dfd194d4afc SHA512 43ca71ee9a2bc7ecc7c3764dd0d06e712479bb919ed1d7f6e5d690472746c2273fccd1f8c62aad01eabed796da386555cc9deb1987464f047bff7d3258c04064
+EBUILD sphinxcontrib-bibtex-2.5.0.ebuild 1096 BLAKE2B bfc6364d85a69ca505c7adff948547233e9ec27389657f3f61bdb6bd154855e5ecef18c37d707b2b08874caf0d3d10ef4780e86a588b921c0e2e93773fa05ad9 SHA512 9cc0a71f42c9c45da2887e5e6692bcca56c9e963e7f4c9ad1d86e118c819d6a1d14e42ed81d2786df8dd26739c6878db19fcee156c047ce0b64ab00973bba0d8
 MISC metadata.xml 539 BLAKE2B 9990d81362d6a2d5bb471fa2372b92d3ce4a4d08e57098dbe981b7a2320c46095e404a6077c5d5c57daf752c03bb4cb809461a05f11e1c2ecf771db201f8147c SHA512 421b99f9834ca4240a7959f99a8907379e0730b8c2ce608533ba4cafff3a8502738044675f0abed00f5f1cec195c18f5fd933404afff6f3c9b74c7cca02dba31
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild
index 1a2a11d5847b..081b40e9be74 100644
--- a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild
+++ b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Sphinx extensions for BibTeX style citations"
 HOMEPAGE="https://github.com/mcmtroffaes/sphinxcontrib-bibtex"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
index 5b71a57a32f0..82e18c8ef53d 100644
--- a/dev-python/sphinxcontrib-devhelp/Manifest
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-devhelp-1.0.2.tar.gz 17398 BLAKE2B fcf04148bc4a77963517d9011c20a6b77eee499f1a5dcd4a9631b4f415f80a9f7091b254f74ba2fbc9b7106dfb741dc839e14813e088d5a0802793ed457e95df SHA512 83b46eaf26df3932ea2136cfda1c0fca4fc08ce8bca564845b3efe5bb00d6c8c93991f4edd4913d4ec796e2d85bd2c7265adf28e98f42e8094daeb5ac11a0eb1
-EBUILD sphinxcontrib-devhelp-1.0.2-r1.ebuild 972 BLAKE2B 8f2e1d1119291229c964a4c84d0c54156df347693a323621ea38d8d582c1d1de7cda1fb5a9ee1df0f3852d46c9820078ca1f66c294d30225403b035a3ffa0b27 SHA512 f522cbf9f01cef836a6e764bd37fab23c041f39fdf2f48d19d49d4fda3b3f6b145479355892de731f4dcbaecec6bcf275454ce84bc9bc801a6f1cc899319c8f8
+EBUILD sphinxcontrib-devhelp-1.0.2-r1.ebuild 945 BLAKE2B 5af106fc9bb02644f1d20bcdf3a1441804c44f76c6f1a4e5432dae008f4d9fe4f1d69e284460c0b2565fb4c58b43dee780d034385c198ef16df3a0191b22e633 SHA512 408f8e103425dd8460e27ab706a8dcd52263d47ce3cf84c0c26c78b947c352f99bea823cd1195b07d9ea54d6c6c2284bd295abc309135e5ca252972a5bdebce9
 MISC metadata.xml 421 BLAKE2B 0149d4fd64eb705d8731df8aab1a95f29797e68db4cee2dc31b9c1e1cda44223d966e0ffbd1e5ec1b83952f18c3d9965d4d1d7df51fcf88d8549e30572b0ab91 SHA512 b4051429218926b1a0ea4cf02f48a1ed3014245baa2fc4704d4fff116234fa2a83cd8c229377faa8e2f613445df1391d292c77482c59bc5441289e7d92bb8dc7
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
index 4650f9c8c5e9..f53c64e13b34 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
@@ -4,9 +4,10 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Sphinx extension which outputs Devhelp documents"
 HOMEPAGE="
@@ -14,7 +15,6 @@ HOMEPAGE="
 	https://github.com/sphinx-doc/sphinxcontrib-devhelp/
 	https://pypi.org/project/sphinxcontrib-devhelp/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-jsmath/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
index 1dc165de6ee4..cc210a48a0ec 100644
--- a/dev-python/sphinxcontrib-jsmath/Manifest
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
-EBUILD sphinxcontrib-jsmath-1.0.1-r2.ebuild 988 BLAKE2B c8e6c1648a444f20fdb94d9ab09ead2dc70bdda7fbcc358b06bac62a57680c25c027c69dda05c892ec36fe6fee2c4081de939c4261982e20911fd0c4358e8b61 SHA512 6e23eecac5c4e4dcafe2fbf500276870d8ab756d522ee534feb3cda869923d1f82b062ad0bcb64d1bdd5668ed158cbe36b6395a0ae2780fe9ef0a571e4a59e78
+EBUILD sphinxcontrib-jsmath-1.0.1-r2.ebuild 961 BLAKE2B 6f74737904141838729763a85e3da2b7e20c5549f427fe325ecacc4ea5c52b3d67cab6c9c3ff0f208007cd16c4ea9dd8319e849edbc3bd862a0a7eacdff50eb4 SHA512 397a2ec827764f3c914065a7bbc5fdc3a8d6102d64138977ef295f270d48a3290f9fc087db03b639989d9a2dc0004fb95688ea83f7f951e5651e8a239a5bce95
 MISC metadata.xml 419 BLAKE2B 7b22df905fbf04eb026a37a8bcf2512508558a000793354a80fd7cb06bcacbb032291c24b1edd40cf884248bb761f9e9638b5ff55c6d59aa406777dfe2361214 SHA512 3fec9aaa8e570dfb8c4559dee30b71bdc479d5ac18431fcf85d1fd415adce54b8f2783ced3a5392a08ed083570622e500bf489c7b168f65a395248aa2c235629
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
index df118b7d7638..084aaa30a4c9 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
@@ -4,9 +4,10 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Sphinx extension which renders display math in HTML via JavaScript"
 HOMEPAGE="
@@ -14,7 +15,6 @@ HOMEPAGE="
 	https://github.com/sphinx-doc/sphinxcontrib-jsmath/
 	https://pypi.org/project/sphinxcontrib-jsmath/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index efc37ca1e2ba..5d1724608fe3 100644
--- a/dev-python/sphinxcontrib-newsfeed/Manifest
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 BLAKE2B 708c7a725ac36f54ea735953ba9d230b05da95147eabc91de9d610d3e02ec7d0d1ab8f5882d4e97327da425fc49e1b1a1753e011445ede859edd4f3cd5fb2a16 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc
-EBUILD sphinxcontrib-newsfeed-0.1.4-r1.ebuild 890 BLAKE2B 6eb554b51f911247510b34b6ccf44d36ed126ce942d6cabf598ccfdeee3b21170c1059270ab192b7d4bcdf1c590d8a5174a0b955bee3eba00ca21bec03e999c0 SHA512 7ef578ae81516b425b04a389fa80c09f6071a06d1e5ce8ae44fce34ab5eaafdf8da41d0e6cb7c288cc9485bb36dd31f50faab88808252f617d3db66f0215e811
+EBUILD sphinxcontrib-newsfeed-0.1.4-r1.ebuild 863 BLAKE2B 999ca9a9177f2d3cc2880f1a8e7fa3c6b2de6c095f1417480347eb085769f4f9d2536777b157380485018b1491fcf091058e0be7fead1303eed95f08fffb7fee SHA512 3890efba6bed4d3be692d615d6e62a728862d271ab2ed97bfa01b597ca640095d246940a0d5ebd60db46164878f27e0a8ba8eaebdb48a6790848a7d0d2f79b68
 MISC metadata.xml 356 BLAKE2B a4173a4a59c1cf182ed79bc084ffa73f5f32444cfb6e3a23ad85abbe80e2145bceefe7941d7d2d624e9e1021cfc8ff92abc69d77372f5d5dec03cec6a4131fbb SHA512 c5dc66026235b76fa995f37bdb57a89883119eb23ffa09a06f60f496e6ed60cf06c58fab9bb1bb9efc0a516dc2af232600996db29db181d35ab98746c652aa15
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
index 36edf4246211..0391ab8720a7 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="News Feed extension for Sphinx"
 HOMEPAGE="
 	https://github.com/prometheusresearch/sphinxcontrib-newsfeed/
 	https://pypi.org/project/sphinxcontrib-newsfeed/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
index 897b42f69cfc..443fea6e1085 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-programoutput-0.17.tar.gz 24067 BLAKE2B 07687a221aa9be1e02629b2961b49eace217631a1298337f77a01986c3c6444a50069a8a8b9c96ca224895ae0f9490158a720519fdf3fb544e9d3e513282eb36 SHA512 cbb564830b8a627de6ecfa83fcc235d7dd7981e191ab3cada66a74d79a5bb2ec0a993eb8ae6249db553dc1814eae98891ea285f2c3cf5e745eabce7b8647b0c4
-EBUILD sphinxcontrib-programoutput-0.17-r1.ebuild 975 BLAKE2B a6c6401714b70dae3529ccb8da415421f7423ac2d141298b1585c719f466327edace04615801dc7fcb611c8224481a0c91d802e2a4b6c50be76d99faec042bac SHA512 d409890035aa51bfb6bf822475d2af0bc6d9ed88be7ef0dd0df184c07e8c40e5a09b2d45e2c57a5dafbf215b45836aa8b616abf88d53dcc7cf2170f21ff04241
+EBUILD sphinxcontrib-programoutput-0.17-r1.ebuild 948 BLAKE2B 7629b87f7cc04cd31af419df5da24e8bd339771923cfb70d8ffc7fb36b0bab7c0d89d62467e6cd98ca8c705fd6d9e0d017ceafaaa8aeca1f2ddd0264e07ee843 SHA512 766abf91a93c8eea24454f7b6c5af381e1a2e5d88d05159b9fd6cafe8019ea9c99f1564f6b407505eba23d3fea7277304cd24bc41d81b8723840f6030aa22df1
 MISC metadata.xml 1357 BLAKE2B 13a41cea509aa50edcd189aea0226c07f730d2b19a42d213a9d6fbd35acfedcd2eb656960f8ba40796e8e4a86fccc8e7c1cb578f568e4af6eb43225dc108a122 SHA512 6e6c8761033586ae3847b9d290df186200ae38e552b7dfe59d1a9ec8c4c4fa6ddd2b10f1c9c9dc3b6d77d0f7791c01cd88f6e8b7971be487ba2f6b144d9348b6
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
index d06680a900d4..402967174c30 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Extension to sphinx to include program output"
 HOMEPAGE="
 	https://github.com/NextThought/sphinxcontrib-programoutput/
 	https://pypi.org/project/sphinxcontrib-programoutput/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index 95002c364020..6ef8c249e0c6 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-qthelp-1.0.3.tar.gz 21658 BLAKE2B 7a82e8941d49836cf3e64aabe05ba65b34596f7ba0287b4dc7ed2c5940f6944d1853790d1d52637b03d934effbba8fc5094089e2924322cf1b373432c60bce6a SHA512 29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa
-EBUILD sphinxcontrib-qthelp-1.0.3-r1.ebuild 969 BLAKE2B 1ac008e22eee474fe1ed0b9fe0c523c61009b83974a647392e93a938b950b52685f001a50ab4a0e6989c091f3c8fd7e7ea0b17ba763c58647b60fc2d66faebcf SHA512 815f25830b3e8e345836c41fc86cab57745cc244085f0fd8a0c00dc5c9a199f4c6e7bd9babf7ebf43e45bcd85a316d52055812c5cb9fc167fcbb620152341760
+EBUILD sphinxcontrib-qthelp-1.0.3-r1.ebuild 942 BLAKE2B 7fe5defdccf16789c38613a85de23610c48bec9403cb52fcec532830ff985f96ef84544329c618d2855bf2347942deab77c38880f43e90364bff4e0f54a8958f SHA512 60787a0bfd77dd80c55fc6bc2fa8c9b2a348bf8b12faf52e0347447df78fe3800cabb508fc722fb3b83e2c3b8d4412dd15506c81ec6270d1877484a506219dc9
 MISC metadata.xml 419 BLAKE2B 5a559b50428f6425568dfbae01bce3ada0905cbea24542e75122f1f3fce9e04cec6861f4d662515c7efa8c15a5b2347a83af5a2ea38326c069f9253436e7199e SHA512 559911ed37cd63368b2783fd6d65aa9b5fecc7b58422978f9d86b32eb8f50275f6b52a910ea4c73ef2ef3d081373862eff8a8e0e4098bd83c6b1cf4f06cd1af0
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
index 32f869577fdd..089c5961d346 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
@@ -4,9 +4,10 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Sphinx extension which outputs QtHelp documents"
 HOMEPAGE="
@@ -14,7 +15,6 @@ HOMEPAGE="
 	https://github.com/sphinx-doc/sphinxcontrib-qthelp/
 	https://pypi.org/project/sphinxcontrib-qthelp/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 43aaffeb2246..6b3a8e899f3d 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-serializinghtml-1.1.5.tar.gz 21019 BLAKE2B e2da8b1e1300a327b8d508ce98e7c0d3eff1e0cea28cd874df4fbd9ed0bd4de6c17e107e622ec72e00bb237025ae26b2c5aaa33b2156cee2fad7c8f8d2c65ed5 SHA512 c5aabe4d29fd0455c269f8054089fdd61e1de5c35aa407740fc3baae4cfb3235d9fd5515c0489b0becd12abc8f18d0f42aa169ed315c00f30ba87e64ce851667
-EBUILD sphinxcontrib-serializinghtml-1.1.5-r1.ebuild 1000 BLAKE2B fb18a1bde2373731d6f78d1fce805e7be303cd67d7aae3e618269e0a3777af4f1358dcef018f8d3a7518e2c6e12c9c4fd2677ec85d305517354115ee668fd72c SHA512 3069b39d91107c40a091dd7376af9ec4b4af7aa96edd47dae9e1941f75660b254666bb622bb0402f9aa06fb9ee7f36ebe415b0d193c412b2a25138c6bde00542
+EBUILD sphinxcontrib-serializinghtml-1.1.5-r1.ebuild 973 BLAKE2B de8a753b87412be7b44b2410ca1c0eaa3d2259d6b296484e0cc69ac045468a90428622228753477f2fa0f4fcfa2cbcbc50a6130bfee1b3b5674a577d07b15cd8 SHA512 fe69a738cb31afdc8115382d8453f327b0c9511ebfcdf15139a282bf1134a15a6f946b73b450c65ab80b4b950df9dd664c9159c4ddf8011cebef31ee81482dab
 MISC metadata.xml 437 BLAKE2B 6b040f2d00f91a4f275afa689de0eb172fe59e4b16685f30181901e4abc6d72bd8684e2a5503a5712a22cd2eead81d1433a504568d9d596ed109afd632b8b575 SHA512 7606411699692a843b2ac349d9c60905009c02691e94c73dd6a271ea4ad9f2c1c5c972ff54f45612977374e7e850457dbd7ed63b2fe5f16b11c7fa45999b9f63
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild
index 3bba6b0a2157..7207fbb7f3b7 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild
@@ -4,9 +4,10 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Sphinx extension which outputs outputs serialized HTML files"
 HOMEPAGE="
@@ -14,7 +15,6 @@ HOMEPAGE="
 	https://github.com/sphinx-doc/sphinxcontrib-serializinghtml/
 	https://pypi.org/project/sphinxcontrib-serializinghtml/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/sphinxcontrib-trio/Manifest b/dev-python/sphinxcontrib-trio/Manifest
index 5464064b1445..a1a4cd9ac635 100644
--- a/dev-python/sphinxcontrib-trio/Manifest
+++ b/dev-python/sphinxcontrib-trio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-trio-1.1.2.tar.gz 24131 BLAKE2B 5ddaf5ed6c85905275e206fdd966745ce4dd7296595c488864df291cb7202725ccab722f306dd9d6c27d660f5cb3e43bf9ab2fe50e8aa5a7232c2615dddbdfd0 SHA512 cb90f37f463fbdd3f810eb6d76b4bdaaabe83317de0ad747fcee55980849d691e272884ecdfcbee58851cf536f268f2520caba281d7550fe3250e92c69164434
-EBUILD sphinxcontrib-trio-1.1.2.ebuild 1010 BLAKE2B 70be8fed2517459e25baa1ca8146cd11cee22c8a852f6718c2a05bba895434e9c812794c288ae17c34d7855be4dda6fe432661057ea192d720d4b75e68e8f50b SHA512 dd470e0feae3b901fcebfcd0c84f5914cd42ec0eb51e44a9a4ea5c6530b3205e84d035c851b91c00ffa02891eb787523922673543004c912c2189f73b31d3115
+EBUILD sphinxcontrib-trio-1.1.2.ebuild 983 BLAKE2B d2be6677eecea0219121f32516c1de3579c00f76e559b094ed6ac270ada4af6d11f3ba7153a8ac7df9ced02dcf976bfe5049b7eb1df3ad8294228301a99feef1 SHA512 613e07c9f22bf65186de66d7db766e0d6d8f69809d474572a74c1da9516a86a7de609b7a305ec24c0942361d32e10564d512660798a89d1a40c8c7839cbcdc60
 MISC metadata.xml 1118 BLAKE2B f86bb065d9a5073e419a2c34c88412f0340de6e444afc26ee316a05b962699dd744a790758e2409d3d0b32378d865f66d8d7e8392fdd4523b393566caf67e65a SHA512 a16c4e89c6be00a81c3278f8c8ebe6cd75d1b1cba1e8c9f9d1aa4d2bd318073687556adf91f44c1cd39c2e26a179153b1bbee501101fe26d154f1d69a1a2d376
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
index 0ab33da7cf54..d12a14f4e202 100644
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Make Sphinx better at documenting Python functions and methods"
 HOMEPAGE="
 	https://github.com/python-trio/sphinxcontrib-trio
 	https://pypi.org/project/sphinxcontrib-trio
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index 5883213aedbd..06c8224c33a2 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-terminal-1.2.2.tar.gz 9486091 BLAKE2B 0ac3178bddf82704bd1414999388248c83f9becaf96341a44a4117db88089730882acd08d4688b3ef8a09e52d06b5dc595edcd0fca07b3855fd9c82100af2f0e SHA512 7a4e7ca82553bf870650e0f3ce22f4ab93d54c539799ff855599e17452e4b0887854c30cadba1106b4feece021326709ec7c599e2953d0e72fae8e268db93cce
-EBUILD spyder-terminal-1.2.2.ebuild 681 BLAKE2B d0cd0db1a84ce82660fb75ad62fca738bc7fe918dade2e91a49ceb53c334d93ef8aed6ca91be3c92c3bf349de1986c5235b2fa52e8d0fa8f8833fb07f09a0871 SHA512 28632172f41c896e86624ab2cd68a0c861f0b10db3175ddc9620dbb2fe5bf5137c8ca522bfd2e8b43cddb0df5e6e386e743d2a46ae7870089cd0fe4fa08eae5c
+EBUILD spyder-terminal-1.2.2.ebuild 654 BLAKE2B 819ef6a44214562df2f207315fc187adc4d3c7cd788f27762bd9bf25078363f9ab2636b495ecae6980449ae3c8ce16fafdaa605ff099770b2d20c243c016edde SHA512 e885959e18018113d08ddc7b86e81e234024cde917683a8a87fb33cd39142e85297077f2eebdbeea076c25a8856e2b2378da2212ea5c0df5c644a07cca28266e
 MISC metadata.xml 427 BLAKE2B c563113539eba5ff70feda0ab561790c0087c59487605eb9c2ccddffab5bbdf350e34ae979f38736328c8addf3f84e10951e94c8382d0f25a1f9cc212c1649ce SHA512 173ff707314cab98b492127405af8144c7eec9e76b6a994f1865b8f45de07cbc17a618bf61f83ed478a17c2c3afc7c2a328c0e954e70a5d4f8a129932a059d7e
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
index 59a975a72e64..4c1b23891cec 100644
--- a/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
+++ b/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
@@ -5,11 +5,11 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Run system terminals inside Spyder"
 HOMEPAGE="https://github.com/spyder-ide/spyder-terminal"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT BSD Apache-2.0 BSD-2 ISC CC-BY-4.0 ZLIB WTFPL-2"
 SLOT="0"
diff --git a/dev-python/subprocess-tee/Manifest b/dev-python/subprocess-tee/Manifest
index 21a3b69ee44e..210394c41efc 100644
--- a/dev-python/subprocess-tee/Manifest
+++ b/dev-python/subprocess-tee/Manifest
@@ -1,3 +1,3 @@
 DIST subprocess-tee-0.4.1.tar.gz 13599 BLAKE2B 779a8b5381155e8d524b6715ab9cc37f8e55565dd378a2d256648d56f018dc71860b0db2a50572a5e03fab7d2de5cd691be53c49c1aa79e756b4eb8a8d5878a5 SHA512 683813096c4bb78a4263075ba8590a926134ec92db5e2e72ed98ab1db9e231768adc15bb4273ba138f9a1b2a14ae4050d0b6acc76d483d0f3530f376ce8d9eee
-EBUILD subprocess-tee-0.4.1.ebuild 937 BLAKE2B d6882ddcb9dabace42148220a7c95047b6519ba3ed118d0cda4da90a3899e0304809d3dc1115ddcd2e02963f70bc806e375583ef38d5e9af81be664dc2c72054 SHA512 e2e5378a2c1570778e310fca149821e79cc26b978fcd1d3dfa946d3c95156ce104fc3b4a1239c39067014a98474a7f991d51586d84dbb449aebe5f0da64f4fc3
+EBUILD subprocess-tee-0.4.1.ebuild 910 BLAKE2B 93d8c0e938dc5ca61f9c457dc6c21762d0690cf4cb92c986efc7047bb97ecfe35b57e5ee26d2d982ef2b52c1d6b9dbda96ac67d8f3621ef5dbe31db8b7a72aef SHA512 8cf8c3eab35c68745de674e2fbe9ea2d4789671ce0e630a92e7686cb9108a09cd8741eb92ae728fea1f63d845022e3b64364daaa7d2b883d2847defab2b4654d
 MISC metadata.xml 733 BLAKE2B b18b79649744580db9298cb069dbf3b4c23d10983f012206199f6049752a5a232ed7068daad0716add206cfbf811d3c30e61c90d465e9f2a7f5c444f415d5dad SHA512 a3458edf61b355dc98f05602aa0a98c56d553567f85644ce5157f6a36f8947f8fb11971992305074c1d00a00e38481d4b34048ccf2312f51b477f33498cd792f
diff --git a/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild
index 21d5496c2cea..66074e9ff463 100644
--- a/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild
+++ b/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild
@@ -5,15 +5,15 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="subprocess.run replacement with tee(1)-like output"
 HOMEPAGE="
 	https://github.com/pycontribs/subprocess-tee/
 	https://pypi.org/project/subprocess-tee/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/suds-community/Manifest b/dev-python/suds-community/Manifest
index 444499fd60b1..aebe9a08252a 100644
--- a/dev-python/suds-community/Manifest
+++ b/dev-python/suds-community/Manifest
@@ -1,3 +1,3 @@
 DIST suds-community-1.1.2.tar.gz 285409 BLAKE2B 6cf047bb6fa6aed147fa519fee4300f52195c94a409aaa769feffaaf4d43552a566efb0162e440092c3dcb8ec21cf441325db449e5417b81a5f859133a078b83 SHA512 9f26ebbf36fcbd915281f3c3afd4ea776ca409ede4ba9e487b746ef4e527171ee2fdb44075100d52b5bba0658fafec817eea2cbf64b8d2851bdc974aee430d57
-EBUILD suds-community-1.1.2.ebuild 610 BLAKE2B 5b736a4b647f7ee025aeb11651113f3f335a0302c03f2cfd36de4d5b6a2959269b452fd2c08eef18d4885b751c168ce864806dd302d2230b2e52e82fef00f776 SHA512 f4243adabed4250a7685c11b3d061ef18152741d1c8b8686933c3c27c97b3bf2f182639557ec68511c65a6818d22f6181e2f21722a7171b2edd41e58e4013bb6
+EBUILD suds-community-1.1.2.ebuild 583 BLAKE2B 3e5b28a31c3cc517570490c5e65a19974e037166ef0473fb3919de18940c7a66cf0d70699938fb270659e73015ad18d4bed0787f022f67d38060455f64428278 SHA512 f9b918a4cc5d30a5b9b7e08161f47c3eef423976617271c6a2f0ac0d1d006aa7704ef8082aa64ac168f76b8a64afaa086c302aa59ca171be8bf4611736cd0823
 MISC metadata.xml 557 BLAKE2B 1ae35931a85cfdaf853e47471764926aaf69ecac0e4d0fb208278dbe2324bfb141d1f3a870eccb94fa10c4450c2c7a141a4c007cd24d65f51a52536f7b9839e4 SHA512 232676d84079a770034e67f6d23592375998b5940a46efb7f1a654de6a78df8296a3fef694e65a7767add3dcf3ccf0b0d947d0733c85a68f5c4ff802e09b0bec
diff --git a/dev-python/suds-community/suds-community-1.1.2.ebuild b/dev-python/suds-community/suds-community-1.1.2.ebuild
index 6c798a39a1ce..c4bd0469ca13 100644
--- a/dev-python/suds-community/suds-community-1.1.2.ebuild
+++ b/dev-python/suds-community/suds-community-1.1.2.ebuild
@@ -4,17 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Lightweight SOAP client"
 HOMEPAGE="
 	https://github.com/suds-community/suds/
 	https://pypi.org/project/suds-community/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-python/text-unidecode/Manifest b/dev-python/text-unidecode/Manifest
index c98c9d7a3e7c..ccb9bf47f537 100644
--- a/dev-python/text-unidecode/Manifest
+++ b/dev-python/text-unidecode/Manifest
@@ -1,3 +1,3 @@
 DIST text-unidecode-1.3.tar.gz 76885 BLAKE2B b783963b4fce6588d45d48a498de566c08df83ae62c72caf599648df195eb94b7c02090503590ab8c747af0d210847ddfbf0772289e170361914db20c049828e SHA512 aeaf0e79bd0545ca7a4fe700d5a7dac1d5900841fcfe8a5a568c84ba7d3bee5f75eaac0531f4a01d689a550ac5bc7e1acaeb8132293f220db8387fae2eb6a150
-EBUILD text-unidecode-1.3-r1.ebuild 529 BLAKE2B 558e56901f65c4b3e14617c920ef5fa759a5a45c74e93085b193531769b187b674de79c05632cf35c54bd70ba33bb33850ba9eda7d300a5675a25896366484a8 SHA512 905cc8d26fab70d7a5418351dcf9fd1a26dd96b8f200901b0944480c732b26a9b2faa47e1e2b2dc80fb8c26d4edb4bd1638d995ff327b9a9ffe42582afb4306c
+EBUILD text-unidecode-1.3-r1.ebuild 503 BLAKE2B eb0c50b4f713b9ac48bdee3a9494aebfcaf8947711962beb4000f71b95f5d8cc65c52b7e63223302529400cb23b3b1e05c7a4f164ec221188a87fcbb5f4a18b8 SHA512 8523e0a4834f8d7f35000722ed720ca5a2b65f8fb21f3d91e179a36409f83e4d056c2cb3e6d4edacbce52caf1d87e47134ee8e8ae213527e3e3c30e816026f0f
 MISC metadata.xml 356 BLAKE2B bc31b0dfed91be054b75af4688b79ed74e6b55511377248068e2bfa54da07eecef31bbc1abeebb7e55fe2e5eed7594bf13b0169cf61ff16c522fef08535223dc SHA512 0769235a37895d6778dd153901bbe6424effe034e1847b686201c19eb81bf16439e10ecf8ef9442149a08cce6d4dcd695cd286ec48d36cd1744f256cb03d8e40
diff --git a/dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild b/dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild
index 9c29a532efa0..2ebd8c87821f 100644
--- a/dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild
+++ b/dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="The most basic port of the Text::Unidecode Perl library"
 HOMEPAGE="
 	https://pypi.org/project/text-unidecode/
 	https://github.com/kmike/text-unidecode/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2+ )"
 SLOT="0"
diff --git a/dev-python/tpm2-pytss/Manifest b/dev-python/tpm2-pytss/Manifest
index b761478ebf98..8a8ca986a732 100644
--- a/dev-python/tpm2-pytss/Manifest
+++ b/dev-python/tpm2-pytss/Manifest
@@ -1,3 +1,3 @@
 DIST tpm2-pytss-2.1.0.tar.gz 203244 BLAKE2B f960fc08c12d10835ec7127e47842ea82b760e2de4fb3060a2f55f9bab5396cbe6f8edd07cb35b98d90ba8ec22c2d3ff287acbad47feac05f02df38b154f2132 SHA512 b4d8b3a0124e67278f08ff72d3635221e84ae26b6a5489ee159e641931aa9045b4b5111ed02d5ff86d69bd89b8460b2592a3fdb94742562351e41783c78184ba
-EBUILD tpm2-pytss-2.1.0.ebuild 942 BLAKE2B 935a106fa4fe94a35527b42b154613173cd36e5f12d4b91eb604a3223f9cfa2c6193b1d3f43c18c8fcaf01237607920ad55e4040e13bf1053b9e8544254a8767 SHA512 47dccd995289116bf1f538879f39f9ebe4d9aed6016054fa979e8dee7d4af8fda12bc88705c6f338b9081be63a3e1ada5a73d2dd6aeb132579b31953e0cecc30
+EBUILD tpm2-pytss-2.1.0.ebuild 915 BLAKE2B 48dccd531172289afb2e3b8a006c32e42f3d721130a4568c3638aab6dc0187aecb102a19aa1a95ec8b7dfa08e7498080e87c5824c3e08596b376148a6dc32d48 SHA512 ae910cfb461ddf7e921d02f9c86130056a9dad184325906ac5e157c8ca2339c97b11d70f8b42f111310467e0dcbac140e487531cf99bb4fa8583c9a9d5a1453e
 MISC metadata.xml 648 BLAKE2B e4de9aae579210454f1a71043de7073c1aa7ead9c5acdea48ec2c8ebf5665ebb6837f198b6de49f7ae58bd1f5062ed4f8ca7092df56d8904aecd16bc226d95cd SHA512 dd87ec10b28530281c08d57d86a5004178e4eda729a43690ad4ab84effe246b34d777ec56c66d61a1e0335d2b9c1599366aa55bc58477f7c2dfa4eec5ab7d9ac
diff --git a/dev-python/tpm2-pytss/tpm2-pytss-2.1.0.ebuild b/dev-python/tpm2-pytss/tpm2-pytss-2.1.0.ebuild
index 6fd418968a9d..087095e3631c 100644
--- a/dev-python/tpm2-pytss/tpm2-pytss-2.1.0.ebuild
+++ b/dev-python/tpm2-pytss/tpm2-pytss-2.1.0.ebuild
@@ -3,15 +3,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python bindings for TSS"
 HOMEPAGE="
 	https://pypi.org/project/tpm2-pytss
 	https://github.com/tpm2-software/tpm2-pytss
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index ae40ed9f1312..32aa83f715d2 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1,5 +1,3 @@
-DIST txaio-22.2.1.tar.gz 53645 BLAKE2B 375203ddbe65d293ba0bf85e316880d552f47cbc9008bd41e50976ee097940c626ec66ad25e0b5322493f71f77141d03f543ce9c9d83268a1a896b16f434ccaa SHA512 b5e33ba671ab215dadf4c348b01e9d5057d080c21707d31e38912fe596aabd7b388e8c5e0f2dd2b7d0d09fe0a175a0906e2a2ee428c1a943e786afa79182631e
 DIST txaio-23.1.1.tar.gz 53704 BLAKE2B 1c12892c34cc848732d718a715e83059a6be0973cbabe619639c67d230b0d4e55b4e6d1b13baa05b13fe9faa266dadb6f2913bc01491af381fde5ca78ce6941e SHA512 41320501ec3e2555edc63326f2c5ee9bbc2fd103198a515b6dc4c44603a41d633c99a8f12c92ffc85f43546f0382d40f0c9748b13f7a7e70d98c5c4a2de85e2e
-EBUILD txaio-22.2.1.ebuild 1152 BLAKE2B f0987280126eebcde1aed5fb0fc6785b211edb15f91c2732bbcda8c89709c859384568505619f3a8252d2021d28197ccc78853feca9892bf33d2f96bd81b3bde SHA512 3049014b05828ff301247b0e4ed4a6664a5f6003656fbf0c665a19aa44eaba70cea2339b546d12d6c6eca5ed24575657452cc3bc0f4bfd35ae25a6f574a38818
-EBUILD txaio-23.1.1.ebuild 819 BLAKE2B e6daa9dabfac330db64eed43d25aed4f08c357fa66841067764edda938dc5d6ac6fe765396c36f48a81b5aca5753a5610cb3e89b4d267396e40df04acc21d2a7 SHA512 51bb0e521f06f5b350d07cbe214ffde41e8675df5716cefb726776ac2a185682adb569a3fc1cac66709bf0e988ef3f413244f02b37a104f1429162acad15e54c
+EBUILD txaio-23.1.1.ebuild 815 BLAKE2B 56d4c743a008b2e50ec30496d8cf68a389e805e089128ab007f19f0d272435aa0eeee138c80f493c9481ea97220ba2cb32508bf10d634a9c1fc639dc7fa74973 SHA512 09b0857a4861680273d82f91aa8e37bdbf0787bd93f5e1c0738416d9abbcaea06c0c8eec449b5ab53b829b4c7d476b795c3c7fbc729901fab03e3d280861e46b
 MISC metadata.xml 618 BLAKE2B bd097fc800fd543169f113520e8579f6514a355de3d68548e48e6037812b192bb4f6f8d4c2956934ee9cf88e6d13a11f8a2f95a3cdbba95f66638593734087d1 SHA512 fd8817810ff9ee6ab874f8bce30c1a1834caa0c5b22139d2c1317722155ff87e15a05c3f95b6f23f03e7b98807d0a71b0e2081518cc5e2086718cecea42b0c42
diff --git a/dev-python/txaio/txaio-22.2.1.ebuild b/dev-python/txaio/txaio-22.2.1.ebuild
deleted file mode 100644
index 126e1b91b171..000000000000
--- a/dev-python/txaio/txaio-22.2.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 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 optfeature
-
-DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="
-	https://github.com/crossbario/txaio/
-	https://pypi.org/project/txaio/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/sphinxcontrib-spelling-2.1.2' \
-	'>=dev-python/sphinx-rtd-theme-0.1.9'
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# we certainly don't need to test "python setup.py sdist" here
-		test/test_packaging.py
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# tests for removed asyncio.coroutine
-		test/test_as_future.py::test_as_future_coroutine
-		test/test_call_later.py::test_explicit_reactor_coroutine
-		test/test_is_future.py::test_is_future_coroutine
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "Twisted support" "dev-python/twisted dev-python/zope-interface"
-}
diff --git a/dev-python/txaio/txaio-23.1.1.ebuild b/dev-python/txaio/txaio-23.1.1.ebuild
index 2e1c60c53fa9..cdfcc7646a10 100644
--- a/dev-python/txaio/txaio-23.1.1.ebuild
+++ b/dev-python/txaio/txaio-23.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx docs \
 	'>=dev-python/sphinxcontrib-spelling-2.1.2' \
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index a295e45cebcf..4762097d485a 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,4 +1,3 @@
-AUX typed-ast-1.4.3-python310.patch 984 BLAKE2B 32d456979a29086021599de94683b00d17f2d458c6f36605c71b578f0a1ae08739872716103e63bdcde119b68916711cafd2da58eda72dab2b0cb62cf003a1b9 SHA512 050ef59d85e8fe6369bcda4e4991cdb614994c7443713e5a3faebd2a65cf42cffa47709b48a5658e752b46955e421f4430794f5a66c61972d8727a8e21bc960f
 DIST typed_ast-1.5.4.tar.gz 252491 BLAKE2B 07a97a881cd4c015897ca85e0b46acd6f63c48dbc69f4d73ad5e3bfd42b1b995a614d97b81c8d21c8d5dcbdddc838bffde033e11b55d866fa8e8db0aa8048731 SHA512 1ff27316d8e07219ad5b3744c167b7a7dfebb992f8ebc4623bf510f8b5d2b939cc9f659428e3228a42cdec0e63215cca973458aa914f2efdc59d5f33c150e153
-EBUILD typed-ast-1.5.4.ebuild 638 BLAKE2B 4fd77f50747810bcece377a1262a4af3605ebc868df154ba168838aa69a4dc14aa4d9a32cb0c09233b038e952256e2c5586a5465d432495464adee8075acabc7 SHA512 9bdaf054cf3d331635aeb22f97b08a846c44348f4838a36f29a936c030e8d8e05fe9ec14708d890b7d1aa9997fd3aeb97ca976018d8d8a6307c52536e4f7b48f
+EBUILD typed-ast-1.5.4.ebuild 559 BLAKE2B 357bb329841e09d305013d97fffe766a395f1d32d34122b062b8eaeeb97d905f8b514328e78ea55565f58549a3f9bc2c0ccbe6c9a81a1e2443c8d1a7087227fe SHA512 396100c8930b16ed38dc0dd92a87652f19ab90eca42514fca871191ab85bd5ded7de604cce1c87d841778d4ac0be4210ee61a9453216b83a2fec337a840937e4
 MISC metadata.xml 369 BLAKE2B b92a11c32ddd0afacac11717dacfa997976da54d30c6330873eaf36cf1f9a748ab089b5e5d586302abe57d1579054df38a036cbd8534779f7daa59ed92e7bdae SHA512 fc1961ab74c1a975ba3423568be93e6bff1358cb29e3e7209043d890e1d6a9d8659b21a6a5d5c04f42377e608d547c55d008d77811d37bf46c6ccb44d5b931c0
diff --git a/dev-python/typed-ast/files/typed-ast-1.4.3-python310.patch b/dev-python/typed-ast/files/typed-ast-1.4.3-python310.patch
deleted file mode 100644
index 7c95f2465f0d..000000000000
--- a/dev-python/typed-ast/files/typed-ast-1.4.3-python310.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://github.com/python/typed_ast/commit/123286721923ae8f3885dbfbad94d6ca940d5c96
-https://bugs.gentoo.org/874900
-
-From 123286721923ae8f3885dbfbad94d6ca940d5c96 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Wed, 10 Nov 2021 19:15:50 +0100
-Subject: [PATCH] Define _PyUnicode_DecodeUnicodeEscape even on Python 3.6+
- (#171)
-
---- a/ast3/Python/ast.c
-+++ b/ast3/Python/ast.c
-@@ -56,6 +56,8 @@ _PyBytes_DecodeEscape(const char *s,
-     return PyBytes_DecodeEscape(s, len, errors, unicode, recode_encoding);
- }
- 
-+#endif
-+
- PyObject *
- _PyUnicode_DecodeUnicodeEscape(const char *s,
-                                Py_ssize_t size,
-@@ -66,8 +68,6 @@ _PyUnicode_DecodeUnicodeEscape(const char *s,
-     return PyUnicode_DecodeUnicodeEscape(s, size, errors);
- }
- 
--#endif
--
- static int validate_stmts(asdl_seq *);
- static int validate_exprs(asdl_seq *, expr_context_ty, int);
- static int validate_nonempty_seq(asdl_seq *, const char *, const char *);
-
diff --git a/dev-python/typed-ast/typed-ast-1.5.4.ebuild b/dev-python/typed-ast/typed-ast-1.5.4.ebuild
index 7e4b8d6eb039..52f3ac4b3731 100644
--- a/dev-python/typed-ast/typed-ast-1.5.4.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.5.4.ebuild
@@ -6,15 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python typed-ast backported"
 HOMEPAGE="
 	https://github.com/python/typed_ast/
 	https://pypi.org/project/typed-ast/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-S="${WORKDIR}/${P/-/_}"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index c177697a56a1..94b7f89d0b31 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,6 +1,4 @@
 AUX typing-extensions-4.4.0-pypy-tests.patch 879 BLAKE2B a726c163cdfe5bd70d6f736d022f77e223f5ca6fe4bf16e276a4fd90a5f492e2eb74daa9ec79221b81bd72a44320335ef2be4f3613c0d915bb6a5882a2fd670e SHA512 28fe33f5f4bd766d8b6bc4829f39b1bd522b7c7149351def26850448fee9561dbbaf66ce91abc4a52d32fcde978798aa8ab40596ce51fe23c06b046ac63afe96
-DIST typing_extensions-4.4.0.gh.tar.gz 50027 BLAKE2B 4cb757eadcfce85842dc5625e620f01f8fda00fe3712d5895d8b0aa07a9e649cd20f9f820cb2801e3b34c84c1d3b79d5e71fc49cd37014924825b6cdef0152c7 SHA512 1c046e6dab22fb399acf7ab8771d035aa24c88b09cbd023e80a41cd04851c5f8b1d297275012e933658e963e008b073b8d3815f5703042545b57130daa38f143
 DIST typing_extensions-4.5.0.gh.tar.gz 52431 BLAKE2B 3d905e4f1146d23d00b695044daf653722fce9ade8f44730116bab0b8fb15c3e8d2124a6b0d395fad078878e0e4b7888e19660ca2491ccc9ec01dc11ce318fc8 SHA512 29369da83cdca57aba7d8c2089c77ad265eeb614fd34056f678e6dc9374558d1059ff2c514326115734fadbcad27ec98e1e5fcec087022a9d838cc2bfd1fe825
-EBUILD typing-extensions-4.4.0.ebuild 810 BLAKE2B f1975b1389f2b0a25afc27581b9c4dd0088102fcc4ceea056b1ca9a1e3ae3f5810184b161bd27baa652f5c3b73c418bfc6701f8ed43a8ed5bd005e17b5a8e3be SHA512 54946feaff692afa3d10aed3018621803d1db50da969813cae313aa42784d1878148b4eb51a83f3481015e78c162d5adeb78d9ae600f665db3f9d3088f8eb6e6
-EBUILD typing-extensions-4.5.0.ebuild 768 BLAKE2B 312628569b40389a3b453a7343d1155a8860c53dc946299ea6c34a38bd2fe0ba7ef9568ae87def02dced6c5f5ee6139730aa7b165c26c5f54a683d55d18f91fd SHA512 227c6f71e876bd4817ba9c372c44c325819260f7303355ab138fd658ecd2f00f117e4e44cb284ce45d76a30a52f1182eedf80a20a4077646be56b79e315cf139
+EBUILD typing-extensions-4.5.0.ebuild 760 BLAKE2B ad247cb704e9094b816819d493d65f14dbde4c076775ac8c8d8f13313b347848e3a0311b3d869ae83dbfb1c3bd124d613e7a5e7b6664757b2fb50803bf7511c0 SHA512 24455175c62ce957461ef94b235c6dc9c88e97c1c034eb4d73a6e204bb44be0ee2b713639381e8fb454f88aa1b50ad77e82cada4cada63b6edfe84f841a3761e
 MISC metadata.xml 409 BLAKE2B f2defedc04bc50fcdccb536be53f5148d2630bc235437d9c2ab32d579585e27c108f87d22cc9b458151e742d2f6c0788ae993fcbefe247295f2a572d8648ffaa SHA512 be8e74d9c73f2e4dfce9728cb06c3bc56ae35120e3388fc232da3f4cff17367775401805f63fecb74397ecc7ae8340d68dfa271cd06ed2fb03def8d155262d02
diff --git a/dev-python/typing-extensions/typing-extensions-4.4.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.4.0.ebuild
deleted file mode 100644
index 8a7b2b50c029..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing_extensions/
-"
-SRC_URI="
-	https://github.com/python/typing_extensions/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pypy-tests.patch
-)
-
-python_test() {
-	cd src || die
-	eunittest
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild
index b036b91b4a48..e56af8570ac0 100644
--- a/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/u-msgpack-python/Manifest b/dev-python/u-msgpack-python/Manifest
index d8ea1f63d91b..c89601ce663f 100644
--- a/dev-python/u-msgpack-python/Manifest
+++ b/dev-python/u-msgpack-python/Manifest
@@ -1,3 +1,3 @@
 DIST u-msgpack-python-2.7.2.tar.gz 20654 BLAKE2B 0365e4e778c9979d9154d8a267ba3bdaad9b2ef808723d2ae89e078fc0c8d76aebab234f1723985cf3b288274123e49571607599d6087ea234e3e8dc11e3a302 SHA512 e5d35bc03e5c23cfbaf9cc7f6459576e89b5dd19661ddff2a4ab5de2751e0b73c17e4685c6fead15ce2bf100b2250a3ba7cb10a7fa3f23debfa2141f4370b623
-EBUILD u-msgpack-python-2.7.2.ebuild 617 BLAKE2B 341ecd4679506c87dc395ee49d216939fd63c30d87c5ae9fbe7d454e876bf8e0778f23604ab165b78035a90e69463e6e654c5f032b1fe82386864aab393854f4 SHA512 428459b939b8aa8451e4e45ae842a9cd4b6e3799bc224ff103342ccea7ba897d3b6eaa98e487765b1ef6ef68d986456d35ae81ca9508ee11e5ae2c8c2c139a2f
+EBUILD u-msgpack-python-2.7.2.ebuild 591 BLAKE2B 43c8d2b5ec8e724d62ce383b8a353c13d153eecbe388686844824af4619748c29589e600c721b61b787f5e4ad3a3c5164b6ed463b5f830c47e78c59c674c702d SHA512 6efc1d68285e127276c5ba67bbf3a5154c92a7afa8bcdca649a44d2c05d6fc6b6eb4e1cedf90d6aed08fdcb72df05283d36c5a735e35220c68c53e139f625cbb
 MISC metadata.xml 932 BLAKE2B 6c35c0276d1f132074198ec85c5b80967dda5eceef914b3e8c444c50926a83638a97754a483fbadd6246931af2eaf5de86c97d48ce6346da55dce1e577ea47eb SHA512 cdc35e790e2c454af8e82456fa438bfbe0c9e569001bd94d416b48d37f6ca8e78540fb76ad37c72c1cd632eff2f66d782e28265c5825f94f989786cebba59e67
diff --git a/dev-python/u-msgpack-python/u-msgpack-python-2.7.2.ebuild b/dev-python/u-msgpack-python/u-msgpack-python-2.7.2.ebuild
index 79b14437c8a4..afda61b225e4 100644
--- a/dev-python/u-msgpack-python/u-msgpack-python-2.7.2.ebuild
+++ b/dev-python/u-msgpack-python/u-msgpack-python-2.7.2.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A portable, lightweight MessagePack serializer and deserializer"
 HOMEPAGE="
 	https://github.com/vsergeev/u-msgpack-python/
 	https://pypi.org/project/u-msgpack-python/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/versioningit/Manifest b/dev-python/versioningit/Manifest
index 6ed631f5db9e..d9b415c94c94 100644
--- a/dev-python/versioningit/Manifest
+++ b/dev-python/versioningit/Manifest
@@ -1,5 +1,3 @@
-DIST versioningit-2.1.0.tar.gz 735718 BLAKE2B edceb4b5a76ecc5e4f5549a348cd5c72bd1c77be1fb6d8c1694af4c94ff38e773b2e288ad22cecd93a3cd14d602dd6c50634db74a51e486856472098cf18bf89 SHA512 0cea71e8b21edefba008d947d8527810e1e38c8e2f208707dbc913b3734b51a57b20444fa4dd703574f0106068518057496292ae5997d85ba047ff4795ba64fa
 DIST versioningit-2.2.0.tar.gz 742936 BLAKE2B 05bfebce378947a9196b4bd90495dc8f89fa9b79b99e5a4423ff39df77f0353125ba5f2deec1e685feacb6fbb8ee896fd1f18155b985f803be4d21e885689128 SHA512 9169bd04c29937a5d913dfa4951affe9d01f21f513fb6f704bdd65f44c91dd47c366169fd50aecc938992cb32b6cac835359b1dc9a6b431b8b5371125564791e
-EBUILD versioningit-2.1.0.ebuild 1069 BLAKE2B 397a1f92cf673a4f950104047a762a514080f1eae57aec3d9118714419a2b9162b11995124eb0c71e3ef4d8eeaa074c48038fdeda210e0472cba3cc4cdc5d4ea SHA512 5d7661364ac44059f2d6fb8ad2073e1238322ce77273637aebe597ab2a3c842a397c6e012549daef1117ab1300d984047aa325257a464805c53d2d08077b3fbe
-EBUILD versioningit-2.2.0.ebuild 1023 BLAKE2B e0fa343a3665245326e8f22b27728e723e3742f18b2d547c00dce8c49c33bafd876959461752f95d9e150351ee8d39114a823d74ee9b2f906df7824c530ff6a7 SHA512 e1c8bf5f75a10d642835f7f18a402af3e65657698eb4e4a7dc7eca063127226b9763f6d31fa9baff4016e1f2f21b3224e37d125fbf08e2946f90eb0f64c35b6b
+EBUILD versioningit-2.2.0.ebuild 1022 BLAKE2B 76f8f4352e0dbfb583aa8932785776469bd5a1b93d555d39dd54c6a07a8299d7ba3f8c32b4643217b7b1c4dcf56c2813a34058f568fca8e293bd30107fcc4260 SHA512 82a78cf51e5e133cd326a62ae7f4725ab198da67cf0163be56c4b93c3d3ef853230d2f2c01069e82295250a209061d6bb0967ffec7bdb0f73278c5691d33150d
 MISC metadata.xml 400 BLAKE2B 96934adb9ade5b51537765da51d530a644f87328688415cfd5b239048adede18db1ec7cbb2a234cc2e28fea368aa9c815176bb22262c9053fdc2c85c6c6e3f56 SHA512 9070b850fff35058a11cc7504bbc5fbef17cc9154df5419a64bae10fd3cb160a043ffd0880fc3c5054bd1d2eb4891bcbf5764c56f2441ab79366336caf91e379
diff --git a/dev-python/versioningit/versioningit-2.1.0.ebuild b/dev-python/versioningit/versioningit-2.1.0.ebuild
deleted file mode 100644
index a0d4acc1502b..000000000000
--- a/dev-python/versioningit/versioningit-2.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 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="A setuptools plugin for versioning based on git tags"
-HOMEPAGE="
-	https://github.com/jwodder/versioningit/
-	https://pypi.org/project/versioningit/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		<dev-python/tomli-3[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Tries to do wheel/pip installs
-	test/test_end2end.py
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/-cov/d' tox.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest -p no:pytest-describe
-}
diff --git a/dev-python/versioningit/versioningit-2.2.0.ebuild b/dev-python/versioningit/versioningit-2.2.0.ebuild
index 253f1e1850f0..03c79ae142bb 100644
--- a/dev-python/versioningit/versioningit-2.2.0.ebuild
+++ b/dev-python/versioningit/versioningit-2.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 92cc9216a4f2..6017edaf98c2 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,11 +1,5 @@
-DIST virtualenv-20.17.1.tar.gz 12269737 BLAKE2B 5caa223d549ecb69de3a17dec84a608f34f01c5abd39ab478c27438f71e36e6878a719f9002464dbf0f335bc90a2f4552e201d59e0e757fabef6f3caaaf857fb SHA512 6b32145f431f6b1f4c2a2ed888e8b9e5cb941e04ea1e68830053dceac80ee8bbf2286c1f353951d50d4b8417b8d81ee4b30dae597c94f2a3baf50f174f7ef4d4
-DIST virtualenv-20.18.0.tar.gz 12063086 BLAKE2B 272957077dd0a5868e8979c7c34bda1ae28af857d1d5bbafeef6955bcf44a7c5d38f4f131b57a2593180ffdc5a034b18998ba3e4307b7191ebafccc80ef46278 SHA512 b02533878b8d8859f10b51dbdb9fecddf9b49aa2cf1437ddc10cadba82e5361fdeb8b8c94efcc3c8268ddecef31651c28c213e87588aa917479e8d0e2e823493
-DIST virtualenv-20.19.0.tar.gz 12063084 BLAKE2B 6a6d94c7099aa841523909173b04821697c7fc8b284325dbf191f6b2184bce19802924e0a001267448a785c35f8bbd7cee74f7514a375e4e47a9d3275404f756 SHA512 75c63fea11ad070985cb2ba17adfcb7e1739e8798b80919cc17a527d7180f68a04197436b44146cd07423d8d2e4982d1716b0e18159add5ce6a748b31f6b2776
 DIST virtualenv-20.20.0.tar.gz 12069625 BLAKE2B 3db53d2859c542953be233af0d195d992eecef345700ad7c229b88519f7042189907263d312d3613b45c5c069bec2440a8639bcc58b2c6894ed79301735e65b2 SHA512 6710efcbead1358479961c84ec3f6b9c3a1fc59c2f6b33fa13e2609554f7072aee7ef8cc07b4aa2fbc27ac950a78e447529fb8ceb2e4ee0881a4356a67d26641
 DIST virtualenv-20.21.0.tar.gz 12070063 BLAKE2B f69d5934191ccd8e9420c37e51b53df7876961d6f13d0f75845530893fd91df29a512e64eaa27135535816250a3149087029e6fe1b15317b8079af9cee2832ea SHA512 77aae5ebc5007093953c30da1eed996e851a65c7dd1f7a3a85961a1bb251b3d7970936eea1efe8babb216d2024072bdbf1c1a97ba8760a04a0abf6e7c3a27d09
-EBUILD virtualenv-20.17.1.ebuild 4921 BLAKE2B 0a9fecb5aa534e8dc12e1bac8b6b9fe7cbe10ca06406c7e2c1cc0ca8e0b5d464954829b0c7fef275370a31ae0c9dd7e8f9257d2b311d5d8238689c81c7999970 SHA512 68c7673a1e9843be546199feab56e112e37b09f601d6e07490a470eb4e1ccc34248c1901895c81ad749d8d1023a9c8377cc47615dbf131eb44865083a9beab66
-EBUILD virtualenv-20.18.0.ebuild 5012 BLAKE2B 9254d23d00755994534a17315ac32795634bc2f29a65cca17c59ce5c9f9d3bb3bbfaca59afdce96daea7bb773640135827d5a78caceefe5a60dce13e13bc7a6b SHA512 95bafcdf488a146aea8d3aea945466ede8f7e98c364c43973dda5130560dc9f927751b742ef4ea37a8e4129a907bcc86b49485a64a7e2b8c06d9a45bdfbe5e5c
-EBUILD virtualenv-20.19.0.ebuild 4956 BLAKE2B 519d903e8449c44867db84ad230e14bc90317f6088ec65a5f5aeb82c069e3b597582c22b26cfc27f04eb0894a8b154e3ac0d0f32203f8ed5754e4eed7e59dc4b SHA512 bac83db65b2f129cdc1b3dfae131a79b4f1c7d5435d07baf11fe4714c186034b944546654b70ad58e6c295d2c0146daa210e33e8d067910d37e53739b8753933
-EBUILD virtualenv-20.20.0.ebuild 4769 BLAKE2B b2641b3d910b24c0d5b52ef5a3a4d79b8b7256b2a86cb17994d6ce64f79a4c14103f75ae76d8f4f1426defa853ca884c5da1983685bf2e22cca553408a54e472 SHA512 49ee545c8b6898126d138665f88b3018ebdb6c7f2580b7e8be13626103680f051a61017038f53429f0caf7913265e0092076619c50fd5b12bb593a8e36ab7e9a
+EBUILD virtualenv-20.20.0.ebuild 4761 BLAKE2B 75819c09d97c7f43d32d2840c67d2a42c71b1218e19dbf327f2cb9c9fb705376384de1b4d071302f3d65b16ed5d0dab9fe4504eb68b07dad8446be8240806244 SHA512 ecdb0b5b5073eff31b43a3fc6879d2df6650dc788b6a82d7e15316b394aba08d2c44ea8f66f0481c3086b4702e2eb7438ed86aaa0b9b780a1355d7a9b15bcf4e
 EBUILD virtualenv-20.21.0.ebuild 4769 BLAKE2B b2641b3d910b24c0d5b52ef5a3a4d79b8b7256b2a86cb17994d6ce64f79a4c14103f75ae76d8f4f1426defa853ca884c5da1983685bf2e22cca553408a54e472 SHA512 49ee545c8b6898126d138665f88b3018ebdb6c7f2580b7e8be13626103680f051a61017038f53429f0caf7913265e0092076619c50fd5b12bb593a8e36ab7e9a
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.17.1.ebuild b/dev-python/virtualenv/virtualenv-20.17.1.ebuild
deleted file mode 100644
index 58de01bde78f..000000000000
--- a/dev-python/virtualenv/virtualenv-20.17.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-63.2.0[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx-rtd-theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
-		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.18.0.ebuild b/dev-python/virtualenv/virtualenv-20.18.0.ebuild
deleted file mode 100644
index 2584f7c8b178..000000000000
--- a/dev-python/virtualenv/virtualenv-20.18.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/distlib-1[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-	<dev-python/filelock-4[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx-rtd-theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/platformdirs/s:<3,::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
-		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.19.0.ebuild b/dev-python/virtualenv/virtualenv-20.19.0.ebuild
deleted file mode 100644
index 3a67e6028e58..000000000000
--- a/dev-python/virtualenv/virtualenv-20.19.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/distlib-1[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-	<dev-python/filelock-4[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
-	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx-rtd-theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
-		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
-		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.20.0.ebuild b/dev-python/virtualenv/virtualenv-20.20.0.ebuild
index d32afc1e8df6..6d67e05abece 100644
--- a/dev-python/virtualenv/virtualenv-20.20.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.20.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/youtube-search-python/Manifest b/dev-python/youtube-search-python/Manifest
index ab2342882a78..75fce801f0b5 100644
--- a/dev-python/youtube-search-python/Manifest
+++ b/dev-python/youtube-search-python/Manifest
@@ -1,3 +1,3 @@
 DIST youtube-search-python-1.6.6.tar.gz 115732 BLAKE2B d53f99272917c488709a2b7b6273e430e1831d5d34930ad39a5cbb838fec1ee9694b8d7fc8aefcac643dfec0fc91bb278a40224b2e0bc865a93db17d647c8ac8 SHA512 b03ead324e7684f7bf28a4c05a104a558dce8bb4e126b42853bcd875675a4a39876bb47cad3e57a618eaffdc1561fd523021be3dd77dd1180b9bf7d752faa2ee
-EBUILD youtube-search-python-1.6.6.ebuild 534 BLAKE2B 85d483ee3baf4b240e3dac0a492067150456bf0afe20b112595510ddf40800ba3f0b6ce75d713f3fe533eca0cac27aeb84d9fa0a9dedb701a3a8b0ae607b283e SHA512 6d85819705306f639818d70fff75ee7d84e337cd849928b7854453544d27e1790d6b5fc8262e458dd346cccaf17dca04fd6e42cf65c9e123eff7858e18d9ec9b
+EBUILD youtube-search-python-1.6.6.ebuild 507 BLAKE2B b2ee50b27e3988c97ce65e159f2a4964f2ecd3c9b2fad85dd3eaec012a8e82152f7c09857e2b386f8ce557a020ea4b1f34203694f3900a31edcf95e0d6095238 SHA512 47db734549552e13c5aabbf440a7a25597de14366222b6a5be379e1db4da1375b4e3656f8f13f0bd1179533776e0ae7a1f35eb1eb30865a7551ab18abf5f9f28
 MISC metadata.xml 609 BLAKE2B 68d69628f5baaf15fc262a378f693f6e8a666ed3eead875b08cb9f79154f0ce62e7c0c994609ff299921553432c0aebbe26c81dc6351ac271a9ab512eafff9c4 SHA512 288fd341535df110f348dc3da3666d45fb1ff28a40009363b1fdde808ce9f77187b154075a431639d639a8ec9c1aa416c32ef76990b48d8944240f4dcb39ec0d
diff --git a/dev-python/youtube-search-python/youtube-search-python-1.6.6.ebuild b/dev-python/youtube-search-python/youtube-search-python-1.6.6.ebuild
index c46eb6c2c397..ae358a93e809 100644
--- a/dev-python/youtube-search-python/youtube-search-python-1.6.6.ebuild
+++ b/dev-python/youtube-search-python/youtube-search-python-1.6.6.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Get YouTube video information using link WITHOUT YouTube Data API v3"
 HOMEPAGE="https://github.com/alexmercerind/youtube-search-python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 25685c1d1d58..168863c83828 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,7 +1,3 @@
-DIST python-zeroconf-0.39.4.gh.tar.gz 137174 BLAKE2B 9e7d66bec5ebb52754c5a45fd584229db2f20f37cc43830b31c903a6267aadc3a45a3f8c35fd329586aa81f083dc823f0e6d6fad3dc2b6cc5ada17a2eb4a2208 SHA512 0e69a31dd31111f95eda0a44ee7d00484d8b909448eef4ef41bef6e170a410ecdae02e01cc944ad7534634aa26ef0c95b465c784ee67de1c2cd0ec4ab040d445
-DIST python-zeroconf-0.47.1.gh.tar.gz 151191 BLAKE2B 30cbda51b533519b9affe52d73c96fb60d6eb4d882791729a021b41e48974ac14bac46c1ea9030d792587eb09104670b38f1000192aa202ec7e793a5f79b08cc SHA512 abb74fa3e05b962b6b93ff9df58f2bb3e029d74ca03aaebd38ee716b204ec8b8af665c97f7b9fbbf998767c9308ab7d900f39a92fae4224d5689ecbe229c01d5
 DIST python-zeroconf-0.47.3.gh.tar.gz 151413 BLAKE2B eff81832a029cf173c55290355207bfd17b1701f85c60be544252d00579ad835eb2b7c0a29c967ba62b1293d9efae953bc3b564c5ca134c2a898621584cdf544 SHA512 e1435490ba6890d9f0fe8efd7be64f0f9fd20a6ae723b176861865a8a795593db7cd797062f9977a5b1df4107781011d25bdf69dd4cc54dd94ef6e891c425df4
-EBUILD zeroconf-0.39.4.ebuild 1429 BLAKE2B 6357e6e97104e97b3317123bb738941dde75a9b7191e982a324869c93fd23bc3a3613c866605ff867c64e42bcd2ccdde88ccffae16e870619dcee4540973528b SHA512 39353464811da3d7625eec017bcbd9a2e7d7c27134883e7876a91dc8aba52f9e30fe52a78ac3eaf88ed27987dbcb459f1770385e39ef9f4d5bd1ca7bfab86f1e
-EBUILD zeroconf-0.47.1.ebuild 1716 BLAKE2B 224b3a246b31fff93a301e65d3a4b7f4fbffa3de34135f098ab7bb2b99c011a1f719acadd62c9d306c13ea22103ba74cfeb9856f4ad951f423b8868e50fd99a9 SHA512 96439eaa953b21645d2d87767bada01a823258655940768eeb9d98ba21b2f48768e9fbf9223764568efc78e7e318b0b044347d356394f66c5c12d5027f93e503
-EBUILD zeroconf-0.47.3.ebuild 1716 BLAKE2B 224b3a246b31fff93a301e65d3a4b7f4fbffa3de34135f098ab7bb2b99c011a1f719acadd62c9d306c13ea22103ba74cfeb9856f4ad951f423b8868e50fd99a9 SHA512 96439eaa953b21645d2d87767bada01a823258655940768eeb9d98ba21b2f48768e9fbf9223764568efc78e7e318b0b044347d356394f66c5c12d5027f93e503
+EBUILD zeroconf-0.47.3.ebuild 1714 BLAKE2B d5a5092327d4de61e1bec37c6d963030c5703ed4fe3360ab91f42133456367390bc547fb8f591512d86093078f2a279b16fcbbaff49252b6589498c55ac805b3 SHA512 1d6fc8b09de6aa52049ae8bffa2cde9d5a1299495b8af075805059d55c1a09d206b8cc161fc32728cb3cfcfbff4757f28baac6ced0ab3cad3dab7f88acec9fde
 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9
diff --git a/dev-python/zeroconf/zeroconf-0.39.4.ebuild b/dev-python/zeroconf/zeroconf-0.39.4.ebuild
deleted file mode 100644
index a83c8ce4d736..000000000000
--- a/dev-python/zeroconf/zeroconf-0.39.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 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
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-SRC_URI="
-	https://github.com/python-zeroconf/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/async-timeout-4.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# network
-	tests/test_core.py::Framework::test_close_multiple_times
-	tests/test_core.py::Framework::test_launch_and_close
-	tests/test_core.py::Framework::test_launch_and_close_context_manager
-	tests/test_core.py::Framework::test_launch_and_close_v4_v6
-	tests/test_core.py::Framework::test_launch_and_close_v6_only
-	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-
-	# fragile to timeouts (?)
-	tests/services/test_browser.py::test_service_browser_expire_callbacks
-	tests/utils/test_asyncio.py::test_run_coro_with_timeout
-)
diff --git a/dev-python/zeroconf/zeroconf-0.47.1.ebuild b/dev-python/zeroconf/zeroconf-0.47.1.ebuild
deleted file mode 100644
index 09501c2c741f..000000000000
--- a/dev-python/zeroconf/zeroconf-0.47.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 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
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-SRC_URI="
-	https://github.com/python-zeroconf/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.{8..10})
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.47.3.ebuild b/dev-python/zeroconf/zeroconf-0.47.3.ebuild
index 09501c2c741f..70781d4d3bc3 100644
--- a/dev-python/zeroconf/zeroconf-0.47.3.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.47.3.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 341e06144807..d82f5d1db211 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,4 +1,6 @@
 AUX 5.1.0-drop-coverage.patch 571 BLAKE2B d5f334b7f5ec5df710174f9a3768c2d7400cefec7c3bb7cb0e4a3fced701b812af738d601ced61df57b78212f1ec621c6a53b906be2bbdf0838c31dc8c6f9e29 SHA512 04b30a85357fd7d0e0a4c52913b0260cc437f7cde2344399d400c2fc0e10cc60261eb4a3201954a515dfd030cfa564c9a222424390af8a3e20349270c89272b6
 DIST zope.interface-5.5.2.tar.gz 300533 BLAKE2B 04b348492d5af729eebc6b1abc6dc7bd4a28931c5d65d03261bc4a77a39e97c4cbcf319ea0b5a960ddab7bd1056481e741d2b69cf6c21bea4bf3885b757aa1bd SHA512 ecc20df9b84c91f7a03ce7be087abcd6288f77b2e04f6974ece5b86a222944baf0dc0a2aa49063c74dc7c4d47c474fd01f512c7686164806d48f360667581205
+DIST zope.interface-6.0.tar.gz 246297 BLAKE2B e1aac8346d639527808f0f54a9a81a68ca9474d5169f6a07599b3e345ff50fc5e9379df62591cbcdc781e73d151f7c7d993b9e392ea11b21e609030fb805ab70 SHA512 ed6bc98a61c91c34cfd8e24a8545e462fdffab13bc77a8144714a9cdd3bc7f4b873a50597a64f50b3c811f57218e1f2c78ceb267e52ae0ab5c136f082caa0612
 EBUILD zope-interface-5.5.2.ebuild 1277 BLAKE2B 2cf80c7bc92b3a4ae18dfda2f2944405f5c4f77b5dc7235592326cd1b9734bf68ddb7f58d05e1d8b563002d1857927952a5b313f5ea65c06fdbaec7917535ef5 SHA512 3ba00240f8e8a5f6b8e6abec1a00190b0bfbf5bb6257abc2fe455fc6ee4fc62ab032279b7439b65c11aaf151c3dbcccf01a8ed34237418f8ccd338e135853f51
+EBUILD zope-interface-6.0.ebuild 1248 BLAKE2B a49aea48459301ccb4ec6994dbf505c5f40491d53d6ddb12e06db408be7913b9d048e65e157c67728309e1c681a99a3c13955f159cc24ec4e495c430abbabb4d SHA512 d4f3132bb5fee6f342770d78db06c73f82f037509ce1a72d950c7a930d5fe937b9897ed1bf43932c1063c3140434f9c0acd4750f4785a21b4de4bb371d4c35fe
 MISC metadata.xml 387 BLAKE2B 1d5e2a8f2fcd2c8fcb423f8a123d2d17a0456cd4003489358abd8baf74d3ea9ddfa04af94b9ef67b329520b5ee9bc3084343e824f3fbf7420f14372d43581dbc SHA512 258f0bd291cd42f6374bd331c3b906f149ff455dd264716eefc63487710d95f8b388ecb34be5733dbd7a0e185f449cc18fce04b46521a2d19fd9766e7dc0ed82
diff --git a/dev-python/zope-interface/zope-interface-6.0.ebuild b/dev-python/zope-interface/zope-interface-6.0.ebuild
new file mode 100644
index 000000000000..71c1fab1a966
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-6.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="
+	https://github.com/zopefoundation/zope.interface/
+	https://pypi.org/project/zope.interface/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
+S=${WORKDIR}/${P/-/.}
+
+LICENSE="ZPL"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	!dev-python/namespace-zope
+"
+BDEPEND="
+	test? (
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/5.1.0-drop-coverage.patch
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -e "/'setuptools'/d" -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 357652fdb6cc..45e4ad1e2228 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index 06ba9170a355..8b71c9f9f07b 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -3,5 +3,5 @@ DIST bcpp-20221002.tgz.asc 729 BLAKE2B 64a211fb84ac6ca2926cb54b06945a908bb19ef15
 DIST bcpp-20230130.tgz 155972 BLAKE2B f51ae04ef75125d2040f9ef2ab9fb5513ad83fc6095b85bc091bf109d43b066723743c02f703b90f5d4faeb368da86d611d9ce46237c10e31b861b473de49282 SHA512 1fd22707313c098ac2a338425029d2c6355e9042b9bba3d2a6c8d4315dc59a33ea1bfc0cf30671ab2eb1c05981c4be5313a20d357bbbbb4f14374772253b4c30
 DIST bcpp-20230130.tgz.asc 729 BLAKE2B ffd6266919c8598067b09ac9f855c3b1d93dbd4d6536dbd68a12ccbc5f8cc62e10315e44376fc72d40881e43dfa51676a1af46400aed66bf4c2ac1d4a17b499c SHA512 b52cfa95115726ec7b9575ef8a813fc5d1eb8dc7083b19508d5058b80d41203e70d3cd61a18eea4f35755f77e92ce15c2a1f24db0befb3b62dab3b71065a3955
 EBUILD bcpp-20221002.ebuild 1157 BLAKE2B 405d8ca7ffd8dc04148b75824dcae7d68f200c79ff9fc357704b6eac62a11402be26ad066bd5e1382df8f1a6921535c12ffa4922631e8550e03daaee8fa37a59 SHA512 466d468ea8faa18b5b1754427c250f772f1450c1e1feed9b9f36b4e24f3f1c01e0b68f1ef0fd551386d638ce9929884f821531a8a92606555c61e77de92caad5
-EBUILD bcpp-20230130.ebuild 1160 BLAKE2B df2ce0040a9160ce04302e52980a53057e6a69f1184734578014085c3485c4a88d8253688e6af866eac34873a912ee7d7285a658b8bc73a902280cfe3273ad4d SHA512 dd68133af4ad4dff3e1fe2640a2fcc9431965661301dc9af8cc64fd6fd78c75efaa2f04cbcbc2497756610d3f659ae4da05f309669c4dab4d646fdf8450cc1d9
+EBUILD bcpp-20230130.ebuild 1157 BLAKE2B 4d96ba3ec14bfc44e341be5b7ac1352785b3e9b733eeb882347dd4128bb1df2144081e4fb9c9ca12f371a02169978334c9805885de3992dcc491b23ec6e76a1a SHA512 6f35e7e77042b6dc761a4a82597bfb6f96c0b31017b2d88c8c5827ebaa922266b49719702d1acbccb7986c05420905907f04bab6ed7b1c20a14371509e3e0f76
 MISC metadata.xml 327 BLAKE2B 98cfc008c1157e6c7bf26938ee9cb85afed7b4ca15f625a6bfb4f10a4a7ec9b7ad101c38c6b5bde51ac8ff8f6ebc15ca0cdd2903db65f1d691c13f534f5783e1 SHA512 ebaa5a7e3f02bc91337c50366007ffb65ef5a8a5604c43872d3a45f50a372adca5ac279b84309e3045fd34b81d0a9a138d2f73141955e15f0e827a42fab70673
diff --git a/dev-util/bcpp/bcpp-20230130.ebuild b/dev-util/bcpp/bcpp-20230130.ebuild
index f5beeb1bf188..519db7f27f84 100644
--- a/dev-util/bcpp/bcpp-20230130.ebuild
+++ b/dev-util/bcpp/bcpp-20230130.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
 
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index a3ba12cb15fa..7666c277ec98 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,3 +1,3 @@
 DIST buildbot-badges-3.6.1.tar.gz 3967 BLAKE2B 07763a458c0eb32db13fd7b39a20186c2772ff53ea30e3b199f0dd64008346c218d550b10b238b63deb2ee64064b3f1fb19c95013f6647ec4992b8fee12ca2e5 SHA512 4326f49c2d69d86e9c49250c261c59d67553d6cb63098f19c391f3bfb83c4f99ea783d2351930fcfed40fe83dbfc8466294d77609e39e79e76c6c7b42e557c0f
-EBUILD buildbot-badges-3.6.1.ebuild 924 BLAKE2B a75e32f2056584df8ab1718b57e510e974dc2635b74bd28cbb3c8a56e9df10e6091f4de8c02e86d91a91cc454f9e8bf1f1d87c7e63757e5bd1664392f265b9cc SHA512 c10b6c3797b0c320e00f78e374055b40803284ec06e3a72fd8f85c65c94fe3bca7163d41698dbd989f98135db5b7de3a7f1ee783ebca443333f025ec12111856
+EBUILD buildbot-badges-3.6.1.ebuild 825 BLAKE2B 48313a73b56a1dfe994c5e70f665dcfb4b365bf3ad457cdcaa7cb02a3869243fe8185af2bf6fe42e93b2923668957ad0bde0689a14de4ec599f99cfadff15ab0 SHA512 2ab6939430fc0859b6721be186d99265a385d0cfab5750a2cfa62535c40289858d36c9191e673d0465585b12208f6a4c09fe3677189063801bf4812166005add
 MISC metadata.xml 762 BLAKE2B bad3590966f17a1a4f25b1b382be72f6e2a1ce77c5a0a806fb878b9d20d9c30dec6ea493a530e0aedaefe2dcc964fe7397e752f38a00f9feb2c8ee372d541c9a SHA512 f3936f9cedb5c400740e691833ee030996e61f0f9e6e7661adc5ace37f415c2d456092137a5d14cf792089387177499a36be0bdd53188676b699a829bfc21c24
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild
index 3936a86e6f01..d479d9b90eca 100644
--- a/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild
+++ b/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild
@@ -4,19 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
+inherit distutils-r1 pypi
 
 DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
 HOMEPAGE="https://buildbot.net/
 	https://github.com/buildbot/buildbot
 	https://pypi.org/project/buildbot-grid-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 0939b26eee32..6f3d162ae718 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,3 +1,3 @@
 DIST buildbot-console-view-3.6.1.tar.gz 18731 BLAKE2B b572b0c2bedfb1149056237a5b7417c933cdd75b8a723edcb5b37cbf33c8d6d1c1fa5d490955a119eb6ca6df7317b89182c45462ceebb310d3b78f44712f4d33 SHA512 3489579c02db7f2b02aaeab8d9cc2eb60d72e5a12eca51c63cf10491c683ba7b99069de6ca2348fcf44dd6ce81d58d437a7d03749815a3fad55162e50df912e0
-EBUILD buildbot-console-view-3.6.1.ebuild 715 BLAKE2B 8066a8fc3f04d3dbcc431717d574f6b6aacb1ecd083cfcc49f0bdeea091afd4d0ec65a443aec40e452ea2502ea6126fb1774aec18f6625503face96867f6c29d SHA512 755444ef6a1921c92dba1322fb8b73c5bf150258bd22c6efba60e2edded7ff44d9b4ab3f34922fefcc47d9a2ada3b48b98cade70b50415d4420aa217c4778426
+EBUILD buildbot-console-view-3.6.1.ebuild 616 BLAKE2B 1db56910fd3cece1110c646a6a0963ef65b1e7cc3a48ae755c66833a850596352fb57ca03baed925705eb50ad09dcf239e6165e67bedf0630cfebd8ee00645d1 SHA512 2ea660c6fd5225f8cb15eb13aab9460b896408ccfba01d45be4d6c4830f2b74c3af2d0c976e353ea627b9597253b3f32cb03b178cc9bec87e132ff7d94536772
 MISC metadata.xml 661 BLAKE2B 00812636b1e2bf2b7d604a540ed1982e891894f38d8fa256bd954a693f6ff4b203c9a6cf8a2d4b67288b489a362a661b072de042dd3f62cf3d596ef14049e35c SHA512 1f905f5810e7a216e73e942fe2cb42302010fdb19078f20ee95a20555e2b2f0e13e29b3cf326d0a546bfc78e4d610d402199acbb915fc0b57ff55be3c402ec2b
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild
index 4c2a0313068c..6628f62be6ba 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild
@@ -4,19 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
+inherit distutils-r1 pypi
 
 DESCRIPTION="Buildbot console-view plugin"
 HOMEPAGE="https://buildbot.net/
 	https://github.com/buildbot/buildbot
 	https://pypi.org/project/buildbot-console-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 9ccc505494fa..077dfe18fe6e 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,3 +1,3 @@
 DIST buildbot-grid-view-3.6.1.tar.gz 13706 BLAKE2B 808d663b397459c7dd2d537a1a6eab2a0cc839ef0ba42bf56722ee53628bc9e6d41d03f549f0adb0fa92b0b8f416ca8c0a4bc310d67b4b06823eefe33b1ed02b SHA512 7605a5af1428ff08c96751f9c93fddd7b54f57a8879b85c270338e94eeb4ed55ddcfb7066519a2a3ff6d07b537a6ac28bb388b48eecb81c477aa1b6fbaa361dd
-EBUILD buildbot-grid-view-3.6.1.ebuild 695 BLAKE2B d500ca5ffe669192fa239e0256424c26b1b9d20879cb64c0f3711e3daf238c55677687decf5d433af95c29e0198c6ba6d59659b2de5295795073d2cd9d50003c SHA512 6a4d12baed1e2e9dee0c4bbb23f023b353f8579f97747aa669576cf5a39f67efd14610cd151487f20a014a7b5a5ce36886e201c6a1d242e6cd0ba5e540f778cb
+EBUILD buildbot-grid-view-3.6.1.ebuild 596 BLAKE2B 78638e3b13b08cbb071f2a036869c8f5cc22280310da6069bb3d902f75af75371a8a2ef7106eaa9e4ed70bcfc19e3d988192d590c73ad5bdc76c531910a7ca79 SHA512 57b8b15ed380b63b8d2a497276effe61b9b93b340e2cb200c29ff1323c4e4a8c1c608c95752c1625c95d9aac969172f2c7775c48d5312233bf863e5a65b3dc7f
 MISC metadata.xml 640 BLAKE2B 22ccf767dae88664f3da52b44a6cc1d7abe93e282db0bccd6fc7bcd20bad2719b3cbc0ae75a7a72baf6a542908e7155026d7fdf1fa6976b165129110e348e11a SHA512 d6c7605dc32e3fc40690a45b8bfc70fd73e82e07ddcd49d94503254c25f5d532fc21ce79b94a37fc0a1fd023f5632065c35e946f0d48bc802c051f04a5dcaf81
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild
index 3f9e5517ce0e..daa18dde2ea9 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild
@@ -4,19 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
+inherit distutils-r1 pypi
 
 DESCRIPTION="BuildBot grid view web interface"
 HOMEPAGE="https://buildbot.net/
 	https://github.com/buildbot/buildbot
 	https://pypi.org/project/buildbot-grid-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 1ebda2baf675..a4267f856d99 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,3 +1,3 @@
 DIST buildbot-pkg-3.6.1.tar.gz 4807 BLAKE2B d492d0ca36fa8634e877bbc56ffd06ff6a7bb477c98bde2e3586dfc64f4b9d394ec1e5bb1a113aad9d2905277805b9f8737babcad669e2b73abb67d156d3126c SHA512 5833581b4551dc204a52a8356bdb110d57a9de022c33b09b7efdc14f5f4a7c0b0e26f9f9a6a076945aec3a5b7089c040ddaaad8d94c6e0217c2cb6b7742c1ac2
-EBUILD buildbot-pkg-3.6.1.ebuild 899 BLAKE2B dbbbd10ca6578602eee0cdfce88679cba48dc3ca3f9fa9aed4596181a603c14a919e219097b675ed89f39ec036fd2acb61158faaf72c4949cbee316a124896de SHA512 64be5ce4b13bbc68bafb158ce8e56a3450cb28bb2cc94e4463995d9eb0277138af8094af8dfda0511bba316cf2cf22a505e6987cc4cbaf24989f1920c6f145d3
+EBUILD buildbot-pkg-3.6.1.ebuild 806 BLAKE2B d80cc4f3b62a29e9b8bcc66cdc8a9b6cd092b338fe22e426c7c9404ba3e4f85e70d4a6b8adb08aee74d81600b2570fe787ad4e312cbc83dfd8f75f4236ee09ea SHA512 3af7624ad7030fe68404e918c1c99110e9a4ecd6b441bfbdb3dd412cff6fe8deeabe90f04a88d8c497c9909e40b15bce86d0c2d91cf3855def8f000860aec265
 MISC metadata.xml 1199 BLAKE2B 1eb102f71e83b2d11adff2f92f08614715428508b83042358d054babd4cd7f5bb63ef0e289fd9e60360111dccbd734422215b6f8a9811198f62c30cb82612566 SHA512 545c227af17fe4492aff85837e948769001d281dc40cbfdb5a74663dc5fde6989df632aab9a6f5cda644fd20f385d36469ec38b930bb42bfb61483c1c5e46faa
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild
index 501c0f2c713d..d845a8f61fce 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild
@@ -4,19 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
+inherit distutils-r1 pypi
 
 DESCRIPTION="BuildBot common www build tools for packaging releases"
 HOMEPAGE="https://buildbot.net/
 	https://github.com/buildbot/buildbot
 	https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -29,6 +25,6 @@ RESTRICT="test"
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 src_prepare() {
-	sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die
+	sed -e "/version/s/=.*$/=\"${PV/_p/.post}\",/" -i setup.py || die
 	distutils-r1_src_prepare
 }
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 9ee5e4f05758..8cc93ff23191 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,3 +1,3 @@
 DIST buildbot-waterfall-view-3.6.1.tar.gz 193914 BLAKE2B 401dd8b1c042fe2dc5bc1c696607d3c0ab3188975757feb8a242049fb73c28f1f5f4dc1dc027ccf37f7a942e1a7d3093b917c1c3a4f81d5181bf8f8dffff6196 SHA512 f1bf080fa7b8e1dc17d52367e1e3dc3e4224c2de6db128bc2f061c338ef69c88732b39d487dcf92d06e2855902d6f078d76e97ddd0d38e348d4e83d0728ad634
-EBUILD buildbot-waterfall-view-3.6.1.ebuild 754 BLAKE2B 9ddc16d519113322f3303d12ccf775f48607c964e328d6a10dbf454c9e9460289cea8c69e9a14bfa5bc90202673119a983726abb93b8700631930231e9284d0b SHA512 a7626674288a8c7edcac656cb352d37ae4f9d86c5985b5e3bc8227792e9b2d7718d4b38768436b226c7b924a528a7af1997a03661a608a62cdb5a5555bc80778
+EBUILD buildbot-waterfall-view-3.6.1.ebuild 655 BLAKE2B 368f3de2951d6650e5206bb07a81fda95a9438b0b039fad790ed2dc92ddba9f675aaff7998ff47b14aa9b21ac762a52c9b44dde3d8da10fad3fc17d21dab39c8 SHA512 cc81b4f15d81171f6bc71f4159d824360fc3fab2377819f269f5f197c4519529276781ea4893e51aad53605132d939df08b153b3f398851cc28daaf7ecf48951
 MISC metadata.xml 681 BLAKE2B f74bd19772210f0ffbc45a54aa06a05c97c11bcc18a76ca621e4761d36f690bd0d1ce926b744e3b6c0dc83fd3bd709a2bbc7dc53c63c0364cd0e82bafaf0620f SHA512 37b2205043cbbfdf019b0a827494d28693e3e0537cad6fca6a1e46cccd3a6779f5b9244f2b9523953ae07238e8b8c90da00cf5061f8e6d54895c06c447137fb4
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild
index 6f7399a3a1d6..67e064ee16f4 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild
@@ -4,19 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
+inherit distutils-r1 pypi
 
 DESCRIPTION="Buildbot waterfall-view plugin"
 HOMEPAGE="https://buildbot.net/
 	https://github.com/buildbot/buildbot
 	https://pypi.org/project/buildbot-waterfall-view/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index d923f09b4741..9422e2ea4267 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -6,6 +6,6 @@ AUX buildbot_worker.target 149 BLAKE2B 93902e53b76a09aac472280df295fd4aafe19aca6
 AUX buildbot_worker_at.service 343 BLAKE2B 6fed117fe1e5478ef3d2fb1bfeac92fd9b9e9b50c6d184b05f13a8847acc74d461eb4ea7797c01366c1c340950dbd07e06683897095b992c3d01e263dd7b7192 SHA512 41c250e31ad0fdbb13830ed4ae0563572ac7edd7c037728cbad943e1d3f82559c41529993edddb922d46c20f7eaa7e7781f5ed1c548f7ed07bb7520e5e3019f8
 AUX buildbot_worker_at.service.conf 154 BLAKE2B 20323a777b44200c5a73278a10804169c64e07a5c2fc8695eb49339d1ba415b06324db6ae3084aa4fa6cfd1a684e4f41fb4b73436fa4305314faf9e5da485a9c SHA512 5fd61d4436652a927af9788799bb9f8b7a66baadc0bf486c9bbe171a5cd9ec8457719bdda45f911d5b0620db8fb4c494c75e2b2fd69951ee4dc83119dd7d6628
 DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89 SHA512 f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b
-EBUILD buildbot-worker-3.6.1-r2.ebuild 5282 BLAKE2B e8aab252a5a0e68a9cc9027b0484672b56d86a419564add8b3344b815b40a0d33b84b94b0d9ff9019f84ff87198c28267b4cec7c737278fd56d423a2adf04b40 SHA512 5fb8d5a9c2b01f294f472c516fca366d4d98424367541b574667125fa2cc1a90ca6b0044a97f3c6201453fc83efc0a703429b77c96faf66cb114aac74a470fc4
+EBUILD buildbot-worker-3.6.1-r2.ebuild 5185 BLAKE2B 451f2ed62e2f394461834277d9cde7569c53e166aba3dc5889d782ab6ea986f7819dacc32a0b8903f725574c959b4eb26863d086766e1b76e09dfbb1caad95ec SHA512 742cb741e1a78599660eb29b2d4cc992b62f24c6f033ab26a07eb64aad433bbeaf6a53609906a14362a31b0b1a52f937c97e0bf8ad5aa206be7920ba837a4405
 EBUILD buildbot-worker-9999.ebuild 4932 BLAKE2B 31671c7f38fd50845ea0943a0a6dbd70c50c8a534104fb2f368169f5a64bdd5592448397c3e4162f4b17c66d5f30d93cf3055b7a0f0fbba70b8323a7d86e1c6c SHA512 8162703679bd3499712a05054897c72d64777de613e4e6a42e7f87479d5504054b2ddbc4efdd2f98414f295e8b7c9f43a1f8e4291172bd976ec0343068b61cd4
 MISC metadata.xml 481 BLAKE2B 884b573e537512f10a184b60b3d354ef70aca1200507c74ad4be79ebd0fc81cabeaafc9db05e23edae6cec47b92340febbcb3345c0227a32f95119d607493cae SHA512 d6f00cc040032613bbbc55fd957a0544266b20e54ae30710f7c32847576a91d329c55692a9fdc74e25827c7b8689eb17770b7935bd91ebd8395237e0e8b200ae
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.6.1-r2.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.6.1-r2.ebuild
index 9612882e9779..926f7a6624f9 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.6.1-r2.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.6.1-r2.ebuild
@@ -4,18 +4,14 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_10 )
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
+inherit readme.gentoo-r1 systemd distutils-r1 pypi
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
 HOMEPAGE="https://buildbot.net/
 	https://github.com/buildbot/buildbot
 	https://pypi.org/project/buildbot-worker/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 8d24c7ee7e54..f39b31cebfbf 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,3 +1,3 @@
 DIST buildbot-wsgi-dashboards-3.6.1.tar.gz 5584 BLAKE2B f0b82de52022c3a8a0d0747aa4ade67345af177be70a8767d66163fe98ceff63e0b297ba547619de874a66e381b721c48d864361fdb82a818f2450c339d687cc SHA512 7ecd4fd71786258deab1fb1d96b4999ef929df4486d09404cb1bc3d1a7f831c90f8253f5bf0474258ba472ac9e8f960f4c4eb1f7993a0a8070eaa68e3bbbb4e9
-EBUILD buildbot-wsgi-dashboards-3.6.1.ebuild 739 BLAKE2B bd153b75b3b1c77ed3c448b28e952d6cb74b0c6d833cabad8ac116b0a07fda1c1c4a12c9c64348aa037144ae1b51e5c641ef402750e99b6e25f358b6c115b7d1 SHA512 e8622b486bba889dd00ec44ba430e75425c58cfdec4c97918d56fea1a8355a21ded738e50f76ab8d525af920583c092c3975817bf00c27b4c97d8d588c597970
+EBUILD buildbot-wsgi-dashboards-3.6.1.ebuild 640 BLAKE2B 3c679a171c4b6c607a8bd657640f019e31f889938835c9ef985773cc29ebc737b26e8e85a2a0f699410805b98a1726836344d7669b71b1816a74965e80e00261 SHA512 db46be55869702da43e8b862b80615764badc5382d67fe02a0133e17621d982766cc4ffdc70f4b4bd209174d54877294df3542f4eb723551b7db440d3a17bcfb
 MISC metadata.xml 680 BLAKE2B b3fea763f6f493b0fb8be5e0408f80b295a5d205c5d01443e3a47965a5c982dbcc8e1f806978b0d8939e31ffeaa425590f9be8d5b563f0c064d700b1f33343be SHA512 01aeda23d466d40dc4c2bf7668595795fb6f743930c168549f259fd2a6e0f3491044079ef039096d030dec48ebb2bf3977bb5084264381675984cf43e063e083
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild
index 0c117fbc896a..7a015dc4abef 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild
@@ -4,19 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
+inherit distutils-r1 pypi
 
 DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
 HOMEPAGE="https://buildbot.net/
 	https://github.com/buildbot/buildbot
 	https://pypi.org/project/buildbot-wsgi-dashboards/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 9ae621f7346b..6397e8f027f3 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,3 +1,3 @@
 DIST buildbot-www-3.6.1.tar.gz 3210526 BLAKE2B 6db8be32ee85cab63ad3f92d0e24042ed1ebece3b7be1b67e6f72240f61f3af2c31f1b3b31315db0d7ca18dddab1351eacffb92e762d1f1d68ce414349e52eee SHA512 d2fb3f97412e4a1b21fe7637458dffa8e8e005693ad2275222e908d35551ec64f89a88e696859a09f64b2b5be5fbdb386fbd71324356dbe8c2adc92b1c6b9f01
-EBUILD buildbot-www-3.6.1.ebuild 710 BLAKE2B 6d8def45135423b971dbc72556b4e2835248b2b7aed82d73188e4ff9c074cf41a495965e209259067b0c5a323e8843396299b9c9baed27b2168ad81d91c80ae8 SHA512 f61651c003ff8b2b1e6e3aa78b496623f9c598a1166fe9600a87a5acb7d2fe0f426ac48c67f0ef5974ddbf426d3e66cb5224e9251c365c08112745ce4cd93d68
+EBUILD buildbot-www-3.6.1.ebuild 611 BLAKE2B 4db6a49b6095024f97e0080177e4b0b4acd3cc78d65f4c69ffdcfb967599f2ec465f4e88c911df649c11bf238492aa519b27eee8f7826465c546e0da6dfdfe29 SHA512 aa4e4cf81f07ebf333033d0d34c2b8eec95b2b077f0272ce83c73e4a90e386978660478b48276b45f6aa31f40860971d64c81ccf838ef7e23f57a1bb12e738b5
 MISC metadata.xml 667 BLAKE2B 10cb0032009c616e55be86ca788abf9b643890605d456b71636b40b0b9591136270a2d30227d3b06854ddce18a7697a3326233cf6da0e1386af4f8102d8d53bc SHA512 d024b9e5148003c7d0d20c82d25bd376006d4c2d8bdd8d58c865f6f35a252333618ec3964a5af1baf63ba9ac7fd5b49fca4c65438066512a016804ef85032256
diff --git a/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild b/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild
index b789ec6f1eb8..fd0f093a2b10 100644
--- a/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild
@@ -4,19 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
+inherit distutils-r1 pypi
 
 DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
 HOMEPAGE="https://buildbot.net/
 	https://github.com/buildbot/buildbot
 	https://pypi.org/project/buildbot-www/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index 9708d75d6dd9..ef7852bc44a6 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -5,6 +5,6 @@ AUX cgdb-test.patch 2132 BLAKE2B 7308e2817a0956382a2949baad003ff0adf10989825170f
 DIST cgdb-0.7.1.tar.gz 314768 BLAKE2B 767a57d071fa4e3c75d231a1ec879d871669fcda9c733d157d380fa525dd321f1deb68d7ef7f424b3f36a115043a0a0faae271f24746f934e288ba7d9a4e7fa1 SHA512 050c7bad963d51c1a2cb309530319ca77e9d236f419fb0abac4ab5030ff1068d799fa626959a8b3036321711de98bddf40d264bf9367ff5697075e30ca8168c6
 DIST cgdb-0.8.0.tar.gz 328281 BLAKE2B 60e577dd5f8363b91da33136a9ffd911581e9cea4cdc1d0fcd338e0a761a26921e6edf6298c619b8d0eb1486449843457b2c5370a395a8c49fed5382a60e63a2 SHA512 e2b653db472de2014402dae6d13953ab811526a47ad5d7a05e34cfba09f44d6fea6b19304b9205ff0e2ac9549ffa5818f4282d7c03293b6c0ca9d563f9ae89e1
 EBUILD cgdb-0.7.1.ebuild 1541 BLAKE2B 9ec609c8cd1a8f9b5c89e3ccb160119a5bfc3f31171f056aea03060789cf1813df45702c727600049d76324c548f9f292dc41423b2539b9a3391db9c4264a287 SHA512 647bef5ac18b1f0ba19bbf4e3b2148f760c564cd7f74e4a66721c2417ce46a1605331e29f19615fbc1e843419e8955b42da70494f2c78a770162466c5b072ce0
-EBUILD cgdb-0.8.0.ebuild 1475 BLAKE2B acdb9fb5b71f846519346a6492707c961d6f28ff3699f6410c460d1314cec77f64dbd063866060f4d3934f6e980a77b2aea2dbaa740422a83222a2e1d8b1cef0 SHA512 8e7546a49e732727c88aadb3672aea19d75ff41ab2afcd891c821619ab07802178b0e94f7e916e3a5147c95869f2eb538aa1d4dd74c2c8e8b46b28e80d2d610d
+EBUILD cgdb-0.8.0.ebuild 1470 BLAKE2B a40ceed3c19f874977736ff6d8bde18acb3860b73eca45c8751cb0138b4d28c697b919f32fc0958b6cfda11d5866aea3c800234993e7551898d1123f472fab62 SHA512 4ccf267b60659feaf6a543c2fd7049ac53726105371298981102ddbeac927699172656ef94d6ef839afefda3c40dca15e9da98f303a3abc1214f1a2c01aac984
 EBUILD cgdb-9999.ebuild 1475 BLAKE2B acdb9fb5b71f846519346a6492707c961d6f28ff3699f6410c460d1314cec77f64dbd063866060f4d3934f6e980a77b2aea2dbaa740422a83222a2e1d8b1cef0 SHA512 8e7546a49e732727c88aadb3672aea19d75ff41ab2afcd891c821619ab07802178b0e94f7e916e3a5147c95869f2eb538aa1d4dd74c2c8e8b46b28e80d2d610d
 MISC metadata.xml 291 BLAKE2B 10d0b1b36ae41f63a8dac8cae9860c08141b6bddad3672fa8f6649cdc50e545ee2c8f1ebd800b4026dd32dfa5e8545380a68765d5539617d971229e90535407b SHA512 b7dcb0521d63080ce670d3195bd56fe54af7d3fa3d2f0f2eaee2f1ee93a14106facffb67f1e82ff49768c90133ceaf7dc57df089b86a98f67007df1089471d77
diff --git a/dev-util/cgdb/cgdb-0.8.0.ebuild b/dev-util/cgdb/cgdb-0.8.0.ebuild
index 416db639d484..d6919aa26130 100644
--- a/dev-util/cgdb/cgdb-0.8.0.ebuild
+++ b/dev-util/cgdb/cgdb-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/cgdb/cgdb.git"
 else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit autotools multilib-minimal
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index b377ec24acab..1c72edbcd47f 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -5,6 +5,6 @@ DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0e
 DIST colm-0.14.7.tar.gz 3110831 BLAKE2B c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c SHA512 a5702cb8202599c75f4f4c1975d02e398f1394826f01b86039bd53a34f3ca250a7250d043a430ce6a383e6ca854fe4c72305891ab98c5f3d0ce54192423b7627
 EBUILD colm-0.13.0.7.ebuild 536 BLAKE2B 63e79a820fc90b689337ae2d4bf23c008414f40e2a731322be6585c154bcda1c54ef7445d3df7ef398f92979c6a77bdb144c9e6714bced9799be80b9115baef3 SHA512 a5a414ceb658cf09730b8a2bfb3c5cc99506f998034ee9131c3ee2b7ee29b362a5053f1ff55991336d31685cd65b8f1c2f76f71456ccf51a198596f07782208d
 EBUILD colm-0.14.7-r1.ebuild 1548 BLAKE2B cbfd522b33a1444ed0107ce67ed93bdb52d3c08e4759f30a0f29cf0ddb64aaf11e439fc216c0127322e5af2c4d1860019fdb6c38f069c9ffc682815be8deb600 SHA512 5ac04d835b9637569755fe65e4a918820c4d55b08c6eb6a6379aa5eaa1c26cedf8e533cc60090e19b8adc2358a54fec3673d77057b5f65b30be7cdbe99a03cb0
-EBUILD colm-0.14.7-r2.ebuild 1626 BLAKE2B bec293a6d21aebedb9e9152d707f5773ccc7cf6aa840b19a0d3da1d3ec9a5fb0c136f92f880742dc0bc99aaf779d197b492aaa9e2792ecbf2d65a158fcd8649a SHA512 9ec8817ece6986c65092e8d5336b73abbfa9267141afd2a0672cc4804e980b14b7e821e665fc9f05c4f77f67180aa47b0fb7e37c27382bcb520df61573d94dbc
+EBUILD colm-0.14.7-r2.ebuild 1626 BLAKE2B 134b719654a28a368da647ec2b46f8b135e466464d1262054eb1ca258ef373dee5d6272dd078416d6183fa09788f1ee6c847d3402ab28d40c9f0e99362c1dbf8 SHA512 fcc30237fb0d7c175509a83ba931613c2e7ac1166ef4f66cdd37140fb060971fdd60bfe6e077ebf03d33e157712afc26f28d3f40106dfde4472454ccc26810b7
 EBUILD colm-0.14.7.ebuild 1382 BLAKE2B a040745057dc087cca435929c57c7cb09ba76156fddce29a3e8e50bda6e100c550bab847a66a24947bb089566992596d83b69c9f0260287894355a11e9f37284 SHA512 026aa8dcbf7c827840179d3d336bf6ed006732a2b69688df307183ccc6d622eacdf4581510b8499c7cce9904b1028dc6e664af6b71f027dca9dba2f592d1e627
 MISC metadata.xml 253 BLAKE2B a2ab0ef0490c566ca6997a4cf9cb3b5e92449a989cfb7c71a653e6f06c8eeb1945cb81155e315051f91369dcb5ed689eb9f31b4cee0afc479ae4c61d95335833 SHA512 ed9c676e9a7622619fc74ff3cdc943e7ea4203f230043200fe3aa1836b776952ffd2c34160c93ed5156b500ffc538ac0582a201322b5577f29df625224a69ed7
diff --git a/dev-util/colm/colm-0.14.7-r2.ebuild b/dev-util/colm/colm-0.14.7-r2.ebuild
index 23a2f43b338a..b193e30a6003 100644
--- a/dev-util/colm/colm-0.14.7-r2.ebuild
+++ b/dev-util/colm/colm-0.14.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index 54cf6195bfc0..ed7d4bbce3c5 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,3 +1,3 @@
 DIST gi-docgen-2023.1.tar.gz 2516453 BLAKE2B d97ca86f1e9c29de3b1500a08b93a1617dddfc6f29314f1d0f1cbd3ec7b367f4de7b8d7d7eba9fbe5af0a8bbcdd4c4bb0786dfd4deda0acd19ac6372dea24d0a SHA512 fb19af318a66ba475e04826d9b61163ec85e6ea4503847ec6685940424bac8108cf385546bad1de80fedd1ddbb21054644083dc4908caf7e2e616c6e0673b0e3
-EBUILD gi-docgen-2023.1-r1.ebuild 1033 BLAKE2B f418cfaa9a34e7e34e6ef5afc204af967981167091f80b05949d10c243efbff0b75f4d50c2c4e547c152728d3f360493a4eaf794f66abca4919ae06a5bca3146 SHA512 b83b67fa9e03fdfda7290b71a1cc737f061aea4361eaaa73aaacc7e4f245feecacb196ddc31762cce050ff351da4ef769021ec9fcabd3628717247564af68261
+EBUILD gi-docgen-2023.1-r1.ebuild 1006 BLAKE2B ceda1d8b7637a63e507e65be8ccc1dc01e350f3819938e4a89a5aebf7e3d5b38280c0ef7b5cb3d8f9bb111cc5611de73bc9c0335c578f45fbc6fa6efc364b884 SHA512 e1676cd4aa46e9401ddca247f463eb542285ce87be1c87a4c6812e59178d7854b8cb383e27d4a710761b8093aad2b517df6c208bcca2bd090fc820edd9994e8a
 MISC metadata.xml 350 BLAKE2B 157af2fde028e5332e19fa28df298bd81e9aa0d61981ed034f4a270cb41de1ed1b8aa96c1537c4ea6e6588811d08456ba65678c47747bc744ceecf45531bdb2a SHA512 6aab61ec8a175dd2d6a1010753d1e70df2e7a030d708acb61ee4158dc0d2afc214aed20f0e01fa565c7b463617305f2a2d3347e5e80259f9b5b2e03383870c80
diff --git a/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild b/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild
index 1d4c77144f15..77063dce38e6 100644
--- a/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild
+++ b/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=8
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A documentation generator for GObject-based libraries"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gi-docgen https://pypi.org/project/gi-docgen/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
 SLOT="0"
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index fb76d54f222d..208f546de7c1 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -9,5 +9,5 @@ EBUILD lttng-ust-2.12.1.ebuild 805 BLAKE2B d17d93ce40c9bc6371528c2e49b5d9628d69f
 EBUILD lttng-ust-2.12.2.ebuild 807 BLAKE2B acdc598a8ece8bbfc7ea782fb10a4fb8986f59ded7428be8fbd9a11580ce0d1b5be0a046b1493d294320818d1d71c5af370c6d22ba720a1e4228859ef7fac6ee SHA512 df7e6a17c879366b5efc0c1b7a1a957ac78f07a4302a6a8c5f67d7269a94577765f6955692a28b8a36e65d5c75536d503e34a404de4dcb7faee230c2e855eda9
 EBUILD lttng-ust-2.12.4.ebuild 807 BLAKE2B de1a5a71db40f0b49d75205dd05f4ea404a8a983c90e25aa488da31bc71f7d296d97469e8f5b5d1fc832591c586c98a6990d7a7847389d0d98d13ff2666f2bf0 SHA512 bf58535651ac42457f7efbefff8d9d5a70d461604742a0b78fa4df5dccc9b78f193be3be4197f2a4115df0144a407d9213b968b399f870b296aa9297d08db05e
 EBUILD lttng-ust-2.13.2.ebuild 814 BLAKE2B 9cca651a1ce78589833ba4c1cd762db4388f277f7ca571c84b5890cc1716ba7c9903457be4a55ab32bf474867b33c31b1ab4a23dcd843f4d8917c368243066e0 SHA512 09306977b8ab9e922ede046a3439017601522b80654347f07c6e893553d8b78eb8477884121f59b6feea8db0765c1113de1b2cc8684f4ea7455f6759c5818093
-EBUILD lttng-ust-2.13.5.ebuild 814 BLAKE2B 9cca651a1ce78589833ba4c1cd762db4388f277f7ca571c84b5890cc1716ba7c9903457be4a55ab32bf474867b33c31b1ab4a23dcd843f4d8917c368243066e0 SHA512 09306977b8ab9e922ede046a3439017601522b80654347f07c6e893553d8b78eb8477884121f59b6feea8db0765c1113de1b2cc8684f4ea7455f6759c5818093
+EBUILD lttng-ust-2.13.5.ebuild 809 BLAKE2B 82f6f05b9854e2ef16b1cba9b2c43baf0eb5b964870335421b3afffe3f6e0c1249d9fada85c3eccd4c6cd94177226b4330ae69e0cbad0f22a77f7551c426fc73 SHA512 5292432039208d387470be2395758ad9611c546ce1ee61826bde57ffb1798f9d8511358d56fb7e7b2472f45f3ccb0bac06a10aeba351b73f07ed45e51b42f785
 MISC metadata.xml 708 BLAKE2B 8f87692839d2a77928c1f09ab4b7dbbf49c94409621833b2d01cf3b44b5d3fd456359bec1bc53c834cd96657fca9d4e6e403a924039d9114b89aeabc519115d7 SHA512 b4bb08c738e6d2e0f813b220f14c70f83074ee34180f997bd72569710ec0ff0374d079558332ee9e2addbc526d0c38441f2c1b06bc8de193edde5cf0728434e0
diff --git a/dev-util/lttng-ust/lttng-ust-2.13.5.ebuild b/dev-util/lttng-ust/lttng-ust-2.13.5.ebuild
index c50f2434c11d..2f408c788f04 100644
--- a/dev-util/lttng-ust/lttng-ust-2.13.5.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv sparc x86"
 IUSE="examples numa"
 
 DEPEND="
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index e20552db04d4..125f91e10f31 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-big-picture/Manifest b/dev-vcs/git-big-picture/Manifest
index 917aa347b33d..b39e953db98d 100644
--- a/dev-vcs/git-big-picture/Manifest
+++ b/dev-vcs/git-big-picture/Manifest
@@ -1,3 +1,3 @@
 DIST git-big-picture-1.2.2.tar.gz 2964564 BLAKE2B 39971b21a9c9a0a8d1bf41f37350a158b634d2eaa0add460c1c18b70f643ab226736d53a337d4ed2583903a5d6c3188ab7a1b06f48a3f354e28d57ec74441599 SHA512 62c43727bb688d6572e7caafe9c5da3b782504738dd0d83d5df675ba757e8be22a8630ec1863c07f0fd2e54549b2ccbd1250ba8f367a6f840afa7b8962c487e8
-EBUILD git-big-picture-1.2.2-r1.ebuild 974 BLAKE2B e2e54360620579ea5a1afc3bb02392149c40e1617cd6f6e9ebf86b32b8f2b47357838916def7a3b8122aa7e9c4fe52108d9a54e0af5ba4c588351669b828c9ef SHA512 66b178bf727c4d2a3b82d1d48234106ee0efe1fe2e3135005791ac6be0b9139f2fdb744f3c7b2a3a64b0a085ac08a6bdc00197e648579df61a017212d8e75a03
+EBUILD git-big-picture-1.2.2-r1.ebuild 947 BLAKE2B aa8303db7c6abcb639854a558a7ebacc4b480e680c8b6a201265a975cfaee5fddf565ae86e5ce7f92c67d0173da7397a878823ef97512c4a4ac60751f66ac44d SHA512 90847bea7cf78f4d8f02e08a3d5c29e657e8a40782ee6b3f4e2be567f81a2acce29746a26751274e174a279d6786fa4f988d0c5d9e52ac182b9a872df652b38f
 MISC metadata.xml 399 BLAKE2B 5e912fe66108f5588e14b1766b905e2c19aa6bc8529ac855be153efa928222bd455eec6c21cbefbfa62fa005732356f0368b47eebd4bb91cfbb77ba427dbe356 SHA512 790e96e16572a401754dc67f30fd2bca0a1cf11ef95afca4cab8379fc1b2684389a73ce118e05c062c9ec768c0098240ab7ec1cda40e7ed1a81c0a3525ea1ba3
diff --git a/dev-vcs/git-big-picture/git-big-picture-1.2.2-r1.ebuild b/dev-vcs/git-big-picture/git-big-picture-1.2.2-r1.ebuild
index eb61e8bb73d3..423ee07e746c 100644
--- a/dev-vcs/git-big-picture/git-big-picture-1.2.2-r1.ebuild
+++ b/dev-vcs/git-big-picture/git-big-picture-1.2.2-r1.ebuild
@@ -4,13 +4,13 @@
 EAPI="8"
 
 # DISTUTILS_USE_PEP517=setuptools  # blocked by use of distutils_install_for_testing
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Visualization tool for Git repositories"
 HOMEPAGE="https://github.com/git-big-picture/git-big-picture"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/dev-vcs/git-delete-merged-branches/Manifest b/dev-vcs/git-delete-merged-branches/Manifest
index 01f4c5f5cd05..e84bcbc243ac 100644
--- a/dev-vcs/git-delete-merged-branches/Manifest
+++ b/dev-vcs/git-delete-merged-branches/Manifest
@@ -1,5 +1,5 @@
 DIST git-delete-merged-branches-7.3.1.tar.gz 41031 BLAKE2B d84e2839223e58f359711f62fe276713e47079efca23860ab28fe43e6ba93ef4661bf56a76be56f2f2c7b5a487214af447c8746bf10adc4fe400aa7727bbb863 SHA512 8c23d8835208f28f64bcd390ee26d2e49c6a941c1299263bc5de91a9790fd2ebd80c573331095847946d2feb98aae8ce71815959b04d1368c7f2cead1e63240d
 DIST git-delete-merged-branches-7.4.0.tar.gz 40887 BLAKE2B e267a0d1154d8adc8cb3a8ab0cfbab687b61b5d17bea63ea6946bbfe41b4cbdbbe288f16e120f7823f3bb50c4e6d61d3ca643fa3fe961bce5c26cc2a64287573 SHA512 90459162bb6d7cf9746ca0497a89f998b6a7b0cf165425e74375c55f99fa7ada3b8db66b567b41985e0728785c922c1a7cbdd30b4aab4700acf6a34a3d5056f3
 EBUILD git-delete-merged-branches-7.3.1.ebuild 1028 BLAKE2B 95b45bf076d7ba0ff13312e1ef14a63bb651f87bd05b785a309d34ab59e116b2e01ad0a15a1aad97d355f039ccf4ca3fdd36cce4023136b81ad459c38b56e7af SHA512 5159e7cfd964f28f1d951e1c9a8b9b7624b3c3b8129af39a8ea9fc81dc7bb110480be1a8bdb42675cf25efef889f7672f0e2d8c0ead0ba2c042a4eaf1dc3c7cb
-EBUILD git-delete-merged-branches-7.4.0.ebuild 1028 BLAKE2B 95b45bf076d7ba0ff13312e1ef14a63bb651f87bd05b785a309d34ab59e116b2e01ad0a15a1aad97d355f039ccf4ca3fdd36cce4023136b81ad459c38b56e7af SHA512 5159e7cfd964f28f1d951e1c9a8b9b7624b3c3b8129af39a8ea9fc81dc7bb110480be1a8bdb42675cf25efef889f7672f0e2d8c0ead0ba2c042a4eaf1dc3c7cb
+EBUILD git-delete-merged-branches-7.4.0.ebuild 1001 BLAKE2B 89f20caec16dcf355810156cc32c5e43d8162f4578873e0b020a7b530a38fdb4e50a672cc390b44b20e25c274ab7acdfbab1981ba562edef5d5b595aea33bee5 SHA512 5cbb87783a7feb608bbf24aebd3ee8d242ecba03993f04dd189602fdfd0274abe49a8588e0970787080e67f6f01c8c8836e2387a1614ef8600f172f118d37094
 MISC metadata.xml 582 BLAKE2B 45e782537ad6d6a54a50ae84e5e1ab46ad9d06297397d30c2314bd15b39c4099f755a2884ccb072e4516499bba240814cffa727862db5a5fc1472b45d7ef7cbd SHA512 e99038593f4bdebdd3874e88f50f4f73dca01272024e2e2d998559b53c1c755d33592865ec4706e99202f2d1f4293578dda7c3812e991a3e7b7da9d1d78dc76c
diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild
index c45cabbc6d2f..656a76226b7c 100644
--- a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild
+++ b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Command-line tool to delete merged Git branches"
 HOMEPAGE="https://github.com/hartwork/git-delete-merged-branches"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/dev-vcs/hg-evolve/Manifest b/dev-vcs/hg-evolve/Manifest
index 11a6790109fb..016b3fe7e7f8 100644
--- a/dev-vcs/hg-evolve/Manifest
+++ b/dev-vcs/hg-evolve/Manifest
@@ -1,3 +1,3 @@
 DIST hg-evolve-10.5.3.tar.gz 847117 BLAKE2B df437e66cd133439fa04fa809a1331345116dc5c29aff431cd2a4c33fb80ebd4a3d029e94e719d34ddeae19fb96d5c137897c0c853bf4820aeb6d09e41100910 SHA512 43be837831d2055b6db653e3471f07acdf0e517b962b20af32118e1adedc687f9ea3dbc5a850d0698666286b74e422e83acb41fa40f98023645ff40084374a10
-EBUILD hg-evolve-10.5.3.ebuild 851 BLAKE2B 410af974a6011e6710638b24c375e06601ee94696d94894f161a720d1946e44a41c89d9f1a4af754b3af4a5b71f48b2474ab516433f0bc76eea688fbeac4fd18 SHA512 4e61af9cc2ae64dd9d2fe15b1dbc795a3356601c91fa83b63513d91654c378e5c14e357bf4bf1b138e339c20f95df108c967c3dc553f8b319819442d60968558
+EBUILD hg-evolve-10.5.3.ebuild 824 BLAKE2B 0f4f3bd99ab404a300fd6b131ccf8ff3d7bc6e02aae5e162b649699b359397e95a2775b8e88b97103509d5e68fd3fd4f7621af4bb6c6cd23204c96a7b775c4ea SHA512 f41b7a973462688a39cda50982effd0acd09b4a7fc918c856d49c60542ec13a037b62d77554d0b2c771776d89aefc9fc5e7c13003659c33d1eeb3be6d688f267
 MISC metadata.xml 288 BLAKE2B 54e31858a4f27a06cd765803e86a61e88b7d749635253c913e726f063e6070955646dd540c6176b9ab3fba03c9e526662657f7896a7a66315bcd0ed831889ae8 SHA512 8eb895e369c0174b4a9c71dcdd167f022464057c0a3eabcfd9570e421b6b85fddaab6b6ee9d9f4f5dff6cffe7f7e6bff88b115cc28fb11c70b71dd367ff9f760
diff --git a/dev-vcs/hg-evolve/hg-evolve-10.5.3.ebuild b/dev-vcs/hg-evolve/hg-evolve-10.5.3.ebuild
index 83206b9d6801..b9809467a52b 100644
--- a/dev-vcs/hg-evolve/hg-evolve-10.5.3.ebuild
+++ b/dev-vcs/hg-evolve/hg-evolve-10.5.3.ebuild
@@ -4,12 +4,12 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="enables the changeset evolution feature of Mercurial"
 HOMEPAGE="https://www.mercurial-scm.org/doc/evolution/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index 59281f6b338d..db8d33c96747 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -1,5 +1,5 @@
 DIST python-gitlab-3.12.0.tar.gz 264005 BLAKE2B 64215b0c2950b1d238ff0e69e88de463ce2645d7c3911963e516b50874b49c4e822f8e27625fa33e6d27a703cc3bb3377151a9bc9c49b0b49ee7bc57db5dfd65 SHA512 76f55945a821553b4b477629dea674956459836df227e70817480b031559317ec97fef6c332d0dc42c4dba0d556ed1118e1cded8f116f4813bebe411db9e7a47
 DIST python-gitlab-3.13.0.tar.gz 270646 BLAKE2B ff7e3c35525ac1bf1cb6dc6e668ca9c8aeefb12073636f115c8e078aa4b9f623f6d847d8487e85e9a325b6f0ad1ef93826631cb32fd86c0bd9023688aac5add9 SHA512 373347392d7030c817a8dcb4cceea71d0609f9e09dce348514c1ca024307094b1a72e287c871ce5fcba9b9d4cdfcc7dc6b4495e2b225b845a3dff2e2dfc4fe82
 EBUILD python-gitlab-3.12.0.ebuild 1015 BLAKE2B 75fe0a911ab5d29347dbbe810ce4edaaab291b1cf99c04ab34e497ee6e220e53c162128ab2695244f2f270b954a856093ab8972de33e7a43a98406ca887633e6 SHA512 87b0a40eb9b2b8e0322d7ffbb90362786ea5a7ffce603c84221d863d64f02f4cfb83753d1b634752d27a08cab13a15229d926604b6a4d4868c86a6d002e18764
-EBUILD python-gitlab-3.13.0.ebuild 1015 BLAKE2B bb0888cfcb311f454d6b13692aadd4d6fc287e67a5bd138a0e7bcecd0c67b91edb72f6608a632365176fa670183f91a8a223ac3bc5f2051eff488b54c4dc3735 SHA512 065ba4145a7e3a2857446e97d722b4bfa3ec2895a5897da674a130aa06b64cf7609cd8f6406908810d0831ea1c647d4a67e57b4e2890744be272f527b5e7496f
+EBUILD python-gitlab-3.13.0.ebuild 996 BLAKE2B 606d0da9842aae4538739b8920363111d95c9b25424615669193207640cc999da854e2c1a882eadba9369e1317e0fc0e6fee40d8ff605874a0da88aaf45b8c7c SHA512 b6b4a746e2ceb29b995eca5adad37885c81b88c0beb8dc605e819215fd58c3574afe4aebc4549bce56b2a93331a2594e0052122f2b7c4a756fc7a7d5ac92a37e
 MISC metadata.xml 467 BLAKE2B fe85595edfdf791a5ae099188cdcffbbb80802f62a7ce0f95576f2b217e91e3b835fdf4989a196678c91e66108bc969108fadc1b04ba026273c8bb71dfe52d6b SHA512 8e3332d042520e9ae097575c6b25ca3f1b9b706676fc79f54bfa639be6baabb060e2e0da290008f6ea4cf592e4b538a068abb593f7019b87d4b9aedeedc446eb
diff --git a/dev-vcs/python-gitlab/python-gitlab-3.13.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-3.13.0.ebuild
index 2fad79ea4fa9..2206afc66ad0 100644
--- a/dev-vcs/python-gitlab/python-gitlab-3.13.0.ebuild
+++ b/dev-vcs/python-gitlab/python-gitlab-3.13.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 inherit distutils-r1
 
 DESCRIPTION="Python command line interface to gitlab API"
@@ -13,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
 	inherit git-r3
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 	KEYWORDS="~amd64"
 fi
 
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 9699ef014f01..82cc3ff3f097 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,119 +1,213 @@
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST ahash-0.8.3.crate 42416 BLAKE2B 84836a4e33451012ff32c1a1a90500d87eb7ce649b60dff4eecfb0d25b9782a186376c154673c3121b154ff4616016d1718dfd687b88f4772c2c89eeb2f119b6 SHA512 cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST anyhow-1.0.66.crate 43770 BLAKE2B 8d74397c47bd64c00f015cf7ee279fa020ea39191440208d77e4a5fdb35fca531e8bb9b765be223b24050d0fd1db76fa5b516146f450937f84a5c113c9eca997 SHA512 7b4078906df2805d491dc2f29c4eec85a9f43078c0dcd9c05261c2706ed655953b693c4f59fda62547681b29cda9ac7a0789f1359bb18110403cfe34e9fb0dc3
-DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST anyhow-1.0.69.crate 43576 BLAKE2B deb44b3110aee1314dd599b730df8c2f03b7d13c0d945d4ef00a0e30ca74257269e43107be19868adfea331a8c730e0aec2dff3abea704e56bc6a35b9581fe14 SHA512 d65e5c9404a70b1e0af90dd66af157f8c31ad0858f703765d5fc6c828f1fc8db690b17451c4108e3a52a7da2d6c2366e745d7b4bd7d19e6dba3485f7c3a43071
+DIST arc-swap-1.6.0.crate 67342 BLAKE2B 6afd6570c3cef4ae722d4168c3320be1343c4f6043892e5e5b52879b8210a896e083d720797b41a41db04a08eefdcfbacbfdee1a7f2180e9755c868d6fded872 SHA512 5e09cef9fa12d1204db24f3397158a3f45d12dd0fa61eadd691bba120a43fdaa916ab09997e7a63d61a3fb7dada4e3266181f4ef413850c4bc5e59d2c6c5b9df
+DIST atoi-2.0.0.crate 7785 BLAKE2B 406b5d14541bbd1428171874c549cfbfa1b80b8317a03b1b0e2795da7d2d54e94b30fbac05fcced9b1ecdb6e15709985cf84490af9e57fc16697bd581fe48554 SHA512 089959e903a17c5550f90fa1be67fb937120f693a924800d4443c49caee6516f2537c57b29ecd9136020d7644281457f75654315e9c5a211b2e4b57e77076024
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bstr-1.0.1.crate 340636 BLAKE2B 5c5c67fd6ac1d7219eb0b47fab4a32dcaca91218316a0151e8cdcda0c94dbec06623cb1ac1cc8a2203bd77bfeaaed57042b2dfb401f5f4bd8d397d64a34d9e56 SHA512 b4896364458074cf478c8df412619860858f5eb96e2228e5d083f074dd11b49ec1076df314c5d593dd4f8da1a286305793cdfecbcd9aa5f417706e545c4e8585
+DIST bstr-1.3.0.crate 340998 BLAKE2B cb965b9fc3f2e6906308eac7a99f1920423646fdce3221df0d532167239c4195a7b8f4451c34914c4a8ea99a79f847b6c8d0bf1f392044120ee27e02fd3418a1 SHA512 bacb9d8ef907853810bfa67efb670a98f76116af74161664ef11fc875f0b9f5f80423ee8af7db6a483f2c7cf70c13be3a36cbc1354698ea55405c684e9604253
+DIST btoi-0.4.3.crate 10007 BLAKE2B 60a4c0511afc23ec3bdd07a905e82b501f1000081e6dbfca9ee6a0d6aad40ade84ab09d740fbc8e9656653a7f5a9a12a68ffa732618e8dc87f9cf00a90b6d3cd SHA512 35d54183a37c8adb11838724a061b38d286a92603a557ee8b4b80dd230649a0ceb165fcab4b6e41402284f2153e18fad5c246f83d99accb2fdaa8f32f854bd22
 DIST bumpalo-3.11.1.crate 81207 BLAKE2B ba76008fb5a975aca12b6f893779e18dd353a22a42cbbeecd5870622a7cbc0cd7e37036af600c570b8a55f26ea8d07f44a9aa1a8373d977b6f75bd4276730292 SHA512 70e90bee1fa4e783ff5a3b18f192b9347bafab7daaa907e74913a415a66c29acfb073fcfb46150801aa7649ab0d2ec8a610de239551565dd167bac72ab13a9bc
+DIST bytesize-1.2.0.crate 9996 BLAKE2B 0ce55dee06cb604e7c79190eec4b95533adc0c08df6288d467771940ce9b05288368f65d3ba0ef12d7033e2f159085f37e4fedc4f9eb7f672de044e6bfa4889a SHA512 425d284141175f0e40ba88a77141269b65bb63175ca8d1624359309fab546dd9e2959470cf16dec3f69a41b334e45eef62ee34298d3a74f3e987b44a7df912f5
 DIST bzip2-0.4.3.crate 34195 BLAKE2B 946ff5824531de8b82241fa042638cd33e708c4b517fa40c99e49f77ac7fd7aabe614e4b560ed8f5484ef8fd06bf19041cb20b7a622f4f1dea9ba26c5b821c5e SHA512 2d4622c336f204ab28970ccb369ba55829bfea426bfe96f15da376f2375c441a9bfb03c46f5da210990f23115740250cc15e9036309034b39a1c960dca542da2
+DIST bzip2-0.4.4.crate 34197 BLAKE2B b69f8ad38b44eb4912b33d53467492b0ebe6ed740451bdfe9133e71c47a8dbd85b1110a9607c4cc627fbabc44cd86fe0396bb545864632ffb6169f9cfa547b6c SHA512 9cd2b9159bd0b42ac908ecad41f0a737272af94ae0d6dcfe182d2f44bcea4632d32b0456f02322047ea9d6f46377db6cd083f468782bccd6126bcc75cb852555
 DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
+DIST castaway-0.2.2.crate 11091 BLAKE2B 3445e68aaf533caa1df958fb371622ef61c7778d515fd1efe39a12588e24fe07480738daba008e414a95e72af10d5ea29702425e5b91ebb277fe346ff74bc43b SHA512 dbce2a61a429eda7a8f21b4a35dced729267298be9793310afaff58843211a7177a9bb932a4bd9dfcedaaf1a2570b90261d4c1047c62474450ea835dcfc325a4
 DIST cc-1.0.77.crate 60723 BLAKE2B 93720cee6c5721ec43b3f502b0879043afc44049e2ce528addebd8b6cf182a8e370143d67e32a965f1ef4fc07e55c87aaf95c0b1b5f9b85eb4e743a95b17bdf5 SHA512 38a421818bbb22fa6a6bd871a7d69add88932db68683ec91d1b4ce1ba68ea2b9272c42c35f437030614cb522f43db964e3a8f1223dcdef9158090b00d17afe2b
+DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.23.crate 187259 BLAKE2B b4a7cfb8d1921d396c9e2bf350e6c61d04480a78c170d153e525ff581e8298936583744b6c59769774fdb8ad433269d01ad792f967da96e6c19d33460de937f9 SHA512 697a78ee83eaf38d83011bdf2086b3149b830d3d270e8414828b98ed2426063df43ac6eb4324f2dd694662afb86e6e4f005dee6116dfdd97adaebedefffd43fa
-DIST clap-4.0.26.crate 205197 BLAKE2B b4e0a998d102ff5f5511d07f4d4697bdfb1bf9b6e787d2336babb817a6fb5e7de7d3b38298dd7b629efa681e6907622bf2aead197f22c5009649ec336b8c899f SHA512 096d9a69c5c09cac0315f9e1895d873b861beab6bfcf0c4a28e85c50ad63a8282f36933fb16333d749e821032048da7d7100bd5d774ccfc4078e90d3ea672e35
 DIST clap-4.0.29.crate 205982 BLAKE2B 0d57169481787bca874c25b988ea007df7a7906b06f232c7be1df56009cfb134b72a73ee6e9592e29944529312a37d135a25c9ba9af09451b203bd1469a8c689 SHA512 5706d4049a949b35e7e37c60a789337cce94f6c101e82a0a53ce1af0c7bc72da04ccff075270cdc8c37685e0bc4aecb07fdbdd420b46fe1813c3b54a408a485c
+DIST clap-4.1.6.crate 207177 BLAKE2B 0931ac4fb47d51cd9688397a47bdd19d78bcd56c7e2ac2fc871192ab3ef36caa63ebf6d85d0480c6931a877d44d850d3efaba7d49913e592612d39f24929a408 SHA512 739b1e3521762aa3f661489d448cce0e0856dad9ac392d4402c2f9051c5ea2db2660b0cfab73f04374fed854804f80cbba45e2d1a0e70ca0f0527c5ae12565a0
 DIST clap_lex-0.3.0.crate 9671 BLAKE2B 4422495226da19cb7a793d364ba5539ec77f9d327e2f1627e4b547fee0625162b57ddc6bc50585f520d31ec289a53065a2b6e0ba66111959390f756143cd5fb7 SHA512 5e601d540e46e527f6a2ea1959fa5aa035ad823008806f3a5adb4785f1928de4c9fe04e61680c64bcb87ed32b2e991951ec27c5cc5acdcfae51cdc61767ff100
+DIST clap_lex-0.3.2.crate 9650 BLAKE2B c07d8a180cfb959a5c9a2a79ba5343aea2185fbd10052a8e1fdfe0bc8fc2e9433a762d117bfdbb6cef497eb79eb8c757227681559ee995753f1eec738c4c1510 SHA512 f7c55878d3b35e37af607a035b471aaf6c2b1d849c26fba1df6e5585c0af0b93abe0b6409c504d4ee122c9c653daa2e47a89b6d06f31559db760a88a73c42006
+DIST clru-0.6.1.crate 16507 BLAKE2B 6379e70a2d75530bde76e82c370c4481ce84d8196a395e94b30dddc1126529774e7ac662da2611e4da10cad6dd54fbe55e1bca4d554369ec5f4798bab59a9d53 SHA512 bb9303ea245e3df6321bbf3c4cf9f899648067f8d3950638387badc79ab37e7570ee73c90af96dfe4eefc004d116c5fc77cc8d89a2809defa2107cde530cd192
 DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
+DIST compact_str-0.6.1.crate 54555 BLAKE2B 4f389035aa42b763035c2d7a49500c1ec98cb563fc7f693d7fd468de9132105a86d5d180866fc1dbbb5e79e2281f882f3a9667fe81173db189930a40878e0f3d SHA512 4f017210cd42ed6d1a641cbd1c9f214c356dd9a188675413751aef2359eff27f2045622802f9df633fa803073099e32619c7a67477369197be81035da0c10acc
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
-DIST ctrlc-3.2.3.crate 12853 BLAKE2B 96574341086e071a38aed957090dba8893ed6f1dbdc3fa6c85ea8735b45dc2b139730d9edb583775cb68ac9909831cb4951a4273257d03243edc8c97a3475457 SHA512 078a1214397a23e823d35d745822510e74e9edfbb01a20751e9976ee1f3afba00f636d2d7a7243e0c0d3337b3573f6f59d14e8b64cea6f9d47e9edcacdbd79c0
 DIST ctrlc-3.2.4.crate 13207 BLAKE2B 74158a7322b8f0131c7c1259b844e07eab208e0273b45ca4e839174424280cb6d84c5f363a99da8f6a315034afedce99ce176c74782ab7f813393456cad20a73 SHA512 cc945d6092f8eed3e2a50fac82e54b132dd661d58819b9326dd23592c3848c919caa6c2490cda269154b8ddd0cdd47144df025461c72885b4fd6f5d33cdab242
+DIST ctrlc-3.2.5.crate 13282 BLAKE2B 6a6709cf1d412b26381fb82c11eb882cf9193d6784470e8d7ada42834b48832bc2499d8da022351a318fd8c46631df2353bcd8b2adf822556efaada3416f9580 SHA512 27ffc60b19a17b1dae2e8ff90698b0c17d7980ccdfdc680f88d2dcbdf9717c26deba239dfe34ce3d67adf0e828127db481ec82000da9cf705abb199094d27097
 DIST curl-0.4.44.crate 91415 BLAKE2B 0193d51d0ebca5a9ac87a3a2537d573a15d8f0c47e0dba5ad3c0401dfe4a96e63c43a1be054433eb782f90ec61dbc60a12ba035e4fdb033eefe53860d41c3494 SHA512 499c3496cb019856773da10c5dcdf539c3fb7542a5e5dde4923d36e0f9274515b43a68bd31fc18a9adbfa9061d752fa698dfc2fbb6a6b1c1347001b3d112b3e5
 DIST curl-sys-0.4.59+curl-7.86.0.crate 2996584 BLAKE2B dd06c7cdf7740049558b8296d16e2485ee1b83692a94bdd2a037ecd45c0ec88c32bf48a26ea985c8de2de84296edf3f52092bfd3ab8338e10066e0a8defdc33d SHA512 048c5dbc3e1870c9b205c107e006c7112d01f4f7f03eb301ad9ca06ef29d03b08a840717ccc45883f19f1f6734958301375365653ccc6e45ff99151bd5e03b3f
-DIST cxx-1.0.82.crate 197448 BLAKE2B a8cafe81de4c19b828531b502b9a2cedce746f6c59d55037d3e7e8290de32be1078131c140b1f7ecd6501d13a83732bd2cac5087c9a46c8989b3ae4034344bd8 SHA512 dc7b446c96133ee1ecf79f8d8f56921e85eb45ffd33c42c5e399062d9ddaf0cd76ea183099025331bffba58a6c91a8df571596d56f8dc75960573eacda293e6c
+DIST curl-sys-0.4.60+curl-7.88.1.crate 3091641 BLAKE2B c95d222f484d13c7dc2728c3572680e0b24e0b0f2353e704c7dd9cd3f036464fd5c7c180c7d9012f75cb8b806477b4f531554dec32c11cd696f3d825398f3dad SHA512 de9cc21903a82f17b17bed296077961d71cea948e151a2166498f98c47c44d0ff1ac3992a16e8c388f877a9d92891e4d08e35f18cf64bc9653b787bcd3c87296
 DIST cxx-1.0.83.crate 198262 BLAKE2B 7ce2d0d9ec4682309caeb21ebe99a5d9c27ffebc4cbe31cd956d9743fb9084ff887320e8b45639861b5d32989559df72c8da4bc50bddc4cb35c2e1d18cca2125 SHA512 771d4de0d03ce3b2046fd5f714fbed235df70e4d04036eb4bd39dfc383572447c6a8bb065bff2c6af57816b1b55290c4e4d51ac83fdf93d60766b5b6ae9342fe
-DIST cxx-build-1.0.82.crate 84841 BLAKE2B 8554064b044094119f069ac5a6ca636625bc1d79c2ae1d7e744ca56c8275622c3dd15e8c24aab58132e0e4f443516a1735b8837b51105d15a673eb2259fd04c4 SHA512 cf5e6e41aee73896b074da154092a52db843e7607d13928ce448fa914b1e4bb0f184ebea595c26fa75a067d72043b9aa53c0509602490de52c783ba7fb323d99
 DIST cxx-build-1.0.83.crate 84791 BLAKE2B f1eb2f1de194b97424acc2a0ae855e688f35c2308422acb490f6325f110df9a3d9ddb9a5845a2d89073e06ae00a1f76e244383f6b2f74388c672c07082dfa3f8 SHA512 041a55366a481f1fb4aebf6a2083276d21c6bdf0a4432d5a1aa57de3140c384f4e8801a6d51cc64a2aef045344339d57cf76a9464e8cdf1458ff137ad74af57b
-DIST cxxbridge-flags-1.0.82.crate 5634 BLAKE2B d2681f8d106245ca022accb4cf0a4dfe70cdf8252c825482bf9e400dbe815e3ea0275d2f423d70efeb5abbed0a0f77c81b56a4ec67369f397720e3fcfea810e1 SHA512 eb02cb7075c2fba7b66670186a019971fa5897d91a746b7a7e840c7fca6c501f412d850aa82bd5f74358f02411041bf38fb6712a005e137f870e30aeaeac0258
 DIST cxxbridge-flags-1.0.83.crate 5635 BLAKE2B 40bc5b192f2045585036b175923c554822bf1d036860bad56b5b8087aadad1680890d5da187607eeb44c9d04db20d0c63ba7db19b86d562ac673528156731463 SHA512 6a46112289c6b723f5473c917a184b97cef0cac930c682c8d4f7f96e5c7166c537659ad524b6b56dd653f56ee09c3b3db92dc5e1b928279c2aa1b329e90d79b3
-DIST cxxbridge-macro-1.0.82.crate 59863 BLAKE2B 84d0ff1227e579df8456148d266049c3a9b2fca4fb796bf281828fd5c68c942dddab6ded1d251344d0d77432025fc778804d3237a5075e8016b7354abfc8df9e SHA512 630d342c4d4c9a7435dcdb042fc26faffa8cb97b7a43fbc98fe4c9733e16c92862655356ad896f31e6f09a23ff0c26b73f28f1df6a7e3f740644d78c0d01516b
 DIST cxxbridge-macro-1.0.83.crate 59869 BLAKE2B 0502a4ea6677fa1a413d59b1ccb721aae59d041fab3b84cbb4c4f109462bb6d3e057c5fbebfa94ec3db4fead95554fe9e62a9093878b85d2e5ecca0d8b4d7f01 SHA512 571bb333f80a285de72ac26ce624c2da01b5b8b4f278960e764966e55d93ab3342518432d0cc2f4ab5b13dcb04152be5fb4dd206c9b5179c41ce6c4d3d48698e
+DIST dashmap-5.4.0.crate 22862 BLAKE2B e24fdd4bba250f1fcf9baaf05184726f4da5dba592d23c0a31f68f903bf6a8f9071c46a11f17e61716a745597338cf52d1db04bf6a8f4c6bdafd745f249f6db6 SHA512 886ec6dd43d4053ca964ade99586a31b420953e47a6e710a1259d8d5f34936f847683844db5c73dfe243803ba45b30ab9641b27af1ae5d825180119a7d61a910
+DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
+DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
+DIST dunce-1.0.3.crate 8035 BLAKE2B 77e560f0b9d28dd51865b8a49fea832e0b530724c6f6fce9ac981240ab247c8fc564d951cfc236ae68b04daa966e59f23208fc1c768d5c42afbc5cec0bf4dbd6 SHA512 3d775fd99d74462d5bd7dbec65c196868c20befb52f04c37ea93f3f67d33cee6062534342abe20c01577a517ad4b16bf15b08a09bbb2d310fdb731db5b1511dd
 DIST encoding_rs-0.8.31.crate 1370113 BLAKE2B aedcc32bafb95c54a034c6ab082d722834c744c33b525b176ad00ca2ede4157de6765f41e52678fb05a8a1271ed234933ac26a1bfb2cf08096420384ba88e0d1 SHA512 a9e582ab63d00bfd17c9f813f886c5908279fe4d23cdd70f79580931f3a0479162b78210a27b113a7bf6fbc4f8d62bbf098ef645d598fe0eaa428639c35cec31
+DIST encoding_rs-0.8.32.crate 1370046 BLAKE2B ca9c15eb521434daef94de5eecefb487e2b4053ac002f0fa24e3ad101b89fd4a19cbc05b2e52a85599a45d50869a5671dca0786254138b7a5e9d5dddd2be712e SHA512 8a695aedf388dc90b039277fb8a88cd0fe157002554ef478b820e962b6fb19f3fecd5940d0720cc820d07c77e64f7415271a119c87b72c740e6e370ee8cc418a
 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
 DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1
-DIST filetime-0.2.18.crate 14622 BLAKE2B 736ffe3ebadd458eeb24f8c5970d1350bbe07b179e0ad4f0d5708197bc91378939791cd331326a2cde9e03a84daba5a48a7a4a1001030fec4bcbc8af3741cb31 SHA512 d1631a50d0f1d3f43e316c6348a3595ea4a7d1116e904ac2bf6586b76ea5aef98ba84ff6e6d0b2a08de2515b8ad40f52fb95d6ccfaf1f316cfd7c5f6f8332129
+DIST fastrand-1.9.0.crate 11910 BLAKE2B 570c66ec1d4ace08b9790299759e3b6f0394aca52c4ec2e02258229c198846cba7c0627807548bac3ef1f86c7e512c4bd105f1e18e35ac0ea6934f76a6838e1f SHA512 321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52
 DIST filetime-0.2.19.crate 15028 BLAKE2B f157d08993d74c7cf2051de416d5904237a4af38040fb362caf3a150511bc31d95245c892ed51da2f7269c3a43bf9cb3a8d6aab8c39a8c517627a085d5088f55 SHA512 9a30f078ceab0f24ff63cb6b80e76f357fd15aab9ec206186ddda950370b9ed738a6817b942cfc01baf518f9eb749e3b9c749718b4581ba74f65424bc226c34d
-DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5
+DIST filetime-0.2.20.crate 15027 BLAKE2B 393bf9696992ebd17a8319f23d660a8c841b536109d8216103ba163ef50c78dafe35f640c8996a707a43fc523d24becf38ced2cada9cf072445b13bc3138ae38 SHA512 71b2705acb0aed833b8c5da8f07384aeb0e290be78c68f4bfc044bcb7e8285740186b74b0e37c619d93bc05b9022a83cb0edb75c688b106cdc844f843d0e8a0d
 DIST flate2-1.0.25.crate 70210 BLAKE2B 992525ffeeb4433a222487cdfb0c3927ad77f914e1db94f612d80e81faef4a2c955c755c2b800251e3416d0b22726d5f7d7e432a81c3582c54b7de95ab7a324e SHA512 d81a463360ee2778f609ff297e04548120d1fda1f9e020fb2f429ea51189b8fe6cae57252fcd924d71fb65ad0f93ff7cdc7235913f8b78fa82925939cf884af7
 DIST form_urlencoded-1.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c01404697bc7b7eb7c64fa04167dcb403a41818487fc46c5d9118842818472d549a2f5fcef5e4d962461e1c103d895d1 SHA512 9e245495dbf235b147e4216b313f2e6a96357d2782a66d71c08c2902c6a065701ca8ecdbb6b2035983a83c44cf36c921b5c71d63af0e02dd39bf5f8347117e11
+DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
 DIST git2-0.15.0.crate 198983 BLAKE2B 0e340dedef36339cc6ce4cf9ac79014e7bcbdf9ebf688986d1836c3e2f480998a60a2722017381124682edc5dc511368497f03c9bd9a8c4d0e7690682789bf88 SHA512 8ea32850e592cb9bc8caa0d7a04042e284c11b9d46959807d8e6d496d93946342dc37fcdf1ed354010434798a404f415e8e980fee2ce4f5cb998e0f8736b5bc5
+DIST gix-0.37.2.crate 219801 BLAKE2B 35faf676d1bbd525f675a66f9fa24d13fd13d311ad431b69632361d3937ff1fa4b24261305dbeb0ecffad7c51c77e9cbb281275739e768e283d4538bb8c6d474 SHA512 6dc08b4250bff6e28acf25b8c0843a91b07e797d65e843fb87144b9ca728a8f3c6fefb236f756c3090352ab64622e7f919f7098063daa7ab56e0d0c321f3a13b
+DIST gix-actor-0.17.2.crate 4148 BLAKE2B 203957a682b8e00fd97aabdb5e32b02c1fcca90981beaab40dc9c883157dbee3695dd90e71e4a04aba55d06c3356d8f6a038485236867d8dac07ea992677de20 SHA512 04c213b7ffc699ecb33a28ad10369ca2ca1e7bae6a8e6b7c3a12d273b8a1c77f62a6d6d21d79325a2a494d43109b0f9a3526ebf5b1643a2827377b0e2cc127c9
+DIST gix-attributes-0.8.3.crate 22457 BLAKE2B bfbeab97211012133381e99e2e41a35f20fed96c1be744da6465044b1d3f3c0acf4c507227add0e1aab68321145835e38f9ab17779db3ef5f7d24b017c671565 SHA512 1c11421064e26a3b6cf8dab450cc5126dffa2469deb523094d83b14bf5dea6384f8fdae0fe5fdc4374692c88e525eaa2576fc91af0fe86181956db6193e7eaa0
+DIST gix-bitmap-0.2.1.crate 8995 BLAKE2B f36f7bcfea92770522c52fa2e285bf354453395c17b615590141b17753fb7b5c19b647d0d28c7de92251e2f4e9bcb9aae518efd30824c4f05290fab4e146e8c4 SHA512 82300afd5a383dfa34a1e2cbaa9f1573720770a48000cb33c3765802cb30b519295c9a12c073cc472518899465c1539aa7120e5101e0678fd6feca18fe0eaae3
+DIST gix-chunk-0.4.1.crate 12248 BLAKE2B 49a55d3ab4391b343ac3b42af93be8117de5946a0dbd5eaaff45d24ee456d8d6336f84e9f72fbaebdc03861a764fadd9e0c2ae856d6eebde54637d07ea298b44 SHA512 6fd5ed914389573f59f8fdff47cb47050309de385996456004ad8a9e4ae67426288272715df712a3e6124b81d456354684cdea1f892624ed3961abf3f73683f6
+DIST gix-command-0.2.4.crate 9212 BLAKE2B 889247edc864c9ffc3ce4eaa189654f9a599b9adc1d83cdefabebab4295951da1ce48ccbb386e400ad2ab850f484fd5acc4e93f2705bab7cd86a9ff9aedef4e5 SHA512 7a777ab4d557fee97e067cb602b80d55f824347b2c7c18c46abadb4f644dc891c926d6060c0a93823fb21caebba8830ae65ef0b4569d4c5856b7303dc8343852
+DIST gix-config-0.16.3.crate 133691 BLAKE2B d77f141f66a4dd5b9f580526542095f197d67d99a6a0d63a6de742a2ef29e09a2e4b2cff6b98f953ae7d98270ca0b39fa5f247725820ea2e74a7c81d93b489d0 SHA512 ef0765d9c0a472044ce1acf93dc464fce8f3449cf9ca3b4fde30f674e6c921288deec065a03a32dacb230f4532e1ab1fb30d701c7066fe6cc4dcbb77bb055b54
+DIST gix-config-value-0.10.1.crate 17354 BLAKE2B 737c91c2c37dfc0eae60e6a747ce86836224832f431c69746cf992c51617688a4f0c2972e692fa9587eb081b2e1157d5ee355430d53f2a592a30dabfeacf5f0d SHA512 ee79772f745681ed5ac6c3d6efc5f302f6952d0823968910f9b23c7ebd93bc3c96cba171cc5f84f33a358e3a994927f531aeb51ef23f383104309aeacc0f25eb
+DIST gix-credentials-0.9.2.crate 36035 BLAKE2B 0156afd2e675562c18014df4aaccd32e92dd35163947d195e612fa5906dca734247a5ad2535b368a35f84b192c351e7c8ba0918e17a67b8bd42e67eedd402a79 SHA512 475a2bcef1805f56e210d26f5292ea49438561646a69476c44b5c95ecc1a27b000857399d0393014963b618b7ff17d0ea5fe1c94d675e807378b293eb7ce1833
+DIST gix-date-0.4.3.crate 19793 BLAKE2B c71c9467cc7cd48a2f867f6df014c46258667eaa9da249ddcae4f70287259a7adb3ce0f4f5a19abdc903e69a73287dfcf1cd71c666ad41d398bd00470d2145be SHA512 e2e047d081e07e2cf1b77dc60ad5336023673911a47f73cd42dcb550e492019a4d299953728d5ebc76d68f1d662b9a9e97183040985a268d6bf9014f95655e51
+DIST gix-diff-0.26.3.crate 7022 BLAKE2B e643ab77b281a8b3ba29c75addee4b92ff61bc2f6444adc8a36c789180356a4d573f767265c90d5453b677bbb18f2d16031d6bc4a44457df0c55c5834f33122d SHA512 30ced77c3b419d7e4f545ce5ed56ffb0555cae03d692e51d5dfffe8df006021c1441dca17bcfb6e069506f3b6321cc0e2393ed10ec8c61d150ec1081eb295d0d
+DIST gix-discover-0.13.1.crate 29648 BLAKE2B 13ee4eefbd7077a613799f057a8d3512a627dbca707c26668fc1816c35f2ea2f98efc9066b0d61a99c0e238275a098fdace86b101d701cd0e5d808c1b7693cb7 SHA512 ed9cec17c3b1056afaadf9a2f51b14739a2e99bf733b87463aeb42b0425f9a1fb830b8016d22b3f206b70af3164add1696d6298ebe6347514178d693fc32dabc
+DIST gix-features-0.26.5.crate 61182 BLAKE2B cb5d016d14c257e6460666a90f4387c1fab013356fd47dc90a8f6c12251a66fb63a0f02bd845467646e91460d276446f3c84d1903104faaca51a1432ad44de0f SHA512 70ab5b861034951f3f0a10e48202718f20ebb4b6519ea144367f3023aa8e49ab96d3f15099d3e9e7152ff1948f64c8d75005a873a7ad647d6b92aba504e48c98
+DIST gix-glob-0.5.5.crate 39749 BLAKE2B b2f1d5385a7b7f963c799447ebdf7624e5d52e3b3a1cc2800ef60165ce2774ef63231a7dfb9fead3118a052d21c3977b579c1b6df094460bcf39b09b3ecfbb29 SHA512 15ac1ff886a6a364c181776bf5630635e0cfd519a5ec1ee58e9bc1a097dfd14030511db490acb534e8428b8016c946e9efc3324cec891ab9f2698a9096a1df09
+DIST gix-hash-0.10.3.crate 26019 BLAKE2B 22c9c962e107735c8d53a07d192dc3fbff6942b141e6dc3af9fcc2a5b69fa1820492f6b334bffbb6e27a94683420a34b14332a8c2f896418f8660a4207983596 SHA512 d8bc8326c2c898c93ca59ea33e0b6de915247fe161dea0e55d0ea82f5714afddcde8680f3f09feaf8607439ad40e955986bdb70660b4daffd3d218acf419fa0b
+DIST gix-hashtable-0.1.1.crate 1540 BLAKE2B 5be4cae4c0735c66fcf1be769591df10e11677a560a6b950e8128495adf1443e7100dcd442ce783c59fc72f4a94930f039682b554c2b49c7802793d0337bcddd SHA512 1d3f428311e5a88af359925cdbeaab01a564f49e8a8e5acd787168f6c4717daf34646c9f7fe33949c588862bcdb78d056e71489c8336b4d5068f762267e772ed
+DIST gix-index-0.12.4.crate 58559 BLAKE2B e4476f9c3676d93b480df6e202ece120a24f855c7bbdd6ab6515aff02b23b3b9d715c08312890fb6bce080e773ea0e47294f7146bc8d89a0f6e70f90e553e325 SHA512 c1016ca1cf0957d0b1b5fe8d3024f846c4721458f30ac6f1557633295aa0215055a38b40d88b8cd60c65da22a8b906e927f083ad682d4fd6d4ad5b1d1d5a3f76
+DIST gix-lock-3.0.2.crate 20168 BLAKE2B b5ef668d0220e22517527fce64d9a4c1e5590a21a3c0c1f086704727ad287aeeec4b230cd2a2efcba657f322c8b49fb5843aa88253f3932cd79b558bddb8f492 SHA512 214b5a5eaa22caf5012f49bda022105f07dd45e082fc60e1d5e7c41472eb81f08a0cdf52da3802dc87e3ffcd7b72ba40e746026b9c05773f7eafc128296a62c9
+DIST gix-mailmap-0.9.3.crate 18712 BLAKE2B 4d8af4e7acd7f049120d7b60078f1c49085eecab46facb22a850fd3eb501e6f993533ae46db2b625beabb7fda89fcd4a222fb7e7ba5970f38590907401606df0 SHA512 bc5a74cf66892557894d50c0789f08d9398df8e9f59936093045e947be72309a27819e8b1230079e0df0adfa087173942fc9d7d6558b9ae543ec9af43d00c9a3
+DIST gix-object-0.26.4.crate 23594 BLAKE2B 26f7448110b62c859a72d06f5bf7b0d153f51c6d68afc22e6d7795c1f7c4b92fc44acfbf14035610165c8f6c2c87bdd8a7ba47b7034a7a3653690b77f8e9880a SHA512 9d0c9f3cfaf84b3325c0e7008a024f80b73496d85d64e123fdab6909a93beb9ec14cebcb4dce37cc863294d772524739f85052a9fa05eade25147b20e72059c9
+DIST gix-odb-0.40.2.crate 134667 BLAKE2B b69081855e0026a1dacbb59e98b7cd63b3754280bfbdd4cdf685c9fd8088121072fd795714d8071b1ff007633004a44dc516551e1fecdb568b952d924edaf143 SHA512 f013517a530824b6645e122ee3ad11fdcf0ca2c3ce601dd2eda7503bea2f7a1786bae4f7872b085902c143d0508850f146593853bd9cc0438de056aa0f00a459
+DIST gix-pack-0.30.3.crate 133981 BLAKE2B 0c2cdaed310d0556fdb1d2a761fa08bb888e4654138cb415114c889b8e70a0296fd7b62763d36a50e8a2e05fa03ca18de89917a523936e0cc9aadb55d1ee3c58 SHA512 decf60906aa7a1473a2340dd6883c5054d3b1dc62efb4435c3995caa06c8e445dc1b4913fa11715748073f353a213ddd0b1052e54edd3377a8571e454e73bb5e
+DIST gix-path-0.7.2.crate 21554 BLAKE2B 6f5e1a5e027e446a67c78778a6d2a68cd214808189cb7cd6460eec61ca3e8c1cf59ac96e73c0b93082a41bef96d1a5193a418e89e24535262b60c13c44bfcc9f SHA512 d98f4ce0383dbf404192b8088789f0b016a515f4bdc0f1c61186844e0eb588e80ae5f6caf8bd9d363bdbaeb6939e8cda1d2af6d07e6d9f8b1c58aa173a0b5892
+DIST gix-prompt-0.3.2.crate 15366 BLAKE2B cdc0eb5643b3d047871fc432b7e1fde11da0174976a1ac6c34f19701b0b12d4d2b8efe31bbf3c2fec1db85a535f51c0f2e969487fa4c3c31230ceca9cbd2a5a2 SHA512 a8fc69f136451eae2f3ba18fd4259efb70f8c0dbf80ec5e6bccff822caee87f02f48bb2e6d6abd9adee454651cca4d8b02e91498e6dd4181293c93c2f4bc7a50
+DIST gix-quote-0.4.2.crate 9354 BLAKE2B 08054346e591a9f2301b1b0b1a81eee7c35d0bbf74fea30b8ced0b2d3bb788c64fd0d1f4759fcf913a2c607aef8ab4aa383b2f4c61e781ce8d272cfa00662b20 SHA512 03e9d3afac942adad03b7c687a2972609db90b5b261380b467ab9e03c67000dca03c2921578329c3a7d33c7f5fcf99df6e5259e08e0051474c647f968fac095a
+DIST gix-ref-0.24.1.crate 50232 BLAKE2B 2426a5784728faec7a9485e4c41438b1acf2898eec4173795fb9b90a361e54228a81ecbb83361b1e024e27af5f0888d4bf8b2df4de60d9fd78a5deb1ff8d3f0c SHA512 582a6a7cbcceabd6b6aabae8c0cbba3418db1d85b2ffa871c513a09d1885e44e35ebd6a4fd143524f2f60b8d239544c7d49da4703f70f4266f902d0cb53e523b
+DIST gix-refspec-0.7.3.crate 27740 BLAKE2B f7c7a507c3775394d0a1ec6c318ee0bde062c157edbfb9d0d608a45d74d2ed44b6d3d286f50058387aa682d66f5396018e614f9f98dd6998c3818eae1e1357e4 SHA512 3d39f8d5133f05576b8b9936cfa33d077f6ab2be2c5746281654f3f39d23c55683cbc03ae1d480cd4e2f5657cced6f237e85ff141aa2a7713e8fe62cd9b60187
+DIST gix-revision-0.10.4.crate 35767 BLAKE2B a6392b0a41f6ebbed80ee62b29f851f2ec5272a1d98a76cc24c802eabbdf3d9cda1670034e16f77822cd7abf2b1d286e88b279f461104cab28565fd0cf8dd5fa SHA512 dfaca8d4d5641240a6b73e94f24480263460075bb38a623cffa8f47eb9af7e5d8e8cc608ffac977e15d9ef0636dc1cfc887c100772190f4dafb156e3de50372f
+DIST gix-sec-0.6.2.crate 17385 BLAKE2B 756b8cbf9061a384f863f14f3a8c8fdf8888a9f9886ff70d53ce9fe081d22439a2cee718a721585c3ac4ea67e1ab258b7bb242a11e04fbb6a7b41ea5a1b0cffe SHA512 749af2dc7ac0b350cb5cc68d6f44d1d9fdeb345b336f60a1800db4ed4adaec4140ee67769c9a3a300c05a6eb96365f65d97be9e6af29de577538cbb84504e93d
+DIST gix-tempfile-3.0.2.crate 32760 BLAKE2B e101905f99129d7994926521d434ba47a276c661cb9195548a8fdd81bf2e2fc29602d5bb77fc3239de6f5650c1b7464e96402efdbf86a6736095aca9b7f178bf SHA512 53c35a375729f01bab34755b681f308c3add6f1256a790ebc6587e6cca8408fdc4b3e7f353c8f7412334874992fa6b3cfce2afc85c63b4f54237c93f7f39d84a
+DIST gix-traverse-0.22.2.crate 7244 BLAKE2B 0e7adf2031b729805c50aebe6193b3dc807fe915734cc099cb3bf468c2cc8be19c44ea390ab3cae31cb2476b219eed84dc5d9f392c305f20ae735a420dd97f42 SHA512 c456cca34ccf82db97f458e329987a7d3aa76a1438e4def97290aac8e7c151774df85f88b5ace6b7c9f0222848451ee185be4d968776b6fb6f3224e642e51370
+DIST gix-url-0.13.3.crate 27986 BLAKE2B 0f43565c3d6d0be7335cafd5fe65a81352ffd13c2cea9af29ab4887bd6e91452e075558876b4bcea80128490584c773df9d8130b5243fcb43ec231f67f4fc66e SHA512 e4b5c1c8d163dcd2251ffc6891fb1f8fcafbcb6882e9fcbaf21c2d54121b21dcc9d9561a62a76b3ea2db190e82de8f962187ff92c2d849395928a44f3dd8c822
+DIST gix-validate-0.7.3.crate 2529 BLAKE2B f764591ece464cef4b3b71c0f5204478266cc122a59ae5c26d50607e76a966aab42cbd5b49d36d73bf15bc4b6faf6fa4f84a12c5214a9bd3e4077077a1702fe6 SHA512 9e62a03d9f1c98fef391343536f31696445a29d7f504ef286c102ba4bdaca321ceed99e0072e788334f8c57fa90103f184bc251346d9bbcb59b670d954e37010
+DIST gix-worktree-0.12.3.crate 36477 BLAKE2B 220356cfe2893a66a90e5f21e195045939a2957ec04e1e22d8ac73c12a522d640850a339f835006ee732d2d00facfd42f7338169b2098454411740a88c20176b SHA512 4b7d57e54e6447b826fe990edbd8657017289ab94bb55f3b7bc3bd74c5a756fab64d8fd8a939bf48ea9996f7cd5891dbf79a75123b62295adff70a03dc9f9187
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
-DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST hashbrown-0.13.2.crate 105265 BLAKE2B e9ff7e6e753166ab3051a834df6f2da81a19ac6997ba269ab13a65e0abb9ce00839311785aefb451553284ad5ef3a0cda925dc2bc188d2a138a78578e530969c SHA512 21dae7a283326d21e16bb32ae0dd1481c4936939a32a06478a3351c2dec97941be532437b808e99ac40e7900a75433fe0efbd852158659a682461245e19d0e70
 DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28
+DIST hermit-abi-0.3.1.crate 13793 BLAKE2B ece7865a09f566a95bfba5f1fba380bf12836c3761fc6d5a3d5543d3e50ca0eac81bb567d50b5643849cf1a752aa651a0db4c053c60faa8f1c74fe2f12819d71 SHA512 a55fe9230e4e8fef63284befff74108f206e76067257439d334d33068875368902dc690926a1feea15611f14123073867d7e9cd21397bc484cef849d6e1dfbf9
+DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
+DIST home-0.5.4.crate 8538 BLAKE2B 1512afc063cc31104e24a744aefc2a28f07d4ded12b4500480610124289e5b7c7f2fa3f1e66da36832cc45874c4bd2d08c1a584fed25aab4ecc962abc6675e33 SHA512 2494111301bd1281c89dc77f4f78d3bc6e3a04d1969938cf4584d465c01af12ad85022832b4a99a5c0ce6adc31a83c00820df2d513a09bf5c0d4fe44c53812a4
+DIST human_format-1.0.3.crate 6718 BLAKE2B 4e8c43738c2820990925b8385072df14cd66d5a569e530f9b3a3a5132f0a3b4a8f3d760a48e50515ed934df6a91d945f3eaeded5561683b5cb4e1ff297c0890f SHA512 a91357f791c136db826fc4704266b20d7acbbf681cf4b4c7e43ef3ae33f22a31bbbda13feccdddeb33619ceab61ff593ae431ad2816645e8a4d6c6d7b48dde77
 DIST iana-time-zone-0.1.53.crate 20176 BLAKE2B 842c3c2a9f5b753363668af5162edb6f2734a51fa6c6fc8bafc3981f5f287451258f5ab31d5ea6c2a1df75934233849bba8dde4ee5aa9fcc456fbafa93d8b51b SHA512 a3f899fe9ebc7501bd22e75b2df34c3b26ad5a53afbff4fa552672d0185d8a291736c48ac2fa76dab36a6621e689b5584a2d7bd0334055994bb21077765aa7cb
 DIST iana-time-zone-haiku-0.1.1.crate 7200 BLAKE2B 9e748694423cadd6edebc1daef2aa4126904f5597202874d68066a15580cade77f48f1e6f2a77e17c7de0fae5204ef1262ad5b6f30bd95f4faec77748aa2ae0a SHA512 daa7570aaf5a07c990b07fdc2153b63d947598ed35aa9c35c4773772a6c67997143b120a18ff4c7c13474d296e81a92975ebf5b9aa9d204c1820e9629cb2e369
 DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
+DIST imara-diff-0.1.5.crate 154821 BLAKE2B 5be6954d53e1787e6c88b23c7cbc8848f92aa7892a4590fa7d55269550dd7e0a355ea13ff646abb4f91467ef4fca12e74da60958181ff0c6800d9965f6a536d6 SHA512 9c8254012958869cb4845f76d34849b140dd1604d14dc9822f969ffd66c32a94ae6151a1b11052817e1ef60fb94ec52ac9bd0a122b5a1e6a994952445e4d869e
 DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285 SHA512 946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
-DIST io-lifetimes-0.7.5.crate 36261 BLAKE2B 4d6692d2bd5f65fbb2893bdf248b27324deb143c19414f8997cc502ce13216a0852772d44241cdb71020e4de00c5d500c1d513a3cd85e6e434c235fcb7b036ee SHA512 d4580859378a20e9a5c496f8bcaa2d26d3f4fcfde3d6608c9081193b55d53d1c393f32a0a40c089a64f6f4705e184c44e7724cb8bb5f80eb64e53762396f77e7
+DIST io-close-0.3.7.crate 8025 BLAKE2B 3ae34374d194407200f327695e7525268d03e5c2e8a051c99aecd1d395407197f9e6ba39339f67ad4ac249b8be63e4595993e6cfefb2f0b421bfaf8d655099bc SHA512 0cc06245da4ad9f8708ab03619734dda41d1cbb2777a7944df10e2efb0ed0a6d34aab3ee55210b05eb4507c802d01a301b6718ddd6cb8e2b4abdd2e1be11303b
 DIST io-lifetimes-1.0.3.crate 35650 BLAKE2B 51182293d373618fdf5dbab016167a01b3e12f79bffcbcc00e1679c2f63a167f7fc291fcd8f886944a855ad5d9828aadc9aceff1a3e5c09106fb274b39e837be SHA512 afb868979d54bc99d5c8a1c31062c91ea9e920470bb1f0bce95c2ebe0ef22fe8970ba86b2ad570d789f648485ea4d75fd83bba34e5a590a443698c713a321388
+DIST io-lifetimes-1.0.5.crate 35939 BLAKE2B e52a66b90464bc799889c5fe32d8269fa125d5eddec709e2daeb9a0b5db20c5fa5b5f51dcca2b130b75b1980e42e2aa5e892e6133b9d7f8f0b3172856e6808f8 SHA512 73b884426e26c19e65e25bb44c6255f1c46178d946306d39088350151253c2b96760ac9df84a01609f50bbfc79680a58e9a2490a14f2bef2ca7d4c11f4faba2a
 DIST is-terminal-0.4.1.crate 6892 BLAKE2B b9277429523c12964710aa21465c0b48c3742bd7b04e4de2ba66bb58349b6d7a171f1df509bc65f97ddde483c3c8d08c2a7d3dda7f3fb90afa12aaf47e658726 SHA512 40ad52218fbbdc0091a67ea9f0de6b2bd988195262ac1b06fa4284aca02b2741951414aee884fcafbda8ec111518a243430c760721c0f18d251efb30f50e1b35
+DIST is-terminal-0.4.4.crate 7744 BLAKE2B 051334469f476582dc6443b432bd476e497dcf26ee9d6ed9bd8ab4521ef87184615a5acd2d912ad8ff0cb552ba31c27a706d009c32b62cece180414ddfe27c9a SHA512 7b5906277f65876a6ef66b25b0ad44358a8823c1f69e4700b31418b78ed37398d37bd3e074e82d9fb4dc18863bc316064dbab70b542849fe3c5a079a7334c9c5
 DIST itoa-1.0.4.crate 10601 BLAKE2B 95545252eaabc3114323a44c8b8ea12a91568d9fc8d26ccb3bdd798ac0e04d9a6a9307927c17558f1284fa5491464cfceba2f0b880d00673449b94c0fb783150 SHA512 a70bb6fbdbcab27fbb5a84041bcbad8e0c8fda58d55ca7ac757f7be5cd373101be40df99e9acd6ae49e637e40de037c6bc59560f96c9adeccb2b2e0bf6531e42
+DIST itoa-1.0.5.crate 10622 BLAKE2B 0d08db487ee791a252389e40e08e47a649d9eb90faad16bfbdfdfde46366082d2e3561fb8a62da80b122e7771052c50a0483e9618260d094820e20748d99882e SHA512 b90841e3a016a9a68cb090e4bf78959bbadecb3391cba71e0deeb5ac2723379ccd3251ec18a0bd055fba7cb6e71608ab1d7db990ad4d03cf2fd1289bd5834540
 DIST jobserver-0.1.25.crate 21888 BLAKE2B 2ecd417446f9eb975119af4ec74c9b3463d061f5348ebca380f0ab9963ccce6dcea8c1671c7701f3f867c7e49d0ec130809a37bff466261a2fc75e80cc01d15c SHA512 0c014e7c72a070e3332463cfa6e9c9095d542a68f8631150bad0efa3706a2d6de0347bf7d1221cc3bc0f3d5f9840fe7188aad949559375403b929d43b4a524b7
 DIST js-sys-0.3.60.crate 79257 BLAKE2B 714facdab00d567d074de4a25b69487400c23194d0f58ca784159483f9e02289acadce084b1514d8816cc9e0597800de82a5298b071b7df19a24df93541f23c1 SHA512 543dfd444539fad27bafcbbf112366f53d4ccf4bc63f8bb17820d818c3e1804656697ed6268a793f383ddf6b6227f7e9b3a11fb6fbb24e10732fdbd971801665
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.137.crate 606185 BLAKE2B 6724b7ddc2460fef1d0f20efee8726162d904b92987f9de2d3dda06c9cd49124c9fa43a9b39e84d78c03d217ed8ffd30e0dc55a4eb31970413d56fd58ea00adb SHA512 1ef979dc59a7ec4aad7229ec5b40be0ec9a8496c7a2177d325db62f3eab00d72c8d2277d517c0093e0750de12fbb4e45b67133604afeef9153b8e1d4aa0baac4
 DIST libc-0.2.138.crate 609081 BLAKE2B 210aa9a7ba99d69533946fb06c2ac6ca0714b3d4c0c5a80096e188f849319dc5509b3b41ec56aff7d1ee899378be2197fe9f8dc921500b11ea6cdc8b3b15df45 SHA512 986ccf0fcd18dd124fa6d3d89c3c7cfeca1046270a6a1b5c4addcdbc7f7f36216cb74094836ce8e97a9e331b97ed893d57daf39e919d24b001c4789a022f7761
+DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
 DIST libgit2-sys-0.14.0+1.5.0.crate 1740370 BLAKE2B 0bdcec13f78292ad7849f88bbf21a8168371e9d4b15dcd09863b2ef703caa8e94a33da01164214620e11ff6f75038cf9ee6257c44aed5e07c52af044abca9952 SHA512 b2e1e54b172e6b0c71fdd02da0800e9120a3fe1b9c33b5fee4e667e9aa627979012865397b406fe91437425bf52e52a26245cfb7fa84f3ba64269dbe204582d6
 DIST libz-sys-1.1.8.crate 2481844 BLAKE2B e890a3850aed5348afe7558168c7571564687d6a7d3567a4d53ffdf79444d38c4d70d35891e16f496f31169bf73b669534f5fc584f9ec520b518dda05e80b882 SHA512 0766ab72cc1414160ccefe4812e6204cbed1341607e5d17607f24fd4ff81dca68d8f2cf43e1d27f332a508d602bff0ad340c4c647a5d5f85acc120c19cfb4100
 DIST link-cplusplus-1.0.7.crate 7576 BLAKE2B 9e8fc7f4b149a778c732469c6ef4663ad01aa49d6dae747b4368f827a41c62cd2f38cbd7e1efff45d8bf0ccafbff305b8ff5503f25028bef12400343b427e278 SHA512 c8fdf9ffb29cd0f8824bb4416d28f6f4fd7a024ce5056acbe63a680f975f50fc0cb408c0d0af04a37b6985bf15f78e7e7d1fc20a9c0f8b729e7ea696460d8c75
-DIST linux-raw-sys-0.0.46.crate 807633 BLAKE2B 58a63a6ee202e53892d78f2142d6ef98f8bb21109962273689b284cb4d6756e6399010983da813f6f58664d6191b392b70ecd161518e8ca0fb46992bc3d23adf SHA512 b821ab53d9a885b9dfef6eb3d36a422525cf35d797fe32fee3abf9bb5463712af57febf684c9ab41b5de40c9b0e73d9e369599497f7a7f1314ff455795d32b39
 DIST linux-raw-sys-0.1.3.crate 878488 BLAKE2B eaf7d613f42d3f843f541a29641a1bc4f9152854f7a61a837ed79f121f1c962222e6c32244fc473297f09215a0e33c475c833090897b2e84af64197594112f1f SHA512 c968f7ef0289195717d245977b57aa127e8874d3e15310b38b92897f39da547211b2e7ea914b21bc3dc7cbe67daa8dbed812be868db64a00d6f270c51c5b3f26
+DIST linux-raw-sys-0.1.4.crate 878981 BLAKE2B b8708b06e48ef4e32d820b5a0e25ce12d3d985d729a2d7fef46d0b3b4518b4ad40d037d4689fb2270f9c2583dc031d0f4daa26500197e6c32bffd1400357934c SHA512 ee6d5a7a08b183681ae00890784c9e6b72e4c987b2ce2d7de6e7308b7a10d4a2b532db3d5121523bf5d4a262407f3033af4f4c1fd9f09be091523366fa30d768
+DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
-DIST miniz_oxide-0.5.4.crate 53485 BLAKE2B 8836697bdc3707f89fa869e6b09a36ee4d83ce2ae0a53bc7b06bbad70ed7ac25f8f67d841f3f611f6756d891f0eddb0abf7fcaf87570f8ab32220f113583ea6d SHA512 589dac16ca9c2f94e6fa92b68bcf51d140f46562cbb3a1b791b75c59feae51da5ec16042604bbd6bcb7d7f0c7f75e98ea1af8cf42d177133a5eaa86429cf3114
+DIST memmap2-0.5.10.crate 26847 BLAKE2B 1cf50f710ffedcebade4f131b8c3103b036778b320da671305c0244077743c53da155d444bcc4d0eece294234bb6e86bffe67da67aaf12a116573c64ce0ebc50 SHA512 39bd2734ce4f16c7f5a5e771f9ef92272b26f511421d5f39dfd2aaca072400ee38f2cd38352005c0c8c359095131770ce1c14570790bfe19ce6a17f711deff8a
+DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
-DIST nix-0.25.0.crate 269825 BLAKE2B 48d673485e302feece1f82df603fc44d4aa91cf650ad2fbe3c7b2b28b1199f38be2869cbf935a6ac361210ab506bd67f12806b2043b66c27cdd28f26ae15be13 SHA512 1a244469068946ac04e0dc83b8f6a578ebe70e969f232263736e4e9ec0d94fcbb54772c4dd570c4b0d1c2c7395af64b9e9a8a6f7eb7b97592b4a91ff948ac38c
 DIST nix-0.26.1.crate 277805 BLAKE2B 7ba6efa24a5ab399184623fd019643a132a803cf72a9b8b4d0070caf839e123fb4394773e0b816c0d024494d657eae9b05b56b0b4cc6ace6d07db03a3d1c461b SHA512 4d75ccc1a8c4627dc14b4a2080aeda721d22dd6d7c78e448131f7589d0ddb58fd5649eedd80816153a978571fc843f078256a6c09ceaf34b95fd3caa3e6b73e4
+DIST nix-0.26.2.crate 277973 BLAKE2B 86adcbeda37edda784593196c390e92ee069761d283f706c0390bf8983ba8841a51486a98a1869f910fe4d518afba5572490e9c69a021e12c598d094b41361ad SHA512 abf2d0a4eb83cd4bd43836e8b533f0f07f07979619c86c11302a2df0800d569f33f0dda0bc2c4136d36c79789d175eaf5d3928ecf16286319aabf93c720a1704
+DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
 DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
+DIST num_threads-0.1.6.crate 7334 BLAKE2B 416efdf395b0299b6b01e1508823afdda08cf67ca54e1d644fc5accbb0490945a492a34bc5ba70c3e838e6405d17ddce164ef87468bd9da27097de8994ad9577 SHA512 b2d9897e29e59353379b6372a629fc7f9afc89f777b4410eaeac7b4729527948a8dbecb175f056899f9076693ef855cc0d40e725cc54f28af588fbac5f7ce3b6
 DIST once_cell-1.16.0.crate 32120 BLAKE2B 59bfc8a44f1fec72442e3d34bf4be3a5af073f854f07b3618b2857c759dca4a0fa6ba358514ae28c25d745b01bb7b390ffe9ed6e296d163fd3dd67e49092b87a SHA512 bc199570ee43bde9245a2c4637ae738e370ce9988635c8342349ceb6fb158f376247b69f9ec4ea0e6d76b934decdc77a524299ebde96c0a2c2d29d9501b9a568
+DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
-DIST openssl-sys-0.9.77.crate 60799 BLAKE2B 8a2344c7a579c568a420959eb2710a012af0819c054b190cd2de688defa804bbc735efdfec1a537462feaf9cc1d891c4b53be1910713e06786e811e66c6b1488 SHA512 a31256943e739a4ee500a1080d105d8380a65ff43b88ef5bbdcc164cf97a133ab2926b5f4ab3010bca3c14a09edc7570a2edfcb745fc21169408aadc0eef0fff
 DIST openssl-sys-0.9.79.crate 61400 BLAKE2B d52dddaae79712f741b9ea69ff8cd59e3b663f9d2579272221f2629b68291fc54be56ba8cec96b33703044d398c938bc366c4f3c27dcc730998a5efe8f8a881d SHA512 71293f4fd450660508bb5b24e6f4609604c0e7971a41c67e3dc5b5459c4a8a3131c29278c1e4f0850a67af99ae41dfc221c1966d589ac16541d8a232cda98a4f
+DIST openssl-sys-0.9.80.crate 61687 BLAKE2B afe13340a51b5f7c6242085a0861c02ca20de7ec24e12efadb4eafd55b769f45d0ec4866799bf64bc383e68933277503639f148dc600f8036ecf6c325b745f5d SHA512 e141423f7a7c72d9062616b87163d2e1ded028ec165b3758c52a2e5f8519cd517fb1a89fa0ab3da27e0b47a1f5973772673d8233e98cf4ef79ded56e0363a072
 DIST os_str_bytes-6.4.1.crate 23101 BLAKE2B 252fc826f646bbb999fa80b47f58ac9a77e409b10a99284c7b669304c0cd701a3d20e690350018f5d7de8c6c7d38521f3413ac81d08067dc26f76b7c0e5b056b SHA512 2199502ad24449e08370686a596f905325f5b145e105e8c7bf90ed7729bbc405e065fce62c98eada40f77f0665ca041db41f16cc8e62473501eca32c24e56f43
+DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
+DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
+DIST parking_lot_core-0.8.6.crate 32567 BLAKE2B 9943244f813879ab85eae0b9a6bd8f8f0070fe190bc43148a832b217ad546bc97e58707a3987072965a79ae8bc2fa839aebac272f2de00993b8ac1ca0c5fc5ef SHA512 906241f8e2d71784d572fb78978c9550b19af9c4e32fe3b2da751287806d0faeba61f5bd36f7aab026970b2bffaaa1f62ddc10c64dc348eae61bf7b51297ef80
+DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72 SHA512 1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0
 DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68
 DIST pkg-config-0.3.26.crate 18662 BLAKE2B 2ad92dfdc8ac0414b12a61dd30ea4ac5f142bbb55d0555ecfa3a53e750367e1b11766a693ef11f8cbe5a2ddb978327632458b2bcf75be7aa8f973262033349ee SHA512 509c4d1494cccc20de6a62d9d037c63ff77ebee8d907747c57ba0926d177b08fcac0231ccdda14511b453deb0b76ddd10f8fbdf63ff94257d72a12a889546435
 DIST proc-macro2-1.0.47.crate 41955 BLAKE2B dbfc20b61443225130d08b05deeba56e63e76921e56359c9b0531798b18778d6ddcb56c3372fb6ccc68586a6c1dc725054f0e83f93e8623cb5ff6a7a2ed3dc83 SHA512 60c5d0dcbdee7ddab40664882d3cf5a868f7ea5b49ebab3b4419c3f325582b816625e73e0d1737bbd46bd7d765ece6c81c2ff4be894555d4b255f5cb9255e931
+DIST proc-macro2-1.0.51.crate 41804 BLAKE2B 579e5a157da81cd8350a6407603e5f8102bb9b6618ea8e81ced1692a6a6f4b57bec35aeb965b643f2542f65a3b9965fbbcf7e0ade35cf159270583d34665a628 SHA512 10ad77a5d05437c1b2c40a8f82389d081e64993171aa6259e8dca98d9afb04f5fb870f2037ad626a280d59c1a89fd4482bead701d744d6fb7c893bd9e78dfc1f
+DIST prodash-23.0.0.crate 83490 BLAKE2B 60c7915f9bf4287f538ecac08be0df014e30fe91d0c85567cc385445d7c590288ef52beedf1a6d0358008b7daca80be751bfc6c461ad24efbcc4315dada96eeb SHA512 fbdbd05d810451916216e96c54ab80101a68c70bbf2d9569e882dbe0aeee14df27bd3771ba7981610dca484c5aa472adacd99fcf690c5941c3e7c4da6c2f245b
+DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
+DIST quote-1.0.23.crate 28058 BLAKE2B 81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99c0d678374507613da916a60e3f5b14d4a4d295e1c9ef0413fa1f16447df8f19a9db8cb0485b7a5c327fdc1 SHA512 3bce6846dda94d285de15771549099e60df39c8395c498b372c90a240f77df31d6d9048127913ec1c7ed8f3a189470ade1db2bede406bb00fa715ea641ec87c2
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
+DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
+DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rustix-0.35.13.crate 270275 BLAKE2B 842344c8ecbaa8205bed0d3bdba91752e12dc0e10b36008defef340caf76182254e756d8c8c20f96b8b393c4dbcc72ebed84f253e20967e6ed5656385aa39bcf SHA512 382b79ed52779e5fdeb25ae27bfe7cf2bfff0ee1a75231a620dc459b1c259ae43e9d9d473e21c682498927908a2660b231eaef473f9656cf1f6f7008e8d9a2a1
 DIST rustix-0.36.5.crate 287459 BLAKE2B ffe3cbf130c6bfca2b6b12c045c6843d18a148a8305bd55b4be1d3c4154d273d047c484cd1973a7284b2bd69c14187373f09e0713f097b576724fa0279a056a7 SHA512 4e682d94c170f578c426ca6db9434ac5b7b4b9d93903954b12367e87bcc4f747b2a6125b449354972f606fce74c3b18b64470c33540ba6e894e828a15c59e2c8
+DIST rustix-0.36.8.crate 290808 BLAKE2B 62da252100523d282d6d8d2bf141f6e59f0dafcebb0a1025b6bddb78c2a100643d63edcaea4cf64ce68696219ef52706f6b49f6a7b22f99c544866643952f98b SHA512 6fd6ca326feac93145ddbf6eba65c8eff731c9a9e7ff3a6724c19e5c8bbb05236f526df27c4c916e855e7e75e65914470af2d9c98e1571692991a7bd811b5bb0
+DIST rustversion-1.0.11.crate 17485 BLAKE2B 940646bc3783dfc663b179e4624ed03d3726bc745517581fd3d6eef607fea2b2c75e636f1e1dd2d9e30cded59e2b9fb64b964f47693baf2928b515eba0e89f09 SHA512 60b94f8378cb1d0ee61dad768e14f50bd043d4c0e4a4e0ef4979d7366886909e1b186abe2c65cd36ef077bc2663f1610f3bc4328ab2f078b94405384a07dcd76
 DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408
+DIST ryu-1.0.12.crate 47070 BLAKE2B 02b0eec6bf266b7c482aea15ff83de4bf3cd6f607f8cd6f17f1c3ffc60cc64b62b15738907b4069f5816dd81669ed4f5b00c4bbc8705abaebe3a0846f56e8e29 SHA512 070f0b2b52e47cc9a6d8f003439d257c27aec15ffb030a92481ac22d5052436156e25127ea3ea7986cc514d2a7a924f9328710d743c216d7b1379beacae79829
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.20.crate 41579 BLAKE2B a7924b4bf0f130e2aa4668cad3c7112e39e028fdcb04259c6926fac4875f8061a9148da5f001dc49051310ed8e6ab341da0990ccf0a7cbd4dccce8da54c1ca46 SHA512 19f217fd4571a0d0fcf52060a8639e0ce7114719aa23fb0aa2ab5a531e8f8be0a21af55ef45c8da804101e5a62f15669e66fe005c4cd5bb24def09f1b4afe059
+DIST schannel-0.1.21.crate 41719 BLAKE2B 8e3ce88c460b44839a46304c5ce6c02ec518a1f094165ae8589107cd32b79553e1c7aab581cb07fed4ef5935822ae4af8141f63d70e1f898a10e75377b1a057c SHA512 7457d4accd0096c791240aa19970307c6448486a22303e3b20b7fb25c326e50edb8564781e3d81ecb4a7626796ef78233c224f9baccc0de03f0eae2086624880
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST scratch-1.0.2.crate 8152 BLAKE2B d38df70a8067ab6a411798b64e4e9679b554aa66886c824e410d50ed805555716e96c54872186617f2963526119ba81c20ce237d4a0b1ce754d7d28696c9b742 SHA512 c3863dff0c67184605b356d6cc57db2bdf26cad9e0357ce6cbf7d3f23d913fa8917966a8c93b3084a3c9c900e357c6ca4bc2bc5ae5db3bb6feb5ee1ea5c61521
-DIST serde-1.0.147.crate 76697 BLAKE2B 90fb2df19ad225c96a30cf88dea82a5785bb110f256b882cadef8d1e09f91dd610637a104c2e7629847a14d4a422f89f7ae324c29845788aefb0a6bb51503886 SHA512 d993bd86c61bba602faf7286ff21d36c5d8c83176c5bbb203cb284a3f89dbc8a1ca893a09eb2657f9e98ccb5c5287f44aac06d2e60db96e78d99ee40bd1fe1b0
 DIST serde-1.0.150.crate 76864 BLAKE2B c92b536f7fe8b4b8e0707f994f5d828e87174fb847179bd58b4267c5e806b4277cb82040ff2114938b90954e3d851a9e402f90f46ef242c1c9caa8da98895fc2 SHA512 317bdfe4ad597af8e081ffa3123987448ed56953aeea195aec1655b9053956c906c888cdd287a6f2e86e6e99ef75103e26ac4c84e805016301236cc5ed85344c
-DIST serde_derive-1.0.147.crate 54861 BLAKE2B c758a3c854f1474dd3fadd66d60a59408e30d5b658cde4c7ceb10c8d4b4210c8069cc13618f83f1faf36de928feeeb82b2f7011b457e8b9003a15177714f9c0f SHA512 434d65dc0d78c7c1c3f8832221389dc4b0c5d74d605ce1d2d660c2df9a92f5e5d0c6d543763e1462c58d6ea18001c823ca594e3dac92a47d8fe48319a5c52e59
+DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b SHA512 b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7
 DIST serde_derive-1.0.150.crate 55565 BLAKE2B 1a1827b2d131410ae853a82483da0f80369fe0aeac2764128cb3c416b92a128b1431ad3313c2fd9a46edc581ff3e4752f4e6bd7c9bc1ea688d1aacc74c1ec669 SHA512 7282c65063477d0e9492b9d80d34f089bbceab422408daa1651403bd6e3f8a31b854cd7a588ee475e7a005970d173242083865847b15cd5ee231fb7d8c12b98b
-DIST serde_json-1.0.88.crate 144528 BLAKE2B ba14e2634a9bf718a08e0dd525e1bbdaf98a5c1d5c99129e4904c886285f40e6fce08699efcda34766860f2899f0db011ef2032298ad647072d73a1c8bfd248b SHA512 a09e4a26c5177d0faeb9190e668b72813ec1f6a318459480419c8471c1e0ef65310a6879d9b26f11cb8c161d84ff911f5d81e7a4aeb683757620c2e5c6541eb0
+DIST serde_derive-1.0.152.crate 55586 BLAKE2B f133c6cdb87d435ea0c05144e685047fec22b93df7c61df4aa139358c2732326c98d0f62fda629da0f648aaacfc9d6f312813940238f45b359546dd435e7a516 SHA512 2f4dffb5671b4758f0b7dc0939f6b5cfe3b3ba02a53c62c75b5a0ec89d2db26bdd95f3e269d1fd4b07ec921bc0ca5f0741c26fdfcd25bd6532ac698c6c701e91
 DIST serde_json-1.0.89.crate 144638 BLAKE2B e296fd2fd3054b81349f246d207de4f7f8072e480a34f1c39afc2d46cdb6b861d1514a8bb64f2f68920e8db43b642814f7f4e989dab95cee62485ca2f8db2e8d SHA512 4bafa5693977e129f5787f2ff10f914e2a7740bf7e631bcdf51b27d0d9e5517873184b56649914371e1881107e7ed0a8fedf487617db334d4a7a4bf95c6c16a3
+DIST serde_json-1.0.93.crate 144383 BLAKE2B e2a824632240f60b51d574f8b44675a38a557e917ac66e7960b303b493604dc369a17870228582bac93faa530b80ecea02b4d5d10ad0b18ab8ce2494ac4154d3 SHA512 b6e6f417466f6715a8cb30df2083a82dda794e9fd5fdb1e0b9c97ffae40bec57878580385da0c0e9e5e3ba76aaff629a9dcf40485aca9a288dda2564093d797e
+DIST sha1_smol-1.0.0.crate 9782 BLAKE2B 214b58f6a8681399b9c925815f4ff48974466b399e96e372c9592cb139ba9306ba162b3b426dc12b585ea15b616fb58a60d253b4d928dde46217de6ddf7d0437 SHA512 75d6809a2aafd47cd5f5888f42283985895a9c82b53ead7529a23cd6f2484f32654094dda7a9e5d93e82afc9d0049938def1bdc28803502d140d06a3496adea7
+DIST signal-hook-0.3.15.crate 50138 BLAKE2B feade39b877523dd138a5df3114e13c35d6a2ca281ed4cb7774dc970b3cc88b9dc011db2914c87655c0962ad1cc72293fd105f06fa4297e02fe28d78bc56c1c8 SHA512 8b7703c8ef683868e4b0c315a73fcf6802f3e28730db6b79301e9818532ea62d6d218c9ff3ba465e02ed5c19a33e733ec5f7750ae9e0f823a2ebb35bb911a3cb
+DIST signal-hook-registry-1.4.1.crate 17987 BLAKE2B f1df8bba55c72a506b9210347f9dcac4d158948e73f6d1e60f43340ddfae368aff1bbb6a109af326af47246d9738d49f76d380c52208efc3c6f79ea0acd31f0b SHA512 e83acec2b0083967555f6c659dfaacc32d851a9485c9f6f4b4cf257742ae3ffba8c14708c75f1a5520e9d132ea9e21d6eb65aba492eec481e8492af8b798c5d1
+DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
 DIST socket2-0.4.7.crate 44619 BLAKE2B 9bf2560812db2c91498d12274e02d17c279efe5817d882faabc465de71b1cb8045f6eab3c8e6031f6fd18e0e77913f42daab07f01e8d83bfa5ea44cc6966466f SHA512 44487f2de30cd327cad1af31ad36aaaa0bf10c33b5c23b024ada8d7e41d064fb2adbc9edb14aa8aa1eba679d8530c373c7187fc68d9709ae736a5c1a2cf37088
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST stgit-1.5.tar.gz 398562 BLAKE2B 922e014dcd0976a6b9ac884faa5ac6d8cb0e9efe6c56201c85675afb041e0190d07fb3cbcd366664b736d428d93188fc92c19db9a8d1fdc322054e1480b5b8f8 SHA512 6f018754f43c3ba48ce381b59f0e4033c295f0bd0acee4d07c1457f2c004caee9d8e9f6b2af1ee0d46941777639c7f5a49caa4c0dd01a72c3f3a43a34bf9b2bf
-DIST stgit-2.0.3.tar.gz 469802 BLAKE2B cd319f87c898069a4d9f679ddd88b66fceed3b008ec0240d005f031945cab52f9e62457c8618679fa035504d398bff8714c950f0e8f6dfcb7c368555a8cc8483 SHA512 847c3a26894dd69477a9dab080860c9e0dca1e3de2d3eebc62d5ea44c48c85e4bbccb29e2de218d45bd655e8319aee491ff16ba2fd11635f336e74c79b2657e6
 DIST stgit-2.1.0.tar.gz 477106 BLAKE2B 9a044b7d270ca7c293374da8166ebbf0d77980b0da4431b9e70a860e6907543a34c3cfb4057f33fcf12619925f54cc5f444fbce8336d20e271f06aef48aa894c SHA512 d0aa5843bb5e0f2fb865715591a089bed21264fe83dc660a6044c07432739bc060f48b073d4dc1655e7929d1ea8a5bae0913fac6e088628ab4ba4ebc70b68d68
+DIST stgit-2.2.0.tar.gz 507933 BLAKE2B a9167fa37afcbbb7801a31e87d61653914adc7b1a36cfda5f4cbe49828fc69cdf8dd223f88e7daac54809ccd82b426ae5d9eb28a4886fa8cfdd252ae497d595e SHA512 60cac4d95356ef84b367816ee6fd820b485e948cfa4dae813076dda9283391f4074980e07b854d7ffff6286b23d6d562b76ddc1f843f9d459067cfb6489decb0
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
-DIST syn-1.0.103.crate 236495 BLAKE2B fd139b1a8b4449e9be6eddf0036c19b93b876182a03f36954f79eaf79abd5e53667a8a9fcb5c872c96639779307fa293f597831ff838a41d90e1ea201f8a4797 SHA512 3dc0f564ac1a4ce85060926c0897158da0baa127a46bb318506f4fdc79e53d9439295e8ed6a2d5ffcf15d9f6651081b7602cc2a091538e8df061b545f7e3bfe7
 DIST syn-1.0.105.crate 237549 BLAKE2B 14e3187e9e1300c3c62d47504d61f154d4f3f22284fd1a44a5149764eb5b8937d74783e42d48380e1a31920a9319e8e7af8a86e8e9e8bb46bee839964bc4029e SHA512 4e2475853587ec669d43890c88074c00c0fd45a84631f8a0b513f8eeeb78cacc297976121af9488419d2979b33579c5d2b782e18e3fd32dcee35227e767cae0d
+DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST tar-0.4.38.crate 49158 BLAKE2B a344a65951c5c39212ffa3cfdc7dc68c40a85dbc5e4aa08cfe7cf22f0216443fa081ddba5e8fadc48968cc8e70e08d23391a6caefdf359310e5880741c9d6730 SHA512 4b6458734811e1913cb7e348f32db16f9402fd0e0027ae867db81aecac250b35d07d9478cdae4e27a609ce0f29c9d61683934296cfc3b371119df9f2c380a84f
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
-DIST terminal_size-0.2.2.crate 10146 BLAKE2B cfa69956b345337ca027b5cf33dc75b3e2320a1184d235400f59c03ff8568e45ec4501fb9a39d6ceb455625de1483482c5f33a74717665ce1a1a5fa7c51a6e31 SHA512 5adf75cb0a23e5d233f71af58e19293ad9ef6458fb19729d3649e201c649d8ceffcda818e35880603885b00a26d5cbd6e733f5d8d85c8233b3d8bd4cc47c9edd
+DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
 DIST terminal_size-0.2.3.crate 9361 BLAKE2B 38862ed4d98442f755a841b3eb44b397645c6e2ad25793dc96b089df3549c07ff353e18515b83686b34f002e7a557404502f847ceb6f5f673b96830286553d44 SHA512 f390c5e8ce53e0387db7c30619a107e484fa80ba4e046fb797b6006966be446d5aee5bd2179734b0684e206762fe7b19e8fe00d75853069a4bc7b9ae14f74c23
+DIST terminal_size-0.2.5.crate 10271 BLAKE2B 3ae449296ca82131fd98745fc23bc7d6d4909a0c94999caaf377ab22f78fb30731a480c25839daad6449ffacd8b13c794f3526e9603bcfbcf5975a5c0405db0f SHA512 0f32d8708967e46a5def904d13d49a2496cfbbb9b19ab71aa5b24afcff6ee3677054b1181b529b85cf36cc9e87b9334a93b094dc8b4e236ca92b3e440ff9de54
 DIST thiserror-1.0.37.crate 18752 BLAKE2B b8d792715cfdffccba72af132e414a6ef28f8e4dfc0608bea49bda1bde5b6acb13da24feaabf4467b8aeace9b6d90a97e2202f7d24bfb753cc4019c2243bda25 SHA512 07f0cf9da1bf1029d70c1b6f0c54bc41ed759214683f35cf6b321ec2d69173e3da0abf80a692115a1e4630400b1fbf462878053853fdc6026edb40f7e13be72e
+DIST thiserror-1.0.38.crate 18947 BLAKE2B fb81df34dba2958395ae360cbb14e2708e5a3cfa5cd0bd03c58f29c146d8afd8595a7ca1b30f1ed2a75ba140a55ba450fd4fd040aa1a1dccb0baf393b0e98d60 SHA512 95b8ca682b579834a04058f03ed0c994ccef426d75e0fcc28ee47151d343da25e8fe31f8157744d942aa54652115f477fc6037f91c581dbc127b829cc96476ce
 DIST thiserror-impl-1.0.37.crate 15428 BLAKE2B d91e9f058e1a2b722f604d9a399c0f291c5309299c4bc103427f8927ba41c9937c7e7cd4c0f394dfb9d96799be8a3d5b33f8e869045f58228a43354dead5117b SHA512 37d90875118fe45b51afa89dd0acfbe4d9852b899ad391b419b5181a92bda115cf5569ffef57caf6020964d5d847c2b1f191c99e2c0caf7d4166f531bd19f952
+DIST thiserror-impl-1.0.38.crate 15429 BLAKE2B 96202c256e970fe23f07b461d71430889e36d9f0e83608d001c6feb4e86f4a34047ce93617b27f89c6e2a5d6ad8702b9f64ac7e59bfee221677261fdfcb06e69 SHA512 628aa28404a181b384ac6a11a433829a5481d97face5bc1704349414f36e93440738122fca716fdf878719870d10e0cf8d495df6b1d40913e985c2824cbc3aba
+DIST time-0.3.19.crate 108789 BLAKE2B aad6ed697fec86d5faa35dbd4fef5457668be0109b4c8da001833a315916c8060ef40c551f6f725f71c52850871a3cad69717c2bc65c08ecc19d19a4154c42d4 SHA512 1ae3db13bd2734c026421a5373d645b2064556572c57160355b1e325106dbe7eb12ad7218b001c376999de63e3d8445451f3abd5fa3a03a9d7fe17e549038fef
+DIST time-core-0.1.0.crate 6597 BLAKE2B 43137c5cbeb61a89c1cbbef325f2e2dc4b907d4c576553b202d178a64d46396958745b00c9f2aa60a6eb609d663e48b1f9bd1f7ebe58ff6e22540e96b2b1c7f2 SHA512 f7e181a40a0052d7aedf78219a46f8876618342c710e819748a87a5bc0728e5b2fc7ba08e38ebfa6a17d6fb60382003bb35745ff1eabac1c8f8b47d186a383db
+DIST time-macros-0.2.7.crate 23695 BLAKE2B 2cff8495b7e1a69be9276cbd3efc7976dd5eeeac80e6c41c56cbb3769b41f32ac5789120eeb8f69b78dc9992bf6bf8c1bfbdea46aff7c9a1ad2f64aac7ad0d08 SHA512 98b6877fd83cfa72e6c91c607ae12028a8f736b5c68e7a4a5d6e0dc27411118041f33a8b7408a831611634cef63b54148d1d7a9a55c73ec0ff285cdeaf10b8ee
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
+DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
+DIST unicode-bidi-0.3.10.crate 43530 BLAKE2B 2bd5ffea133793ed7588ea95b0848adea16e79fc3ce9a159c33c73929a1af90e0578c44980fe114aeec1d6424d294552bcbf4089e3c196c2ed3d0751d992c216 SHA512 70f81dcf3fb3ada1eb503cfda548e083cae6e7001dc445c0a481b8f467025f17dc26ac14e487edcdc2aba8b67f94a35eb4b5083a62d5b954dafca7b734edd3e3
 DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5
+DIST unicode-bom-1.1.4.crate 10221 BLAKE2B d175111edf436f96d6265b413c8f70b0796e8b0a0fe5bee90a459063dc82dad9837b0d32b00927aa173205b6b32dfedde08c583953b47d332d677ec99fce184d SHA512 c10c42a23822763f1327518d43237b9e2b2d2c9cfd4839d990beb8c85be7cb1cbc528514ec5f4428bd486bd59ce9036a7f980f2aa76c1a28aed2f3a57dcc7343
 DIST unicode-ident-1.0.5.crate 35455 BLAKE2B 7e14ce97ac53a88ccec015dea690918a673dc5b49e44de7fdcb5421871da35c4f514c6db9a363d6f4bfcf2e9a61a50a593d345d0b6f388ea882b17a00cd0335d SHA512 d355370daac356d900cd4c0a792d6c0eff114524c4bffce4d7e74469fe2117883ee00bf0e27d950b72e88739473f2045d5f83440a0aedfede97b4d9163b64a6c
+DIST unicode-ident-1.0.6.crate 42158 BLAKE2B 6e4ef61fcac69b4ccbf743a2c2f857a6ea9fcbac9b9890f5b7208cc0732c6892aa5889b3030e87c8c29ce4ce24ddb7adec6bcf47b7aefe9cb5d19f920f12cfbd SHA512 ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86
 DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
 DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b
 DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasm-bindgen-0.2.83.crate 169618 BLAKE2B f6158596c80a0385bee0a05bd9cf0b3beee83a7958efb40244956b4fec2c83baa1a1b4605eb604f313db3508a7911c78f645acbb19f6fc93eef27e9f7f0ac109 SHA512 ec93d1334417d0329e113d5f2da7f16c0f1209d71e5cbd21a2dc9278d877e70ca2327ff7863b40505504883ed51d6bf20dda98c22ef44011a47c604a7b44e82d
 DIST wasm-bindgen-backend-0.2.83.crate 25620 BLAKE2B 3cbba20a2f5344c0ed2791de7b04ee294746606289ba83a9c139b53b56edf31eab8d3b3802cec309d5395e2404bbd75b7fab5d748a9961b36906fabeb0e66493 SHA512 dd1b65733e4d0a198d61a5287bb75db3e03ef738d2c2dcd3ce3e873c27d41c90cfcbb775ad40b2a546190db8d7213e5866f8e3f9913c28fe4b43a49054bfea44
 DIST wasm-bindgen-macro-0.2.83.crate 12075 BLAKE2B 3b358ba7c2a3563840f54f11170cde78044a8f087659daa7c784fa252f5dd4b7f6200eba425d95b568e50fd43c04c32a509994ddaf5248120feaa67586402150 SHA512 eb83e06f998e858cf25494c1d171984269e72db798147d4d1d8aeeb25ea7a35c5986b882011e131968621742ceecff976430856b4e8b7d7fd7f1237767cf01b4
@@ -123,22 +217,32 @@ 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-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-0.43.0.crate 11492640 BLAKE2B 793aa1a7f5ba07b864ee318d529f0003a979c3c5b588860cc317dd6abb499db73ae7ba98e2c18765f7539ffa3eb2af80fdd10d12238b5e0cfa1fbcf535a0ea9e SHA512 810a1a08ea65dad929ebacef8a2c2f13837f09680d97d1e9db7349b00b54a06ebc5fa1c7e9bb5ecf4a2d0cda54d4acd6b89e3eaeb9e7e1ac888ce105cfbcc139
 DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
 DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354
+DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47
+DIST windows-targets-0.42.1.crate 5524 BLAKE2B 755cb6184733417763bb650fb0bd84bc757503aacbf0d91b811d42e9e8efda05434bbe5518006a88937a82a2a607605a9b609df4f34eb58674d09564667d95f3 SHA512 940c85f6214aa4da17787d3bbfe8d6107a9a7fe4f2e2fcf2b1634facf4619620ac2a7a835ebdd0f57970c992c459ba0a780e64e89945005b240c92563c42711a
 DIST windows_aarch64_gnullvm-0.42.0.crate 357917 BLAKE2B 58da715a46692ed786fa554338d446eaaa50c63ec1d4090cf0690a9211c0221034479e9066cad1c98234410519833826ae3163bf6724c3b06097d5b84d7b9fcf SHA512 8bd60142e8982ddb14dde4e93b9753f9ac34830c05c2a1dd4568377f9a928651bf9f026a0080e5bc7dfa62a45942376736954e3ac800855d00eef0c72929f338
+DIST windows_aarch64_gnullvm-0.42.1.crate 362795 BLAKE2B 722b45789bcd1d973803b327d44072fbf9c904d448e29ae9e56d2f9d1a3e9b64e06883e4bf5ebf141f1e924235858fd1472e07a744cc5b16a0a3a4fc8ec8f6d4 SHA512 51eb9fa7ea441a9fef590c12576a8bbef74932d40fafde8f9e3a28f2734ce5aee6dd5fa478fb3847443241c8c392bb4abbc6014c71260bf924431779f7184f73
 DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
 DIST windows_aarch64_msvc-0.42.0.crate 659424 BLAKE2B a8c9a288767756f2086bd0706774cdcce5c8639431ad76ed122d4b6d13c936ca8fb1a463d34835b3a2728f4444e2f4b91ee772f00c54f348094da69c05ce6b93 SHA512 20c0840adec84dde03b143e5b82bb0003fee675310487f0071a81ed7f40ee647c4018ccb9ebdbc4aeada717ec8600a30dfb15510c6b336f07becdb7167668fd0
+DIST windows_aarch64_msvc-0.42.1.crate 664655 BLAKE2B f4a060b802016a6d77a8ea6ac44c35dfec384acef9c45f932e2b6aca9d3ac48ae031f99e5b58f270d6020b8796e9dd06f7e8ffa7cc5610ea3f69181c2be7adc8 SHA512 f6412bae4b041201ef94e5a159ce90fd6b09816350204d4f573c1afdfb0a6d62d7887fbc2e416b40ec1d4478db521be492edf4703d87482d6d0006a51b827538
 DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
 DIST windows_i686_gnu-0.42.0.crate 728570 BLAKE2B b72079610b5c4fc798a79fa757b19f8c8baceaf7f4ce824193a65fadaac988ebdff1719a74d676b7dd017e11ceb029402bbac4e55c35206172e15a9bef422f78 SHA512 a24dd1ba5eb7d5231853bebadfde0575ae9071a565868d2f3d1bc6ec0a87380c569a621f0cba2552af7a1e46ac62f09f87cfbce3f674be06be1a7c1d3f421474
+DIST windows_i686_gnu-0.42.1.crate 733428 BLAKE2B c1ca24973aca06b255d9317735cca7a13f7f69293da52dad41df43a5cdf48aac3d40d8b6765cf564905fb71cb548308d757f01167efe7a61da7bd2e2a7080f0a SHA512 61c3271b07df1d4585c875d27cf1686c8f595dcbb79626e8d15ff47228f7b7a4556d3d994566ccceee0d6795a4c76767f85f4579282fc9eed731e04c7e193a57
 DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
 DIST windows_i686_msvc-0.42.0.crate 717477 BLAKE2B a37e068f45590f0c31349acbdb56848106d6de0e1f8030e6bd5e1e174bd9a46737db54fbd61de99054e5e8c5263eaef0508c440f43c39dca82baa77792ff2743 SHA512 740400e2b11c1d177f7f37f844cd2a0f84b97a5adb03a7656661deb026b593a799ace8da1f9013ba9f74446fc43260d01dff7d4be607129ec7d602f341b2b4d1
+DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360dab647a1fe525f0ae4b44e6842d93c5674d9f202e8bbca99a0d30ecf7d138af0c48eec8e69e08bf285db51e32bcf83a2c54 SHA512 8afa4f92cb7bd96d4fdbefbd8e7bcaa37dee52224d5d8b950c5a537d3bb805bf9781097b8bd44d96e8b62b1290e3a3020557502fa3b357a53df6fea36b318932
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_gnu-0.42.0.crate 692493 BLAKE2B e00eae443cfed3004809244654268ee1bec17975166ca876dd393dcfe8a2ef0ca65d81b04c8f513f95a0fae9405ba796c085951bc2c597d252a3122f7dbf6425 SHA512 7df7ee0c345f0a2c37d7f9ec3a2824116b4d7a943bf245787509e67809a4f31ebb1862e212efb2d943d82ccef77a716437cdc61004396ca86e95e688368c6dae
+DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892
 DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf5db046ec945cb21ede76d2da477589e15d062ca6f04906dac80fdd2ef9fcda9244490aad86b401d0156eb6b65ba3599098e8cfe7 SHA512 242e11b4a0d50a0ffe8d0e26e971de30ef4d29260ae6749403d39cb4278297a240c1ec4112bb38151cbb11a6f3c8a743e84cd75b6a76adfeaee8e623649c9ecf
+DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
+DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
 DIST xattr-0.2.3.crate 11959 BLAKE2B e67cc186c3a86c3019cb5832aa515267671b8f11f88ba6253a3217eaf06d70b72a0367e9c8fb42a584b5b57113f8788c67f4e3d70db6427dd4e4a6efff59ac44 SHA512 55b99a9a9440463050b672dcacb7e1d1cc78f2b6f40ea7bff2134ee3a1c787d64972a1e00d2e06cf5a341bf76eff32f68e17a0c939a23f2c9a892715722afcac
-EBUILD stgit-1.5.ebuild 1815 BLAKE2B a0f47e9b78662aa3fdb9d2eedb64505e554882dfdb415c9d6428b926eae3a20d3d1d187751d906f114e0de00f743ad3657d76dc979e6e4ada5ed8615a00db627 SHA512 bf7641888805ccc8497252a54c5c57bed9e9108c80c06f7c6b977c823b4cc21b0b84ef750752b7957e0a5e73af7f9f3819e895b30afd55f9d4f22db3bac2c67c
-EBUILD stgit-2.0.3.ebuild 3350 BLAKE2B c40b33cbb649be89bc5b518775584d2e8e77d93b9cc492bf580d9b6942373f030c455a110d0f81d3b443c7dac0195e608a494d4207cb041032d3d915556aca86 SHA512 bcd64cfbd1ce5956cc051017eb07e3090e6ee494ddb06bd1ce5ad2ad1904a758f7ff6c0ec4505db5cb6f41b71f82c664f5a2d1ba0af348678ed92f10d2376a84
+EBUILD stgit-1.5.ebuild 1815 BLAKE2B b2a6f572ccf9a31d348eef17d9e138011d33a4ce95135ff2622944cc0440e2e709a324233b7ab587e91b68ed19b7f192fc12705b9ad7ab844160abb59e785d91 SHA512 cbb9aa5f10818d6de30f312db83272af6414f932643af45dfda4a3db50fcd1189a51f90ecc1354718ccaba1ae1277120a3bf0b6eca0020863d70035a40a1a47c
 EBUILD stgit-2.1.0.ebuild 3413 BLAKE2B ed50431164bf189f8847caea9ade1da4cacb7d676b7695db43933fa6244cb20381a8078155ce2957d367bb826b4760211793628b0833d16fb227892ff3902a72 SHA512 8b5c7824fd4d73e408b044dea533cd9ad89e297b52157fee0f70c0e6af48445f366716ae5a86eeed879d1931d7b7942d595e8d37128bb520230b0de49aaa7bdd
+EBUILD stgit-2.2.0.ebuild 4412 BLAKE2B e5a7e87bb28d2af60d41aef5faef7560d4f456a157a59b336e6060e3855987b7908fa8c65c552cabedaf87749369c1c48d9c35f1aae7d38d085d78cacd6dec75 SHA512 a86f5d1b43d4c98e6d04ac424f9ba2c1c7f77ceef4a4c2f310cf22fa56278a7c83c611ec5851ea2d1425aacc2dd5c4f6069824aec98e9f6963cd778137d63536
 MISC metadata.xml 323 BLAKE2B 1c28327d872297f61225aa1980ceac920aa9b7a55e8ea79f8e1428480cbb9c123c6ac180031ea2ad69848b4e954586d4365e72c7f5789c534a4a6d5f27511d82 SHA512 93f18052662608b3f800bffc766b39a4f3991293889e952d5a5faa0d3eb6d8828031a676a5db8f2cb6a2692cacd4d0fde4ce28d8bb5655487889ce218f0d9f86
diff --git a/dev-vcs/stgit/stgit-1.5.ebuild b/dev-vcs/stgit/stgit-1.5.ebuild
index accf4fa729da..5b693460660b 100644
--- a/dev-vcs/stgit/stgit-1.5.ebuild
+++ b/dev-vcs/stgit/stgit-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-vcs/stgit/stgit-2.0.3.ebuild b/dev-vcs/stgit/stgit-2.0.3.ebuild
deleted file mode 100644
index 46042d23bfef..000000000000
--- a/dev-vcs/stgit/stgit-2.0.3.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 2017-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	adler-1.0.2
-	android_system_properties-0.1.5
-	anyhow-1.0.66
-	atty-0.2.14
-	autocfg-1.1.0
-	bitflags-1.3.2
-	bstr-1.0.1
-	bumpalo-3.11.1
-	bzip2-0.4.3
-	bzip2-sys-0.1.11+1.0.8
-	cc-1.0.77
-	cfg-if-1.0.0
-	chrono-0.4.23
-	clap-4.0.26
-	clap_lex-0.3.0
-	codespan-reporting-0.11.1
-	core-foundation-sys-0.8.3
-	crc32fast-1.3.2
-	ctrlc-3.2.3
-	curl-0.4.44
-	curl-sys-0.4.59+curl-7.86.0
-	cxx-1.0.82
-	cxx-build-1.0.82
-	cxxbridge-flags-1.0.82
-	cxxbridge-macro-1.0.82
-	encoding_rs-0.8.31
-	errno-0.2.8
-	errno-dragonfly-0.1.2
-	fastrand-1.8.0
-	filetime-0.2.18
-	flate2-1.0.24
-	form_urlencoded-1.1.0
-	git2-0.15.0
-	hashbrown-0.12.3
-	hermit-abi-0.1.19
-	iana-time-zone-0.1.53
-	iana-time-zone-haiku-0.1.1
-	idna-0.3.0
-	indexmap-1.9.2
-	instant-0.1.12
-	io-lifetimes-0.7.5
-	itoa-1.0.4
-	jobserver-0.1.25
-	js-sys-0.3.60
-	lazy_static-1.4.0
-	libc-0.2.137
-	libgit2-sys-0.14.0+1.5.0
-	libz-sys-1.1.8
-	link-cplusplus-1.0.7
-	linux-raw-sys-0.0.46
-	log-0.4.17
-	memchr-2.5.0
-	miniz_oxide-0.5.4
-	nix-0.25.0
-	num-integer-0.1.45
-	num-traits-0.2.15
-	once_cell-1.16.0
-	openssl-probe-0.1.5
-	openssl-sys-0.9.77
-	os_str_bytes-6.4.1
-	percent-encoding-2.2.0
-	pkg-config-0.3.26
-	proc-macro2-1.0.47
-	quote-1.0.21
-	redox_syscall-0.2.16
-	remove_dir_all-0.5.3
-	rustix-0.35.13
-	ryu-1.0.11
-	schannel-0.1.20
-	scratch-1.0.2
-	serde-1.0.147
-	serde_derive-1.0.147
-	serde_json-1.0.88
-	socket2-0.4.7
-	strsim-0.10.0
-	syn-1.0.103
-	tar-0.4.38
-	tempfile-3.3.0
-	termcolor-1.1.3
-	terminal_size-0.2.2
-	thiserror-1.0.37
-	thiserror-impl-1.0.37
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.0
-	unicode-bidi-0.3.8
-	unicode-ident-1.0.5
-	unicode-normalization-0.1.22
-	unicode-width-0.1.10
-	url-2.3.1
-	vcpkg-0.2.15
-	wasm-bindgen-0.2.83
-	wasm-bindgen-backend-0.2.83
-	wasm-bindgen-macro-0.2.83
-	wasm-bindgen-macro-support-0.2.83
-	wasm-bindgen-shared-0.2.83
-	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-sys-0.42.0
-	windows_aarch64_gnullvm-0.42.0
-	windows_aarch64_msvc-0.36.1
-	windows_aarch64_msvc-0.42.0
-	windows_i686_gnu-0.36.1
-	windows_i686_gnu-0.42.0
-	windows_i686_msvc-0.36.1
-	windows_i686_msvc-0.42.0
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_gnu-0.42.0
-	windows_x86_64_gnullvm-0.42.0
-	windows_x86_64_msvc-0.36.1
-	windows_x86_64_msvc-0.42.0
-	xattr-0.2.3
-"
-
-inherit cargo
-
-DESCRIPTION="Manage a stack of patches using GIT as a backend"
-HOMEPAGE="https://stacked-git.github.io"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-SRC_URI+=" https://github.com/stacked-git/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="mirror"
-# License set may be more restrictive as OR is not respected
-# use cargo-license for a more accurate license picture
-LICENSE="Apache-2.0 MIT BSD BSL-1.1 GPL-2 Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-text/asciidoc )"
-RDEPEND=""
-
-src_compile() {
-	cargo_src_compile
-	emake completion
-	emake contrib
-	use doc && emake doc
-}
-
-src_install() {
-	cargo_src_install
-	emake DESTDIR="${D}" prefix="/usr" install-completion
-	emake DESTDIR="${D}" prefix="/usr" install-contrib
-	if use doc; then
-		emake DESTDIR="${D}" prefix="/usr" install-man
-		emake DESTDIR="${D}" prefix="/usr" \
-			htmldir="/usr/share/doc/${PF}"  \
-			install-html
-	fi
-}
diff --git a/dev-vcs/stgit/stgit-2.2.0.ebuild b/dev-vcs/stgit/stgit-2.2.0.ebuild
new file mode 100644
index 000000000000..c1d5ca48fd91
--- /dev/null
+++ b/dev-vcs/stgit/stgit-2.2.0.ebuild
@@ -0,0 +1,216 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.4
+
+EAPI=8
+
+CRATES="
+	adler-1.0.2
+	ahash-0.8.3
+	anyhow-1.0.69
+	arc-swap-1.6.0
+	atoi-2.0.0
+	autocfg-1.1.0
+	bitflags-1.3.2
+	bstr-1.3.0
+	btoi-0.4.3
+	bytesize-1.2.0
+	bzip2-0.4.4
+	bzip2-sys-0.1.11+1.0.8
+	castaway-0.2.2
+	cc-1.0.79
+	cfg-if-1.0.0
+	clap-4.1.6
+	clap_lex-0.3.2
+	clru-0.6.1
+	compact_str-0.6.1
+	crc32fast-1.3.2
+	ctrlc-3.2.5
+	curl-0.4.44
+	curl-sys-0.4.60+curl-7.88.1
+	dashmap-5.4.0
+	dirs-4.0.0
+	dirs-sys-0.3.7
+	dunce-1.0.3
+	encoding_rs-0.8.32
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	fastrand-1.9.0
+	filetime-0.2.20
+	flate2-1.0.25
+	form_urlencoded-1.1.0
+	getrandom-0.2.8
+	gix-0.37.2
+	gix-actor-0.17.2
+	gix-attributes-0.8.3
+	gix-bitmap-0.2.1
+	gix-chunk-0.4.1
+	gix-command-0.2.4
+	gix-config-0.16.3
+	gix-config-value-0.10.1
+	gix-credentials-0.9.2
+	gix-date-0.4.3
+	gix-diff-0.26.3
+	gix-discover-0.13.1
+	gix-features-0.26.5
+	gix-glob-0.5.5
+	gix-hash-0.10.3
+	gix-hashtable-0.1.1
+	gix-index-0.12.4
+	gix-lock-3.0.2
+	gix-mailmap-0.9.3
+	gix-object-0.26.4
+	gix-odb-0.40.2
+	gix-pack-0.30.3
+	gix-path-0.7.2
+	gix-prompt-0.3.2
+	gix-quote-0.4.2
+	gix-ref-0.24.1
+	gix-refspec-0.7.3
+	gix-revision-0.10.4
+	gix-sec-0.6.2
+	gix-tempfile-3.0.2
+	gix-traverse-0.22.2
+	gix-url-0.13.3
+	gix-validate-0.7.3
+	gix-worktree-0.12.3
+	hashbrown-0.12.3
+	hashbrown-0.13.2
+	hermit-abi-0.3.1
+	hex-0.4.3
+	home-0.5.4
+	human_format-1.0.3
+	idna-0.3.0
+	imara-diff-0.1.5
+	indexmap-1.9.2
+	instant-0.1.12
+	io-close-0.3.7
+	io-lifetimes-1.0.5
+	is-terminal-0.4.4
+	itoa-1.0.5
+	libc-0.2.139
+	libz-sys-1.1.8
+	linux-raw-sys-0.1.4
+	lock_api-0.4.9
+	log-0.4.17
+	memchr-2.5.0
+	memmap2-0.5.10
+	minimal-lexical-0.2.1
+	miniz_oxide-0.6.2
+	nix-0.26.2
+	nom-7.1.3
+	num-traits-0.2.15
+	num_threads-0.1.6
+	once_cell-1.17.1
+	openssl-probe-0.1.5
+	openssl-sys-0.9.80
+	os_str_bytes-6.4.1
+	parking_lot-0.11.2
+	parking_lot-0.12.1
+	parking_lot_core-0.8.6
+	parking_lot_core-0.9.7
+	percent-encoding-2.2.0
+	pkg-config-0.3.26
+	proc-macro2-1.0.51
+	prodash-23.0.0
+	quick-error-2.0.1
+	quote-1.0.23
+	redox_syscall-0.2.16
+	redox_users-0.4.3
+	regex-automata-0.1.10
+	remove_dir_all-0.5.3
+	rustix-0.36.8
+	rustversion-1.0.11
+	ryu-1.0.12
+	same-file-1.0.6
+	schannel-0.1.21
+	scopeguard-1.1.0
+	serde-1.0.152
+	serde_derive-1.0.152
+	serde_json-1.0.93
+	sha1_smol-1.0.0
+	signal-hook-0.3.15
+	signal-hook-registry-1.4.1
+	smallvec-1.10.0
+	socket2-0.4.7
+	static_assertions-1.1.0
+	strsim-0.10.0
+	syn-1.0.109
+	tar-0.4.38
+	tempfile-3.3.0
+	termcolor-1.2.0
+	terminal_size-0.2.5
+	thiserror-1.0.38
+	thiserror-impl-1.0.38
+	time-0.3.19
+	time-core-0.1.0
+	time-macros-0.2.7
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.1
+	unicode-bidi-0.3.10
+	unicode-bom-1.1.4
+	unicode-ident-1.0.6
+	unicode-normalization-0.1.22
+	url-2.3.1
+	vcpkg-0.2.15
+	version_check-0.9.4
+	walkdir-2.3.2
+	wasi-0.11.0+wasi-snapshot-preview1
+	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-0.43.0
+	windows-sys-0.42.0
+	windows-sys-0.45.0
+	windows-targets-0.42.1
+	windows_aarch64_gnullvm-0.42.1
+	windows_aarch64_msvc-0.42.1
+	windows_i686_gnu-0.42.1
+	windows_i686_msvc-0.42.1
+	windows_x86_64_gnu-0.42.1
+	windows_x86_64_gnullvm-0.42.1
+	windows_x86_64_msvc-0.42.1
+	xattr-0.2.3
+"
+
+inherit cargo
+
+DESCRIPTION="Manage a stack of patches using GIT as a backend"
+HOMEPAGE="https://stacked-git.github.io"
+SRC_URI="$(cargo_crate_uris)"
+SRC_URI+=" https://github.com/stacked-git/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 GPL-2 MIT MIT-0 Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-text/asciidoc )"
+RDEPEND=""
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+# update with proper path to binaries this crate installs, omit leading /
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_compile() {
+	cargo_src_compile
+	emake completion
+	emake contrib
+	use doc && emake doc
+}
+
+src_install() {
+	cargo_src_install
+	emake DESTDIR="${D}" prefix="/usr" install-completion
+	emake DESTDIR="${D}" prefix="/usr" install-contrib
+	if use doc; then
+		emake DESTDIR="${D}" prefix="/usr" install-man
+		emake DESTDIR="${D}" prefix="/usr" \
+			htmldir="/usr/share/doc/${PF}"  \
+			install-html
+	fi
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 361fa424bd30..17b9224dfefd 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index d6a48ebe73cf..e971f75f19e8 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,3 +1,5 @@
 DIST gvfs-1.50.3.tar.xz 1227548 BLAKE2B 9f16d0dec4b19a6ee5821d1151a0f051239b132a5b081f03b3741eb106b286c24086c780126788dd76fb91848759b6882e006d608cd1dd0ecd7684926a7e1770 SHA512 5ef5f22d3074b088cc0662ca2639667ffc9dc645677e7ba9014edb9d0631d04c113edada162cda272b72844be24ee947edd587b685cc5c31d24527e9061f14f6
+DIST gvfs-1.50.4.tar.xz 1226728 BLAKE2B 0d04fb8576bef93fcec7d6e9a80586d439ec88dcc60f9cd65978c87aba77b65ef0af7dc8f831ad2c6eabbedbab2ccc6d37c12e17384a09e276c26b88edc378d8 SHA512 407f1d59f182ad4368aa35edeeb8815d3d67d50bb2050ff9237703e824dd049040e7ab296f01ed2966a73ef3192f026a8ee3918c3d94d82e1ce55337fe16251f
 EBUILD gvfs-1.50.3.ebuild 3908 BLAKE2B 852c0fcdc4a195b5a3651b195fab81284c00b5e13fbc6ae0db9aab25739337c27be76a82cd30356dd6e007a93e9d7a312346da5d1ddc943a27ac058da92c7d8f SHA512 5e0161a743ae2092b308de9f93b89070a7a4da7dcdd88274c4c817a8b910cb4c63d2eb8f8e32df39dbd9ee77e956ad9a81640d8c259b10725cc4a6e7bfb6ab73
+EBUILD gvfs-1.50.4.ebuild 3919 BLAKE2B 5fea82850080e9a0de919ff881db561f2be1ba6e4c857df2d6922941008416c61ab83dc907de117c68790d81c16e63710402086fe24db3e2d96c525a8ac861e6 SHA512 cac71460b5e156753aec5326326e67c74684df3e166cc6ff784bf7ab23c9e7b321c31fdeedf999490dddc22dfd9cbb981325a61f117890c1dd55d3f70db5d1d2
 MISC metadata.xml 1857 BLAKE2B ecd1ccd9d258829723b274a45c4d831755032988e60edad0294c2c313addd274f4f9c7b3b3fb6db4e705a9694dd07f5963440b1bed00a51a4266b6f1c638d11b SHA512 8f45e74dbd38fdfbae9bd51734ffdc516f2fd55ed964d03bd3ee8bb809bf0d858d7b93bc17894a446d5e4a4299da4cc65062d52f49cf4cb60c72d26d45d26dc1
diff --git a/gnome-base/gvfs/gvfs-1.50.4.ebuild b/gnome-base/gvfs/gvfs-1.50.4.ebuild
new file mode 100644
index 000000000000..04e118bc7b77
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.50.4.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TMPFILES_OPTIONAL=1
+inherit gnome.org gnome2-utils meson systemd tmpfiles xdg
+
+DESCRIPTION="Virtual filesystem implementation for GIO"
+HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+RESTRICT="!test? ( test )"
+# elogind/systemd only relevant to udisks (in v1.38.1)
+REQUIRED_USE="
+	?? ( elogind systemd )
+	cdda? ( udev )
+	google? ( gnome-online-accounts )
+	gphoto2? ( udev )
+	mtp? ( udev )
+	udisks? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.70.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	sys-apps/dbus
+	app-crypt/gcr:0=
+	policykit? (
+		>=sys-auth/polkit-0.114
+		sys-libs/libcap
+	)
+	http? (
+		dev-libs/libxml2:2
+		>=net-libs/libsoup-3.0.0:3.0
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+	udev? ( >=dev-libs/libgudev-147:= )
+	fuse? (
+		>=sys-fs/fuse-3.0.0:3
+		virtual/tmpfiles
+	)
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	systemd? ( >=sys-apps/systemd-206:0= )
+	elogind? ( >=sys-auth/elogind-229:0= )
+	ios? (
+		>=app-pda/libimobiledevice-1.2:=
+		>=app-pda/libplist-1:=
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
+	gnome-keyring? ( app-crypt/libsecret )
+	bluray? ( media-libs/libbluray:= )
+	mtp? (
+		virtual/libusb:1
+		>=media-libs/libmtp-1.1.15:=
+	)
+	samba? ( >=net-fs/samba-4[client] )
+	archive? ( app-arch/libarchive:= )
+	cdda? (
+		dev-libs/libcdio:0=
+		>=dev-libs/libcdio-paranoia-0.78.2:=
+	)
+	google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] )
+	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+	nfs? ( >=net-fs/libnfs-1.9.8:= )
+	net-misc/openssh
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	test? ( dev-libs/libgdata )
+"
+
+src_configure() {
+	local enable_logind="false"
+	if use systemd || use elogind; then
+		enable_logind="true"
+	fi
+
+	local enable_gcrypt="false"
+	if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
+		enable_gcrypt="true"
+	fi
+
+	local enable_libusb="false"
+	if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
+		enable_libusb="true"
+	fi
+
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		-Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		$(meson_use policykit admin)
+		$(meson_use ios afc)
+		$(meson_use afp)
+		$(meson_use archive)
+		$(meson_use cdda)
+		$(meson_use zeroconf dnssd)
+		$(meson_use gnome-online-accounts goa)
+		$(meson_use google)
+		$(meson_use gphoto2)
+		$(meson_use http)
+		$(meson_use mtp)
+		$(meson_use nfs)
+		-Dsftp=true
+		$(meson_use samba smb)
+		$(meson_use udisks udisks2)
+		$(meson_use bluray)
+		$(meson_use fuse)
+		-Dgcr=true
+		-Dgcrypt=${enable_gcrypt}
+		$(meson_use udev gudev)
+		$(meson_use gnome-keyring keyring)
+		-Dlogind=${enable_logind}
+		-Dlibusb=${enable_libusb}
+		-Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
+		-Dinstalled_tests=false
+		-Dman=true
+		-Dprivileged_group=wheel
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if use fuse; then
+		tmpfiles_process gvfsd-fuse-tmpfiles.conf
+	fi
+
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index e88a39a72df1..688c9b2bed62 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -4,8 +4,10 @@ AUX 43.0-docs-build.patch 1086 BLAKE2B 449456236c807c28905698c5fc0f4b40b26ab300f
 AUX 43.0-optional-gstreamer.patch 1269 BLAKE2B 2a4599771977e44f9e1b25d2334f838a2016d1bfd6eea48c004ce410442ec12152e69efec389b6d373d1e187f00b78ac3fd617f4992e90acaf69a5a3325b7a2d SHA512 7f578859a3c8100f4d8783851b91a40c1c3d2d702851772e91bb08bade7802271ffa0524861e968004c6ea6450060da0ca6cf917808c4542ad5853bcb7d3ae45
 DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
 DIST nautilus-43.2.tar.xz 3166792 BLAKE2B 354cbdef7ec272a4966229d3c7da192c4613ef7c19187503253b0936dec6efb236e45793089709ab639dab94e372173d8c37c90e0beb9b0d258e384c2370bc8a SHA512 e4a12984b74614185cd7fbb9bf8c49a2572d673ae59d0f481dac92459d965ccc0eae6d9a5f545afb52ce1f24438a7feb02c0a35b8175187b5d74a9044488c13b
+DIST nautilus-44.0.tar.xz 3194376 BLAKE2B 214626e98f1bd5329bb5429837a2d1d37c5b8117ef9e915ccba330e123252f2a1b57ba4c7dbca5b508b51f4f17139d39e9e3c56a4de1890883f3a35e4d0b8614 SHA512 fa06fe12d7e5de76bac532732c26a242056056b6d4fbbc0a582e288baccdc8c35aaa370789f2656b0d5e38bba5826d0fbc5710612640197337cfb756fa74dd9f
 DIST nautilus-44.rc.tar.xz 3202172 BLAKE2B 36d346b777a658e24a1e4dab895694d3bb6fc54ff201cc0af0e4065a853580d64fdb59a722fd606469c37b555b87f08c36f5301eabbe22c04f797ececdb544ce SHA512 d7b537b3848e5320fa6278118d04ebfeefc06d4d47bcd3753ebeeed7dcc9c35521cdf806df3c932536318c7d245c26f3f718832c4ebb3df6a9d4d3ee243368ea
 EBUILD nautilus-42.2.ebuild 3340 BLAKE2B f2968baf0c7af84edc0d048a40e4edf84d83338d35d57a146bc6ad8dc10867ca3403c7248d0b1b8b530d451cae7299f35a201dca2b100115073acd79e208931d SHA512 465f03fa321f14ef1b8cef926e2c34b4eaa1f648a13f96e273521f193eca174b8b94539701e377f8de9119a1fa2fbbae8cf733511955db6d674007474872b5be
 EBUILD nautilus-43.2.ebuild 3305 BLAKE2B d6a7ce3bf7edbd089660e990f3588879cefcb2518f6e83a86a7bc48c45828143e2004775cc9c951d917789600195cce540c0c6da987aa4f723c08db8213b6ccc SHA512 1e8f230105178b9362c7a1c35db1c2449088c3351781d5f4c2a63ba186f4e0a9ec7a5a4635a99696f8698985405bbc604fd165fe34980cb8e0c5c003805dd7db
+EBUILD nautilus-44.0.ebuild 3203 BLAKE2B d892fa739a29222789898cc4609a08bb0c612a848f1bece29dc150187c5ce2881cde334d76963debb1b78e6e7eb259f07bc42dc6da6c304c6db393d2dc72a5a5 SHA512 b4dc0bdccb1ba2c550b0c280411074f620a0c5ef14e368da12d10ada9b6f68552a21f1ab0b69d6ddf8ff4adbaa503a307e701df3377180b86706021084c52eb4
 EBUILD nautilus-44_rc.ebuild 3303 BLAKE2B 7c9f4a150e045646c825cb6da7174c0f55fc9a3911ad9c4e6921ce43eddac2f087f24f7bc437d4c4a641abd4f3fab76fab82c1f08ee6941ac2fc9780d05e7edf SHA512 b2d96c7067fc11c8473b398e6b69f0c16992969fb9319c263148916509de31d0427d323b6b640a3a738b2a68b616b3ecb17fb6f3a733c4eee7c66179323d2e4d
 MISC metadata.xml 662 BLAKE2B 0d7e1a575749fe5e00899852e51bc0eb184f7b2a55f2fe0eaade6ca087961ceb673d7523b9c6b71d4ac266b8488ad599de1651fb7e6fb0b2c7c160384dc059f5 SHA512 696cc099a35c07475920b8ee5785820ab6f0505bf3a14fc67f6372d8762012f5d21e3c4fa573fee1d7e6cff4e7233dacfb9c78c5f7f025a03f50e6374f3ebb67
diff --git a/gnome-base/nautilus/nautilus-44.0.ebuild b/gnome-base/nautilus/nautilus-44.0.ebuild
new file mode 100644
index 000000000000..bee533365959
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-44.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.72.0:2
+	>=media-libs/gexiv2-0.14.0
+	>=x11-libs/gdk-pixbuf-2.30.0:2
+	gstreamer? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	>=app-arch/gnome-autoar-0.4.0
+	>=gnome-base/gnome-desktop-43:4=
+	>=gnome-base/gsettings-desktop-schemas-42
+	>=gui-libs/gtk-4.9.1:4[introspection?]
+	>=gui-libs/libadwaita-1.3_rc:1
+	>=dev-libs/libportal-0.5:=[gtk]
+	>=x11-libs/pango-1.28.3
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	>=app-misc/tracker-3.0:3
+	>=dev-libs/libxml2-2.7.8:2
+	>=net-libs/libcloudproviders-0.3.1
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	>=app-misc/tracker-miners-3.0:3=
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.51.2
+	dev-util/glib-utils
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		dev-util/gi-docgen
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+PDEPEND="
+	gnome? ( x11-themes/adwaita-icon-theme )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+	"${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+
+	# Disable test-nautilus-search-engine-tracker; bug #831170
+	sed -e '/^tracker_tests = /{n;N;N;d}' -i test/automated/displayless/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
+		$(meson_use gstreamer) # gstreamer audio-video-properties extension
+		$(meson_use introspection)
+		-Dpackagekit=false
+		$(meson_use selinux)
+		-Dprofiling=false
+		-Dtests=$(usex test all none)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	# TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index f9ffb0d00501..b58830e632b3 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 0b5185f95cae..2d6b7b688b9f 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-clocks-43.0.tar.xz 366872 BLAKE2B 1886d8e75b3d1b006a247bb044faf996d1788fdae65d4e825aeada1a2912bd6b58aa244da4088fd7f709c5a87fd788b92c45b9b116e462403d7929395cf0d6ac SHA512 703876a67000fa3a2b5e7bec70451a725aa4ed33aa2392a4c7fafc6ad287dd5591ee24c9aed20961739e9caa1f15ec404da9a2fa42e524dedaf75210d00b4fcf
+DIST gnome-clocks-44.0.tar.xz 368556 BLAKE2B 8cf6bfd1dfbea769b71d74bcb864ccea5393410a90b3d83d6e053afef971c71ac7d35cfdc7b200695c3ffbb2c049baa19c5af0f4042efa7563012e5b333f5c82 SHA512 f262a18d13e5cb373760b02aa4dd79d7e6843aa400813d0c108bee0dfc084fb3d734e01cf1ffeadb34eb0f3e4db29d85d6817a98afa7864e997d7e2c5425d1bd
 DIST gnome-clocks-44.rc.tar.xz 368444 BLAKE2B bc8d5764c17fe40c85668a02224aa0f2e3d16d8015504ea85ce830aa9af0f38923a752f603b1382c1bc084e5170d7e1967aa7e47c84d5664844a64d8e4098d9f SHA512 982bf5a784989369e6593904e0bae9a0e896b74ea34426833a9d70ea6fc8906558c130f766fcfabac8b3f880a0f2ab469a97532be0220f8843731cb787943035
 EBUILD gnome-clocks-43.0.ebuild 1155 BLAKE2B ba9ad0cce1dbfd5615b7cb65463640b82322f7a0e85590819dccf39c2a92abb511210b9fada5633858bd16b4c0b9b9b71a0adaf3b85ad0062853611f736940f6 SHA512 5cd67829426345a42a47ed5edb1eb77cea1b45e3fb90d9421bbe9f9879fdab30097cd8599290bebeb54ecd24d1a07f42a077f2daf2400601f0f450f09f12f0a4
+EBUILD gnome-clocks-44.0.ebuild 1157 BLAKE2B 4524c61d5512599b972899e0b931f0aad06233a633a4470301c20ca769c1e4202e0651132e096fc2cc2a4a1869e79628f6273307ac3c23204526a2412e718609 SHA512 b1c4842b4a9db12ca04515ef87df5e34ab222850ee831fc902ca6ed5588b09892ffc461db7c0a9f8164a1f762715caa6091609d5f0b32fbd0ddc2030460ca8d2
 EBUILD gnome-clocks-44_rc.ebuild 1257 BLAKE2B 31ea740a0033f1a10e90838ff89531c1a66edc8d267ca48ea359ee665fc6e7ded5e4a2ecfe41b0a107f801ca95d010578a30cbcd8e28e85bb4894705aefbb06d SHA512 1a91978ae71c4dfef69b75dfd000a38d872aa5c4611dc57dc59ffb23225f29f3bd927100eb310fc45353c1b6c71a72814a01bdf2a1044edeb12c7c53e83a3767
 MISC metadata.xml 353 BLAKE2B 56683a94c749b3a561421a0ecf799afa6361bfc860330b8f1bfd252d9101b5abcf5b03a07195113556362a91a48fcded621c578a0ad1603b72df95da88dc2c55 SHA512 9dab4b3242926c635c5f503e0eb8ae3e14a585dfe548d0cfe90d60315c9c26af1550a54034dfeae279a3cb076c4ef23b5f50546d2a537e480956d02605a936ab
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-44.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-44.0.ebuild
new file mode 100644
index 000000000000..d2b98d9f0bf3
--- /dev/null
+++ b/gnome-extra/gnome-clocks/gnome-clocks-44.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Clocks application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Clocks https://gitlab.gnome.org/GNOME/gnome-clocks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.72:2
+	>=gui-libs/gtk-4.5:4
+	>=media-libs/gsound-0.98
+	>=dev-libs/libgweather-4.2.0:4=
+	gnome-base/gnome-desktop:4=
+	>=sci-geosciences/geocode-glib-1:2
+	>=app-misc/geoclue-2.4:2.0
+	>=gui-libs/libadwaita-1.2:1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	>=dev-libs/libgweather-4.2.0:4[vala]
+	media-libs/gsound[vala]
+	gui-libs/libadwaita:1[vala]
+"
+
+DOCS=( AUTHORS.md CONTRIBUTING.md README.md )
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=default
+		-Ddocs=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index c77ab6899d22..a9dd4dea1b99 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/grim/Manifest b/gui-apps/grim/Manifest
index dbf3ad393325..3007d60ab79e 100644
--- a/gui-apps/grim/Manifest
+++ b/gui-apps/grim/Manifest
@@ -1,5 +1,4 @@
 DIST grim-1.4.0.tar.gz 18287 BLAKE2B 72606de01624c98876fe1018877a3cf0b25b44ac4bd6a053f82c40ad1ea2c6c0e510cbb6a0bce988f14607ea162dda1d8350b9f30b0f2b9acd8f8e20ba50bc99 SHA512 d0b33528a00528b3ef7488a0984cde5034de4f5a211eb5c8d3299aea356d9348c5d02d08171802bc0315afb19d2446f5f132ea9dca0579ace803b7d5d90a89cc
-EBUILD grim-1.4.0-r1.ebuild 1065 BLAKE2B 4703eaead2310f84e4de8a9ef0797f31fe232f4e64de3a031960dbe6b1a75b0fbc14cadc9d6eb188935b8d425982c3fd8e17b43b7f5653b0c1232bd045a46e81 SHA512 873f906038608fc5a8df65f370fb95ae58a7aab57ff62dbae2f84acb7422b4bd1725d9f61b42fee153967d840be6d391bd5fbb1325c04dfb28634bad75be3d75
-EBUILD grim-1.4.0-r3.ebuild 1073 BLAKE2B da0d77cde31f7985131448d34eea587635333d8836854757c34b94b958746626af8ae84c62da126caa08ec1d8379112b35c76df7e20dad87968be3e61fcad802 SHA512 29ba3c1267a723a2970dc628594d976ddd4fc4b3a1239c8a0e39d116036e6334dc8948bab80caf7fc8da0597ec90dacdfb02ef96d6ecf8f1aaba69212f33fd58
+EBUILD grim-1.4.0-r3.ebuild 1070 BLAKE2B ded6897cad4cb5f09492469ba7084a1280c0cb1fd5e00ea14588627e28957963b090096b0389a9d140874aedef21248d2317da6ac1fc0c73930ae89fb5d086c3 SHA512 648e6b5ef18201d32d4b660283fc4cbf5a080fe2063dddc25287708bdf4576ed12ee0cbefb1cf7a695942ae888a292e3e17efc8c53d6c91b537daec4a8fbb306
 EBUILD grim-9999.ebuild 1102 BLAKE2B 7645ed551bad34e5f7299aee1ce7ec1502b8609c1ab1aaf515e9e7bcc1ae6b296a6351a03748ec4b20d99abe8f55120cf347516a23b25f078f8ab9d3787316bd SHA512 3752c3589ef10b133b5c1f6de68bd4c2a0213a190c3b73b30dc6b5b97df401ef1e5beffd839a7c039fe43e54928f75c772036a091d5d5ddd829d7bcb5345a8cd
 MISC metadata.xml 514 BLAKE2B 48be3679b17a0e46ac29453d7eba0886ce6f31cf47a25c7ea2d9a810792478401f9493fbac7e1c0fbf6e246d67ab80bed4c7c936c0eae7a1536614c58dee6294 SHA512 5064c4a13c8168a5691d19dfeb281847b33899822169b13523d48842fb9eedbea28341725769933ba15a830c1d2acd8f399de99a58ad4f6dacc9d5dad53fb05c
diff --git a/gui-apps/grim/grim-1.4.0-r1.ebuild b/gui-apps/grim/grim-1.4.0-r1.ebuild
deleted file mode 100644
index fd3752c9452e..000000000000
--- a/gui-apps/grim/grim-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 meson
-
-DESCRIPTION="Grab images from a Wayland compositor"
-HOMEPAGE="https://sr.ht/~emersion/grim"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~emersion/${PN}"
-else
-	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+man jpeg"
-
-RDEPEND="
-	dev-libs/wayland
-	media-libs/libpng
-	x11-libs/pixman
-	jpeg? ( media-libs/libjpeg-turbo )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/wayland-protocols-1.14
-"
-BDEPEND="man? ( app-text/scdoc )"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature jpeg)
-		$(meson_feature man man-pages)
-		"-Dbash-completions=false"
-		"-Dfish-completions=false"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	newbashcomp contrib/completions/bash/grim.bash grim
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completions/grim.fish
-}
diff --git a/gui-apps/grim/grim-1.4.0-r3.ebuild b/gui-apps/grim/grim-1.4.0-r3.ebuild
index c7d894147e60..1a332add693b 100644
--- a/gui-apps/grim/grim-1.4.0-r3.ebuild
+++ b/gui-apps/grim/grim-1.4.0-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.sr.ht/~emersion/${PN}"
 else
 	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 7109e2b1799d..e99b5617bd4b 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/libadwaita/Manifest b/gui-libs/libadwaita/Manifest
index 74512696f368..b45a3f01de3c 100644
--- a/gui-libs/libadwaita/Manifest
+++ b/gui-libs/libadwaita/Manifest
@@ -1,9 +1,13 @@
 DIST libadwaita-1.2.1.tar.xz 2023892 BLAKE2B 1adb99f360cded03450575206d23d9d9a6e50b2e7afc3b58a7ecee2b35b09896ab03a584a8f21fca0ea95109d3dd4df46269428934bf7563b716aaaa117fc85c SHA512 e7de0a5bcd01cbabf5a25fe5b81ba2488b0a33bfaa78e3aa12b64d6373b7ffe958ef7d7b438633edf38dff52d58efbff0365c9d7c191fc895ec7daf62eff1605
 DIST libadwaita-1.2.2.tar.xz 1938256 BLAKE2B 4ef46d1781e73d18edea75f663d29c6b8570e40f3d0d8987626104e3a49d39f0ca348ae215a8d572acf062a6320750df055efbd70a63ef1403d79e6d70e2b5f6 SHA512 65bf576145a4cae199dd927b27c295a72b6615d549186ec216a8aae3337ebd3d2b102eca75133a4211c4d2841e32d4e4d510bce72c3424eee1e2d4603b5642e1
 DIST libadwaita-1.2.3.tar.xz 2950664 BLAKE2B 8c76554d603992e99240782a2b52245d5f2149d4eca01a79828bf321545bd249d7742246372d09d7351584b48762f1ba3eac8aa3a391ce658f0025a2ebb1cbce SHA512 dd8eb41df7f8b0f71c711c6d1f350b147e52e37f8d0e5df2a7264c6bdff43b8b0a787c243432039ca1c991f22b109229515c4bc8a10a29ff4c93f1b53813c8ad
+DIST libadwaita-1.3.0.tar.xz 3132876 BLAKE2B 5bc8896fcc98557fb7cde1bb7de49b4d3d2dfb6d427df81380fffb9743a4d1da97a1a942ae0587ce292ab7b297f58c55b61ab694ef7195515ef706d42b11eddc SHA512 186bc9a4b4614751240b8c3fd9519c9d22bce51777177424c388f720799266e0d443c0ecf28d5e853be4d7906b0b6e4e41daedf983ac65b080227e3700f21b3a
+DIST libadwaita-1.3.1.tar.xz 3131484 BLAKE2B 5569effd85c061e2af88a5420e8df43d6873cc67def17570aeecd54b261aaea9c668ebbe9eafd94f1621e47a86e52404f4a9bc67479b577edbc8c5772243aea3 SHA512 9bb5203e61baa671a30aabd7f56f9a160af8b4a01974f4964f7e975cb49669e30d394dcd5e4f4a64d9e2e9cd3e17b82d938a57456e3e166444cbe1ce15fb2b09
 DIST libadwaita-1.3.rc.tar.xz 3132092 BLAKE2B 135c3136dd58525ffbcfe48174168140e0c34fd7711a9793f06daf1a8cb0748e9333e12ec75cd5b72b22edb181d8312dc3702f6ee77a164eed2d2961ec9a9278 SHA512 716e4f8746fa0897f22c689960c76c08f0330ec131fcbf83f14f0f89c737e217977fcb4e8b25b034abb37bbd08dc28f8879137e940b7bd6b0349ddbb03775552
 EBUILD libadwaita-1.2.1.ebuild 1487 BLAKE2B dab9b1cec346f1b20f34ed1347479a58f9142cdbe534c1f2e32ef38d35d92c2760bc38816bb93597481096016410adbc1f7e40733c08a1721b191da36b09f596 SHA512 414540cd74d85c9163636932801cf5d229c0feccb8544ae0e684cfadb432a4036411252a19114160aececf66c4a4534dd6f85b571750d8642c6462dc6ad7fea5
 EBUILD libadwaita-1.2.2.ebuild 1492 BLAKE2B f8666af672936a976cf4233669b7654ea48b6f1472f5237400a5e8b032b1a2b0b9aa75e5fc13c662c2c6c640edd6ba5bf23d4c97a4fb2df23dbd282f53ae8da7 SHA512 6b5a64d0348d01bc91292be4d9adb7e0c424c9d51d9f540aa2132a3f7eef564b09a25a46ce0153f6434f668989c2946cbb1f7fd175902d1d3a42b4fdcf9b11d7
 EBUILD libadwaita-1.2.3.ebuild 1492 BLAKE2B f8666af672936a976cf4233669b7654ea48b6f1472f5237400a5e8b032b1a2b0b9aa75e5fc13c662c2c6c640edd6ba5bf23d4c97a4fb2df23dbd282f53ae8da7 SHA512 6b5a64d0348d01bc91292be4d9adb7e0c424c9d51d9f540aa2132a3f7eef564b09a25a46ce0153f6434f668989c2946cbb1f7fd175902d1d3a42b4fdcf9b11d7
+EBUILD libadwaita-1.3.0.ebuild 1467 BLAKE2B 6d7736ac1984038efb46d043391885050cd24ae10cab213e13c9a1b699cf3ae82a8a715a7014ea3cc70fba363aa4176377e7cb8eefc1b5d364d719f70b2971bb SHA512 de8600f57f56bad51046186909a2a6ca71c92fca029ed19b5ebe2a5c18f2877ee195adb733f89d033e18c805486ba288f7bdab60f689fee0cadb2d33ba87cb19
+EBUILD libadwaita-1.3.1.ebuild 1467 BLAKE2B 6d7736ac1984038efb46d043391885050cd24ae10cab213e13c9a1b699cf3ae82a8a715a7014ea3cc70fba363aa4176377e7cb8eefc1b5d364d719f70b2971bb SHA512 de8600f57f56bad51046186909a2a6ca71c92fca029ed19b5ebe2a5c18f2877ee195adb733f89d033e18c805486ba288f7bdab60f689fee0cadb2d33ba87cb19
 EBUILD libadwaita-1.3_rc.ebuild 1570 BLAKE2B 9dba90e0ade60760a1c3ab380885a812906c08440289e202e4ac9d33ac5e0faf449315026dc58452905b556ad5830e55f04b7b0c4c4706063fdcaf8bf812893e SHA512 ac904ade728d0acb4f0d47ad41893b1647596b03592d5d019a8bc48edaaa0389958385b0171277bd2983690fdc0a011f2b76ee577a23ad95a1ba4d4db59a101a
 MISC metadata.xml 351 BLAKE2B ae57c9eb56cb12bf754b28c2e6620c09ad7ccc79396fd0476e99e52b93bf6d3900fc84ab55fdf11d98e59ed9e247cabf6f301d45bc5e4c453c0fcffc49b144cb SHA512 dc1333518d24d60f69a180ee7369c4b783f234bda36cd65ec66d483db86f3123eca5ed10cd8aadc7a183b707d698a159d7917f7ebd1c342c212f15e90cb8d5df
diff --git a/gui-libs/libadwaita/libadwaita-1.3.0.ebuild b/gui-libs/libadwaita/libadwaita-1.3.0.ebuild
new file mode 100644
index 000000000000..b890018eecd6
--- /dev/null
+++ b/gui-libs/libadwaita/libadwaita-1.3.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.72:2
+	>=gui-libs/gtk-4.9.5:4[introspection?]
+	dev-libs/fribidi
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	vala? ( $(vala_depend) )
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-libs/appstream-glib )
+"
+
+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/libadwaita/libadwaita-1.3.1.ebuild b/gui-libs/libadwaita/libadwaita-1.3.1.ebuild
new file mode 100644
index 000000000000..b890018eecd6
--- /dev/null
+++ b/gui-libs/libadwaita/libadwaita-1.3.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.72:2
+	>=gui-libs/gtk-4.9.5:4[introspection?]
+	dev-libs/fribidi
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	vala? ( $(vala_depend) )
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-libs/appstream-glib )
+"
+
+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-wm/Manifest.gz b/gui-wm/Manifest.gz
index 14d77d19b753..1facabad8c5e 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index c8d5ce7da056..196c0469b0aa 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -3,6 +3,6 @@ AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca615186659
 DIST wayfire-0.7.3.tar.xz 765524 BLAKE2B b82c66796d7fb3d07c7bd9078755b7c38df1bd5c93daa659fc98b1182679bc0a06a24b322c6ab492d06d30c898659e2ba849c1d5944260e8775a04fd8a5bd078 SHA512 7bb5b8492a632a9816e847ec72def74dc234bcc30da7c320a0cd3b1d60492f5521ad8ac76a12ef967d1b114bcde9be72eb8ffc618977aed8e198d4ace1e7056e
 DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53
 EBUILD wayfire-0.7.3-r3.ebuild 2553 BLAKE2B b7d8caa0ef5e425ba5f4ffeef1f7dec8c39fbc2f6ef5aff0989f1aeac93c404550ba8d19e48e288fdfb683e89e982018718afab3b5ca68e0bce45217bea714bf SHA512 988f82606f448bac536e0e6633a0a23dbc513351a84df1fb81e1deb8298b9f0738ef559c15997693c7a93699198eeaf1904feff570b8e73a4e1a7d008aa7ff3f
-EBUILD wayfire-0.7.5.ebuild 2816 BLAKE2B f9090c39d744c03c46cd1467be69958debcf2d94702de78fffad9b3999d10a564ba07a7800f0eeddaf692b9c4f5a8d78f0cefa1a7a80082560c1f0fe048b4bdd SHA512 7d70ded038c7489b89b63e9ca1c6fa531a3d181672e806c6e625beb0b6660ad51a082cea6fe4c46f21e861cd9f7908ebef6a08fcb03ea845c71206ada88c4d8f
+EBUILD wayfire-0.7.5.ebuild 2815 BLAKE2B c841e08e01a2be368fc107406fbf33b6dafaa6982f1e1e4d472329270741bb7c5614f6c87d3b4345eade129c7cf8d38982d77b94d1638c4969ab17e9745fe2ca SHA512 1b30322c706a39bbdbe821dc38630e9f363c5962f9015d668612815efb49747452746874b7216d24b9184ad11c5d1d0450963cde86d7fe1f38569576f43ab9de
 EBUILD wayfire-9999.ebuild 2816 BLAKE2B f9090c39d744c03c46cd1467be69958debcf2d94702de78fffad9b3999d10a564ba07a7800f0eeddaf692b9c4f5a8d78f0cefa1a7a80082560c1f0fe048b4bdd SHA512 7d70ded038c7489b89b63e9ca1c6fa531a3d181672e806c6e625beb0b6660ad51a082cea6fe4c46f21e861cd9f7908ebef6a08fcb03ea845c71206ada88c4d8f
 MISC metadata.xml 920 BLAKE2B 0b0ad723f8383bc65a87cbab8b7195d33a3dabd9ea73c8c2f91957151b9f324e63ea4b25c480d44eba391f595ffe3a9d0c39800eaa9bf4b81b47cb8e3262222f SHA512 c0eb23bcfc87b274bcb2c96b0e52cb91fb6dd3ffb51ef4285f34af3a9861122c0d30179c5989070de85ebcd0dff282906bb4c15c4983bfdce123c5c3b101561e
diff --git a/gui-wm/wayfire/wayfire-0.7.5.ebuild b/gui-wm/wayfire/wayfire-0.7.5.ebuild
index 42ab1b20d21d..3daa6027b141 100644
--- a/gui-wm/wayfire/wayfire-0.7.5.ebuild
+++ b/gui-wm/wayfire/wayfire-0.7.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
 else
 	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index ba9295f2de13..44e93d1ab7df 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index b1555403cc59..4e290225a0be 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -136,5 +136,5 @@ DIST thunderbird-102.9.0-zh-CN.xpi 739887 BLAKE2B 885a7acf5ea5bfcab826755bb1f604
 DIST thunderbird-102.9.0-zh-TW.xpi 748346 BLAKE2B 1f9850366f292ca4ccc613efd071146d772661a26d2ce571dcfb99e7dbad66f39b1d0d2d4833fb8eb40fd4f4efaa633d2b0d8c0e177aa7750b3d2c867cf8a167 SHA512 dd902d37b4e695fb1eb8e1e39c95bd9cee94cf66814c418cafbb48965b6d0d9e9600d0afce309ed36f3bfde32c5a225dba480613ca66468d2370303de68c4ca4
 DIST thunderbird-102.9.0.source.tar.xz 503081436 BLAKE2B 538ec2705bd73f0673864a72e4e8c854d3450c79e40577e00ea8091c7c03f20a33b25ae475b270543963773c544d3819cd889e6bafc816ab0e78bd0b4fb6fd55 SHA512 0de88cef22e7b239804e27705b577dd34a86487512bb2af29804b358d056628c14034a34cbbdded75612bda984fac2c04d116cca8040b9212a7fb0206c07c440
 EBUILD thunderbird-102.8.0.ebuild 34157 BLAKE2B d017fe1b984b0e0c1b12f47ac09e3eaf17d1c94f98b869605784fb90f5210fc7133944bb3a8d849d93444713019d5e453781c898d5f70e0d7519551fc5a3cbd2 SHA512 f75831c5dfcf67a6ce05e937f3bd00dd0f44e2448e931ea9ab6253f69d5a105cf05a6f039af8ebdd0cf02b56db96a143e95e64e52b4e7889aac8051159ff457a
-EBUILD thunderbird-102.9.0.ebuild 34159 BLAKE2B 26750f2f77fa91012c8a0bc3fa966a04423e01ba9bd7e803af9f096ca9296aa1ac119dfec6a7d3e57ef513c4354596657702fabc94f3b228bd6984b2cca8edb8 SHA512 6e9576d27f09570f151b98c07c2ab57ad27d9a46d13476eeba18f74f06cab7857f3727f55091c9062c62d9e6bcbc3990c0c190c8fc3e80b92d02cb311ad4f97c
+EBUILD thunderbird-102.9.0.ebuild 34157 BLAKE2B d017fe1b984b0e0c1b12f47ac09e3eaf17d1c94f98b869605784fb90f5210fc7133944bb3a8d849d93444713019d5e453781c898d5f70e0d7519551fc5a3cbd2 SHA512 f75831c5dfcf67a6ce05e937f3bd00dd0f44e2448e931ea9ab6253f69d5a105cf05a6f039af8ebdd0cf02b56db96a143e95e64e52b4e7889aac8051159ff457a
 MISC metadata.xml 2139 BLAKE2B c348f9dc2bf813c386bc2e62782bf762ef4fdaf3f913cec41bbd115a7bac54b01852dec04e6f7574b24ea5cd6d9500f289109127cdac5887128b07116d6a6cf8 SHA512 09b0670e852cc954b5df5e846935d274ae180e4627d112104d5fedf2a777fda7d52d73cdfde9e50475d9a560ed44946d4c0682d52d793bbfb5f2e1b1e0aac608
diff --git a/mail-client/thunderbird/thunderbird-102.9.0.ebuild b/mail-client/thunderbird/thunderbird-102.9.0.ebuild
index f4d12a7ec864..c41d696dab90 100644
--- a/mail-client/thunderbird/thunderbird-102.9.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-102.9.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="https://www.thunderbird.net/"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 7105ae257655..8ccf1df394ce 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/spf-engine/Manifest b/mail-filter/spf-engine/Manifest
index 98ded5331e49..986eb36cc067 100644
--- a/mail-filter/spf-engine/Manifest
+++ b/mail-filter/spf-engine/Manifest
@@ -1,3 +1,3 @@
 DIST spf-engine-2.9.3.tar.gz 52974 BLAKE2B 9e6c47af7d523e1486d9bbfee2b0e53a4a97dbfc93e1cd14f70d4676542defaf6fede397d33e21c00e9bb2cdd1016c98981b6c0e735bdfd225b226920b9470b1 SHA512 adde80eca38f372ad00ed7355951007b9c02ef8a52a5a4edcbf2fa9959220f1083e3e313668e9c7ad2c26144148ae8ff62ec468d79936d96b43897598254f528
-EBUILD spf-engine-2.9.3.ebuild 2709 BLAKE2B c70ab23538a8195e95c60c0dd2016a8fc65d59bfe7029fe79e5cb1569e0702d5b9428cf93c86b5793b55a5701b0bb52aae32b75c7d1bde6d6ec44b4690d1f7b0 SHA512 3e7a087f95e029e520e497090ca8bd49d879bcb57901c10ff83a9070244e3869e8aea6926ffb004c133e71427187c51014bdbd4d10077f27a3ec36da7ea71fc9
+EBUILD spf-engine-2.9.3.ebuild 2682 BLAKE2B eacf66fea86b7bf6170554da6772a8320f7895bb4b1765b71145934f89bd8215cddcfdfe73029d1a9687c15742e4868cee3a58c085fbdafb91523bfae9529a03 SHA512 9ed7d77956022b3eb53ef00989ad13c40d547e805f74d03a7d8042f69d1e7994899c9654bb329c995a392a2b5ba1c001fafd59388e05fd520c5054a0d6960a66
 MISC metadata.xml 351 BLAKE2B 896ff35eb02fb2dc7a81f61d7698c72566061e15a43773b24655f12840e47b9f84ab98778498da1418b74007309fff3257de8b5ea06f60b4d358633ebfec12cd SHA512 e592b10d44514d4f5ac34295b727a58659d82d41e100c97c96f7881d0e189311e30aa2527a32d92ae1cbefea55aa722d39c7c36c3d3b259fc3b1df04bd9b075f
diff --git a/mail-filter/spf-engine/spf-engine-2.9.3.ebuild b/mail-filter/spf-engine/spf-engine-2.9.3.ebuild
index cd5b4ddf5002..bc923ece8954 100644
--- a/mail-filter/spf-engine/spf-engine-2.9.3.ebuild
+++ b/mail-filter/spf-engine/spf-engine-2.9.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_9 python3_10 )
 
 # The built-in ipaddress module handles the parsing of IP addresses. If
@@ -11,11 +12,10 @@ PYTHON_COMPAT=( python3_9 python3_10 )
 # other words, it's completely broken.
 PYTHON_REQ_USE="ipv6(+)"
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Policy daemon and milter for Postfix SPF verification"
 HOMEPAGE="https://launchpad.net/spf-engine"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b4fe3efb553c..65b84d515200 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 3dce2f9c96fb..6175f3f645fa 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -2,6 +2,6 @@ AUX converseen-0.9.9.0-appdata-path.patch 604 BLAKE2B ca524ae4a52f74b687e0e0246d
 AUX converseen-0.9.9.0-no-update.patch 540 BLAKE2B b8a7bcf561a4be48fdf9137a40c1f5b1451915a6cf4b2043f9adaf8dd1aa853b331ee1499bb34d05ae9e7da2d9f3f0515c62dca8146d4957126054557ebfcceb SHA512 b5ed008bd7a01cb99ec97faa6c9bd412009f1d438c420e201d2605c713ff57c346391d5389ed019c0538a263154d1ed36c4a581d0582d2c2eadf8dc77a67b97b
 DIST converseen-0.9.10.0.tar.gz 769693 BLAKE2B 651edf41b6cdf010fdae47d457f2459c4e99a1657302bc4facfbd70bd7d7b7b85842290b74ea76a396fa75ca5f5398234d309aae179704ce40f1dbb61195835c SHA512 c2ee7c59685879dffcb6f3f4ef9267cb611d358bec21ecd57b90bbc7fa86a07b4aa8dd855956970b35ec671c57b8bbc4d0620c2cb5629a36ca4305e47f4d3b59
 DIST converseen-0.9.9.8.tar.gz 769184 BLAKE2B 136d4454825fd64bd8129544df25213346550d4a1bf550fd8c32eef7c2c02cda5965aa235ec8f637de53462968a08c1e1b7c5db454c68ed1cac64d08c322fd54 SHA512 64ef5c5614c6536d84c6fc5ad6f9180c45a4c9d1294e492f0b09a596203d91871191f62ef80c6f888f010377c834ae76d825a29b137885756cc33a7d38d70208
-EBUILD converseen-0.9.10.0.ebuild 1342 BLAKE2B da8e05a0322ace1bdfe69cc1270463656f38bd63222b3e62c97e5f01a2c16e3af5b6c794d990289eac26744734e1053ec476a89354792ca82155ef428efefe7b SHA512 0d5de19d2c1110025408185b7e6f4314009a53a85f63886f5d92c93869c52578da391f7907fd5e4ce730998cce6f51d72d519a1fa639444db26f560e6477fd7d
+EBUILD converseen-0.9.10.0.ebuild 1341 BLAKE2B 6f8480b7eee229ee5aeb53268ac318a94b8aee971204fd624cc3609622726b0f64ff15974ed9de6b72a7fa61b3d91cac50e42941aa09185207ec04740135a29c SHA512 98483f3b787b11c818e4a2c5853799d0de0c119007371ab4e09d89e24f000fc24a1500b8c2aaa6c513f46f451804c8409b81ffa9b08b8814ea3c844d7fadb7bd
 EBUILD converseen-0.9.9.8.ebuild 1340 BLAKE2B 78bb751dc0f18f8b6137a5217daa30556c45fb15914bcab9bac1c3eda476e235703e9aaa801004972fa11e9fb8b653bce113a3cfa3857f75d2711fd69855abcb SHA512 bca13c456769461e90b2fe34f1e7267a194fd0f4cef26ab564d58702e6beed0ce574c818f7a34b86b81599414c4c2637794b3022bf739e7b1ecc390b2e8a3d3a
 MISC metadata.xml 490 BLAKE2B 7ee59abe13eee7dff622a3e7b701f6e0128a208e3e49f5b22b3fcaf06357991a50ece3ffa9cb607675f94a7784efcec37c2176464e4c7741efbfb8b8427cb5dc SHA512 a56719d55ea41683315c5d3f98b8351d3b15b68fd8f598a9e692691c771a94bec23b8263c8a017e29d63a20a8de8b440db1acfd26558c6f8d51add12e4016ba6
diff --git a/media-gfx/converseen/converseen-0.9.10.0.ebuild b/media-gfx/converseen/converseen-0.9.10.0.ebuild
index 45e1cbd45d90..50f3786b8101 100644
--- a/media-gfx/converseen/converseen-0.9.10.0.ebuild
+++ b/media-gfx/converseen/converseen-0.9.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="debug"
 
 # FIXME: graphicsmagick dependency does not work properly, failures when compiling
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 766a05c3cf0e..a997c5b58345 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -61,5 +61,5 @@ EBUILD libimagequant-2.15.1.ebuild 1385 BLAKE2B 1e9d7df57ee9f12f5395d07e2e0c6745
 EBUILD libimagequant-2.17.0.ebuild 1385 BLAKE2B f286c1e73acec4ec45c45da09fa4a45b70ff76f5090e490180a757c933acc998ef92064aa01cea1e8630e5cf2e216c2ec9e7577888912eaf4188fe78caff8e4e SHA512 beb4f2736ea3faa92c4f8f36eb752e31391f27e794ea1e0b92b3cefe7858bd60600df5d5d644f0bb6bbcee150c3ddaca703fb38aad65379fe70bad555f0aaf30
 EBUILD libimagequant-2.18.0.ebuild 1393 BLAKE2B 8434c65a1e9fa9b4d65d4eba4b77ef1e994ef470cf3fd2f5043378c0de5ff6e91b0816f77f3b243011b451f5bb527665bd41217dadea77fa2a7ffed72fa11f42 SHA512 1053d62c71cc01b5755f529253ae562bbad2d30733338f45e62f89124dc4334cef5b583ab3d73f48ecb1f05b2377b1e29c35f044fe328b990492af72a5c0c840
 EBUILD libimagequant-4.0.4.ebuild 1591 BLAKE2B e2f238a47fc09ec5f39de9ebdfee2a19a33c797a6d128a1ddf869e1067c0cbec2a625a04961fdc79ae96ab003935c9f7e8f522dfd2c68cd3be89c5dd8d53c208 SHA512 0e3d5bcf3e8bd85956c219350f96e1b50bc866410c16a0fdc8d2875467b22292e51b598cb886b101410f8e25da9c8d6e2d1eabc61beac791fb3439f641053471
-EBUILD libimagequant-4.1.0.ebuild 1563 BLAKE2B 20b4953379b9722f01a81905f4e52a52c34986319bcec10927f88467d876e36c8ac3ef4e667863abd3c0f29fcf3becf5cd4ef241776969128feca131fad0b78f SHA512 8104b7cf99b4118aa81896ebf83ea8603207a5248f02c8a402b735f73c93fb4542dd2b97b0597f667c91a78bb1eada2960c8c44657c52d26bb5d3ce0fb0f2697
+EBUILD libimagequant-4.1.0.ebuild 1557 BLAKE2B 7eaa562836dfdcb8c8abc0f953f4d8dbc66c1e8c631a39ea4540a5a69b67239880a8dbd5c796c2210a0f5828a7933474156cb7d8d8ef0e41c61d9a27110ec44f SHA512 73e96ff24ecc5f096119dd1d28ea557c1d974cf17496ec742ec3f6d67a0f69b90fb50d05d3297fadb880479d3af47896b4cb5a26a4c32053a95265013bb79230
 MISC metadata.xml 431 BLAKE2B 19ce5c802fc25f17f74073dba0473b11ea6a5820ec0726d405701c1e6b8f0a64d7019f4fe56ff0e6e43aba6cb52c34a5ac821d4bfcb8d9d6a10d0945bafc8a90 SHA512 4e22cda189c98a07cab44be95311def7b6955025d320869b55006e0e09f98c7370de40f552b556c466013b0c68b04013f36559f4970ebfd79655faf446c1e166
diff --git a/media-gfx/libimagequant/libimagequant-4.1.0.ebuild b/media-gfx/libimagequant/libimagequant-4.1.0.ebuild
index 7de965b89a1d..0d21043c4333 100644
--- a/media-gfx/libimagequant/libimagequant-4.1.0.ebuild
+++ b/media-gfx/libimagequant/libimagequant-4.1.0.ebuild
@@ -50,7 +50,7 @@ S="${WORKDIR}"/${P}/imagequant-sys
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc"
 
 BDEPEND="
 	>=dev-util/cargo-c-0.9.11
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 4a3aa8244d3b..ce772701564c 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -6,6 +6,6 @@ DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be
 DIST librecad-2.2.0.tar.gz 13837301 BLAKE2B ede9181b6805455d10773b70a8262ffb5a1c48f353dbfd1b80f705ba3194be700e9a486cdf528c4e8015b327a75a29c81b832186024d48229a6cc5fd9ca2dc12 SHA512 df33eac311b5232d6fc0480be1b1c9d257a33ba22f9b7897af4c1761978c87c07a962ae3ea37e8728661a788152157fc621aae65d60d44ae37b2028919cc96a2
 DIST librecad-gentoo-CVE-patches-2.1.3.tar.gz 11687 BLAKE2B 4676fa60033e6d0ace35bbebfae569366a50ec46c2dc5b90bace9564e1f6c2020f733f63981788b6f5288fb0c57760215e7b35f294656c21787ebdefa8447fa0 SHA512 b485b41ab1d6eb61750c11a9b327fc70d28cd0cf689b3cd815b4982d3d800737f402522d9c3d416f1e43422166e7de4f97055de238cc2fe80cc45f11fa3377e6
 EBUILD librecad-2.1.3-r7.ebuild 2879 BLAKE2B 4b9da167e4db48da0c8a41bf43c3d5fcadabea9f57a82270fec85b18da2dd6823d60be0eea3bd4bad7f4324599c47fd4b020276f3a4a28f7be5a2d13004a5f8a SHA512 3ed191982b167c0cabdd28e5ab7702784e0da508f358a066507bde711cb5917c885de435985ea0636e96d1f94586f76c007607a7ec1e1f90cb14646724988546
-EBUILD librecad-2.2.0.ebuild 2357 BLAKE2B 0e40d676e00f57fc51f89f1cc2a649a409fd7ca7c9903b9733f7e747bdae375dfb505fd7c7c36f8d1227678eeaf32dd2a61eb6363dfd5bb7f6f846ba91e7a671 SHA512 a43a699b38783f04983ab8d7e766b2d8587e0445be845e27d268bdb0351367e12e9ce250bffddb3edc8c036b144fbc483347c119a01a02702d8045a0bef07904
+EBUILD librecad-2.2.0.ebuild 2356 BLAKE2B abea2f3145e5f3fcabddc9eafb66617fe4964ba78cce46c0bb40e28a8f8c5a8186c62031e2b96e84632fc76ac514268451cf1befca4838f341c266d966d6d1b2 SHA512 910e13087dae778358bff0e9565ed2ea2920f40ffef26f174ef80f0e1739978f44275c968704115dad05d2b5671bd13ef893c7f30bc6c009e90560fd3fc0fe0d
 EBUILD librecad-9999.ebuild 2357 BLAKE2B f1b84cd8486d81b2a11216448be1e7c36d8d4347bfe09297a472b31278fa9e7aeeb4d9f325ed234ac05a0ae6065280efd159b7847195bd868d0991f6101f6c04 SHA512 ca46b07e00004e93ff1fcc2be9ea55049fa92154ce26eca11d033476d66b401653106dfe0fd835e07421d67d651a9af27a9cc505a440f85b43d3ba0c76d17d40
 MISC metadata.xml 333 BLAKE2B 2790ea3fb043f1d8393fd715b4669edab3229e1de59e27cc70f3fd3cc13f83964ad1dc6a5534af981111b4ba1a2c7d29501015459e300905574fbc59fce88ee2 SHA512 bf932b64f53780d10e7e64845f4d50f1726f9d57e4625cb94ed2dcc761a0d7f409731b9e9cd1475880b283b43d7b0b979493b984cb243f09954a38f39baac5b9
diff --git a/media-gfx/librecad/librecad-2.2.0.ebuild b/media-gfx/librecad/librecad-2.2.0.ebuild
index 6764913d807a..c88fba56a795 100644
--- a/media-gfx/librecad/librecad-2.2.0.ebuild
+++ b/media-gfx/librecad/librecad-2.2.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/LibreCAD-${PV}"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 2ce59c1b0495..3b93a82d022d 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -10,5 +10,5 @@ DIST xloadimage-4.1-fix-build-for-clang16.patch.xz 23800 BLAKE2B 8417465020f0648
 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3
 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586
 EBUILD xloadimage-4.1-r14.ebuild 2504 BLAKE2B 12c9a486786e1640d4697c39f4e2fb9fdb61adf775026c2023e9643c5e4191b6a4bf10bcfb8a0345a3650e178c91de58faee153bb0dceeac2c200423b80df7f9 SHA512 c57e7d7b571fc2ad4f56fdd1e7d5de1b56107782edb2703a0887c826d8ac230ce924e0c85772df15a419b1e2550e664f6d5c3716c7430a6fc95aed615e9ccb09
-EBUILD xloadimage-4.1-r15.ebuild 2494 BLAKE2B 5f9ec8ed291dc19206b09b98a0560102e248b5814318d83896dfcd4df64c00b710b9741dcae6da92edc41097e356e4f7e2ff33c8b0729537e9ad2ef941b262c0 SHA512 3c361d2b48a75cf13c29eb3db7b3fca239ac9fc7707a7d91cecedfe701ae82602e995f79af0e6204cf1d19511e8b731a88625c72819cabe05367514312369a64
+EBUILD xloadimage-4.1-r15.ebuild 2489 BLAKE2B 7bb649e54ea221dc72f9073418212f31ae1214ec06dcb5114cf01110c94c0e411c6e06be51b3682acebeedf05ee2d5b7db2c16a2e9075bc5d4b443a53681d0b7 SHA512 bf42e8aed67ac73d92a0b3a9a6a139a4e2321ee83af5178986b87a23abc6490cbfbfecb0bebc751791c59354d0e539756776456b492bd31e7b4e19026af17c67
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
index e2159ce3b14b..fbbc6714dbc7 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index c13032a34181..4c80091a9af7 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/vdr-ttxtsubs/Manifest b/media-plugins/vdr-ttxtsubs/Manifest
index fc5630e4685e..22abe6dd43cc 100644
--- a/media-plugins/vdr-ttxtsubs/Manifest
+++ b/media-plugins/vdr-ttxtsubs/Manifest
@@ -3,5 +3,5 @@ AUX vdr-ttxtsubs-0.3.0_vdr-2.4.0.patch 4085 BLAKE2B 7bb61a31b1b906728f24f2107bc6
 DIST vdr-ttxtsubs-0.3.0.tar.gz 58956 BLAKE2B 681b517c25793bc5a7cc9bde4efdfc5d61cb69ba9524348eaf1c9df1b896650634b489be4a2705d040b7cbdff7648f270d74b63493739544040ebc2051cadb7b SHA512 60edbbc152e4c168dbc91f67f2105f9e9536f108ba0210a8834d950659a0923bc7bc23f44dcfa484135d5d9a6f89abb4e90f0ad39db826ad41c8f1192446bc56
 DIST vdr-ttxtsubs-0.3.0.tgz 57650 BLAKE2B e095d6841c83e2b7209469903301471492f2976ca1a5d85e68e330e177ff71959273871463b169bb667c64848230e2301d7d9438b94b5e6cfddef32b1c4805eb SHA512 634aff77b3a540ca9239cfceaf253ce33e69a2b85733a904828c527549ea1a40b4b9322327cb32bc5333942c1f503046a7b8bfc0ac31cce131621ffa6790d87a
 EBUILD vdr-ttxtsubs-0.3.0-r2.ebuild 698 BLAKE2B 8f90ebeceed012811d9b72d6ffee51e0211f063176d63f747090238ac292650d9dc758d50bae229bcf9a59fbec7e3cb460e761ed32dae7b82f8829a5705fff98 SHA512 4ff458230561b44bf48f9538c60293da75eadd9734c9d26eaee74d22d85e7f61a52a2a5b96d5f07de490c8cf1e13280670bac4e44c216b7f757da51384a116bb
-EBUILD vdr-ttxtsubs-0.3.0-r3.ebuild 740 BLAKE2B 72da13b33cb2fbcdc22bc4f3c19bdd2f7f6b8faabd67f5e98856a72acaf882b8c5e01fb9bada4036d6f94eedbfaf74b4979a02b0c91c84e85d1eff19b8f97d97 SHA512 23122c8e4f334ff1caadb8171562bcd1d84a5e98fdc7514539c6fc6f15269a750cb12f24eb68da4551392a0aff35f5767cbf9d6f0c3363d956c8258b9aa043f1
+EBUILD vdr-ttxtsubs-0.3.0-r3.ebuild 738 BLAKE2B eef36ed0b6fd451913cf2d71147151187049a927268333e436820515596183030851c3f83159d87e0c82647b955d76a5313ce67fb85949a215f5abbc3890e169 SHA512 306f2a46d18d61f223b3649fdccb9847272ce68a18cd0df5e01bdff58f1aef78532f6b96ac3fb031d1d0a869a8edac56f68cf6bdf5c27a7766c4adf3f98cbe64
 MISC metadata.xml 605 BLAKE2B ce60d4cf12cf015e2e8e195f1685d1b85bb1cfd0dfe0512c96d7f27fce9db35b407b0c39a264b2f0711a93637451bf257f6889c17116a95394f4b1ba80789f86 SHA512 79429cb862af499ea8ad98e3553b01cc159c726535afe37dd0fb292a161399bd86883e6fd06a4ea7072fd7679eb4c73b28381900b3df3f57e9f3a9d6f5944cfd
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r3.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r3.ebuild
index 53c7595a69f6..d7f7e4081b83 100644
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r3.ebuild
+++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-ttxtsubs"
 SRC_URI="https://github.com/vdr-projects/vdr-plugin-ttxtsubs/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
 S="${WORKDIR}/vdr-plugin-ttxtsubs-${PV}"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 SLOT="0"
 LICENSE="GPL-2+"
 IUSE=""
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f4bc3718af6f..ae58ce8fb3ef 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 765c9303807b..7b7c9309dda7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Mar 2023 12:09:45 +0000
+Fri, 17 Mar 2023 18:09:52 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 16fd8084744d..d272abdf9a3b 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-03-17T12:09:48Z
+TIMESTAMP 2023-03-17T18:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQUWIxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQUrPNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD7wBAAikO3kc7rCnzGflSALHHxOc+LnESJAmzrAD7wvw2T1LHrGfQn/rADlcBI
-Mh0BgM4YQWYtnOzal/d3dJY38H0f9I1GyusV2ouGMSf3r4h1J+lgDQM/nU2EkUMs
-TjS6Heoix1/Gv9hT4X/mi7CsRsCGp820GqtyFOHPa4ch6FCFdBAdQyX1M7nxk+bz
-W/wdmHDs817Nm6rYaRsn2Ra3btIBEbuiDzcSKwYlw3jfKVpssqX7MSdv9h29qrFW
-8IpY2lent4x2WrDFKLicXO2Zw1R3w5ieJCMUTIGU33RhtT963lmQJeTaVVpBsod4
-VOnc9LUys0nR4Kbfg8lMJL6VT+kHrM9jSJImpQaIMswmOyvbaEu9lICtBIXePJHO
-Yms+CGC0Lvy7Vv9HItZ6NwOD8B0ULZDLzxOvpOQg6dwC+UUcLd14gWEufNsjulNE
-kNIdxAMxMPsklNbttOxY6Vr2S9r5C3EjH8bz0hGbmh2/gXrzMk2LUJWXsRvSvYE9
-x6GbagQeOKbYBdDuZVi6r9pWMQ91vtIu64I3CX/X6WPvFy4nvx1QIZekQsg++x1U
-y9pBpgSxfi5Xun88mr5OQRutmq6b1i6Ni69/KbO3GFzEKh1qxyM2oPPFYicNtIoP
-E6Aux7DZ3QL6pOfQPKo98n1WCCiYmgoOb8p0lMo02TMfSudjfw4=
-=M7qp
+klCeYRAAsCmqkXhP7fAbUVsx1Tz8X6t89DlplcUqbc8t4oIquWNsd/gBXSPM8wdy
+2CAJ9T3F4KnWJ5d6XEHW4JW+qChy3lHP0Tz78hUIF5zugQbjLU7XiLWyXZvpiTGA
+Pmhc6hdwNCh1fN58W2b1i66qEPCMS8AO2MkeQ4djpWWZ3SDyhG2DS4mZPL+R+SJL
+t01ZjMy2lsY2nVBG3x1EReTomcYeoPUsCQ9OHPD+9s7RA/nXBPX1YAX0uOCqonEg
+ce7vvPTo1ktS0mC9gvYDXFkFW0ljTbaTdhmLeojr2W36barr+f3mjVI9raKuaKsL
+ASf068JeIyK+bEoyW8iLNyYjUybBZ8DAqn2T56ELP66No9Ef3AaoGLAnC1/R0UpA
+Vn/wFRIgwNKzmngXTDSiVuX2jx0nyrru3A5y5JOoK6o+E4c2x8V6nXzyujj7Q17h
+h0bh62aUTsWd9dv0doEQ7dC0733T/FwIAxU2hu0Dt5WPGiC+ji2+OQBrV6EMzcM9
+a+tka/fV3qePRSvBWTwhZqUQg/Y/5C9WzNEnVBT181aP+Zpb8wr0M91obkY91Wfx
+WQP9sSurLBtu1mR6rhOI60LujAlevncSmrY5RmLn4AL3lwQYE59W+tiIUpDMVeGa
+78LkPOv8G21MdiZPuU6L1BA1MoISKsaWI0rHVxnZ5XrJPejSh7c=
+=1Tnp
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 765c9303807b..7b7c9309dda7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Mar 2023 12:09:45 +0000
+Fri, 17 Mar 2023 18:09:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6752bd7b88d3..075b0eb3f65a 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index aec5baa4bd4d..0ac20150bff6 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-core-2.14.3 b/metadata/md5-cache/app-admin/ansible-core-2.14.3
index cdceb9b7b30f..d7909b38e05e 100644
--- a/metadata/md5-cache/app-admin/ansible-core-2.14.3
+++ b/metadata/md5-cache/app-admin/ansible-core-2.14.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=8
 HOMEPAGE=https://www.ansible.com/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
 LICENSE=GPL-3
@@ -11,6 +11,6 @@ RDEPEND=dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.14.3.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=26c4185c0b5fcadb15c55abf052bd005
+SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible-core/ansible-core-2.14.3.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d028f6d436cc636cb48205adf2e72f10
diff --git a/metadata/md5-cache/app-admin/ansible-core-9999 b/metadata/md5-cache/app-admin/ansible-core-9999
index 337cb1e0e203..43a4fd639e22 100644
--- a/metadata/md5-cache/app-admin/ansible-core-9999
+++ b/metadata/md5-cache/app-admin/ansible-core-9999
@@ -1,6 +1,5 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-python/packaging-16.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/botocore[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/packaging-16.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh dev-python/bcrypt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nose[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mock-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/passlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/coverage[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=8
 HOMEPAGE=https://www.ansible.com/
@@ -8,9 +7,9 @@ INHERIT=distutils-r1 git-r3
 IUSE=test python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/resolvelib-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/sshpass virtual/ssh python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
+RESTRICT=test !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6f685454b3b7684c96be214681aff15d
+_md5_=d028f6d436cc636cb48205adf2e72f10
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.74 b/metadata/md5-cache/app-admin/awscli-1.27.74
deleted file mode 100644
index 189d5248c36c..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.74
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.74[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.74[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.74.tar.gz -> aws-cli-1.27.74.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=54abcad61904cce6140192c167c33535
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.79 b/metadata/md5-cache/app-admin/awscli-1.27.79
deleted file mode 100644
index bb9b5e08ac89..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.79
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.79[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.79[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.79.tar.gz -> aws-cli-1.27.79.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.84 b/metadata/md5-cache/app-admin/awscli-1.27.84
index 0f0500f352ee..969fc7b24d3d 100644
--- a/metadata/md5-cache/app-admin/awscli-1.27.84
+++ b/metadata/md5-cache/app-admin/awscli-1.27.84
@@ -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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.29.84[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.27.84.tar.gz -> aws-cli-1.27.84.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
+_md5_=54abcad61904cce6140192c167c33535
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.85 b/metadata/md5-cache/app-admin/awscli-1.27.85
deleted file mode 100644
index 9951e98cfbec..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.85
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.85[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.85[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.85.tar.gz -> aws-cli-1.27.85.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.86 b/metadata/md5-cache/app-admin/awscli-1.27.86
deleted file mode 100644
index 6a04322510e0..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.86
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.86[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.86[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.86.tar.gz -> aws-cli-1.27.86.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.87 b/metadata/md5-cache/app-admin/awscli-1.27.87
deleted file mode 100644
index ea5bac9c71b2..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.87
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.87[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.87[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.87.tar.gz -> aws-cli-1.27.87.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.88 b/metadata/md5-cache/app-admin/awscli-1.27.88
deleted file mode 100644
index b054e202252a..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.88
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.88[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.88[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.88.tar.gz -> aws-cli-1.27.88.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.90 b/metadata/md5-cache/app-admin/awscli-1.27.90
deleted file mode 100644
index 0c3626051fd5..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.90[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.90[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.90.tar.gz -> aws-cli-1.27.90.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.91 b/metadata/md5-cache/app-admin/awscli-1.27.91
deleted file mode 100644
index 0b0b6769587a..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.91
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.91[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.91[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.91.tar.gz -> aws-cli-1.27.91.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.92 b/metadata/md5-cache/app-admin/awscli-1.27.92
deleted file mode 100644
index 2aec97b7bf87..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.92
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.92[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-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_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.92[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.92.tar.gz -> aws-cli-1.27.92.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/entr-5.3-r1 b/metadata/md5-cache/app-admin/entr-5.3-r1
index 4d1c254994ff..ec2f05b9c228 100644
--- a/metadata/md5-cache/app-admin/entr-5.3-r1
+++ b/metadata/md5-cache/app-admin/entr-5.3-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://eradman.com/entrproject/ https://github.com/eradman/entr
 INHERIT=edo toolchain-funcs
 IUSE=test
-KEYWORDS=~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=ISC
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://eradman.com/entrproject/code/entr-5.3.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a291f85ec80249686d9506f04f9e8398
+_md5_=fa7aabf0128b7440921c72dc23d435b7
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 9227f8108572..53a391c59e5a 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/gnome-autoar-0.4.4 b/metadata/md5-cache/app-arch/gnome-autoar-0.4.4
new file mode 100644
index 000000000000..84fa77d89639
--- /dev/null
+++ b/metadata/md5-cache/app-arch/gnome-autoar-0.4.4
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-arch/libarchive-3.4.0:= >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+DESCRIPTION=Automatic archives creating and extracting library
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-autoar
+INHERIT=gnome.org meson vala
+IUSE=gtk gtk-doc +introspection test vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=app-arch/libarchive-3.4.0:= >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+REQUIRED_USE=vala? ( introspection ) gtk-doc? ( gtk )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-autoar/0.4/gnome-autoar-0.4.4.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
+_md5_=7a88005f43039b41cd99cf540a5fd3c8
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index a920c6219a96..b21be50f945f 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/docker-buildx-0.10.4 b/metadata/md5-cache/app-containers/docker-buildx-0.10.4
index 031dbd50f623..8bafe112f382 100644
--- a/metadata/md5-cache/app-containers/docker-buildx-0.10.4
+++ b/metadata/md5-cache/app-containers/docker-buildx-0.10.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/docker/buildx
 INHERIT=go-module
 IUSE=test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=Apache-2.0
 RDEPEND=app-containers/docker
 RESTRICT=!test? ( test ) strip
 SLOT=0
 SRC_URI=https://github.com/docker/buildx/archive/refs/tags/v0.10.4.tar.gz -> docker-buildx-0.10.4.tar.gz
 _eclasses_=go-module	472b9e09c35add3a3da376330c033dec	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=71887383c7236928048b1b39a344b03b
+_md5_=99600bca27f1bd96d0a97ae8a9884fbc
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index b6014e82e5ff..82d7518ad537 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/easy-rsa-3.1.2 b/metadata/md5-cache/app-crypt/easy-rsa-3.1.2
index f5226853a115..83bc2b1a03ef 100644
--- a/metadata/md5-cache/app-crypt/easy-rsa-3.1.2
+++ b/metadata/md5-cache/app-crypt/easy-rsa-3.1.2
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/openssl-0.9.6:0=
 DESCRIPTION=Small RSA key management package, based on OpenSSL
 EAPI=8
 HOMEPAGE=https://openvpn.net/
-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=GPL-2
 RDEPEND=>=dev-libs/openssl-0.9.6:0=
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/easy-rsa/archive/v3.1.2.tar.gz -> easy-rsa-3.1.2.tar.gz
-_md5_=3d0f4ccbbf2c4f259a8d73c09c57c06d
+_md5_=f822fb38f3772edec7ef1de1e0c6c6e7
diff --git a/metadata/md5-cache/app-crypt/tpm-tools-1.3.9.2-r1 b/metadata/md5-cache/app-crypt/tpm-tools-1.3.9.2-r1
index b28fcfe531e1..4a6269cfc11a 100644
--- a/metadata/md5-cache/app-crypt/tpm-tools-1.3.9.2-r1
+++ b/metadata/md5-cache/app-crypt/tpm-tools-1.3.9.2-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://trousers.sourceforge.net
 INHERIT=autotools flag-o-matic
 IUSE=nls pkcs11 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~s390 ~x86
+KEYWORDS=amd64 ~arm arm64 ~m68k ~s390 x86
 LICENSE=CPL-1.0
 RDEPEND=>=app-crypt/trousers-0.3.15-r1 dev-libs/openssl:0= pkcs11? ( dev-libs/opencryptoki )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/tpm-tools/tpm-tools-1.3.9.2.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8ceaf66d2ea993ee8e1d417d4301d2be
+_md5_=04e54d7abd78aff87f0ee41db6f0d6b2
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.15-r1 b/metadata/md5-cache/app-crypt/trousers-0.3.15-r1
index 79860df181ff..41bc1a37160a 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.15-r1
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.15-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://trousers.sf.net
 INHERIT=autotools linux-info readme.gentoo-r1 systemd udev
 IUSE=doc selinux
-KEYWORDS=~amd64 arm ~arm64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 x86
 LICENSE=CPL-1.0 GPL-2
 RDEPEND=acct-group/tss acct-user/tss >=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0= selinux? ( sec-policy/selinux-tcsd )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.15.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=0a34c2db8b7f4b4e8f518f1f4a283a4e
+_md5_=17dc73d5ab4e5e62a1f3858e73e38b69
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 316f5cdefb25..dedcd7fd90b6 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/yudit-3.1.0 b/metadata/md5-cache/app-editors/yudit-3.1.0
index 5d0099a5ead5..3475e75cd6a7 100644
--- a/metadata/md5-cache/app-editors/yudit-3.1.0
+++ b/metadata/md5-cache/app-editors/yudit-3.1.0
@@ -4,9 +4,9 @@ DEPEND=x11-libs/libX11
 DESCRIPTION=Free (Y)unicode text editor for all unices
 EAPI=8
 HOMEPAGE=https://www.yudit.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://yudit.org/download/yudit-3.1.0.tar.gz
-_md5_=066c9a9acdfd1d9c42014a2b28120173
+_md5_=7c97e3c0412451f9670c4a16a7b0b183
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 71c668a3809b..56a6c4cfbeb2 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-3.26.0 b/metadata/md5-cache/app-emulation/diskimage-builder-3.26.0
index afe5301010ba..b918afc2b807 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-3.26.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-3.26.0
@@ -4,13 +4,13 @@ DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_9(-)?,python_targets_python
 DESCRIPTION=Golden Disk Image builder
 EAPI=8
 HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.3.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/Babel-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/networkx-1.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-3.26.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fe7931ee860439dd1d473d1e679ee8d2
+SRC_URI=https://files.pythonhosted.org/packages/source/d/diskimage-builder/diskimage-builder-3.26.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=1c9455e212c2f41e8ee0847b8a88beba
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-9999 b/metadata/md5-cache/app-emulation/diskimage-builder-9999
index 65f205007d0f..75e84bc55014 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-9999
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-9999
@@ -12,4 +12,4 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_9(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=adc14e831040cc81424340ec84da5710
+_md5_=b98a3240216b75a2c87a4e4f975b240d
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 51ee79099cd5..3c18717c92cb 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/aide-0.18 b/metadata/md5-cache/app-forensics/aide-0.18
index c61e0df3a6eb..79fa7f146e4c 100644
--- a/metadata/md5-cache/app-forensics/aide-0.18
+++ b/metadata/md5-cache/app-forensics/aide-0.18
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://aide.github.io/ https://github.com/aide/aide
 INHERIT=readme.gentoo-r1
 IUSE=acl audit curl e2fs mhash selinux xattr
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre2 sys-libs/zlib acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) e2fs? ( sys-fs/e2fsprogs ) !mhash? ( dev-libs/libgcrypt:= dev-libs/libgpg-error ) mhash? ( app-crypt/mhash ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) selinux? ( sec-policy/selinux-aide )
 SLOT=0
 SRC_URI=https://github.com/aide/aide/releases/download/v0.18/aide-0.18.tar.gz
 _eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=2015319bce9fc3fb2361ecf668f10f89
+_md5_=8fba7dc471ade7f60fc106d86baf788d
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 3f9ab59b8283..c100d6891e7c 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.14 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.14
index 2dce876a6264..5b81392d8f20 100644
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.14
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.14
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-i18n/anthy python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) nls? ( virtual/libintl )
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-i18n/anthy python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) nls? ( virtual/libintl )
 DESCRIPTION=Japanese Anthy engine for IBus
 EAPI=8
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools gnome2-utils python-single-r1 xdg
-IUSE=nls python_single_target_python3_9 python_single_target_python3_10
+IUSE=nls python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-i18n/anthy python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-i18n/anthy python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus-anthy/archive/1.5.14/ibus-anthy-1.5.14.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=67c87c7a10860f4f4c94c88e146ba603
+_md5_=a7fa319e3f346413db2a6faf6b3ce7be
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
index ddfeb2989609..87b35fc100cf 100644
--- a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
+++ b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Korean Hangul engine for IBus
 EAPI=7
 HOMEPAGE=https://github.com/libhangul/ibus-hangul/wiki
 INHERIT=gnome2-utils python-single-r1 xdg virtualx
-IUSE=nls python_single_target_python3_9 python_single_target_python3_10 test
+IUSE=nls python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libhangul/ibus-hangul/releases/download/1.5.4/ibus-hangul-1.5.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=293deeed1e52b6e55a04e68b121d6d36
+_md5_=8aa52e7eed2027739c0e8097520aefad
diff --git a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r5 b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r5
index ccd0825f9073..b18a930693e3 100644
--- a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r5
+++ b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/intltool sys-devel/autoconf-archive virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-i18n/pyzy dev-db/sqlite:3 python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) boost? ( dev-libs/boost ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) nls? ( virtual/libintl )
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-i18n/pyzy dev-db/sqlite:3 python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) boost? ( dev-libs/boost ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) nls? ( virtual/libintl )
 DESCRIPTION=Chinese Pinyin and Bopomofo engines for IBus
 EAPI=7
 HOMEPAGE=https://github.com/ibus/ibus-pinyin
 INHERIT=autotools lua-single python-single-r1
-IUSE=boost lua nls +lua_single_target_lua5-1 python_single_target_python3_9 python_single_target_python3_10
+IUSE=boost lua nls +lua_single_target_lua5-1 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-i18n/pyzy dev-db/sqlite:3 python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) boost? ( dev-libs/boost ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) lua? ( ^^ ( lua_single_target_lua5-1 ) )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-i18n/pyzy dev-db/sqlite:3 python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) boost? ( dev-libs/boost ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-pinyin-1.5.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=744ce14d4a624fe3871ee485881ec68c
+_md5_=fe763c2df71548ea9c7e40bb6452b4f4
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.16.14 b/metadata/md5-cache/app-i18n/ibus-table-1.16.14
index acf701d683bf..0ad29f7dae55 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-1.16.14
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.16.14
@@ -1,18 +1,18 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
 DEFINED_PHASES=configure postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) virtual/libiconv nls? ( virtual/libintl )
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite(+)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) virtual/libiconv nls? ( virtual/libintl )
 DESCRIPTION=Tables engines for IBus
 EAPI=8
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2-utils python-single-r1 xdg
-IUSE=nls python_single_target_python3_9 python_single_target_python3_10
+IUSE=nls python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) virtual/libiconv nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite(+)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) virtual/libiconv nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.16.14/ibus-table-1.16.14.tar.gz
 _eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=046c177e634e314e91eeba17dfb24f40
+_md5_=2969f3836ffa1fe69e73af9a356c9734
diff --git a/metadata/md5-cache/app-i18n/opencc-1.1.4 b/metadata/md5-cache/app-i18n/opencc-1.1.4
index 1f9239d7c06f..3a6a6b4336e5 100644
--- a/metadata/md5-cache/app-i18n/opencc-1.1.4
+++ b/metadata/md5-cache/app-i18n/opencc-1.1.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-cpp/tclap dev-libs/darts dev-libs/marisa:0= dev-libs/rapidjson test? ( dev-cpp/gtest !hppa? ( !sparc? ( dev-cpp/benchmark ) ) )
 DESCRIPTION=Library for conversion between Traditional and Simplified Chinese characters
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=https://github.com/BYVoid/OpenCC/archive/ver.1.1.4.tar.gz -> opencc-1.1.4.tar.gz
 _eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a94b2d4c2c1fd726148f40a73d96e47b
+_md5_=3053be0e458af853be3b472ce228406f
diff --git a/metadata/md5-cache/app-i18n/pyzy-0.1.0-r3 b/metadata/md5-cache/app-i18n/pyzy-0.1.0-r3
index b7145023c6e7..f03fc2abd73a 100644
--- a/metadata/md5-cache/app-i18n/pyzy-0.1.0-r3
+++ b/metadata/md5-cache/app-i18n/pyzy-0.1.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) sys-devel/autoconf-archive 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-r5 >=sys-devel/libtool-2.4.7
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) sys-devel/autoconf-archive 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-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-db/sqlite:3 dev-libs/glib:2 sys-apps/util-linux boost? ( dev-libs/boost ) opencc? ( app-i18n/opencc:= )
 DESCRIPTION=The Chinese PinYin and Bopomofo conversion library
@@ -12,4 +12,4 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 sys-apps/util-linux boost? ( dev-libs/bo
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dlan/distfiles/pyzy-0.1.0.tar.xz https://dev.gentoo.org/~dlan/distfiles/pyzy-0.1.0-patches.tar.xz https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pyzy/pyzy-database-1.0.0.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=64f8950cb7a441c3027b4e1143df63ec
+_md5_=94bcb38c04e47cf3e5734acbc090caed
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 950eb996df0a..371f471bb198 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/gnucash-4.13 b/metadata/md5-cache/app-office/gnucash-4.13
index e7134aaaebe0..4726d9e195f3 100644
--- a/metadata/md5-cache/app-office/gnucash-4.13
+++ b/metadata/md5-cache/app-office/gnucash-4.13
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/4.13/gnucash-4.13.tar.bz2
 _eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cb1eda339d85dfde881ec3382fd21319
+_md5_=2fd713455c926e011e8cbad3f808f7da
diff --git a/metadata/md5-cache/app-office/homebank-5.6.1 b/metadata/md5-cache/app-office/homebank-5.6.1
index 44346b9f8583..4836a85d1506 100644
--- a/metadata/md5-cache/app-office/homebank-5.6.1
+++ b/metadata/md5-cache/app-office/homebank-5.6.1
@@ -7,10 +7,10 @@ HOMEPAGE=http://homebank.free.fr/index.php
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg
 IUSE=+ofx
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.39:2 >=net-libs/libsoup-2.26:2.4 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3:= )
 SLOT=0
 SRC_URI=http://homebank.free.fr/public/sources/homebank-5.6.1.tar.gz
 _eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=425ea589b82b4443c152e184182d7732
+_md5_=4234a3b446d5609bd338b34e0b1cd05f
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 92f03a9fa0c9..90c3a3f2f124 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/crengine-ng-0.9.7 b/metadata/md5-cache/app-text/crengine-ng-0.9.7
index 944fe2af2097..10783313c116 100644
--- a/metadata/md5-cache/app-text/crengine-ng-0.9.7
+++ b/metadata/md5-cache/app-text/crengine-ng-0.9.7
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/coolreader-ng/crengine-ng
 INHERIT=cmake
 IUSE=+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig )
 SLOT=0
 SRC_URI=https://gitlab.com/coolreader-ng/crengine-ng/-/archive/0.9.7/crengine-ng-0.9.7.tar.bz2
 _eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=400acb0a6b82e814f3c72791f4116198
+_md5_=c8c4d0fd43b5371c1d8753f18c925f2f
diff --git a/metadata/md5-cache/app-text/crqt-ng-1.0.9 b/metadata/md5-cache/app-text/crqt-ng-1.0.9
index da21b120a831..8a5595eeea42 100644
--- a/metadata/md5-cache/app-text/crqt-ng-1.0.9
+++ b/metadata/md5-cache/app-text/crqt-ng-1.0.9
@@ -6,10 +6,10 @@ HOMEPAGE=https://gitlab.com/coolreader-ng/crqt-ng
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake plocale xdg
 IUSE=+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/crengine-ng-0.9.7[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gitlab.com/coolreader-ng/crqt-ng/-/archive/1.0.9/crqt-ng-1.0.9.tar.bz2
 _eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=07bcb7007d0df0c2c307ccbf43e287cb
+_md5_=07919a8ae9d50acb2f490aae7daf1ba4
diff --git a/metadata/md5-cache/app-text/openpaperwork-core-2.1.2 b/metadata/md5-cache/app-text/openpaperwork-core-2.1.2
index 511d1dc59ee0..7c24b1c3d993 100644
--- a/metadata/md5-cache/app-text/openpaperwork-core-2.1.2
+++ b/metadata/md5-cache/app-text/openpaperwork-core-2.1.2
@@ -4,13 +4,13 @@ DEPEND=dev-python/distro[python_targets_python3_9(-)?,python_targets_python3_10(
 DESCRIPTION=Core part of Paperwork (plugin management)
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/distro[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/o/openpaperwork-core/openpaperwork-core-2.1.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b247e792956e0b3e2c5d4959c25cda14
+SRC_URI=https://files.pythonhosted.org/packages/source/o/openpaperwork-core/openpaperwork-core-2.1.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=25261e8d6a67cfb76c307b7bd0f0f5c2
diff --git a/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.2 b/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.2
index 39ee44d1e6c0..e9ae70e48fa2 100644
--- a/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.2
+++ b/metadata/md5-cache/app-text/openpaperwork-gtk-2.1.2
@@ -4,13 +4,13 @@ DEPEND=app-text/openpaperwork-core[python_targets_python3_9(-)?,python_targets_p
 DESCRIPTION=Paperwork plugins
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-text/openpaperwork-core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycairo[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] gui-libs/libhandy x11-libs/gtk+:3[introspection] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/o/openpaperwork-gtk/openpaperwork-gtk-2.1.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=71b5c78aaef13957d7f46f12082e2c38
+SRC_URI=https://files.pythonhosted.org/packages/source/o/openpaperwork-gtk/openpaperwork-gtk-2.1.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=80f8aee47198b0a7f3f32fbe1b065393
diff --git a/metadata/md5-cache/app-text/paperwork-backend-2.1.2 b/metadata/md5-cache/app-text/paperwork-backend-2.1.2
index 2a322369a6f5..5e12222eb7a8 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-2.1.2
+++ b/metadata/md5-cache/app-text/paperwork-backend-2.1.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Backend part of Paperwork (Python API, no UI)
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,6 +11,6 @@ RDEPEND=app-text/openpaperwork-core[python_targets_python3_9(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-2.1.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=947ab75f388d5c3166edae4b09a7db38
+SRC_URI=https://files.pythonhosted.org/packages/source/p/paperwork-backend/paperwork-backend-2.1.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=2e5bc07a0c9e23f8b68e695017927d05
diff --git a/metadata/md5-cache/app-text/tesseract-5.3.0 b/metadata/md5-cache/app-text/tesseract-5.3.0
index 90a47d3e598f..6d442d7bc91b 100644
--- a/metadata/md5-cache/app-text/tesseract-5.3.0
+++ b/metadata/md5-cache/app-text/tesseract-5.3.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/tesseract-ocr
 INHERIT=autotools multilib-minimal toolchain-funcs
 IUSE=doc float32 jpeg opencl openmp png static-libs tiff training webp 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl[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/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(-)?] media-libs/leptonica:=[tiff] ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) || ( >=app-text/tessdata_fast-4.0.0 >=app-text/tessdata_best-4.0.0 >=app-text/tessdata_legacy-4.0.0 )
 SLOT=0/5
 SRC_URI=https://github.com/tesseract-ocr/tesseract/archive/5.3.0.tar.gz -> tesseract-5.3.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=eb9fc7ca35b5e2779fa1a2a8fd5a924c
+_md5_=bad99440b428b8769110c0fcdb61dbbe
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.4.0 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.4.0
index 3318da2e6157..498bd20c274f 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.4.0
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.4.0
@@ -7,10 +7,10 @@ HOMEPAGE=https://git.pwmt.org/pwmt/zathura-pdf-mupdf
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson xdg
 IUSE=+javascript
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=ZLIB
 RDEPEND=>=app-text/mupdf-1.20.0:=[javascript?] >=app-text/zathura-0.5.2:= dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/archive/0.4.0/zathura-pdf-mupdf-0.4.0.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cfe7c127f1cb00f43589dbdca2534a8e
+_md5_=e2a62eca54916519d5194f8655626c74
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 7875ae7d3f37..708cea4f7708 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/kyotocabinet-1.2.79-r1 b/metadata/md5-cache/dev-db/kyotocabinet-1.2.79-r1
index 9cbfd1352e85..12b4f3e6680b 100644
--- a/metadata/md5-cache/dev-db/kyotocabinet-1.2.79-r1
+++ b/metadata/md5-cache/dev-db/kyotocabinet-1.2.79-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://dbmx.net/kyotocabinet/
 INHERIT=autotools toolchain-funcs
 IUSE=debug doc examples +lzma +lzo static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=sys-libs/zlib[static-libs?] lzma? ( app-arch/xz-utils:=[static-libs?] ) lzo? ( dev-libs/lzo:=[static-libs?] )
 SLOT=0
 SRC_URI=https://dbmx.net/kyotocabinet/pkg/kyotocabinet-1.2.79.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=dbf4fc25614625a1aaf6e992f076e21e
+_md5_=1aa3a8a98ccec3c895b6c1f7b8814e25
diff --git a/metadata/md5-cache/dev-db/sqlite-3.41.1 b/metadata/md5-cache/dev-db/sqlite-3.41.1
new file mode 100644
index 000000000000..b0389b1a9e16
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqlite-3.41.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/tcl-8.6:0 app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=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(-)?] icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:= ) test? ( >=dev-lang/tcl-8.6: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(-)?] )
+DESCRIPTION=SQL database engine
+EAPI=8
+HOMEPAGE=https://sqlite.org/
+INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
+IUSE=debug doc icu +readline secure-delete static-libs tcl test tools 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-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=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(-)?] icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:= )
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://sqlite.org/2023/sqlite-src-3410100.zip doc? ( https://sqlite.org/2023/sqlite-doc-3410100.zip )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=7bcd07a560e5e2e9fefac7497bb7396f
diff --git a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r3 b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r3
index 529af197d782..8a93ac07bb25 100644
--- a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r3
+++ b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://fallabs.com/tokyocabinet/
 INHERIT=autotools toolchain-funcs
 IUSE=bzip2 debug doc examples threads zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://fallabs.com/tokyocabinet/tokyocabinet-1.4.48.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5e9b7981129021558d5a1c4f60ce6115
+_md5_=f88c785957383f2cc86cf46420a0df79
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 9d578638c878..5e9f36bd9b8f 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/php-8.2.3 b/metadata/md5-cache/dev-lang/php-8.2.4
index d6693f7689e7..10f30e889afc 100644
--- a/metadata/md5-cache/dev-lang/php-8.2.3
+++ b/metadata/md5-cache/dev-lang/php-8.2.4
@@ -5,7 +5,7 @@ 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
+INHERIT=flag-o-matic multilib 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 +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 ~loong ~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 )
@@ -13,6 +13,6 @@ RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30
 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.2
-SRC_URI=https://www.php.net/distributions/php-8.2.3.tar.xz
+SRC_URI=https://www.php.net/distributions/php-8.2.4.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0379f745e5cab6bce08cc49bedf56c85
+_md5_=b60b55f8fea53c70d7c8f013acf9c8a6
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 6da47f983538..9d87d68b476b 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libcgroup-3.0.0 b/metadata/md5-cache/dev-libs/libcgroup-3.0.0
index bc49bd9533d4..e7508fa2945d 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-3.0.0
+++ b/metadata/md5-cache/dev-libs/libcgroup-3.0.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/libcgroup/libcgroup
 INHERIT=autotools flag-o-matic linux-info pam systemd
 IUSE=+daemon pam static-libs test +tools
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=elibc_musl? ( sys-libs/fts-standalone ) pam? ( sys-libs/pam )
 REQUIRED_USE=daemon? ( tools )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/libcgroup/libcgroup/releases/download/v3.0/libcgroup-3.0.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b36ad5db30d76a04deb4ae779e6fe71b
+_md5_=9e9a583e2a9bf8618c1f6829878c7890
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.9.6 b/metadata/md5-cache/dev-libs/libtpms-0.9.6
index ec9665214636..1a5ec3ea3374 100644
--- a/metadata/md5-cache/dev-libs/libtpms-0.9.6
+++ b/metadata/md5-cache/dev-libs/libtpms-0.9.6
@@ -5,10 +5,10 @@ DESCRIPTION=Library providing software emultion of a TPM
 EAPI=8
 HOMEPAGE=https://github.com/stefanberger/libtpms
 INHERIT=autotools
-KEYWORDS=~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:=
 SLOT=0
 SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.9.6.tar.gz -> libtpms-0.9.6.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0e6f99993ef600c5ceaf2d378de2519a
+_md5_=340819beda6b5a2b2a3801e29ce02ca7
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.21-r1 b/metadata/md5-cache/dev-libs/xapian-1.4.21-r1
index e2c8451245d3..dcbe09efa4d5 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.21-r1
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.21-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=8
 HOMEPAGE=https://xapian.org/
 IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris
+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 sys-libs/zlib
 SLOT=0/30
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.21/xapian-core-1.4.21.tar.xz
-_md5_=009703dceef8b400fc15217c2a2304c9
+_md5_=fda573a0ff1b45de6b6e9d77e0f9a964
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 8459e9d006bf..189c3011f5bc 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/base-0.15.1-r1 b/metadata/md5-cache/dev-ml/base-0.15.1-r1
index 4da6d9bd2fbe..aa818ea67adc 100644
--- a/metadata/md5-cache/dev-ml/base-0.15.1-r1
+++ b/metadata/md5-cache/dev-ml/base-0.15.1-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/base
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.10.0 =dev-ml/sexplib0-0.15*:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/base/archive/v0.15.1.tar.gz -> base-0.15.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=dc47f9c720d65daf78bf01954ff586fd
+_md5_=af4256a0cb1cfd868b99062d848e22ce
diff --git a/metadata/md5-cache/dev-ml/bin_prot-0.15.0-r2 b/metadata/md5-cache/dev-ml/bin_prot-0.15.0-r2
index 7ca88dfe4bd2..9c6bd137a3ca 100644
--- a/metadata/md5-cache/dev-ml/bin_prot-0.15.0-r2
+++ b/metadata/md5-cache/dev-ml/bin_prot-0.15.0-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/bin_prot
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_custom_printf-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.0:= >=dev-ml/ppx_optcomp-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppx_variants_conv-0.14.0:= dev-ml/variantslib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.15.0.tar.gz -> bin_prot-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=3c8487fe5b9e69a4f98df7053233981d
+_md5_=b850c97aabf7dd70c7eaebebc78d6cdf
diff --git a/metadata/md5-cache/dev-ml/cudf-0.10 b/metadata/md5-cache/dev-ml/cudf-0.10
index cde4da6ccd2d..8c188e383b7e 100644
--- a/metadata/md5-cache/dev-ml/cudf-0.10
+++ b/metadata/md5-cache/dev-ml/cudf-0.10
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://www.mancoosi.org/cudf/
 INHERIT=dune toolchain-funcs
 IUSE=+ocamlopt llvm-libunwind test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-libs/glib:2 llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) sys-libs/ncurses:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.10
 SRC_URI=https://gitlab.com/irill/cudf/-/archive/v0.10/cudf-v0.10.tar.bz2
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=935cd36aac627fa33aef8fb5008f6d9e
+_md5_=f7c0377fc68ccfeed77d4bff1353180f
diff --git a/metadata/md5-cache/dev-ml/dose3-7.0.0 b/metadata/md5-cache/dev-ml/dose3-7.0.0
index 668d624fce85..beb1d76bb812 100644
--- a/metadata/md5-cache/dev-ml/dose3-7.0.0
+++ b/metadata/md5-cache/dev-ml/dose3-7.0.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/7.0.0
 SRC_URI=https://gitlab.com/irill/dose3/-/archive/7.0.0/dose3-7.0.0.tar.bz2
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=f08e339d29a1da182fb15921f0db203b
+_md5_=cd3a4e6d41d79b15f8205332672e8bbd
diff --git a/metadata/md5-cache/dev-ml/dune-build-info-3.6.1 b/metadata/md5-cache/dev-ml/dune-build-info-3.6.1
index 5df2e992524c..c1ed74cfcdf5 100644
--- a/metadata/md5-cache/dev-ml/dune-build-info-3.6.1
+++ b/metadata/md5-cache/dev-ml/dune-build-info-3.6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=dune multiprocessing
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/dune-3.5 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.6.1
 SRC_URI=https://github.com/ocaml/dune/archive/3.6.1.tar.gz -> dune-3.6.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=db0cac02bd91b8013b3efc7efd1b02d0
+_md5_=98d8f271279c066531cda917dd856edc
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-3.6.1 b/metadata/md5-cache/dev-ml/dune-configurator-3.6.1
index a36baafe64a6..a2ec6f4a4c19 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-3.6.1
+++ b/metadata/md5-cache/dev-ml/dune-configurator-3.6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=dune multiprocessing
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.6.1
 SRC_URI=https://github.com/ocaml/dune/archive/3.6.1.tar.gz -> dune-3.6.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=8e93217e9260dcf6998ad880bd30b04a
+_md5_=2cc33c4a7f88beb0ab9870c993f65683
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-3.6.2 b/metadata/md5-cache/dev-ml/dune-private-libs-3.6.2
index a773b1d02b07..cae7887f93b5 100644
--- a/metadata/md5-cache/dev-ml/dune-private-libs-3.6.2
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-3.6.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=dune multiprocessing
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.6.2:=[ocamlopt?] ~dev-ml/stdune-3.6.2:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.6.2
 SRC_URI=https://github.com/ocaml/dune/archive/3.6.2.tar.gz -> dune-3.6.2.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=4c9498458190eaeeae95329707d2571d
+_md5_=172d1c259aefd1179443872cd93e198a
diff --git a/metadata/md5-cache/dev-ml/dyn-3.6.2 b/metadata/md5-cache/dev-ml/dyn-3.6.2
index 069e4ba6d798..6c3417fea64b 100644
--- a/metadata/md5-cache/dev-ml/dyn-3.6.2
+++ b/metadata/md5-cache/dev-ml/dyn-3.6.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=dune multiprocessing
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=~dev-ml/ordering-3.6.2:= dev-ml/pp:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.6.2
 SRC_URI=https://github.com/ocaml/dune/archive/3.6.2.tar.gz -> dune-3.6.2.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=511ed694c22c345f58ca5282be17d2df
+_md5_=87745270d051ec898840d5111f308b8b
diff --git a/metadata/md5-cache/dev-ml/integers-0.4.0 b/metadata/md5-cache/dev-ml/integers-0.4.0
index 6594f1fa2bab..143393e35d48 100644
--- a/metadata/md5-cache/dev-ml/integers-0.4.0
+++ b/metadata/md5-cache/dev-ml/integers-0.4.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ocamllabs/ocaml-integers
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm ~arm64 x86
+KEYWORDS=amd64 arm ~arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.4.0
 SRC_URI=https://github.com/ocamllabs/ocaml-integers/archive/0.4.0.tar.gz -> integers-0.4.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=17598d48780fc6047d9fc42e65541826
+_md5_=f12f1c7fda6e9776260d4f6d84a8d693
diff --git a/metadata/md5-cache/dev-ml/jst-config-0.15.1-r1 b/metadata/md5-cache/dev-ml/jst-config-0.15.1-r1
index fe23e6f867c0..82a290da0d8b 100644
--- a/metadata/md5-cache/dev-ml/jst-config-0.15.1-r1
+++ b/metadata/md5-cache/dev-ml/jst-config-0.15.1-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/jst-config
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-ml/base:= dev-ml/dune-configurator:= dev-ml/ppxlib:= dev-ml/ppx_assert:= dev-ml/ppx_compare:= dev-ml/ppx_here:= dev-ml/ppx_sexp_conv:= dev-ml/stdio:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/jst-config/archive/v0.15.1.tar.gz -> jst-config-0.15.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=afbf042ed88482972012928ea71d4db6
+_md5_=fa5295408d0e89084fe2bbe515a4613a
diff --git a/metadata/md5-cache/dev-ml/lablgtk-3.1.3 b/metadata/md5-cache/dev-ml/lablgtk-3.1.3
index 67bfee4a8202..a5562bd768a0 100644
--- a/metadata/md5-cache/dev-ml/lablgtk-3.1.3
+++ b/metadata/md5-cache/dev-ml/lablgtk-3.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/garrigue/lablgtk
 INHERIT=dune
 IUSE=+ocamlopt sourceview
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ppc64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 PDEPEND=sourceview? ( dev-ml/lablgtk-sourceview:3/3.1.3 )
 RDEPEND=app-text/gtkspell:3= x11-libs/gtk+:3= dev-ml/cairo2:= x11-libs/gtksourceview:3.0= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=3/3.1.3
 SRC_URI=https://github.com/garrigue/lablgtk/archive/3.1.3.tar.gz -> lablgtk-3.1.3.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=7d8966c7a0469001f4a913735908777c
+_md5_=daab4b6c313bfb87ce76d6d85b4f7849
diff --git a/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.3 b/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.3
index d1c496ca0336..09ffaafdc979 100644
--- a/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.3
+++ b/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/garrigue/lablgtk
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ppc64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/lablgtk-3.1.3:3= dev-ml/cairo2:= x11-libs/gtksourceview:3.0= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=3/3.1.3
 SRC_URI=https://github.com/garrigue/lablgtk/archive/3.1.3.tar.gz -> lablgtk-3.1.3.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=b7007d13e2277c2f55a3b8092b3cff3e
+_md5_=d32136d78cbe32c4eca82a7e790d8b9e
diff --git a/metadata/md5-cache/dev-ml/mmap-1.2.0-r1 b/metadata/md5-cache/dev-ml/mmap-1.2.0-r1
index 9e6e021640ee..889163022721 100644
--- a/metadata/md5-cache/dev-ml/mmap-1.2.0-r1
+++ b/metadata/md5-cache/dev-ml/mmap-1.2.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mirage/mmap/
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/bigarray-compat:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.2.0
 SRC_URI=https://github.com/mirage/mmap/archive/v1.2.0.tar.gz -> mmap-1.2.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=b1a45d78db8efbecea9d891768d0ebfd
+_md5_=49cd31d1456330c40ae5613cb60959f2
diff --git a/metadata/md5-cache/dev-ml/mtime-1.4.0 b/metadata/md5-cache/dev-ml/mtime-1.4.0
index 55b340952902..cd2e16174b61 100644
--- a/metadata/md5-cache/dev-ml/mtime-1.4.0
+++ b/metadata/md5-cache/dev-ml/mtime-1.4.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime
 INHERIT=edo opam
 IUSE=test
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/1.4.0
 SRC_URI=https://erratique.ch/software/mtime/releases/mtime-1.4.0.tbz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	opam	42c5d48985d3f77484fe405cfc69356d
-_md5_=d86731f670485985c19af3317cfce2b5
+_md5_=9473e2125323b76d93ffeff794f102b7
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.20.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.20.1
index de9530e4e4e1..1d6f3fd24b2b 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.20.1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.20.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes/
 INHERIT=findlib
 IUSE=test +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:= >=dev-libs/libffi-3.3_rc0:= dev-ml/bigarray-compat:= dev-ml/integers:= dev-lang/ocaml:=[ocamlopt?]
 REQUIRED_USE=ocamlopt
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.20.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.20.1.tar.gz -> ocaml-ctypes-0.20.1.tar.gz
 _eclasses_=findlib	d8fa93cf137156660d0b72144b1e31d9
-_md5_=c8f607b6dfe72aaa04a6c3ca108e4ace
+_md5_=816b863bb882859de82916b237a01cc5
diff --git a/metadata/md5-cache/dev-ml/ocaml-expat-1.3.0 b/metadata/md5-cache/dev-ml/ocaml-expat-1.3.0
index 6053f91aeea8..d98981be5bc5 100644
--- a/metadata/md5-cache/dev-ml/ocaml-expat-1.3.0
+++ b/metadata/md5-cache/dev-ml/ocaml-expat-1.3.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/whitequark/ocaml-expat
 INHERIT=findlib
 IUSE=doc +ocamlopt test +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/expat >=dev-lang/ocaml-4.14.1:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.3.0
 SRC_URI=https://github.com/whitequark/ocaml-expat/archive/v1.3.0.tar.gz -> ocaml-expat-1.3.0.tar.gz
 _eclasses_=findlib	d8fa93cf137156660d0b72144b1e31d9
-_md5_=396f26dc24765fd2610c99eff143b9ad
+_md5_=2075c84229782b1b3e8baeaa4f0cf03a
diff --git a/metadata/md5-cache/dev-ml/ordering-3.6.2 b/metadata/md5-cache/dev-ml/ordering-3.6.2
index 485c7d3ee45d..7d036e4f50f4 100644
--- a/metadata/md5-cache/dev-ml/ordering-3.6.2
+++ b/metadata/md5-cache/dev-ml/ordering-3.6.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=dune multiprocessing
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.6.2
 SRC_URI=https://github.com/ocaml/dune/archive/3.6.2.tar.gz -> dune-3.6.2.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=7e0204472e648a15dcddf5197c060698
+_md5_=85aa8727c78fb7a6ff8cd80f91c8a663
diff --git a/metadata/md5-cache/dev-ml/ounit2-2.2.6 b/metadata/md5-cache/dev-ml/ounit2-2.2.6
index a12eb844e10f..0fb148502bac 100644
--- a/metadata/md5-cache/dev-ml/ounit2-2.2.6
+++ b/metadata/md5-cache/dev-ml/ounit2-2.2.6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/gildor478/ounit
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-ml/lwt:= dev-ml/stdlib-shims:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.2.6
 SRC_URI=https://github.com/gildor478/ounit/archive/v2.2.6.tar.gz -> ounit2-2.2.6.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=8eaf56d124410571c85d7291bab55285
+_md5_=75d1f8b3cdd37e7f8d60db4e1cf85c11
diff --git a/metadata/md5-cache/dev-ml/pp-1.1.2 b/metadata/md5-cache/dev-ml/pp-1.1.2
index 5ac5642a9c11..ece5117542f5 100644
--- a/metadata/md5-cache/dev-ml/pp-1.1.2
+++ b/metadata/md5-cache/dev-ml/pp-1.1.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ocaml-dune/pp
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/ppx_expect:= >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/ocaml-dune/pp/releases/download/1.1.2/pp-1.1.2.tbz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=23f59d230b5c9b7d8c17a1d27fd023a4
+_md5_=4f7f41cffee25e20a538614d5e62f5ab
diff --git a/metadata/md5-cache/dev-ml/ppx_pipebang-0.15.0-r1 b/metadata/md5-cache/dev-ml/ppx_pipebang-0.15.0-r1
index 520fa1a4fae6..fe085ad4c0f7 100644
--- a/metadata/md5-cache/dev-ml/ppx_pipebang-0.15.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_pipebang-0.15.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_pipebang
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.08 >=dev-ml/ppxlib-0.23.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/ppx_pipebang/archive/v0.15.0.tar.gz -> ppx_pipebang-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=605788a7509efc6119d591b2c383e528
+_md5_=85bbaedf42ba451400540d57f238c45c
diff --git a/metadata/md5-cache/dev-ml/react-1.2.2-r1 b/metadata/md5-cache/dev-ml/react-1.2.2-r1
index 9165065750fb..8bce79769aaa 100644
--- a/metadata/md5-cache/dev-ml/react-1.2.2-r1
+++ b/metadata/md5-cache/dev-ml/react-1.2.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://erratique.ch/software/react https://github.com/dbuenzli/react
 INHERIT=opam
 IUSE=test
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/1.2.2
 SRC_URI=http://erratique.ch/software/react/releases/react-1.2.2.tbz
 _eclasses_=opam	42c5d48985d3f77484fe405cfc69356d
-_md5_=4f76abd8aa80db4e33aee315b5feca55
+_md5_=8ae48e475bd5ea64ff260066ad8f57d1
diff --git a/metadata/md5-cache/dev-ml/rresult-0.7.0 b/metadata/md5-cache/dev-ml/rresult-0.7.0
index bdb4b0f4db57..1406443bc19b 100644
--- a/metadata/md5-cache/dev-ml/rresult-0.7.0
+++ b/metadata/md5-cache/dev-ml/rresult-0.7.0
@@ -5,10 +5,10 @@ DESCRIPTION=Result value combinators for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/rresult https://github.com/dbuenzli/rresult
 INHERIT=opam
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4.08:= >=dev-lang/ocaml-4:=
 SLOT=0/0.7.0
 SRC_URI=https://erratique.ch/software/rresult/releases/rresult-0.7.0.tbz
 _eclasses_=opam	42c5d48985d3f77484fe405cfc69356d
-_md5_=21fd7a0ef69fd9e5e8f4a7713d2156da
+_md5_=4a4c7d307bbea23ef1c7937d5a6ff884
diff --git a/metadata/md5-cache/dev-ml/spawn-0.15.1 b/metadata/md5-cache/dev-ml/spawn-0.15.1
index a92e1a79be6e..a3743af51ca2 100644
--- a/metadata/md5-cache/dev-ml/spawn-0.15.1
+++ b/metadata/md5-cache/dev-ml/spawn-0.15.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/spawn
 INHERIT=dune
 IUSE=+ocamlopt test
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/spawn/archive/v0.15.1.tar.gz -> spawn-0.15.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=68b37cae21466dd96a41410b9148a544
+_md5_=a96e65836fa8c35fafe6bc3fb648fd1e
diff --git a/metadata/md5-cache/dev-ml/stdune-3.6.2 b/metadata/md5-cache/dev-ml/stdune-3.6.2
index b1cb9552be74..bb1fb9b7950e 100644
--- a/metadata/md5-cache/dev-ml/stdune-3.6.2
+++ b/metadata/md5-cache/dev-ml/stdune-3.6.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=dune multiprocessing
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.6.2:=[ocamlopt?] ~dev-ml/ordering-3.6.2:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.6.2
 SRC_URI=https://github.com/ocaml/dune/archive/3.6.2.tar.gz -> dune-3.6.2.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=ac184dd2e82e179df579740fbda7a375
+_md5_=6201784e9c76916e1957c8277878db74
diff --git a/metadata/md5-cache/dev-ml/uuidm-0.9.8 b/metadata/md5-cache/dev-ml/uuidm-0.9.8
index 340fa642928d..a71be6f24163 100644
--- a/metadata/md5-cache/dev-ml/uuidm-0.9.8
+++ b/metadata/md5-cache/dev-ml/uuidm-0.9.8
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/dbuenzli/uuidm/
 INHERIT=opam
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.8
 SRC_URI=https://github.com/dbuenzli/uuidm/archive/v0.9.8.tar.gz -> uuidm-0.9.8.tar.gz
 _eclasses_=opam	42c5d48985d3f77484fe405cfc69356d
-_md5_=d2c42b9091b393360bd1908b7dd534d0
+_md5_=c1524f089e5b116606f00bb4d7dd9fe4
diff --git a/metadata/md5-cache/dev-python/CppHeaderParser-2.7.4-r1 b/metadata/md5-cache/dev-python/CppHeaderParser-2.7.4-r1
index cb2086e03f5c..ea8a94697df7 100644
--- a/metadata/md5-cache/dev-python/CppHeaderParser-2.7.4-r1
+++ b/metadata/md5-cache/dev-python/CppHeaderParser-2.7.4-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Parse C++ header files and generate a data structure
 EAPI=8
 HOMEPAGE=https://senexcanis.com/open-source/cppheaderparser/ https://pypi.org/project/CppHeaderParser/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-python/ply[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/C/CppHeaderParser/CppHeaderParser-2.7.4.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4219551d10455f14b3531048de718dfb
+SRC_URI=https://files.pythonhosted.org/packages/source/C/CppHeaderParser/CppHeaderParser-2.7.4.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=11b19fa1a28dc61fab261064bc94c611
diff --git a/metadata/md5-cache/dev-python/DBUtils-3.0.2-r1 b/metadata/md5-cache/dev-python/DBUtils-3.0.2-r1
index 2f019e9b4780..d389c090b00d 100644
--- a/metadata/md5-cache/dev-python/DBUtils-3.0.2-r1
+++ b/metadata/md5-cache/dev-python/DBUtils-3.0.2-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Database connections for multi-threaded environments
 EAPI=8
 HOMEPAGE=https://webwareforpython.github.io/DBUtils/ https://github.com/WebwareForPython/DBUtils/ https://pypi.org/project/DBUtils/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/D/DBUtils/DBUtils-3.0.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2b302dbb5872a6911f37355563c8065c
+SRC_URI=https://files.pythonhosted.org/packages/source/D/DBUtils/DBUtils-3.0.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0b4fc42974aa12a0cb93a3215659e84f
diff --git a/metadata/md5-cache/dev-python/Faker-16.8.1 b/metadata/md5-cache/dev-python/Faker-16.8.1
deleted file mode 100644
index 026e6bbf01d2..000000000000
--- a/metadata/md5-cache/dev-python/Faker-16.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,tiff] dev-python/validators[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-16.8.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=57a58e713637f5862758e53d08e2b781
diff --git a/metadata/md5-cache/dev-python/Faker-17.0.0 b/metadata/md5-cache/dev-python/Faker-17.0.0
deleted file mode 100644
index 9d34f32521f9..000000000000
--- a/metadata/md5-cache/dev-python/Faker-17.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,tiff] dev-python/validators[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-17.0.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3d823a26c5da46c3034436f91a3e509b
diff --git a/metadata/md5-cache/dev-python/Faker-17.3.0 b/metadata/md5-cache/dev-python/Faker-17.3.0
deleted file mode 100644
index de9a0d523aac..000000000000
--- a/metadata/md5-cache/dev-python/Faker-17.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,tiff] dev-python/validators[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-17.3.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3d823a26c5da46c3034436f91a3e509b
diff --git a/metadata/md5-cache/dev-python/Faker-17.4.0 b/metadata/md5-cache/dev-python/Faker-17.4.0
deleted file mode 100644
index d831b2276229..000000000000
--- a/metadata/md5-cache/dev-python/Faker-17.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,tiff] dev-python/validators[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-17.4.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3d823a26c5da46c3034436f91a3e509b
diff --git a/metadata/md5-cache/dev-python/Faker-17.5.0 b/metadata/md5-cache/dev-python/Faker-17.5.0
deleted file mode 100644
index ccce08e7e15a..000000000000
--- a/metadata/md5-cache/dev-python/Faker-17.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,tiff] dev-python/validators[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-17.5.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3d823a26c5da46c3034436f91a3e509b
diff --git a/metadata/md5-cache/dev-python/Faker-17.6.0 b/metadata/md5-cache/dev-python/Faker-17.6.0
index 861b21da3eba..970623276564 100644
--- a/metadata/md5-cache/dev-python/Faker-17.6.0
+++ b/metadata/md5-cache/dev-python/Faker-17.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-17.6.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3d823a26c5da46c3034436f91a3e509b
+_md5_=57a58e713637f5862758e53d08e2b781
diff --git a/metadata/md5-cache/dev-python/Frozen-Flask-0.18-r1 b/metadata/md5-cache/dev-python/Frozen-Flask-0.18-r1
index b81c85f0816a..aa236cd278c5 100644
--- a/metadata/md5-cache/dev-python/Frozen-Flask-0.18-r1
+++ b/metadata/md5-cache/dev-python/Frozen-Flask-0.18-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Freezes a Flask application into a set of static files
 EAPI=8
 HOMEPAGE=https://github.com/Frozen-Flask/Frozen-Flask/ https://pypi.org/project/Frozen-Flask/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_9(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/F/Frozen-Flask/Frozen-Flask-0.18.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b011dfeff941481bbf4af64e98f8bd01
+SRC_URI=https://files.pythonhosted.org/packages/source/F/Frozen-Flask/Frozen-Flask-0.18.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5df2b50f678eb52035f3c9ff14e7d5bd
diff --git a/metadata/md5-cache/dev-python/GridDataFormats-1.0.1 b/metadata/md5-cache/dev-python/GridDataFormats-1.0.1
index e86ebe2ec453..a3d47d8177fb 100644
--- a/metadata/md5-cache/dev-python/GridDataFormats-1.0.1
+++ b/metadata/md5-cache/dev-python/GridDataFormats-1.0.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Reading and writing of data on regular grids in Python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=LGPL-3
@@ -11,6 +11,6 @@ RDEPEND=dev-python/mrcfile[python_targets_python3_9(-)?,python_targets_python3_1
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/G/GridDataFormats/GridDataFormats-1.0.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9db78a79f85bf3cf9acacfe715a1c845
+SRC_URI=https://files.pythonhosted.org/packages/source/G/GridDataFormats/GridDataFormats-1.0.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=33d680462efdccf098baa17273d373bf
diff --git a/metadata/md5-cache/dev-python/IPy-1.01-r1 b/metadata/md5-cache/dev-python/IPy-1.01-r1
index 9276d34fc70e..b9da18acb1d0 100644
--- a/metadata/md5-cache/dev-python/IPy-1.01-r1
+++ b/metadata/md5-cache/dev-python/IPy-1.01-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Class and tools for handling of IPv4 and IPv6 addresses and networks
 EAPI=8
 HOMEPAGE=https://github.com/autocracy/python-ipy/ https://pypi.org/project/IPy/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=examples python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/I/IPy/IPy-1.01.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=176dea528ebe39c9ec8d982c364dcab6
+SRC_URI=https://files.pythonhosted.org/packages/source/I/IPy/IPy-1.01.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=84a63683fd23c55fee45d3a76c304e8c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index d17711c66a33..d5949fd44c54 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/MechanicalSoup-1.2.0 b/metadata/md5-cache/dev-python/MechanicalSoup-1.2.0
index c12487de6b57..920c3860b88b 100644
--- a/metadata/md5-cache/dev-python/MechanicalSoup-1.2.0
+++ b/metadata/md5-cache/dev-python/MechanicalSoup-1.2.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python library for automating interaction with websites
 EAPI=8
 HOMEPAGE=https://github.com/MechanicalSoup/MechanicalSoup/ https://pypi.org/project/MechanicalSoup/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=examples test doc python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/beautifulsoup4-4.7[python_targets_pypy3(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/M/MechanicalSoup/MechanicalSoup-1.2.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3ba37aa2cb0cb85980cda9238ffb43d9
+SRC_URI=https://files.pythonhosted.org/packages/source/M/MechanicalSoup/MechanicalSoup-1.2.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a3905cd419a26b7f6679c2d3b3e2beb2
diff --git a/metadata/md5-cache/dev-python/Nuitka-1.5.3 b/metadata/md5-cache/dev-python/Nuitka-1.5.3
new file mode 100644
index 000000000000..7bc581a6a673
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Nuitka-1.5.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-util/ccache ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
+INHERIT=distutils-r1 flag-o-matic optfeature pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/N/Nuitka/Nuitka-1.5.3.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8cf4127b8da219de3d0ae035e5ea0295
diff --git a/metadata/md5-cache/dev-python/PyQt-builder-1.14.1 b/metadata/md5-cache/dev-python/PyQt-builder-1.14.1
index 09982688586b..402355fe13e4 100644
--- a/metadata/md5-cache/dev-python/PyQt-builder-1.14.1
+++ b/metadata/md5-cache/dev-python/PyQt-builder-1.14.1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The PEP 517 compliant PyQt build system
 EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 SIP )
 RDEPEND=dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sip-6.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/P/PyQt-builder/PyQt-builder-1.14.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c9d0238210ee952c30151f4a6bee41fb
+SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt-builder/PyQt-builder-1.14.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0ebbf81dc0b01c50958f7ff7e6592cb2
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.15.9 b/metadata/md5-cache/dev-python/PyQt5-5.15.9
index 2c7760758803..399e85cef6ab 100644
--- a/metadata/md5-cache/dev-python/PyQt5-5.15.9
+++ b/metadata/md5-cache/dev-python/PyQt5-5.15.9
@@ -4,13 +4,13 @@ DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targ
 DESCRIPTION=Python bindings for the Qt framework
 EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/ https://pypi.org/project/PyQt5/
-INHERIT=python-r1 qmake-utils
+INHERIT=pypi python-r1 qmake-utils
 IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network opengl positioning printsupport sensors serialport speech sql +ssl svg testlib webchannel websockets widgets x11extras xmlpatterns python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-qt/qtcore-5.15:5 >=dev-qt/qtxml-5.15:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtdbus-5.15:5 ) declarative? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5[ssl=] ) opengl? ( >=dev-qt/qtopengl-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5 ) serialport? ( >=dev-qt/qtserialport-5.15:5 ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5 ) websockets? ( >=dev-qt/qtwebsockets-5.15:5 ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5 ) >=dev-python/PyQt5-sip-12.11:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
 SLOT=0
-SRC_URI=mirror://pypi/P/PyQt5/PyQt5-5.15.9.tar.gz
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c9e8497cc9b4be90ec343e5cda34d77a
+SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt5/PyQt5-5.15.9.tar.gz
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ade69429279cbc825f9f04d92a0559a1
diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.6 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.6
index 05291a18d6fd..aea2d9a3f930 100644
--- a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.6
+++ b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.6
@@ -4,13 +4,13 @@ DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targ
 DESCRIPTION=Python bindings for QtWebEngine
 EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/ https://pypi.org/project/PyQtWebEngine/
-INHERIT=python-r1 qmake-utils
+INHERIT=pypi python-r1 qmake-utils
 IUSE=debug python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/PyQt5-5.15.5[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] >=dev-python/PyQt5-sip-12.9:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/P/PyQtWebEngine/PyQtWebEngine-5.15.6.tar.gz
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=544769220494384d7ee028b513c8360a
+SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQtWebEngine/PyQtWebEngine-5.15.6.tar.gz
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c814dd8925606676a00e7381e60da32b
diff --git a/metadata/md5-cache/dev-python/PySDL2-0.9.13 b/metadata/md5-cache/dev-python/PySDL2-0.9.13
index e0268b1a1ff6..4ac053484b99 100644
--- a/metadata/md5-cache/dev-python/PySDL2-0.9.13
+++ b/metadata/md5-cache/dev-python/PySDL2-0.9.13
@@ -4,7 +4,7 @@ DEPEND=test? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_pyth
 DESCRIPTION=Python (ctypes) bindings for SDL2 libraries
 EAPI=8
 HOMEPAGE=https://github.com/py-sdl/py-sdl2/ https://pypi.org/project/PySDL2/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( public-domain CC0-1.0 ZLIB )
@@ -12,6 +12,6 @@ RDEPEND=media-libs/libsdl2 python_targets_python3_9? ( >=dev-lang/python-3.9.16-
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/P/PySDL2/PySDL2-0.9.13.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=25c5bf22f4389a1fd94eef73521f62ae
+SRC_URI=https://files.pythonhosted.org/packages/source/P/PySDL2/PySDL2-0.9.13.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ea609c0d20e5416017ce0420291312d2
diff --git a/metadata/md5-cache/dev-python/PySensors-0.0.4-r1 b/metadata/md5-cache/dev-python/PySensors-0.0.4-r1
index dd1d9004dd49..52ceacc2cc80 100644
--- a/metadata/md5-cache/dev-python/PySensors-0.0.4-r1
+++ b/metadata/md5-cache/dev-python/PySensors-0.0.4-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python bindings to libsensors (via ctypes)
 EAPI=8
 HOMEPAGE=https://pypi.org/project/PySensors/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/lm-sensors-3 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/P/PySensors/PySensors-0.0.4.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9baa621a5a8e9a4e9861dab591b8a846
+SRC_URI=https://files.pythonhosted.org/packages/source/P/PySensors/PySensors-0.0.4.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c8144a4c6a6ce6de96b0efb8ce98825d
diff --git a/metadata/md5-cache/dev-python/PySocks-1.7.1-r2 b/metadata/md5-cache/dev-python/PySocks-1.7.1-r2
index 8150ff92c4a1..04b85553a879 100644
--- a/metadata/md5-cache/dev-python/PySocks-1.7.1-r2
+++ b/metadata/md5-cache/dev-python/PySocks-1.7.1-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SOCKS client module
 EAPI=7
 HOMEPAGE=https://github.com/Anorov/PySocks https://pypi.org/project/PySocks/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 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-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://pypi/P/PySocks/PySocks-1.7.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=57f701758a07c1536dd57c3013761d1f
+SRC_URI=https://files.pythonhosted.org/packages/source/P/PySocks/PySocks-1.7.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=cf8ff24b400ef91a1d8fccb2570fb193
diff --git a/metadata/md5-cache/dev-python/Pyro4-4.82-r1 b/metadata/md5-cache/dev-python/Pyro4-4.82-r1
index f06fe09c7442..07fccc344b0e 100644
--- a/metadata/md5-cache/dev-python/Pyro4-4.82-r1
+++ b/metadata/md5-cache/dev-python/Pyro4-4.82-r1
@@ -4,7 +4,7 @@ DEPEND=test? ( >=dev-python/cloudpickle-1.2.1[python_targets_python3_9(-)?,pytho
 DESCRIPTION=Distributed object middleware for Python (RPC)
 EAPI=8
 HOMEPAGE=https://github.com/irmen/Pyro4/ https://pypi.org/project/Pyro4/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=doc examples test python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 ppc x86
 LICENSE=MIT
@@ -12,6 +12,6 @@ RDEPEND=>=dev-python/serpent-1.27[python_targets_python3_9(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.82.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ac11aba3e552365f7e4d76281dfa1cab
+SRC_URI=https://files.pythonhosted.org/packages/source/P/Pyro4/Pyro4-4.82.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=093408961a4bd8ece86dc7d17738e1ca
diff --git a/metadata/md5-cache/dev-python/QtPy-2.3.0 b/metadata/md5-cache/dev-python/QtPy-2.3.0
index 4e1cf6b10ea4..76ae1ee311c5 100644
--- a/metadata/md5-cache/dev-python/QtPy-2.3.0
+++ b/metadata/md5-cache/dev-python/QtPy-2.3.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Abstraction layer on top of PyQt and PySide with additional custom QWidgets
 EAPI=8
 HOMEPAGE=https://github.com/spyder-ide/qtpy/ https://pypi.org/project/QtPy/
-INHERIT=distutils-r1 virtualx
+INHERIT=distutils-r1 virtualx pypi
 IUSE=+pyqt5 pyqt6 pyside2 pyside6 designer +gui help multimedia +network opengl positioning printsupport qml quick serialport +sql svg testlib webchannel webengine websockets +widgets +xml test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3
 REQUIRED_USE=|| ( pyqt5 pyqt6 pyside2 pyside6 ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/Q/QtPy/QtPy-2.3.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=3ece1b81b09859f89531a58986332df8
+SRC_URI=https://files.pythonhosted.org/packages/source/Q/QtPy/QtPy-2.3.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=3560f6c2ba28fc041bc223d2cc9d5b97
diff --git a/metadata/md5-cache/dev-python/agate-excel-0.2.5-r2 b/metadata/md5-cache/dev-python/agate-excel-0.2.5-r2
index c1ac939570a2..ed97d65c2a58 100644
--- a/metadata/md5-cache/dev-python/agate-excel-0.2.5-r2
+++ b/metadata/md5-cache/dev-python/agate-excel-0.2.5-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Adds read support for Excel files (xls and xlsx) to agate
 EAPI=8
 HOMEPAGE=https://github.com/wireservice/agate-excel/ https://pypi.org/project/agate-excel/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_9(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/a/agate-excel/agate-excel-0.2.5.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=29d3a789ee3d8f79cedafe184e6227b0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/agate-excel/agate-excel-0.2.5.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a5d4c89e6e26275594c366d9629d9518
diff --git a/metadata/md5-cache/dev-python/agate-sql-0.5.9 b/metadata/md5-cache/dev-python/agate-sql-0.5.9
index 9daffcd180ba..2d457df10843 100644
--- a/metadata/md5-cache/dev-python/agate-sql-0.5.9
+++ b/metadata/md5-cache/dev-python/agate-sql-0.5.9
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Adds SQL read/write support to agate
 EAPI=8
 HOMEPAGE=https://github.com/wireservice/agate-sql/ https://pypi.org/project/agate-sql/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_9(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/a/agate-sql/agate-sql-0.5.9.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8618b75f334530b08196c6c666433d6e
+SRC_URI=https://files.pythonhosted.org/packages/source/a/agate-sql/agate-sql-0.5.9.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ed9f05e780c722acf6aa21a7a936a1a4
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.8.4 b/metadata/md5-cache/dev-python/aiohttp-3.8.4
index f78f412f3cc7..3953b1a42fe4 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.8.4
+++ b/metadata/md5-cache/dev-python/aiohttp-3.8.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aio-libs/aiohttp/ https://pypi.org/project/aiohttp/
 INHERIT=distutils-r1 multiprocessing pypi
 IUSE=test-rust test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async-timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/charset_normalizer-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/aiohttp/aiohttp-3.8.4.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=69081d11ac1832d018a8444e39fc0f92
+_md5_=f6690c0d1e22b298989eb32a84d15c22
diff --git a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5 b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5
index cfb393b7ba81..48ad6fa692c4 100644
--- a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5
+++ b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=jinja2 template renderer for aiohttp.web
 EAPI=8
 HOMEPAGE=https://github.com/aio-libs/aiohttp-jinja2
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_pypy3 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/aiohttp-2.3.9[python_targets_pypy3(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp-jinja2/aiohttp-jinja2-1.5.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7b374a4d5b608dd78115926c1a7f8dc1
+SRC_URI=https://files.pythonhosted.org/packages/source/a/aiohttp-jinja2/aiohttp-jinja2-1.5.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b72f24f02df4ead1304a1a71cad51f54
diff --git a/metadata/md5-cache/dev-python/alembic-1.10.0 b/metadata/md5-cache/dev-python/alembic-1.10.0
deleted file mode 100644
index 6ac27d280a89..000000000000
--- a/metadata/md5-cache/dev-python/alembic-1.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Database migrations tool, written by the author of SQLAlchemy
-EAPI=8
-HOMEPAGE=https://github.com/sqlalchemy/alembic/ https://pypi.org/project/alembic/
-INHERIT=distutils-r1 pypi
-IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/a/alembic/alembic-1.10.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9b28797c4ca290702c6db29402dbd106
diff --git a/metadata/md5-cache/dev-python/alembic-1.10.1 b/metadata/md5-cache/dev-python/alembic-1.10.1
deleted file mode 100644
index 50aea3e6332c..000000000000
--- a/metadata/md5-cache/dev-python/alembic-1.10.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Database migrations tool, written by the author of SQLAlchemy
-EAPI=8
-HOMEPAGE=https://github.com/sqlalchemy/alembic/ https://pypi.org/project/alembic/
-INHERIT=distutils-r1 pypi
-IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/a/alembic/alembic-1.10.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9b28797c4ca290702c6db29402dbd106
diff --git a/metadata/md5-cache/dev-python/alembic-1.9.2-r1 b/metadata/md5-cache/dev-python/alembic-1.9.2-r1
deleted file mode 100644
index 044433dd9148..000000000000
--- a/metadata/md5-cache/dev-python/alembic-1.9.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Database migrations tool, written by the author of SQLAlchemy
-EAPI=8
-HOMEPAGE=https://github.com/sqlalchemy/alembic/ https://pypi.org/project/alembic/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/alembic/alembic-1.9.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e3e72ddc2a1443731b691054fe02140c
diff --git a/metadata/md5-cache/dev-python/alembic-1.9.3-r1 b/metadata/md5-cache/dev-python/alembic-1.9.3-r1
deleted file mode 100644
index 3904f6e4c570..000000000000
--- a/metadata/md5-cache/dev-python/alembic-1.9.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Database migrations tool, written by the author of SQLAlchemy
-EAPI=8
-HOMEPAGE=https://github.com/sqlalchemy/alembic/ https://pypi.org/project/alembic/
-INHERIT=distutils-r1 pypi
-IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/a/alembic/alembic-1.9.3.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f3a24f82081f5d281f621bcaa82a896a
diff --git a/metadata/md5-cache/dev-python/alembic-1.9.4 b/metadata/md5-cache/dev-python/alembic-1.9.4
index 9182db917bc6..375a2b9b1f5b 100644
--- a/metadata/md5-cache/dev-python/alembic-1.9.4
+++ b/metadata/md5-cache/dev-python/alembic-1.9.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sqlalchemy/alembic/ https://pypi.org/project/alembic/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/alembic/alembic-1.9.4.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f3a24f82081f5d281f621bcaa82a896a
+_md5_=572c334dda9195c7dbe64bee22164457
diff --git a/metadata/md5-cache/dev-python/ansible-pygments-0.1.1-r1 b/metadata/md5-cache/dev-python/ansible-pygments-0.1.1-r1
index e1da7574661c..6c3d16967e29 100644
--- a/metadata/md5-cache/dev-python/ansible-pygments-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/ansible-pygments-0.1.1-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pygments lexer and style Ansible snippets
 EAPI=8
 HOMEPAGE=https://github.com/ansible-community/ansible-pygments
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/pygments-2.14.0[python_targets_python3_9(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/a/ansible-pygments/ansible-pygments-0.1.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8f2f7049ceb49ea07e1afa44df28ce03
+SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible-pygments/ansible-pygments-0.1.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=bc04e01eabf83498ca00ddc9fb8fbd61
diff --git a/metadata/md5-cache/dev-python/ansible-runner-2.2.1 b/metadata/md5-cache/dev-python/ansible-runner-2.2.1
index 3e0449666faf..5360671e02c9 100644
--- a/metadata/md5-cache/dev-python/ansible-runner-2.2.1
+++ b/metadata/md5-cache/dev-python/ansible-runner-2.2.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A tool and python library that helps when interfacing with Ansible
 EAPI=8
 HOMEPAGE=https://github.com/ansible/ansible-runner
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_1
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/a/ansible-runner/ansible-runner-2.2.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=75872809ca7fee775f804cf2a0f61a93
+SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible-runner/ansible-runner-2.2.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=15380bdb6a4f1b539256b363c70f9c38
diff --git a/metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r2 b/metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r2
index 37aeb2eaea01..ccb2fefea936 100644
--- a/metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r2
+++ b/metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CFFI bindings to the Argon2 password hashing library
 EAPI=8
 HOMEPAGE=https://github.com/hynek/argon2-cffi/ https://pypi.org/project/argon2-cffi/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 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
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/argon2-cffi-bindings-21.2.0[python_targets_pypy3(-)?,python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/a/argon2-cffi/argon2-cffi-21.3.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=62a39128b5d1f0f825c4a16e7b1cf30a
+SRC_URI=https://files.pythonhosted.org/packages/source/a/argon2-cffi/argon2-cffi-21.3.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ae1584e3fad27e83b9e22d7db7cca230
diff --git a/metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0-r1 b/metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0-r1
index fcdd395b83f4..142fe8f6b199 100644
--- a/metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0-r1
+++ b/metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0-r1
@@ -4,7 +4,7 @@ DEPEND=app-crypt/argon2:=
 DESCRIPTION=Low-level CFFI bindings for the Argon2 password hashing library
 EAPI=8
 HOMEPAGE=https://github.com/hynek/argon2-cffi-bindings/ https://pypi.org/project/argon2-cffi-bindings/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=cpu_flags_x86_sse2 test python_targets_pypy3 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
 LICENSE=MIT
@@ -12,6 +12,6 @@ RDEPEND=app-crypt/argon2:= >=dev-python/setuptools-scm-6.2[python_targets_pypy3(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/a/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8bf2dcd2262f92df16eb759188c48a08
+SRC_URI=https://files.pythonhosted.org/packages/source/a/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e74cda79c59acf1e49851dd61c26b503
diff --git a/metadata/md5-cache/dev-python/async-timeout-4.0.2-r1 b/metadata/md5-cache/dev-python/async-timeout-4.0.2-r1
index d24260a9f6d5..e087aff7ddde 100644
--- a/metadata/md5-cache/dev-python/async-timeout-4.0.2-r1
+++ b/metadata/md5-cache/dev-python/async-timeout-4.0.2-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Timeout context manager for asyncio programs
 EAPI=8
 HOMEPAGE=https://github.com/aio-libs/async-timeout/ https://pypi.org/project/async-timeout/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/a/async-timeout/async-timeout-4.0.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3e8fa2ba7e2b5bed77d9c8736fa0dcfd
+SRC_URI=https://files.pythonhosted.org/packages/source/a/async-timeout/async-timeout-4.0.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=3dad06ec659df3fe21818e781b268298
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r2 b/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r2
deleted file mode 100644
index c555e399ba47..000000000000
--- a/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Atomic file writes
-EAPI=8
-HOMEPAGE=https://github.com/untitaker/python-atomicwrites/ https://pypi.org/project/atomicwrites/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/atomicwrites/atomicwrites-1.4.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6df97e6ddee5f03442967643d0820f24
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.4.1 b/metadata/md5-cache/dev-python/atomicwrites-1.4.1
index 73209663a1ce..75f1ebdf1a3b 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.4.1
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.4.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/untitaker/python-atomicwrites/ https://pypi.org/project/atomicwrites/
 INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_pypy3 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/atomicwrites/atomicwrites-1.4.1.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7e3cfe74188f768d20ea00b8faa059ab
+_md5_=261274af1b51d7ff2e42d3e7fbf611b3
diff --git a/metadata/md5-cache/dev-python/basho-erlastic-2.1.1-r1 b/metadata/md5-cache/dev-python/basho-erlastic-2.1.1-r1
index 7dcae4035210..d481be404e12 100644
--- a/metadata/md5-cache/dev-python/basho-erlastic-2.1.1-r1
+++ b/metadata/md5-cache/dev-python/basho-erlastic-2.1.1-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Erlang binary term codec and port interface
 EAPI=8
 HOMEPAGE=https://github.com/basho/python-erlastic/ https://pypi.org/project/basho-erlastic/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/b/basho-erlastic/basho-erlastic-2.1.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f5689656a9b4749318fe6b18b373dfd4
+SRC_URI=https://files.pythonhosted.org/packages/source/b/basho-erlastic/basho-erlastic-2.1.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=eef059a217e2bd4705e9ff9154b466ce
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.74 b/metadata/md5-cache/dev-python/boto3-1.26.74
deleted file mode 100644
index f1819c73e7e3..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.74
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.74[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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.29.74[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.74.tar.gz -> boto3-1.26.74.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5e1c7eb57959d37c37ed506a006bf1af
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.79 b/metadata/md5-cache/dev-python/boto3-1.26.79
deleted file mode 100644
index 569cc24fa8fa..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.79
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.79[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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.29.79[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.79.tar.gz -> boto3-1.26.79.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.84 b/metadata/md5-cache/dev-python/boto3-1.26.84
index 3436027fcb36..754ded1c9134 100644
--- a/metadata/md5-cache/dev-python/boto3-1.26.84
+++ b/metadata/md5-cache/dev-python/boto3-1.26.84
@@ -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_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.29.84[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( 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.26.84.tar.gz -> boto3-1.26.84.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
+_md5_=5e1c7eb57959d37c37ed506a006bf1af
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.85 b/metadata/md5-cache/dev-python/boto3-1.26.85
deleted file mode 100644
index be60b755e4b7..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.85
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.85[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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.29.85[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.85.tar.gz -> boto3-1.26.85.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.86 b/metadata/md5-cache/dev-python/boto3-1.26.86
deleted file mode 100644
index ac3eca44cda3..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.86
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.86[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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.29.86[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.86.tar.gz -> boto3-1.26.86.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.87 b/metadata/md5-cache/dev-python/boto3-1.26.87
deleted file mode 100644
index 0ef68ba15228..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.87
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.87[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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.29.87[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.87.tar.gz -> boto3-1.26.87.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.88 b/metadata/md5-cache/dev-python/boto3-1.26.88
deleted file mode 100644
index 504517889bb3..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.88
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.88[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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.29.88[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.88.tar.gz -> boto3-1.26.88.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.90 b/metadata/md5-cache/dev-python/boto3-1.26.90
deleted file mode 100644
index 8f7843f89987..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.90[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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.29.90[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.90.tar.gz -> boto3-1.26.90.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.91 b/metadata/md5-cache/dev-python/boto3-1.26.91
deleted file mode 100644
index a955764b7918..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.91
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.91[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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.29.91[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.91.tar.gz -> boto3-1.26.91.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.92 b/metadata/md5-cache/dev-python/boto3-1.26.92
deleted file mode 100644
index 65160a16c860..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.92
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.92[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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.29.92[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.92.tar.gz -> boto3-1.26.92.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.74 b/metadata/md5-cache/dev-python/botocore-1.29.74
deleted file mode 100644
index 1f397761a0da..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.74
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.74.tar.gz -> botocore-1.29.74.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c65aa179611aa2473a786bb3cef9a1f9
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.79 b/metadata/md5-cache/dev-python/botocore-1.29.79
deleted file mode 100644
index a9664355131b..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.79
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.79.tar.gz -> botocore-1.29.79.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.84 b/metadata/md5-cache/dev-python/botocore-1.29.84
index 1e84a69d3585..309ef90f4e1e 100644
--- a/metadata/md5-cache/dev-python/botocore-1.29.84
+++ b/metadata/md5-cache/dev-python/botocore-1.29.84
@@ -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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/botocore/archive/1.29.84.tar.gz -> botocore-1.29.84.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
+_md5_=c65aa179611aa2473a786bb3cef9a1f9
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.85 b/metadata/md5-cache/dev-python/botocore-1.29.85
deleted file mode 100644
index 361c75cd6e80..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.85
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.85.tar.gz -> botocore-1.29.85.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.86 b/metadata/md5-cache/dev-python/botocore-1.29.86
deleted file mode 100644
index 54b9d2f5f471..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.86
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.86.tar.gz -> botocore-1.29.86.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.87 b/metadata/md5-cache/dev-python/botocore-1.29.87
deleted file mode 100644
index d96dd98b9305..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.87
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.87.tar.gz -> botocore-1.29.87.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.88 b/metadata/md5-cache/dev-python/botocore-1.29.88
deleted file mode 100644
index de3350863abd..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.88
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.88.tar.gz -> botocore-1.29.88.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.90 b/metadata/md5-cache/dev-python/botocore-1.29.90
deleted file mode 100644
index b462827acc87..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.90.tar.gz -> botocore-1.29.90.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.91 b/metadata/md5-cache/dev-python/botocore-1.29.91
deleted file mode 100644
index be86a2550b7c..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.91
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.91.tar.gz -> botocore-1.29.91.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.92 b/metadata/md5-cache/dev-python/botocore-1.29.92
deleted file mode 100644
index f5108604c83f..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.92
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[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_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_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.92.tar.gz -> botocore-1.29.92.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/cached-property-1.5.2-r1 b/metadata/md5-cache/dev-python/cached-property-1.5.2-r1
index 1a759bcb6cd3..f89f7eb33979 100644
--- a/metadata/md5-cache/dev-python/cached-property-1.5.2-r1
+++ b/metadata/md5-cache/dev-python/cached-property-1.5.2-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A cached-property for decorating methods in classes
 EAPI=8
 HOMEPAGE=https://github.com/pydanny/cached-property
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm64 ppc64 ~riscv x86
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/c/cached-property/cached-property-1.5.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=851ed58057801306c1ef92e29264bba9
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cached-property/cached-property-1.5.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0bfaf3f97504814d551ed2b367f9602a
diff --git a/metadata/md5-cache/dev-python/click-log-0.4.0 b/metadata/md5-cache/dev-python/click-log-0.4.0
index 34103af40aad..c3f65204689d 100644
--- a/metadata/md5-cache/dev-python/click-log-0.4.0
+++ b/metadata/md5-cache/dev-python/click-log-0.4.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Logging integration for Click
 EAPI=8
 HOMEPAGE=https://github.com/click-contrib/click-log/ https://pypi.org/project/click-log/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/c/click-log/click-log-0.4.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bb22265b5dd448e3c71cf460ad9f7f20
+SRC_URI=https://files.pythonhosted.org/packages/source/c/click-log/click-log-0.4.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=cafbcd33ba56c3c4ef469a3a9cc50792
diff --git a/metadata/md5-cache/dev-python/cliff-4.1.0 b/metadata/md5-cache/dev-python/cliff-4.1.0
deleted file mode 100644
index 5de221ec21ec..000000000000
--- a/metadata/md5-cache/dev-python/cliff-4.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/autopage-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prettytable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[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.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command Line Interface Formulation Framework
-EAPI=8
-HOMEPAGE=https://opendev.org/openstack/cliff/ https://github.com/openstack/cliff/ https://pypi.org/project/cliff/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/autopage-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prettytable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cliff/cliff-4.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2f6acbd70a7538340692219922ec76d3
diff --git a/metadata/md5-cache/dev-python/cliff-4.2.0 b/metadata/md5-cache/dev-python/cliff-4.2.0
index 08dfcbc02c1b..0528d476e32b 100644
--- a/metadata/md5-cache/dev-python/cliff-4.2.0
+++ b/metadata/md5-cache/dev-python/cliff-4.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/cliff/ https://github.com/openstack/cliff/ https://pypi.org/project/cliff/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/autopage-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prettytable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/c/cliff/cliff-4.2.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=50394442acf03098ba6410c7b2eedb0a
+_md5_=84817f58540c305de864b07b2a4f77c4
diff --git a/metadata/md5-cache/dev-python/colored-traceback-0.3.0 b/metadata/md5-cache/dev-python/colored-traceback-0.3.0
index 3fa2d7582a4d..a29ae38a6ac4 100644
--- a/metadata/md5-cache/dev-python/colored-traceback-0.3.0
+++ b/metadata/md5-cache/dev-python/colored-traceback-0.3.0
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Automatically color Python's uncaught exception tracebacks
 EAPI=8
 HOMEPAGE=https://github.com/staticshock/colored-traceback.py
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv x86
 LICENSE=ISC
 RDEPEND=dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/c/colored-traceback/colored-traceback-0.3.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b1e04befef0111592859c37d791c2359
+SRC_URI=https://files.pythonhosted.org/packages/source/c/colored-traceback/colored-traceback-0.3.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=70fcc4035b7262e7b6f1563a60c95042
diff --git a/metadata/md5-cache/dev-python/cov-core-1.15.0-r3 b/metadata/md5-cache/dev-python/cov-core-1.15.0-r3
index b422ddea1d45..14b8000e845e 100644
--- a/metadata/md5-cache/dev-python/cov-core-1.15.0-r3
+++ b/metadata/md5-cache/dev-python/cov-core-1.15.0-r3
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=plugin core for use by pytest-cov, nose-cov and nose2-cov
 EAPI=8
 HOMEPAGE=https://github.com/schlamar/cov-core
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/coverage-3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/c/cov-core/cov-core-1.15.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6303602399a63a513dfce355fae7e571
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cov-core/cov-core-1.15.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e3f24005f967b43d8df5951f0a4608cd
diff --git a/metadata/md5-cache/dev-python/css-parser-1.0.8 b/metadata/md5-cache/dev-python/css-parser-1.0.8
index a05fc1464dd3..9ee7f547ce89 100644
--- a/metadata/md5-cache/dev-python/css-parser-1.0.8
+++ b/metadata/md5-cache/dev-python/css-parser-1.0.8
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A CSS Cascading Style Sheets library (fork of cssutils)
 EAPI=8
 HOMEPAGE=https://github.com/ebook-utils/css-parser/ https://pypi.org/project/css-parser/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=LGPL-2.1+
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/c/css-parser/css-parser-1.0.8.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=003922d91d27416e303f41a3a4bfb593
+SRC_URI=https://files.pythonhosted.org/packages/source/c/css-parser/css-parser-1.0.8.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=94b8f31ae142da077e4e06b4497f8def
diff --git a/metadata/md5-cache/dev-python/diff-match-patch-20200713 b/metadata/md5-cache/dev-python/diff-match-patch-20200713
index 01b16c53a088..18ba300c8a56 100644
--- a/metadata/md5-cache/dev-python/diff-match-patch-20200713
+++ b/metadata/md5-cache/dev-python/diff-match-patch-20200713
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Diff, match and patch algorithms for plain text
 EAPI=7
 HOMEPAGE=https://pypi.org/project/diff-match-patch/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm64 x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/d/diff-match-patch/diff-match-patch-20200713.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7f83706accfafe8eb201420d001ad3e5
+SRC_URI=https://files.pythonhosted.org/packages/source/d/diff-match-patch/diff-match-patch-20200713.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=29657288de62936850b36743288a55ca
diff --git a/metadata/md5-cache/dev-python/dj-search-url-0.1-r1 b/metadata/md5-cache/dev-python/dj-search-url-0.1-r1
index 13ef049a1f01..9ed33c645f9f 100644
--- a/metadata/md5-cache/dev-python/dj-search-url-0.1-r1
+++ b/metadata/md5-cache/dev-python/dj-search-url-0.1-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Use Search URLs in your Django Haystack Application
 EAPI=8
 HOMEPAGE=https://github.com/dstufft/dj-search-url/ https://pypi.org/project/dj-search-url/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/d/dj-search-url/dj-search-url-0.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8d4ff072be8631795cdc95f8ebb37208
+SRC_URI=https://files.pythonhosted.org/packages/source/d/dj-search-url/dj-search-url-0.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=002c5d99b9c36044f08824abbe11df38
diff --git a/metadata/md5-cache/dev-python/django-redis-5.2.0 b/metadata/md5-cache/dev-python/django-redis-5.2.0
index 89233ceba9a4..2f46f4402c6f 100644
--- a/metadata/md5-cache/dev-python/django-redis-5.2.0
+++ b/metadata/md5-cache/dev-python/django-redis-5.2.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Full featured redis cache backend for Django
 EAPI=8
 HOMEPAGE=https://github.com/jazzband/django-redis/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/django-2.2[python_targets_python3_9(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/d/django-redis/django-redis-5.2.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=662845bed5d582e46a658ac7a8f4dd04
+SRC_URI=https://files.pythonhosted.org/packages/source/d/django-redis/django-redis-5.2.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6be142ea29054fabda9c7103d81c01cf
diff --git a/metadata/md5-cache/dev-python/django-tagging-0.5.0-r1 b/metadata/md5-cache/dev-python/django-tagging-0.5.0-r1
index 3cd1df63d23c..67ab7e458c1d 100644
--- a/metadata/md5-cache/dev-python/django-tagging-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/django-tagging-0.5.0-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Generic tagging application for Django
 EAPI=8
 HOMEPAGE=https://pypi.org/project/django-tagging/ https://github.com/Fantomas42/django-tagging
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/django-1.0[python_targets_python3_9(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/d/django-tagging/django-tagging-0.5.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=35535cd222dd53c62ef80d79d428c5d8
+SRC_URI=https://files.pythonhosted.org/packages/source/d/django-tagging/django-tagging-0.5.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4a8ea7b7671c4ec7a10e01d45a7a98e8
diff --git a/metadata/md5-cache/dev-python/django-taggit-3.1.0 b/metadata/md5-cache/dev-python/django-taggit-3.1.0
index 46020adb2c14..81ced10644ce 100644
--- a/metadata/md5-cache/dev-python/django-taggit-3.1.0
+++ b/metadata/md5-cache/dev-python/django-taggit-3.1.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple tagging for Django
 EAPI=8
 HOMEPAGE=https://github.com/jazzband/django-taggit
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/django-3.2[python_targets_python3_9(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/d/django-taggit/django-taggit-3.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a4b84fe5ebcca6e2b64cb7c67b6a5fce
+SRC_URI=https://files.pythonhosted.org/packages/source/d/django-taggit/django-taggit-3.1.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=93be443e66f27a5a48ad0af1bbefd608
diff --git a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2-r1 b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2-r1
index 5ede9fad3010..36239fd791f3 100644
--- a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Add flag to ignore unicode literal prefixes in doctests
 EAPI=8
 HOMEPAGE=https://pypi.org/project/doctest-ignore-unicode/ https://github.com/gnublade/doctest-ignore-unicode
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/d/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0bc342c1ab9cfce63fba38d05a7dc7df
+SRC_URI=https://files.pythonhosted.org/packages/source/d/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=dfa60e637d7dac5b5e6f03b457ae1cbb
diff --git a/metadata/md5-cache/dev-python/doublex-expects-0.7.1 b/metadata/md5-cache/dev-python/doublex-expects-0.7.1
deleted file mode 100644
index ddabd806e433..000000000000
--- a/metadata/md5-cache/dev-python/doublex-expects-0.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/doublex[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/expects-0.8.0_rc1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mamba[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Expects matchers for Doublex test doubles assertions
-EAPI=7
-HOMEPAGE=https://github.com/jaimegildesagredo/doublex-expects
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/doublex[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/expects-0.8.0_rc1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jaimegildesagredo/doublex-expects/archive/v0.7.1.tar.gz -> doublex-expects-0.7.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2c67601935173b77488c9885523a08d4
diff --git a/metadata/md5-cache/dev-python/doublex-expects-0.7.1-r1 b/metadata/md5-cache/dev-python/doublex-expects-0.7.1-r1
index eccaa73b0f03..7172daa862ec 100644
--- a/metadata/md5-cache/dev-python/doublex-expects-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/doublex-expects-0.7.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaimegildesagredo/doublex-expects/ https://pypi.org/project/doublex-expects/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
 RDEPEND=dev-python/doublex[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/expects-0.8.0_rc1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( 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/jaimegildesagredo/doublex-expects/archive/v0.7.1.tar.gz -> doublex-expects-0.7.1.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2583f4b1958b1db15962c5bb8caed599
+_md5_=5c5ae4f30c95ca6454ea1c1f8e6d3f8a
diff --git a/metadata/md5-cache/dev-python/easy-thumbnails-2.8.5 b/metadata/md5-cache/dev-python/easy-thumbnails-2.8.5
index f06774361542..4123c5a40f7c 100644
--- a/metadata/md5-cache/dev-python/easy-thumbnails-2.8.5
+++ b/metadata/md5-cache/dev-python/easy-thumbnails-2.8.5
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Easy thumbnails for Django
 EAPI=8
 HOMEPAGE=https://github.com/SmileyChris/easy-thumbnails/ https://pypi.org/project/easy-thumbnails/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=svg test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/django-2.2[python_targets_python3_9(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/e/easy-thumbnails/easy-thumbnails-2.8.5.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b39baaea1045bdfef94caa15b628d648
+SRC_URI=https://files.pythonhosted.org/packages/source/e/easy-thumbnails/easy-thumbnails-2.8.5.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6d28d182418e5a6be444abe837f647b9
diff --git a/metadata/md5-cache/dev-python/expects-0.9.0 b/metadata/md5-cache/dev-python/expects-0.9.0
deleted file mode 100644
index b459ea100c14..000000000000
--- a/metadata/md5-cache/dev-python/expects-0.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mamba[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Expressive and extensible TDD/BDD assertion library for Python
-EAPI=7
-HOMEPAGE=https://github.com/jaimegildesagredo/expects
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/e/expects/expects-0.9.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=995a31b75a848b7539e45a1332e88742
diff --git a/metadata/md5-cache/dev-python/expects-0.9.0-r1 b/metadata/md5-cache/dev-python/expects-0.9.0-r1
index 557c1f128a55..98a7e8a3662b 100644
--- a/metadata/md5-cache/dev-python/expects-0.9.0-r1
+++ b/metadata/md5-cache/dev-python/expects-0.9.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaimegildesagredo/expects/ https://pypi.org/project/expects/
 INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/e/expects/expects-0.9.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f43b99335a3ef0656d4ef0a70db935ca
+_md5_=9de9cb5e16ffff51c9ac0e179c02b4dc
diff --git a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2-r1 b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2-r1
index 753df559a634..ed2a747f9c2a 100644
--- a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Polyfill package for Flake8 plugins
 EAPI=8
 HOMEPAGE=https://gitlab.com/pycqa/flake8-polyfill
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/flake8[python_targets_python3_9(-)?,python_targets_python3_10
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/f/flake8-polyfill/flake8-polyfill-1.0.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ee8d7be5f753cf864974601514b16748
+SRC_URI=https://files.pythonhosted.org/packages/source/f/flake8-polyfill/flake8-polyfill-1.0.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a15fc66eaeeac19d4798800c3e764d30
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-3.0 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-3.0
index a73a4a8f7112..1e57f4559f40 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-3.0
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-3.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library
 EAPI=8
 HOMEPAGE=https://pypi.org/project/gcs-oauth2-boto-plugin/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-py
 REQUIRED_USE=|| ( python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=903eeef1bf1d31606eaebfaa0afcf0b2
+SRC_URI=https://files.pythonhosted.org/packages/source/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f6b797b06eda2a83bfdb72d1369329b5
diff --git a/metadata/md5-cache/dev-python/ghp-import-2.1.0-r1 b/metadata/md5-cache/dev-python/ghp-import-2.1.0-r1
index 4ca9df710b85..e29dcdde2a44 100644
--- a/metadata/md5-cache/dev-python/ghp-import-2.1.0-r1
+++ b/metadata/md5-cache/dev-python/ghp-import-2.1.0-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Copy your docs directly to the gh-pages branch
 EAPI=8
 HOMEPAGE=https://github.com/c-w/ghp-import
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~ppc ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-dateutil-2.8.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/g/ghp-import/ghp-import-2.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6e9efe44c25d32edf4f8dc4fc8b2c3dc
+SRC_URI=https://files.pythonhosted.org/packages/source/g/ghp-import/ghp-import-2.1.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=13dc24e9904259aaa23934b7baf23b3f
diff --git a/metadata/md5-cache/dev-python/git-review-2.3.1-r1 b/metadata/md5-cache/dev-python/git-review-2.3.1-r1
index 466023439e0b..9fce191eaa9f 100644
--- a/metadata/md5-cache/dev-python/git-review-2.3.1-r1
+++ b/metadata/md5-cache/dev-python/git-review-2.3.1-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tool to submit code to Gerrit
 EAPI=8
 HOMEPAGE=https://git.openstack.org/cgit/openstack-infra/git-review
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/g/git-review/git-review-2.3.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4632dd9e5caaf4f41b897b1b3515308f
+SRC_URI=https://files.pythonhosted.org/packages/source/g/git-review/git-review-2.3.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=45c3276b27e947721633110b11dd04b1
diff --git a/metadata/md5-cache/dev-python/git-review-9999 b/metadata/md5-cache/dev-python/git-review-9999
index fe8e9c6af97e..38daa15fe72c 100644
--- a/metadata/md5-cache/dev-python/git-review-9999
+++ b/metadata/md5-cache/dev-python/git-review-9999
@@ -11,4 +11,4 @@ RDEPEND=>=dev-python/requests-1.1[python_targets_python3_9(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2c3575a33c8c54905a5fa70981de8634
+_md5_=93692849785c1212aa57649dc18c4b8b
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.77.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.77.0
deleted file mode 100644
index 6e8c76081be0..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.77.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_10(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?] <dev-python/uritemplate-5[python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google API Client for Python
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?] <dev-python/uritemplate-5[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.77.0.tar.gz -> google-api-python-client-2.77.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e778ca56df4ad5f94ba65fa5bfce05ec
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.78.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.78.0
deleted file mode 100644
index 1bb6a5f18e56..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.78.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/uritemplate-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google API Client for Python
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/uritemplate-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.78.0.tar.gz -> google-api-python-client-2.78.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7bd7358eb2335dc1983776d2b17ea8c2
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.79.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.79.0
deleted file mode 100644
index ebe8b4dbe2cf..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.79.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/uritemplate-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google API Client for Python
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/uritemplate-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.79.0.tar.gz -> google-api-python-client-2.79.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7bd7358eb2335dc1983776d2b17ea8c2
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.80.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.80.0
index 484791c75125..e00e2b89feb4 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.80.0
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.80.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/uritemplate-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.80.0.tar.gz -> google-api-python-client-2.80.0.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7bd7358eb2335dc1983776d2b17ea8c2
+_md5_=85249451eaf75edb69849965017cf276
diff --git a/metadata/md5-cache/dev-python/google-pasta-0.2.0-r2 b/metadata/md5-cache/dev-python/google-pasta-0.2.0-r2
index 6e1965cddeb0..9c1fbf4beeda 100644
--- a/metadata/md5-cache/dev-python/google-pasta-0.2.0-r2
+++ b/metadata/md5-cache/dev-python/google-pasta-0.2.0-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=AST-based Python refactoring library
 EAPI=8
 HOMEPAGE=https://pypi.org/project/google-pasta/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/g/google-pasta/google-pasta-0.2.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fd16c75233c5705234ebe310fec9c93a
+SRC_URI=https://files.pythonhosted.org/packages/source/g/google-pasta/google-pasta-0.2.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=29df92f436460a9826f263168cfa18e5
diff --git a/metadata/md5-cache/dev-python/googleapis-common-protos-1.58.0 b/metadata/md5-cache/dev-python/googleapis-common-protos-1.58.0
index 5649f49d8ebd..6dba91bf9672 100644
--- a/metadata/md5-cache/dev-python/googleapis-common-protos-1.58.0
+++ b/metadata/md5-cache/dev-python/googleapis-common-protos-1.58.0
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python classes generated from the common protos in the googleapis repository
 EAPI=8
 HOMEPAGE=https://github.com/googleapis/python-api-common-protos/ https://pypi.org/project/googleapis-common-protos/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/protobuf-python-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-3.15.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-google python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/g/googleapis-common-protos/googleapis-common-protos-1.58.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77ea6809f43fe92c5a6b5a1eb2819ceb
+SRC_URI=https://files.pythonhosted.org/packages/source/g/googleapis-common-protos/googleapis-common-protos-1.58.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9ac4349c8cfb8cec3b8d635ec57bb04d
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.51.0 b/metadata/md5-cache/dev-python/grpcio-testing-1.51.0
index c6419f481202..25a4f6cbc784 100644
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.51.0
+++ b/metadata/md5-cache/dev-python/grpcio-testing-1.51.0
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Testing utilities for gRPC Python
 EAPI=8
 HOMEPAGE=https://grpc.io
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=~dev-python/grpcio-1.51.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/protobuf-python-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-4.21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.51.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=76a8355b7dfaefde797c5d40f9b5c63e
+SRC_URI=https://files.pythonhosted.org/packages/source/g/grpcio-testing/grpcio-testing-1.51.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=22981db8f3e7d692c226b052cd0d0e55
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.51.0 b/metadata/md5-cache/dev-python/grpcio-tools-1.51.0
index 682c860a465b..d16150229cb0 100644
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.51.0
+++ b/metadata/md5-cache/dev-python/grpcio-tools-1.51.0
@@ -4,13 +4,13 @@ DEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(
 DESCRIPTION=Protobuf code generator for gRPC
 EAPI=8
 HOMEPAGE=https://grpc.io
-INHERIT=distutils-r1 multiprocessing prefix
+INHERIT=distutils-r1 multiprocessing prefix pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/grpcio-1.51.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/protobuf-python-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-4.21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.51.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c747a90a6e91ed27040088feed256c64
+SRC_URI=https://files.pythonhosted.org/packages/source/g/grpcio-tools/grpcio-tools-1.51.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8738c70a201e9aa75f56b0d11676fb11
diff --git a/metadata/md5-cache/dev-python/html5-parser-0.4.10-r1 b/metadata/md5-cache/dev-python/html5-parser-0.4.10-r1
index 29d697b3bb77..9b7fa17d7549 100644
--- a/metadata/md5-cache/dev-python/html5-parser-0.4.10-r1
+++ b/metadata/md5-cache/dev-python/html5-parser-0.4.10-r1
@@ -4,7 +4,7 @@ DEPEND=dev-libs/libxml2:=
 DESCRIPTION=Fast C based HTML 5 parsing for python
 EAPI=8
 HOMEPAGE=https://github.com/kovidgoyal/html5-parser/
-INHERIT=distutils-r1 toolchain-funcs
+INHERIT=distutils-r1 toolchain-funcs pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
@@ -12,6 +12,6 @@ RDEPEND=dev-libs/libxml2:= dev-python/chardet[python_targets_python3_9(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/h/html5-parser/html5-parser-0.4.10.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ea50782f7d4c39e516acac146d30d607
+SRC_URI=https://files.pythonhosted.org/packages/source/h/html5-parser/html5-parser-0.4.10.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=01b349af5f3a8afadbfce7e221aed1f1
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.68.0 b/metadata/md5-cache/dev-python/hypothesis-6.68.0
deleted file mode 100644
index d1252d8bd175..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.68.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,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_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,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_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,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_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
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,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_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,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_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
-REQUIRED_USE=|| ( python_targets_pypy3 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.68.0.tar.gz -> hypothesis-6.68.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0c18c214578d74873cdf33c899f3c56b
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.68.1 b/metadata/md5-cache/dev-python/hypothesis-6.68.1
deleted file mode 100644
index 96f958e1ff16..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.68.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,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_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,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_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,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_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
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,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_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,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_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
-REQUIRED_USE=|| ( python_targets_pypy3 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.68.1.tar.gz -> hypothesis-6.68.1.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=990cdabf0a2222632a46e5fc0ed375f9
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.68.2 b/metadata/md5-cache/dev-python/hypothesis-6.68.2
index 6a110e2f9125..8d704f3c04ab 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.68.2
+++ b/metadata/md5-cache/dev-python/hypothesis-6.68.2
@@ -5,7 +5,7 @@ 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_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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,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_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,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_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
 REQUIRED_USE=|| ( python_targets_pypy3 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/HypothesisWorks/hypothesis/archive/hypothesis-python-6.68.2.tar.gz -> hypothesis-6.68.2.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=990cdabf0a2222632a46e5fc0ed375f9
+_md5_=0c18c214578d74873cdf33c899f3c56b
diff --git a/metadata/md5-cache/dev-python/identify-2.5.17 b/metadata/md5-cache/dev-python/identify-2.5.17
deleted file mode 100644
index 25e9878b552b..000000000000
--- a/metadata/md5-cache/dev-python/identify-2.5.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File identification library for Python
-EAPI=8
-HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1: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/pre-commit/identify/archive/v2.5.17.tar.gz -> identify-2.5.17.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=eb257d49c6951c65cf483bfd9b531017
diff --git a/metadata/md5-cache/dev-python/identify-2.5.18 b/metadata/md5-cache/dev-python/identify-2.5.18
deleted file mode 100644
index ba47809a4f4f..000000000000
--- a/metadata/md5-cache/dev-python/identify-2.5.18
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File identification library for Python
-EAPI=8
-HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1: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/pre-commit/identify/archive/v2.5.18.tar.gz -> identify-2.5.18.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d67c70bc53580e8d7a5893bb04e378fa
diff --git a/metadata/md5-cache/dev-python/identify-2.5.19 b/metadata/md5-cache/dev-python/identify-2.5.19
deleted file mode 100644
index 9af6e281c19e..000000000000
--- a/metadata/md5-cache/dev-python/identify-2.5.19
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File identification library for Python
-EAPI=8
-HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1: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/pre-commit/identify/archive/v2.5.19.tar.gz -> identify-2.5.19.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d67c70bc53580e8d7a5893bb04e378fa
diff --git a/metadata/md5-cache/dev-python/identify-2.5.20 b/metadata/md5-cache/dev-python/identify-2.5.20
index 6eab1fa0c8d3..1dd9ee5bc25d 100644
--- a/metadata/md5-cache/dev-python/identify-2.5.20
+++ b/metadata/md5-cache/dev-python/identify-2.5.20
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( 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/pre-commit/identify/archive/v2.5.20.tar.gz -> identify-2.5.20.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d67c70bc53580e8d7a5893bb04e378fa
+_md5_=eb257d49c6951c65cf483bfd9b531017
diff --git a/metadata/md5-cache/dev-python/jinja2-time-0.2.0-r1 b/metadata/md5-cache/dev-python/jinja2-time-0.2.0-r1
index 01aa1dbef130..94e633e7c850 100644
--- a/metadata/md5-cache/dev-python/jinja2-time-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/jinja2-time-0.2.0-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Jinja2 Extension for Dates and Times
 EAPI=8
 HOMEPAGE=https://github.com/hackebrot/jinja2-time/ https://pypi.org/project/jinja2-time/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~ppc64 ~riscv x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/arrow[python_targets_python3_9(-)?,python_targets_python3_10(
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/j/jinja2-time/jinja2-time-0.2.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=98fe79a35b52468ca8b464a42d8d2767
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jinja2-time/jinja2-time-0.2.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=29a9b68153cb8bbcf59b462579baa379
diff --git a/metadata/md5-cache/dev-python/json-rpc-1.14.0 b/metadata/md5-cache/dev-python/json-rpc-1.14.0
index e67829660016..99f2958dcf16 100644
--- a/metadata/md5-cache/dev-python/json-rpc-1.14.0
+++ b/metadata/md5-cache/dev-python/json-rpc-1.14.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JSON-RPC transport implementation for python
 EAPI=8
 HOMEPAGE=https://github.com/pavlov99/json-rpc/ https://pypi.org/project/json-rpc/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/j/json-rpc/json-rpc-1.14.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=43143dd528d992be22dce3371afbf62a
+SRC_URI=https://files.pythonhosted.org/packages/source/j/json-rpc/json-rpc-1.14.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=497e535fddbf20418352b8b1464274b5
diff --git a/metadata/md5-cache/dev-python/jsonschema-spec-0.1.4 b/metadata/md5-cache/dev-python/jsonschema-spec-0.1.4
new file mode 100644
index 000000000000..44c8287fb545
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonschema-spec-0.1.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-python/jsonschema-4.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JSONSchema Spec with object-oriented paths
+EAPI=8
+HOMEPAGE=https://pypi.org/project/jsonschema-spec/ https://github.com/p1c2u/jsonschema-spec/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/jsonschema-4.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/p1c2u/jsonschema-spec/archive/0.1.4.tar.gz -> jsonschema-spec-0.1.4.gh.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4e89881496ecdc1153e9de495f192a8a
diff --git a/metadata/md5-cache/dev-python/jupyter-lsp-1.5.1 b/metadata/md5-cache/dev-python/jupyter-lsp-1.5.1
index b7f63535a416..d32829f4731c 100644
--- a/metadata/md5-cache/dev-python/jupyter-lsp-1.5.1
+++ b/metadata/md5-cache/dev-python/jupyter-lsp-1.5.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab
 EAPI=8
 HOMEPAGE=https://github.com/krassowski/jupyterlab-lsp
-INHERIT=distutils-r1 optfeature
+INHERIT=distutils-r1 optfeature pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=dev-python/entrypoints[python_targets_python3_9(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/j/jupyter-lsp/jupyter-lsp-1.5.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=294ba1bebfeff889550e7f12647d49e1
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-lsp/jupyter-lsp-1.5.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=708071e110f2dee4556942982efe6c8e
diff --git a/metadata/md5-cache/dev-python/jupyter-server-proxy-3.2.2 b/metadata/md5-cache/dev-python/jupyter-server-proxy-3.2.2
index cca9c7f1f095..d9e093b1f674 100644
--- a/metadata/md5-cache/dev-python/jupyter-server-proxy-3.2.2
+++ b/metadata/md5-cache/dev-python/jupyter-server-proxy-3.2.2
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Jupyter notebook server extension to proxy web services
 EAPI=8
 HOMEPAGE=https://github.com/jupyterhub/jupyter-server-proxy
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/aiohttp[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/simpervisor-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/j/jupyter-server-proxy/jupyter-server-proxy-3.2.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ef042382fb4dead81d29d94be24a1093
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-server-proxy/jupyter-server-proxy-3.2.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=80a31cad690256abb29f3bf129423817
diff --git a/metadata/md5-cache/dev-python/jupyterlab-lsp-3.10.2 b/metadata/md5-cache/dev-python/jupyterlab-lsp-3.10.2
index b0e77875da14..5b3d82ca40d5 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-lsp-3.10.2
+++ b/metadata/md5-cache/dev-python/jupyterlab-lsp-3.10.2
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Coding assistance for JupyterLab with Language Server Protocol
 EAPI=8
 HOMEPAGE=https://github.com/jupyter-lsp/jupyterlab-lsp
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=>=dev-python/jupyterlab-3.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyterlab-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-lsp-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/j/jupyterlab-lsp/jupyterlab-lsp-3.10.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3dd2b69892fa621a8ece9703d0c2581d
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab-lsp/jupyterlab-lsp-3.10.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=099eb209322f0c5d37ba899c84dea345
diff --git a/metadata/md5-cache/dev-python/keystoneauth1-5.1.0 b/metadata/md5-cache/dev-python/keystoneauth1-5.1.0
deleted file mode 100644
index c0ceb2814808..000000000000
--- a/metadata/md5-cache/dev-python/keystoneauth1-5.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/betamax-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oauthlib-0.6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-kerberos-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testresources-2.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.14.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/os-service-types-1.2.0[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.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=This package contains tools for authenticating to an OpenStack-based cloud
-EAPI=8
-HOMEPAGE=https://opendev.org/openstack/keystoneauth/ https://github.com/openstack/keystoneauth/ https://pypi.org/project/keystoneauth1/
-INHERIT=distutils-r1
-IUSE=test 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/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.14.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/os-service-types-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-5.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=53e31764e339ef8ac77131470515e36b
diff --git a/metadata/md5-cache/dev-python/keystoneauth1-5.1.1 b/metadata/md5-cache/dev-python/keystoneauth1-5.1.1
deleted file mode 100644
index 8871f99e3ac8..000000000000
--- a/metadata/md5-cache/dev-python/keystoneauth1-5.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/betamax-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oauthlib-0.6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-kerberos-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testresources-2.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.14.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/os-service-types-1.2.0[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.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=This package contains tools for authenticating to an OpenStack-based cloud
-EAPI=8
-HOMEPAGE=https://opendev.org/openstack/keystoneauth/ https://github.com/openstack/keystoneauth/ https://pypi.org/project/keystoneauth1/
-INHERIT=distutils-r1
-IUSE=test 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/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.14.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/os-service-types-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-5.1.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6bb7b72bff42747a0ca1987987d7cffe
diff --git a/metadata/md5-cache/dev-python/keystoneauth1-5.1.2 b/metadata/md5-cache/dev-python/keystoneauth1-5.1.2
index 9b93c5d50670..69a40b05cda7 100644
--- a/metadata/md5-cache/dev-python/keystoneauth1-5.1.2
+++ b/metadata/md5-cache/dev-python/keystoneauth1-5.1.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/keystoneauth/ https://github.com/openstack/keystoneauth/ https://pypi.org/project/keystoneauth1/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.14.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/os-service-types-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/k/keystoneauth1/keystoneauth1-5.1.2.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c7a44fa77482b1749855f696d7acb9f2
+_md5_=64a33b9cbf89a394a056ee2231d9b1e4
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.9.0 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.9.0
index 4921ff66846c..04110f3182ac 100644
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.9.0
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.9.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A fast and thorough lazy object proxy
 EAPI=8
 HOMEPAGE=https://github.com/ionelmc/python-lazy-object-proxy/ https://pypi.org/project/lazy-object-proxy/ https://python-lazy-object-proxy.readthedocs.io/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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 ~x64-macos
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.9.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9691f7e3b6018cd27aeffa7c5d715739
+SRC_URI=https://files.pythonhosted.org/packages/source/l/lazy-object-proxy/lazy-object-proxy-1.9.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=731892b083f69530ec8b9aeffca1fb4b
diff --git a/metadata/md5-cache/dev-python/mamba-0.11.2 b/metadata/md5-cache/dev-python/mamba-0.11.2
deleted file mode 100644
index 226cff49f16b..000000000000
--- a/metadata/md5-cache/dev-python/mamba-0.11.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/clint-0.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/coverage-3.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/doublex-expects-0.7.0_rc1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/expects-0.8.0_rc2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( >=dev-python/sphinx-5.3.0 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python test runner born under the banner of Behavior Driven Development
-EAPI=8
-HOMEPAGE=https://nestorsalceda.com/mamba/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm64
-LICENSE=MIT
-RDEPEND=>=dev-python/clint-0.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/coverage-3.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nestorsalceda/mamba/archive/v0.11.2.tar.gz -> mamba-0.11.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=278d3bae4edc544b01867abadc07ae79
diff --git a/metadata/md5-cache/dev-python/mamba-0.11.2-r1 b/metadata/md5-cache/dev-python/mamba-0.11.2-r1
index 4ad34bf4e141..a2078622c9fa 100644
--- a/metadata/md5-cache/dev-python/mamba-0.11.2-r1
+++ b/metadata/md5-cache/dev-python/mamba-0.11.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://nestorsalceda.com/mamba/ https://github.com/nestorsalceda/mamba/ https://pypi.org/project/mamba/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=MIT
 RDEPEND=>=dev-python/clint-0.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/coverage-3.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( 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/nestorsalceda/mamba/archive/v0.11.2.tar.gz -> mamba-0.11.2.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=377a30d258f652b223d73e139c67ecb1
+_md5_=60a6fbeea929227d82b8d4d1b3955f8b
diff --git a/metadata/md5-cache/dev-python/mkdocs-i18n-0.4.4 b/metadata/md5-cache/dev-python/mkdocs-i18n-0.4.4
index 5cbfa24a4281..b82860c52e88 100644
--- a/metadata/md5-cache/dev-python/mkdocs-i18n-0.4.4
+++ b/metadata/md5-cache/dev-python/mkdocs-i18n-0.4.4
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=MkDocs i18n plugin
 EAPI=8
 HOMEPAGE=https://gitlab.com/mkdocs-i18n/mkdocs-i18n/-/tree/main https://pypi.org/project/mkdocs-i18n/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~ppc ~riscv x86
 LICENSE=AGPL-3
 RDEPEND=>=dev-python/mkdocs-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mkdocs-material[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/m/mkdocs-i18n/mkdocs-i18n-0.4.4.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9110d39a58e14c4f5050b6c6cb32008a
+SRC_URI=https://files.pythonhosted.org/packages/source/m/mkdocs-i18n/mkdocs-i18n-0.4.4.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5c633e264ebe63ffeb22519bd84011b0
diff --git a/metadata/md5-cache/dev-python/mmtf-python-1.1.3 b/metadata/md5-cache/dev-python/mmtf-python-1.1.3
index 39305a3769dc..79f94d7c7692 100644
--- a/metadata/md5-cache/dev-python/mmtf-python-1.1.3
+++ b/metadata/md5-cache/dev-python/mmtf-python-1.1.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The python implementation of the MMTF API, decoder and encoder
 EAPI=8
 HOMEPAGE=http://mmtf.rcsb.org/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_1
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/m/mmtf-python/mmtf-python-1.1.3.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=705f820d54ee9517b97e012585e56b46
+SRC_URI=https://files.pythonhosted.org/packages/source/m/mmtf-python/mmtf-python-1.1.3.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9a3f892f90eccc8e79c65e8ea2dcdfce
diff --git a/metadata/md5-cache/dev-python/openapi-core-0.17.1 b/metadata/md5-cache/dev-python/openapi-core-0.17.1
new file mode 100644
index 000000000000..aca0ae3df18a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openapi-core-0.17.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/asgiref[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/starlette-0.26.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webob[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pathable-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Client-side and server-side support for the OpenAPI Specification v3
+EAPI=8
+HOMEPAGE=https://github.com/python-openapi/openapi-core/ https://pypi.org/project/openapi-core/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/pathable-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/o/openapi-core/openapi_core-0.17.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c0b8e7bbeb33499b9dac9fdbe8cc5a5a
diff --git a/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.4 b/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.4
new file mode 100644
index 000000000000..a95d9d92eecd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-python/jsonschema-4.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenAPI schema validation for Python
+EAPI=8
+HOMEPAGE=https://github.com/python-openapi/openapi-schema-validator/ https://pypi.org/project/openapi-schema-validator/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=<dev-python/jsonschema-4.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/o/openapi-schema-validator/openapi_schema_validator-0.4.4.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=32a9991916afcb78008949cc8fff7276
diff --git a/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.6 b/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.6
new file mode 100644
index 000000000000..4ee7d008b7b7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-python/jsonschema-4.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lazy-object-proxy-1.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator
+EAPI=8
+HOMEPAGE=https://github.com/python-openapi/openapi-spec-validator/ https://pypi.org/project/openapi-spec-validator/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=<dev-python/jsonschema-4.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lazy-object-proxy-1.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/o/openapi-spec-validator/openapi_spec_validator-0.5.6.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a935dd01027fe0fa293e4210b16f69dd
diff --git a/metadata/md5-cache/dev-python/ordered-set-4.1.0 b/metadata/md5-cache/dev-python/ordered-set-4.1.0
index 656b4eb959ac..e5eb36020db0 100644
--- a/metadata/md5-cache/dev-python/ordered-set-4.1.0
+++ b/metadata/md5-cache/dev-python/ordered-set-4.1.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A mutable set that remembers the order of its entries
 EAPI=7
 HOMEPAGE=https://github.com/rspeer/ordered-set
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/o/ordered-set/ordered-set-4.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a8767eb1148a1c854d082962c3c3f465
+SRC_URI=https://files.pythonhosted.org/packages/source/o/ordered-set/ordered-set-4.1.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f48886515a7cbdd0af6a6ec97b23b589
diff --git a/metadata/md5-cache/dev-python/os-client-config-2.1.0-r2 b/metadata/md5-cache/dev-python/os-client-config-2.1.0-r2
index 51db6ab724dd..c819f44db94e 100644
--- a/metadata/md5-cache/dev-python/os-client-config-2.1.0-r2
+++ b/metadata/md5-cache/dev-python/os-client-config-2.1.0-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=OpenStack Client Configuation Library
 EAPI=8
 HOMEPAGE=https://www.openstack.org/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/o/os-client-config/os-client-config-2.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a6cb3d2f112b64586dea970472b0b357
+SRC_URI=https://files.pythonhosted.org/packages/source/o/os-client-config/os-client-config-2.1.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=19fd5eda794933b9f9fa75e0fe2c1045
diff --git a/metadata/md5-cache/dev-python/os-service-types-1.7.0-r2 b/metadata/md5-cache/dev-python/os-service-types-1.7.0-r2
index 2a5433b9c645..77c13a48fd3b 100644
--- a/metadata/md5-cache/dev-python/os-service-types-1.7.0-r2
+++ b/metadata/md5-cache/dev-python/os-service-types-1.7.0-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A library to handle official service types for OpenStack and it's aliases
 EAPI=8
 HOMEPAGE=https://github.com/openstack/os-service-types
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_9(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/o/os-service-types/os-service-types-1.7.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=16e70862ce907d5201e17b198b3a249f
+SRC_URI=https://files.pythonhosted.org/packages/source/o/os-service-types/os-service-types-1.7.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=04268b34c3184fd5b0e2416d213e8c83
diff --git a/metadata/md5-cache/dev-python/osc-lib-2.6.2 b/metadata/md5-cache/dev-python/osc-lib-2.6.2
deleted file mode 100644
index 763d2b7b2d1e..000000000000
--- a/metadata/md5-cache/dev-python/osc-lib-2.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/statsd-3.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/cliff-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keystoneauth1-3.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openstacksdk-0.15.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[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.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A package of common support modules for writing OSC plugins
-EAPI=8
-HOMEPAGE=https://opendev.org/openstack/osc-lib/ https://github.com/openstack/osc-lib/ https://pypi.org/project/osc-lib/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cliff-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keystoneauth1-3.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openstacksdk-0.15.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/osc-lib/osc-lib-2.6.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e290fb4e2d3490a4403ede251a92a854
diff --git a/metadata/md5-cache/dev-python/osc-lib-2.7.0 b/metadata/md5-cache/dev-python/osc-lib-2.7.0
index 7dd35f8c907a..597611a47e47 100644
--- a/metadata/md5-cache/dev-python/osc-lib-2.7.0
+++ b/metadata/md5-cache/dev-python/osc-lib-2.7.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/osc-lib/ https://github.com/openstack/osc-lib/ https://pypi.org/project/osc-lib/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cliff-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keystoneauth1-3.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openstacksdk-0.15.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/o/osc-lib/osc-lib-2.7.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=eecbd81bec842b472f01797f888a80b2
+_md5_=3d8e085c3dc783533514c98b7f4ea30e
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.6.2-r1 b/metadata/md5-cache/dev-python/platformdirs-2.6.2-r1
deleted file mode 100644
index 23d614b0ec12..000000000000
--- a/metadata/md5-cache/dev-python/platformdirs-2.6.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A small Python module for determining appropriate platform-specific dirs
-EAPI=8
-HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/platformdirs/platformdirs/archive/2.6.2.tar.gz -> platformdirs-2.6.2.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c4b91fac7f13a45e2e71799b91b1fa3d
diff --git a/metadata/md5-cache/dev-python/platformdirs-3.0.0 b/metadata/md5-cache/dev-python/platformdirs-3.0.0
deleted file mode 100644
index 22a308014eba..000000000000
--- a/metadata/md5-cache/dev-python/platformdirs-3.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A small Python module for determining appropriate platform-specific dirs
-EAPI=8
-HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 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 ~arm64-macos ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/platformdirs/platformdirs/archive/3.0.0.tar.gz -> platformdirs-3.0.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=97ca3303858729bbf861bd5a89b4d3d8
diff --git a/metadata/md5-cache/dev-python/platformdirs-3.1.0 b/metadata/md5-cache/dev-python/platformdirs-3.1.0
deleted file mode 100644
index 8d1cd3aa0689..000000000000
--- a/metadata/md5-cache/dev-python/platformdirs-3.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A small Python module for determining appropriate platform-specific dirs
-EAPI=8
-HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 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 ~arm64-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/platformdirs/platformdirs/archive/3.1.0.tar.gz -> platformdirs-3.1.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5046ed779b6310f2f1bfbf89c766328a
diff --git a/metadata/md5-cache/dev-python/platformdirs-3.1.1 b/metadata/md5-cache/dev-python/platformdirs-3.1.1
index d52279cb519f..acc6b7ea153e 100644
--- a/metadata/md5-cache/dev-python/platformdirs-3.1.1
+++ b/metadata/md5-cache/dev-python/platformdirs-3.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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 ~arm64-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/platformdirs/platformdirs-3.1.1.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6aa78398514dd55ce0059afeb0d4a9b8
+_md5_=343dcd52cd690a70d243f11d87682a03
diff --git a/metadata/md5-cache/dev-python/precis-i18n-1.0.5 b/metadata/md5-cache/dev-python/precis-i18n-1.0.5
index 0e23adae2ee5..0fe7ba4bde7f 100644
--- a/metadata/md5-cache/dev-python/precis-i18n-1.0.5
+++ b/metadata/md5-cache/dev-python/precis-i18n-1.0.5
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Internationalized Usernames and Passwords
 EAPI=8
 HOMEPAGE=https://github.com/byllyfish/precis_i18n/ https://pypi.org/project/precis-i18n/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/precis_i18n/precis_i18n-1.0.5.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=520f6d5f45213d652c6cf7c098ab5605
+SRC_URI=https://files.pythonhosted.org/packages/source/p/precis-i18n/precis_i18n-1.0.5.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b2e254c2d1a71120e072ff7e42181c3a
diff --git a/metadata/md5-cache/dev-python/process-tests-2.1.2-r1 b/metadata/md5-cache/dev-python/process-tests-2.1.2-r1
index 7a84af1a0db7..aa8216ac1d62 100644
--- a/metadata/md5-cache/dev-python/process-tests-2.1.2-r1
+++ b/metadata/md5-cache/dev-python/process-tests-2.1.2-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tools for testing processes
 EAPI=8
 HOMEPAGE=https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 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 ~x64-macos
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://pypi/p/process-tests/process-tests-2.1.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=88a8f475e22503793d4940965ed4169b
+SRC_URI=https://files.pythonhosted.org/packages/source/p/process-tests/process-tests-2.1.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f76148dc61e3b6a52d4a1a736242c624
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-9.0.0 b/metadata/md5-cache/dev-python/py-cpuinfo-9.0.0
index 0cdf5866a90d..6c0e48148e89 100644
--- a/metadata/md5-cache/dev-python/py-cpuinfo-9.0.0
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-9.0.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Get CPU info with pure Python 2 & 3
 EAPI=8
 HOMEPAGE=https://github.com/workhorsy/py-cpuinfo/ https://pypi.org/project/py-cpuinfo/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-9.0.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8f6ce31bd4acafeb756215177f1d6163
+SRC_URI=https://files.pythonhosted.org/packages/source/p/py-cpuinfo/py-cpuinfo-9.0.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5417279a06051c1f57bae0bb445ca4a4
diff --git a/metadata/md5-cache/dev-python/py-ubjson-0.16.1-r1 b/metadata/md5-cache/dev-python/py-ubjson-0.16.1-r1
index b6b21ec1e73a..06795fe7cfa5 100644
--- a/metadata/md5-cache/dev-python/py-ubjson-0.16.1-r1
+++ b/metadata/md5-cache/dev-python/py-ubjson-0.16.1-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Universal Binary JSON encoder/decoder
 EAPI=8
 HOMEPAGE=https://github.com/Iotic-Labs/py-ubjson/ https://pypi.org/project/py-ubjson/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/py-ubjson/py-ubjson-0.16.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=29d25df80a1ab91d7068efadb8612c4b
+SRC_URI=https://files.pythonhosted.org/packages/source/p/py-ubjson/py-ubjson-0.16.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9a3d328285d2d12d34346a00ea008f16
diff --git a/metadata/md5-cache/dev-python/py-zabbix-1.1.7 b/metadata/md5-cache/dev-python/py-zabbix-1.1.7
index d2ff2fb17c37..b918053ac7fb 100644
--- a/metadata/md5-cache/dev-python/py-zabbix-1.1.7
+++ b/metadata/md5-cache/dev-python/py-zabbix-1.1.7
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Zabbix module for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/py-zabbix https://github.com/adubkov/py-zabbix
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/p/py-zabbix/py-zabbix-1.1.7.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=91178c59521647338d1372268ca3f098
+SRC_URI=https://files.pythonhosted.org/packages/source/p/py-zabbix/py-zabbix-1.1.7.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5929a66978454dd301781ed867ceb9a0
diff --git a/metadata/md5-cache/dev-python/pyClamd-0.4.0-r4 b/metadata/md5-cache/dev-python/pyClamd-0.4.0-r4
index acac200dce5d..93183910e9f6 100644
--- a/metadata/md5-cache/dev-python/pyClamd-0.4.0-r4
+++ b/metadata/md5-cache/dev-python/pyClamd-0.4.0-r4
@@ -4,7 +4,7 @@ DEPEND=dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3
 DESCRIPTION=python interface to Clamd (Clamav daemon)
 EAPI=8
 HOMEPAGE=https://xael.org/pages/pyclamd-en.html
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=LGPL-3
@@ -12,6 +12,6 @@ RDEPEND=dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://pypi/p/pyClamd/pyClamd-0.4.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bc8f8ba34fff273acbf123cf0426a39c
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyClamd/pyClamd-0.4.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4d66ef23dcf1392d24e31ed8e0083d95
diff --git a/metadata/md5-cache/dev-python/pyDes-2.0.1 b/metadata/md5-cache/dev-python/pyDes-2.0.1
index 2eded0ba5a3c..e85d1c38e56e 100644
--- a/metadata/md5-cache/dev-python/pyDes-2.0.1
+++ b/metadata/md5-cache/dev-python/pyDes-2.0.1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python implementation of DES and TRIPLE DES
 EAPI=8
 HOMEPAGE=https://twhiteman.netfirms.com/des.html
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/p/pyDes/pyDes-2.0.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7f0b4dffd166d37f018a2eb883660e94
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyDes/pyDes-2.0.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0f247ea2ebe119a4374f8e92551fbceb
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r2 b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r2
index bfb20d177f5b..b1c6e04c0644 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r2
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pyasn1 modules
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pyasn1-modules/ https://github.com/etingof/pyasn1-modules/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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 ~x64-macos
 LICENSE=BSD-2
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/pyasn1-0.4.6[python_targets_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.2.8.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0d7c8bc396904bff6394c3b88237359a
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyasn1-modules/pyasn1-modules-0.2.8.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=1d10127e2570d1fb47dcb72a83fb1756
diff --git a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.2 b/metadata/md5-cache/dev-python/pybtex-docutils-1.0.2
index 4ad71cc5feda..36ee3ce79322 100644
--- a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.2
+++ b/metadata/md5-cache/dev-python/pybtex-docutils-1.0.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A docutils backend for pybtex
 EAPI=8
 HOMEPAGE=https://github.com/mcmtroffaes/pybtex-docutils
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/docutils-0.8[python_targets_python3_9(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pybtex-docutils/pybtex-docutils-1.0.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ee371e6d2c9d711d456c12cfddaf07b9
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pybtex-docutils/pybtex-docutils-1.0.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=33e962427123f2e319f65553a4376317
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-0.6.0 b/metadata/md5-cache/dev-python/pyproject-fmt-0.6.0
deleted file mode 100644
index 25844403c83e..000000000000
--- a/metadata/md5-cache/dev-python/pyproject-fmt-0.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-mock-3.10[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-23[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Format your pyproject.toml file
-EAPI=8
-HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 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
-LICENSE=MIT
-RDEPEND=>=dev-python/packaging-23[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/pyproject-fmt/archive/0.6.0.tar.gz -> pyproject-fmt-0.6.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=821e384de9b5f7d041d50c7398519c65
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-0.9.1 b/metadata/md5-cache/dev-python/pyproject-fmt-0.9.1
index 30ebfab44f17..af12b6389e4b 100644
--- a/metadata/md5-cache/dev-python/pyproject-fmt-0.9.1
+++ b/metadata/md5-cache/dev-python/pyproject-fmt-0.9.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/packaging-23[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 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/tox-dev/pyproject-fmt/archive/0.9.1.tar.gz -> pyproject-fmt-0.9.1.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3a80d62f4c8a3849f29d163472570177
+_md5_=821e384de9b5f7d041d50c7398519c65
diff --git a/metadata/md5-cache/dev-python/pytest-aiohttp-1.0.4 b/metadata/md5-cache/dev-python/pytest-aiohttp-1.0.4
index b59b6f4da0d5..26a342d6934a 100644
--- a/metadata/md5-cache/dev-python/pytest-aiohttp-1.0.4
+++ b/metadata/md5-cache/dev-python/pytest-aiohttp-1.0.4
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pytest plugin for aiohttp support
 EAPI=8
 HOMEPAGE=https://github.com/aio-libs/pytest-aiohttp/ https://pypi.org/project/pytest-aiohttp/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/aiohttp-3.8.1[python_targets_pypy3(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-aiohttp/pytest-aiohttp-1.0.4.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=74b389784729ce5f5a32e5567a804416
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-aiohttp/pytest-aiohttp-1.0.4.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=771615c0244d58f799aba528c0ae957e
diff --git a/metadata/md5-cache/dev-python/pytest-check-2.1.3 b/metadata/md5-cache/dev-python/pytest-check-2.1.3
deleted file mode 100644
index e963953a46c7..000000000000
--- a/metadata/md5-cache/dev-python/pytest-check-2.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/colorama-0.4.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin that allows multiple failures per test
-EAPI=8
-HOMEPAGE=https://github.com/okken/pytest-check/ https://pypi.org/project/pytest-check/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/colorama-0.4.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1: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/okken/pytest-check/archive/2.1.3.tar.gz -> pytest-check-2.1.3.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=53136c6ff2e98e2ec89e04239f05e1b4
diff --git a/metadata/md5-cache/dev-python/pytest-check-2.1.4 b/metadata/md5-cache/dev-python/pytest-check-2.1.4
index 7712908d0f21..a81e17780a46 100644
--- a/metadata/md5-cache/dev-python/pytest-check-2.1.4
+++ b/metadata/md5-cache/dev-python/pytest-check-2.1.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/okken/pytest-check/ https://pypi.org/project/pytest-check/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/colorama-0.4.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-check/pytest-check-2.1.4.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7d043372175f53d8474271061de218ad
+_md5_=5ccb546f75f5be3afdfef24900ef6020
diff --git a/metadata/md5-cache/dev-python/pytest-console-scripts-1.3.1 b/metadata/md5-cache/dev-python/pytest-console-scripts-1.3.1
index 753cfc4eca95..ea43b3f6a899 100644
--- a/metadata/md5-cache/dev-python/pytest-console-scripts-1.3.1
+++ b/metadata/md5-cache/dev-python/pytest-console-scripts-1.3.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pytest plugin for testing console scripts
 EAPI=8
 HOMEPAGE=https://github.com/kvas-it/pytest-console-scripts
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/pytest-4.0.0[python_targets_python3_9(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-console-scripts/pytest-console-scripts-1.3.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=39343d545cd609b1c3e310e4a5b5f9d5
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-console-scripts/pytest-console-scripts-1.3.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=814dd41bb6f6f0b9be21c24014bb11b2
diff --git a/metadata/md5-cache/dev-python/pytest-datadir-1.4.1 b/metadata/md5-cache/dev-python/pytest-datadir-1.4.1
index 3d977b6e936c..39236330541d 100644
--- a/metadata/md5-cache/dev-python/pytest-datadir-1.4.1
+++ b/metadata/md5-cache/dev-python/pytest-datadir-1.4.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pytest plugin for manipulating test data directories and files
 EAPI=8
 HOMEPAGE=https://github.com/gabrielcnr/pytest-datadir/ https://pypi.org/project/pytest-datadir/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-datadir/pytest-datadir-1.4.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7ce846568df42cd47ce2dd9383ab9faa
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-datadir/pytest-datadir-1.4.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=cd5fbb771cc113c4450e6674be5a42b9
diff --git a/metadata/md5-cache/dev-python/pytest-describe-2.0.1-r1 b/metadata/md5-cache/dev-python/pytest-describe-2.0.1-r1
index cfa8a75bcb54..96db8977095f 100644
--- a/metadata/md5-cache/dev-python/pytest-describe-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-describe-2.0.1-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Describe-style plugin for pytest
 EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-describe/ https://pypi.org/project/pytest-describe/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/pytest-2.6.0[python_targets_python3_9(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-describe/pytest-describe-2.0.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b00d874952941ea840656a5542f96c76
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-describe/pytest-describe-2.0.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ff448f5c86b08090a7f7a8c814751dc5
diff --git a/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r2 b/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r2
index 27b57756b783..12055437c809 100644
--- a/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r2
+++ b/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pytest plugin that stores test expectations by saving the set of failing tests
 EAPI=8
 HOMEPAGE=https://github.com/gsnedders/pytest-expect/ https://pypi.org/project/pytest-expect/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 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
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-expect/pytest-expect-1.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d1787972505e273ec2d6a3dd5b97206f
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-expect/pytest-expect-1.1.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f6508e4debac6b1d1dd8a1706d6bdf90
diff --git a/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r2 b/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r2
index 9e66d0f749ef..af242ba5cf2c 100644
--- a/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r2
+++ b/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Virtualenv fixture for py.test
 EAPI=8
 HOMEPAGE=https://github.com/man-group/pytest-plugins/ https://pypi.org/project/pytest-fixture-config/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-fixture-config/pytest-fixture-config-1.7.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=be27d868df1fe1f6d842336631914e06
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-fixture-config/pytest-fixture-config-1.7.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=29bb2a9b5b8f2a5f7ed91e26957b5c80
diff --git a/metadata/md5-cache/dev-python/pytest-flake8-1.1.1 b/metadata/md5-cache/dev-python/pytest-flake8-1.1.1
index 787d02cb7b42..52d92bc285dc 100644
--- a/metadata/md5-cache/dev-python/pytest-flake8-1.1.1
+++ b/metadata/md5-cache/dev-python/pytest-flake8-1.1.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pytest plugin for flake8
 EAPI=8
 HOMEPAGE=https://github.com/tholo/pytest-flake8/ https://pypi.org/project/pytest-flake8/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/flake8-4.0[python_targets_python3_9(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-flake8/pytest-flake8-1.1.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=25885feb125a3fbb00f307d7016a382e
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-flake8/pytest-flake8-1.1.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=df439418b87fddcf5711a04621213397
diff --git a/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3 b/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
index 069076d54431..3909c298a982 100644
--- a/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
+++ b/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=It helps to use fixtures in pytest.mark.parametrize
 EAPI=8
 HOMEPAGE=https://github.com/tvorog/pytest-lazy-fixture
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ec0220f64cd30a1e81dc6a284dc5c573
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0f7ad7ac8d20e2eaac5522b62daa1af9
diff --git a/metadata/md5-cache/dev-python/pytest-markdown-1.0.2-r1 b/metadata/md5-cache/dev-python/pytest-markdown-1.0.2-r1
index 612bfd3042f1..673d167bdd1e 100644
--- a/metadata/md5-cache/dev-python/pytest-markdown-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/pytest-markdown-1.0.2-r1
@@ -2,14 +2,14 @@ BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Run tests in your markdown
 EAPI=8
-HOMEPAGE=https://github.com/Jc2k/pytest-markdown
-INHERIT=distutils-r1
+HOMEPAGE=https://github.com/Jc2k/pytest-markdown/ https://pypi.org/project/pytest-markdown/
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/commonmark-0.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest_markdown/pytest_markdown-1.0.2.tar.gz -> pytest-markdown-1.0.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6ae074bd99210ca1e6d592290abfb6d8
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-markdown/pytest_markdown-1.0.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=879c41cb62fc8f835ded06b85df81985
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.10.0 b/metadata/md5-cache/dev-python/pytest-mock-3.10.0
index 5a7cd95d52da..40e192273794 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-3.10.0
+++ b/metadata/md5-cache/dev-python/pytest-mock-3.10.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Thin-wrapper around the mock package for easier use with pytest
 EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-mock/ https://pypi.org/project/pytest-mock/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-3.10.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6d6c42e4e59a8336385d3cf1420ead0f
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-mock/pytest-mock-3.10.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=27db221a6e2a83b0909b0af810f072e4
diff --git a/metadata/md5-cache/dev-python/pytest-mpl-0.16.1 b/metadata/md5-cache/dev-python/pytest-mpl-0.16.1
index 605ac2aa2eb4..3a787c4e10e4 100644
--- a/metadata/md5-cache/dev-python/pytest-mpl-0.16.1
+++ b/metadata/md5-cache/dev-python/pytest-mpl-0.16.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Facilitate image comparison for Matplotlib figures
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-mpl/ https://github.com/matplotlib/pytest-mpl
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-mpl/pytest-mpl-0.16.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d067c25668afe0c1b1422825a8db2c12
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-mpl/pytest-mpl-0.16.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=3dfe090d36a1a51b3dc4e850e2eda532
diff --git a/metadata/md5-cache/dev-python/pytest-plus-0.4.0 b/metadata/md5-cache/dev-python/pytest-plus-0.4.0
index fd0b903344e3..339cf4635831 100644
--- a/metadata/md5-cache/dev-python/pytest-plus-0.4.0
+++ b/metadata/md5-cache/dev-python/pytest-plus-0.4.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=PyTest Plus Plugin - extends pytest functionality
 EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-plus/ https://pypi.org/project/pytest-plus/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/pytest-6.0.1[python_targets_python3_9(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-plus/pytest-plus-0.4.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=af4a299c67051da811ed86f012f43cd1
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-plus/pytest-plus-0.4.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=7d545b0fd4f91d23950a0c5d7970c7dd
diff --git a/metadata/md5-cache/dev-python/pytest-qt-4.2.0 b/metadata/md5-cache/dev-python/pytest-qt-4.2.0
index e7756ea1a04c..6f63151492d9 100644
--- a/metadata/md5-cache/dev-python/pytest-qt-4.2.0
+++ b/metadata/md5-cache/dev-python/pytest-qt-4.2.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pytest plugin for PyQt5 and PySide2 applications
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-qt/ https://github.com/pytest-dev/pytest-qt/
-INHERIT=distutils-r1 virtualx
+INHERIT=distutils-r1 virtualx pypi
 IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/QtPy[gui,testlib,widgets(+),python_targets_python3_9(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-4.2.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=6c91c196398b514bf1a8bbcdf6f37cc3
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-qt/pytest-qt-4.2.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=a7e3e09229fb9de53a3955ddf6dd47dc
diff --git a/metadata/md5-cache/dev-python/pytest-regressions-2.4.2 b/metadata/md5-cache/dev-python/pytest-regressions-2.4.2
index 223ba335da89..0bfc66458a7c 100644
--- a/metadata/md5-cache/dev-python/pytest-regressions-2.4.2
+++ b/metadata/md5-cache/dev-python/pytest-regressions-2.4.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Easy to use fixtures to write regression tests
 EAPI=8
 HOMEPAGE=https://github.com/ESSS/pytest-regressions/ https://pypi.org/project/pytest-regressions/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_pypy3 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
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-regressions/pytest-regressions-2.4.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e4e9c7c945542f757dc7dd237e91f9de
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-regressions/pytest-regressions-2.4.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=91efaf0a583ed020407af5aaffc876aa
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r3 b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r3
index c18148a67852..9347249286a1 100644
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r3
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A goodie-bag of unix shell and environment tools for py.test
 EAPI=8
 HOMEPAGE=https://github.com/man-group/pytest-plugins/ https://pypi.org/project/pytest-shutil/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-shutil/pytest-shutil-1.7.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f4b3f1c78cc1add944f3961c539cc440
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-shutil/pytest-shutil-1.7.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e239dc4627856edef62c2969db773c7f
diff --git a/metadata/md5-cache/dev-python/pytest-sugar-0.9.6 b/metadata/md5-cache/dev-python/pytest-sugar-0.9.6
index a25545344afd..d231d21a2930 100644
--- a/metadata/md5-cache/dev-python/pytest-sugar-0.9.6
+++ b/metadata/md5-cache/dev-python/pytest-sugar-0.9.6
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Plugin that changes the default look and feel of pytest
 EAPI=8
 HOMEPAGE=https://github.com/Teemu/pytest-sugar/ https://pypi.org/project/pytest-sugar/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-sugar/pytest-sugar-0.9.6.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=099ae8c2bb5933079cb7f3e052baa52a
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-sugar/pytest-sugar-0.9.6.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=30fd281795667ef2ca0e9a033bf8a303
diff --git a/metadata/md5-cache/dev-python/pytest-testinfra-7.0.0 b/metadata/md5-cache/dev-python/pytest-testinfra-7.0.0
index ed4985c1e449..9eab9d8b8f78 100644
--- a/metadata/md5-cache/dev-python/pytest-testinfra-7.0.0
+++ b/metadata/md5-cache/dev-python/pytest-testinfra-7.0.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Write unit tests in Python to test actual state of your servers
 EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-testinfra/ https://pypi.org/project/pytest-testinfra/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_1
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-testinfra/pytest-testinfra-7.0.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=891bb69a1f6f18b227eb9383c5a5bc9a
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-testinfra/pytest-testinfra-7.0.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=2a3c3023961ded7cdae27c10bc857b64
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-2.1.0 b/metadata/md5-cache/dev-python/pytest-timeout-2.1.0
index 7fe6945d070e..ec1f8de40794 100644
--- a/metadata/md5-cache/dev-python/pytest-timeout-2.1.0
+++ b/metadata/md5-cache/dev-python/pytest-timeout-2.1.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pytest plugin to abort hanging tests
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-timeout/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-2.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1b9574881be5847f7e402822c7300605
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-timeout/pytest-timeout-2.1.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e2e246a432bdc11d643634d0ea4a6fba
diff --git a/metadata/md5-cache/dev-python/pytest-tornasync-0.6.0_p2 b/metadata/md5-cache/dev-python/pytest-tornasync-0.6.0_p2
index 414e595304cb..5eb7979d2708 100644
--- a/metadata/md5-cache/dev-python/pytest-tornasync-0.6.0_p2
+++ b/metadata/md5-cache/dev-python/pytest-tornasync-0.6.0_p2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pytest plugin for testing Python 3.5+ Tornado code
 EAPI=8
 HOMEPAGE=https://github.com/eukaryote/pytest-tornasync
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/pytest-3.0[python_targets_python3_9(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-tornasync/pytest-tornasync-0.6.0.post2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=19a0761dc06c1fc77675345e302d6e97
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-tornasync/pytest-tornasync-0.6.0.post2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=aaca1e08be6662942ab61c27ab484aff
diff --git a/metadata/md5-cache/dev-python/pytest-trio-0.8.0 b/metadata/md5-cache/dev-python/pytest-trio-0.8.0
index c45a97985fdb..d38cb4e7ec67 100644
--- a/metadata/md5-cache/dev-python/pytest-trio-0.8.0
+++ b/metadata/md5-cache/dev-python/pytest-trio-0.8.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=This is a pytest plugin to help you test projects that use Trio
 EAPI=8
 HOMEPAGE=https://github.com/python-trio/pytest-trio https://pypi.org/project/pytest-trio/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( MIT Apache-2.0 )
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/outcome-1.1.0[python_targets_pypy3(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-trio/pytest-trio-0.8.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fa054e548e8952aea4d619833f5b6148
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-trio/pytest-trio-0.8.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6ef878ff341e271e8ff1e90bf4245377
diff --git a/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0 b/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0
index d51cc9c0c6fa..e13542730256 100644
--- a/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0
+++ b/metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=More descriptive parametrized-test IDs for py.test
 EAPI=8
 HOMEPAGE=https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-verbose-parametrize/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=db8f41fa43a9ecefce3b5aa831c81149
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=53c4b5f2bf27d0c9ad533f1f79d0decf
diff --git a/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r2 b/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r2
index b25001274980..11136caef904 100644
--- a/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r2
+++ b/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Virtualenv fixture for py.test
 EAPI=8
 HOMEPAGE=https://github.com/man-group/pytest-plugins/ https://pypi.org/project/pytest-virtualenv/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-virtualenv/pytest-virtualenv-1.7.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9b1133c06182a42a43c328add9dc8228
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-virtualenv/pytest-virtualenv-1.7.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=36f107fc10a37447d3b169f19a9849bb
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-3.1.0 b/metadata/md5-cache/dev-python/pytest-xdist-3.1.0
deleted file mode 100644
index 93395b55052e..000000000000
--- a/metadata/md5-cache/dev-python/pytest-xdist-3.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Distributed testing and loop-on-failing modes
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 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=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-3.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a2d145a0912e019604d20085e53d5b0e
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-3.2.0 b/metadata/md5-cache/dev-python/pytest-xdist-3.2.0
deleted file mode 100644
index 9b0792e20b38..000000000000
--- a/metadata/md5-cache/dev-python/pytest-xdist-3.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Distributed testing and loop-on-failing modes
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 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=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-xdist/pytest-xdist-3.2.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c68eb8da5e4f7bf237c2c64396fac3bd
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-3.2.1 b/metadata/md5-cache/dev-python/pytest-xdist-3.2.1
index c5257c0bb3b6..e0711169223f 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-3.2.1
+++ b/metadata/md5-cache/dev-python/pytest-xdist-3.2.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-xdist/pytest-xdist-3.2.1.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c68eb8da5e4f7bf237c2c64396fac3bd
+_md5_=5488dc9cac4759a99f951ced42388cc6
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.22.2 b/metadata/md5-cache/dev-python/pytest-xprocess-0.22.2
index c17f8973e32e..01703d3a9c4a 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.22.2
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.22.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Manage external processes across test runs
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/py[python_targets_pypy3(-)?,python_targets_python3_9(-)?,pyth
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.22.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1aff37a48e79bab5e025bde9a63780fe
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-xprocess/pytest-xprocess-0.22.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c20402e5cea97f8f19949b8b61d8e0b9
diff --git a/metadata/md5-cache/dev-python/python-augeas-1.1.0-r1 b/metadata/md5-cache/dev-python/python-augeas-1.1.0-r1
index 7bdf9735ddca..c4ffa3b95cf9 100644
--- a/metadata/md5-cache/dev-python/python-augeas-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/python-augeas-1.1.0-r1
@@ -4,13 +4,13 @@ DEPEND=app-admin/augeas >=dev-python/cffi-1.0.0[python_targets_python3_9(-)?,pyt
 DESCRIPTION=Python bindings for Augeas
 EAPI=8
 HOMEPAGE=http://augeas.net/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-admin/augeas >=dev-python/cffi-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-augeas/python-augeas-1.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=37d3722c7a494d498bfa32b4db53c2c2
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-augeas/python-augeas-1.1.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=83101fa0430e3012b5db324f0cd5be58
diff --git a/metadata/md5-cache/dev-python/python-bugzilla-3.2.0-r1 b/metadata/md5-cache/dev-python/python-bugzilla-3.2.0-r1
index fa3cd7fbe777..dddd74809bf7 100644
--- a/metadata/md5-cache/dev-python/python-bugzilla-3.2.0-r1
+++ b/metadata/md5-cache/dev-python/python-bugzilla-3.2.0-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A python module for interacting with Bugzilla over XMLRPC
 EAPI=8
 HOMEPAGE=https://github.com/python-bugzilla/python-bugzilla/ https://pypi.org/project/python-bugzilla/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+
@@ -11,6 +11,6 @@ RDEPEND=|| ( dev-python/python-magic[python_targets_python3_9(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-bugzilla/python-bugzilla-3.2.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=288669053a0f813720e270bc88e80c53
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-bugzilla/python-bugzilla-3.2.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=7ed40fc50ad3828368804b8e2fd1819e
diff --git a/metadata/md5-cache/dev-python/python-daemon-2.3.2 b/metadata/md5-cache/dev-python/python-daemon-2.3.2
index a146a1a1726a..c1249ce4229b 100644
--- a/metadata/md5-cache/dev-python/python-daemon-2.3.2
+++ b/metadata/md5-cache/dev-python/python-daemon-2.3.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library to implement a well-behaved Unix daemon process
 EAPI=8
 HOMEPAGE=https://pagure.io/python-daemon/ https://pypi.org/project/python-daemon/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=dev-python/lockfile[python_targets_pypy3(-)?,python_targets_python3_9(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-daemon/python-daemon-2.3.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9c73d7428f3dcca2fa850fc3b88339f3
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-daemon/python-daemon-2.3.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d417538c044670886c0ec5cd278faa23
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.8.2-r1 b/metadata/md5-cache/dev-python/python-dateutil-2.8.2-r1
index 36a5aea6a091..1c6791fc9321 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.8.2-r1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.8.2-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extensions to the standard Python datetime module
 EAPI=8
 HOMEPAGE=https://dateutil.readthedocs.io/ https://pypi.org/project/python-dateutil/ https://github.com/dateutil/dateutil/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.8.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bb14d47ce88a86f3a9d97b02ddcb4ce0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-dateutil/python-dateutil-2.8.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=3a052661ea0412d2aea13e92cf71f82e
diff --git a/metadata/md5-cache/dev-python/python-editor-1.0.4-r2 b/metadata/md5-cache/dev-python/python-editor-1.0.4-r2
index 59c60652c3d5..762d82ac8bd8 100644
--- a/metadata/md5-cache/dev-python/python-editor-1.0.4-r2
+++ b/metadata/md5-cache/dev-python/python-editor-1.0.4-r2
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Programmatically open an editor, capture the result
 EAPI=8
 HOMEPAGE=https://github.com/fmoo/python-editor/ https://pypi.org/project/python-editor/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-editor/python-editor-1.0.4.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1e9036984442bb365884b657c6288484
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-editor/python-editor-1.0.4.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=2d7af41439e923f5918877790a44e46b
diff --git a/metadata/md5-cache/dev-python/python-gflags-3.1.2-r2 b/metadata/md5-cache/dev-python/python-gflags-3.1.2-r2
index cc2f083dd44d..b01ccea74a87 100644
--- a/metadata/md5-cache/dev-python/python-gflags-3.1.2-r2
+++ b/metadata/md5-cache/dev-python/python-gflags-3.1.2-r2
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Google's Python argument parsing library
 EAPI=8
 HOMEPAGE=https://github.com/google/python-gflags
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-gflags/python-gflags-3.1.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2908d6b406d9c1a352ff423cf9cc1c70
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-gflags/python-gflags-3.1.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6f110c8dc53aa492bb1b9287e31951e1
diff --git a/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0 b/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0
index 2b7bc664afde..e1a64e5de43b 100644
--- a/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0
+++ b/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JSON RPC 2.0 server library
 EAPI=7
 HOMEPAGE=https://github.com/python-lsp/python-lsp-jsonrpc
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/ujson-3[python_targets_python3_9(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3ca25588ee5225b51efece97bce72394
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=2cc5122e5098fd16551ce3ac9cf039c7
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.7.1 b/metadata/md5-cache/dev-python/python-lsp-server-1.7.1
index ac2c052c7ef6..15bf4a397e33 100644
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.7.1
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.7.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Python Language Server for the Language Server Protocol
 EAPI=8
 HOMEPAGE=https://github.com/python-lsp/python-lsp-server
-INHERIT=distutils-r1 optfeature
+INHERIT=distutils-r1 optfeature pypi
 IUSE=all-plugins test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/docstring-to-markdown[python_targets_python3_9(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-lsp-server/python-lsp-server-1.7.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=99d946b0b7a6d8504157f86beb43a430
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-lsp-server/python-lsp-server-1.7.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=be87c0fcf087ed33d91ff76d96ce74fd
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.14-r1 b/metadata/md5-cache/dev-python/python-lzo-1.14-r1
index e6daf2c6a7a1..897210f53046 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.14-r1
+++ b/metadata/md5-cache/dev-python/python-lzo-1.14-r1
@@ -4,7 +4,7 @@ DEPEND=dev-libs/lzo:2
 DESCRIPTION=Python interface to lzo
 EAPI=8
 HOMEPAGE=https://github.com/jd-boyd/python-lzo
-INHERIT=distutils-r1 prefix
+INHERIT=distutils-r1 prefix pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -12,6 +12,6 @@ RDEPEND=dev-libs/lzo:2 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-lzo/python-lzo-1.14.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6a4f441fb4fff218151d8b6c98aeebc4
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-lzo/python-lzo-1.14.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=fcd4907929e2cb3109aea71298caab1d
diff --git a/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3 b/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
index f35655f37be0..722142e9db8e 100644
--- a/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
+++ b/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Basic functions for handling mime-types in python
 EAPI=7
 HOMEPAGE=https://github.com/dbtsai/python-mimeparse
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 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 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-mimeparse/python-mimeparse-1.6.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=661897c2fa399709d33305458fa20580
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-mimeparse/python-mimeparse-1.6.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=558d3d43f9c5b942c2430682c39f036b
diff --git a/metadata/md5-cache/dev-python/python-redmine-2.4.0 b/metadata/md5-cache/dev-python/python-redmine-2.4.0
index d009808f2582..9db5631e5431 100644
--- a/metadata/md5-cache/dev-python/python-redmine-2.4.0
+++ b/metadata/md5-cache/dev-python/python-redmine-2.4.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python interface to the Redmine REST API
 EAPI=8
 HOMEPAGE=https://github.com/maxtepkeev/python-redmine/ https://pypi.org/project/python-redmine/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/requests-2.28.2[python_targets_python3_9(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-redmine/python-redmine-2.4.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a41e77717d3c2bd7d51ae33ad1917caa
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-redmine/python-redmine-2.4.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=03128a0dd1d06b8dddf8125d933f6db4
diff --git a/metadata/md5-cache/dev-python/python-rtmidi-1.4.9 b/metadata/md5-cache/dev-python/python-rtmidi-1.4.9
index da0655f1224a..e1a42d6615aa 100644
--- a/metadata/md5-cache/dev-python/python-rtmidi-1.4.9
+++ b/metadata/md5-cache/dev-python/python-rtmidi-1.4.9
@@ -4,7 +4,7 @@ DEPEND=media-libs/rtmidi[alsa?,jack?]
 DESCRIPTION=Python bindings for media-libs/rtmidi implemented using Cython
 EAPI=8
 HOMEPAGE=https://pypi.org/project/python-rtmidi/ https://spotlightkid.github.io/python-rtmidi/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=+alsa jack doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -12,6 +12,6 @@ RDEPEND=media-libs/rtmidi[alsa?,jack?] python_targets_python3_9? ( >=dev-lang/py
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-rtmidi/python-rtmidi-1.4.9.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b032f5874e6bbe336586eccee8edbf5b
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-rtmidi/python-rtmidi-1.4.9.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a6652980b71e2e36afccc80e70a40842
diff --git a/metadata/md5-cache/dev-python/python-snappy-0.6.1 b/metadata/md5-cache/dev-python/python-snappy-0.6.1
index a85257720dc6..80d10271a072 100644
--- a/metadata/md5-cache/dev-python/python-snappy-0.6.1
+++ b/metadata/md5-cache/dev-python/python-snappy-0.6.1
@@ -4,13 +4,13 @@ DEPEND=>=app-arch/snappy-1.0.2:=
 DESCRIPTION=Python library for the snappy compression library from Google
 EAPI=8
 HOMEPAGE=https://github.com/andrix/python-snappy/ https://pypi.org/project/python-snappy/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=app-arch/snappy-1.0.2:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-snappy/python-snappy-0.6.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=39bc5c4881eea8b4e6e39b0dba4c424e
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-snappy/python-snappy-0.6.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=61c8ad39f0d83dd8278c12e94ba3dc67
diff --git a/metadata/md5-cache/dev-python/python-utils-3.4.5 b/metadata/md5-cache/dev-python/python-utils-3.4.5
deleted file mode 100644
index 92aa349f64f2..000000000000
--- a/metadata/md5-cache/dev-python/python-utils-3.4.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of small Python functions & classes
-EAPI=8
-HOMEPAGE=https://github.com/WoLpH/python-utils/ https://pypi.org/project/python-utils/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-utils/python-utils-3.4.5.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a67ac89c8f4903ba105e7f7d4177cecd
diff --git a/metadata/md5-cache/dev-python/python-utils-3.5.1 b/metadata/md5-cache/dev-python/python-utils-3.5.1
deleted file mode 100644
index 245a82bfb113..000000000000
--- a/metadata/md5-cache/dev-python/python-utils-3.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of small Python functions & classes
-EAPI=8
-HOMEPAGE=https://github.com/WoLpH/python-utils/ https://pypi.org/project/python-utils/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/python-utils/python-utils-3.5.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=745f45740364114c3f54042be4a66b35
diff --git a/metadata/md5-cache/dev-python/python-utils-3.5.2 b/metadata/md5-cache/dev-python/python-utils-3.5.2
index 0929924d0af6..e9d3a9de9cf0 100644
--- a/metadata/md5-cache/dev-python/python-utils-3.5.2
+++ b/metadata/md5-cache/dev-python/python-utils-3.5.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/WoLpH/python-utils/ https://pypi.org/project/python-utils/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/python-utils/python-utils-3.5.2.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=745f45740364114c3f54042be4a66b35
+_md5_=1e80855bb638055740826f0f1c7ea896
diff --git a/metadata/md5-cache/dev-python/python-vlc-3.0.18121 b/metadata/md5-cache/dev-python/python-vlc-3.0.18121
index 1322482fc9aa..df3bf4a41aad 100644
--- a/metadata/md5-cache/dev-python/python-vlc-3.0.18121
+++ b/metadata/md5-cache/dev-python/python-vlc-3.0.18121
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python ctypes-based bindings for libvlc
 EAPI=8
 HOMEPAGE=https://github.com/oaubert/python-vlc https://wiki.videolan.org/Python_bindings/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1+
 RDEPEND=media-video/vlc python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-vlc/python-vlc-3.0.18121.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=03223c773c0e133e3b7dad604a30d085
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-vlc/python-vlc-3.0.18121.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=1a8806ccb9599ef79c8fa781a3d1bfba
diff --git a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.0 b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.0
index 5a54825eec99..5a204de78c4e 100644
--- a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.0
+++ b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.2.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Code specific for Read the Docs and Sphinx
 EAPI=8
 HOMEPAGE=https://github.com/readthedocs/readthedocs-sphinx-ext/ https://pypi.org/project/readthedocs-sphinx-ext/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_9
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/r/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=087c51c9f13f77385cc83a8da0f4ba7a
+SRC_URI=https://files.pythonhosted.org/packages/source/r/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=62ee26d171a7fb1161d3ef83eeff7ab3
diff --git a/metadata/md5-cache/dev-python/requests-file-1.5.1-r2 b/metadata/md5-cache/dev-python/requests-file-1.5.1-r2
index c36fa4885574..aed38b952854 100644
--- a/metadata/md5-cache/dev-python/requests-file-1.5.1-r2
+++ b/metadata/md5-cache/dev-python/requests-file-1.5.1-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=File transport adapter for Requests
 EAPI=8
 HOMEPAGE=https://pypi.org/project/requests-file/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/r/requests-file/requests-file-1.5.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9f9a2dea2dc603364bf885d0db785efb
+SRC_URI=https://files.pythonhosted.org/packages/source/r/requests-file/requests-file-1.5.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=aa1beef0475a03b4775345a2a50185bc
diff --git a/metadata/md5-cache/dev-python/requests-futures-1.0.0-r1 b/metadata/md5-cache/dev-python/requests-futures-1.0.0-r1
index 3f274aa9be5e..edb51f681f30 100644
--- a/metadata/md5-cache/dev-python/requests-futures-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/requests-futures-1.0.0-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Asynchronous Python HTTP for Humans
 EAPI=8
 HOMEPAGE=https://github.com/ross/requests-futures
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
@@ -12,6 +12,6 @@ RDEPEND=>=dev-python/requests-1.2.0[python_targets_pypy3(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/r/requests-futures/requests-futures-1.0.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3e976d616e0b60fa023fa45a389ac87e
+SRC_URI=https://files.pythonhosted.org/packages/source/r/requests-futures/requests-futures-1.0.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5cdfa1da06580c1a60982a92e82eb336
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.10.0 b/metadata/md5-cache/dev-python/requests-mock-1.10.0
index b239cc38784f..2e0b367189a8 100644
--- a/metadata/md5-cache/dev-python/requests-mock-1.10.0
+++ b/metadata/md5-cache/dev-python/requests-mock-1.10.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Mock out responses from the requests package
 EAPI=8
 HOMEPAGE=https://github.com/jamielennox/requests-mock
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/requests-2.3[python_targets_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/r/requests-mock/requests-mock-1.10.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c979b8c1ae11bb9da85644dba7d2682a
+SRC_URI=https://files.pythonhosted.org/packages/source/r/requests-mock/requests-mock-1.10.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ce45c28a3eb553731083cbadaefff7e3
diff --git a/metadata/md5-cache/dev-python/requests-unixsocket-0.3.0-r2 b/metadata/md5-cache/dev-python/requests-unixsocket-0.3.0-r2
index 435325cdab36..c6b2c80e2926 100644
--- a/metadata/md5-cache/dev-python/requests-unixsocket-0.3.0-r2
+++ b/metadata/md5-cache/dev-python/requests-unixsocket-0.3.0-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Use requests to talk HTTP via a UNIX domain socket
 EAPI=8
 HOMEPAGE=https://github.com/msabramo/requests-unixsocket/ https://pypi.org/project/requests-unixsocket/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/r/requests-unixsocket/requests-unixsocket-0.3.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c15aab7730d895181d1554e46ae44ef8
+SRC_URI=https://files.pythonhosted.org/packages/source/r/requests-unixsocket/requests-unixsocket-0.3.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=3e7ae6254d56e9dbd9b39a2bba7594b3
diff --git a/metadata/md5-cache/dev-python/restructuredtext-lint-1.4.0 b/metadata/md5-cache/dev-python/restructuredtext-lint-1.4.0
index b14d359e4834..73118053010a 100644
--- a/metadata/md5-cache/dev-python/restructuredtext-lint-1.4.0
+++ b/metadata/md5-cache/dev-python/restructuredtext-lint-1.4.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Checks PyPI validity of reStructuredText
 EAPI=8
 HOMEPAGE=https://pypi.org/project/restructuredtext-lint/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Unlicense
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/docutils-0.11[python_targets_python3_9(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/r/restructuredtext_lint/restructuredtext_lint-1.4.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b16cf09f3a7bd288e0819bf9bcaf1a2b
+SRC_URI=https://files.pythonhosted.org/packages/source/r/restructuredtext-lint/restructuredtext_lint-1.4.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=66f1f2c6fe1a23b5c54e72a32076a2f2
diff --git a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1-r1 b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1-r1
index c183a68e5b62..2386438937a2 100644
--- a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure python RFC3986 validator
 EAPI=8
 HOMEPAGE=https://pypi.org/project/rfc3986-validator/ https://github.com/naimetti/rfc3986-validator
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_9(-)?
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/r/rfc3986_validator/rfc3986_validator-0.1.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a7a69da792cc461a3c40a835bd530fb0
+SRC_URI=https://files.pythonhosted.org/packages/source/r/rfc3986-validator/rfc3986_validator-0.1.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=da5b8c16b23e63adb5e284eec3e22f7b
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.74 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
index db4755755b71..cda2913129c0 100644
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
+++ b/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python object API for managing the Linux LIO kernel target
 EAPI=7
 HOMEPAGE=https://github.com/open-iscsi/rtslib-fb
-INHERIT=distutils-r1 systemd
+INHERIT=distutils-r1 systemd pypi
 IUSE=python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyudev[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.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.74.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e8186b0777e138ebdabd2cf66e077ec5
+SRC_URI=https://files.pythonhosted.org/packages/source/r/rtslib-fb/rtslib-fb-2.1.74.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=fd9ef639a66289828c272ab6437187b5
diff --git a/metadata/md5-cache/dev-python/scikit-build-0.16.7 b/metadata/md5-cache/dev-python/scikit-build-0.16.7
index f4dca25e656a..421dfcdd8f37 100644
--- a/metadata/md5-cache/dev-python/scikit-build-0.16.7
+++ b/metadata/md5-cache/dev-python/scikit-build-0.16.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/scikit-build/scikit-build/ https://pypi.org/project/scikit-build/
 INHERIT=distutils-r1 pypi
 IUSE=doc test 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/distro[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-42.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.32.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/scikit-build/scikit-build-0.16.7.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9aadeeba3c3244bf62901a8c1db9defc
+_md5_=dcae7121ed36734d268f70c3886d11b8
diff --git a/metadata/md5-cache/dev-python/setuptools-git-1.2-r3 b/metadata/md5-cache/dev-python/setuptools-git-1.2-r3
index e5c34010e67a..d72a8a447938 100644
--- a/metadata/md5-cache/dev-python/setuptools-git-1.2-r3
+++ b/metadata/md5-cache/dev-python/setuptools-git-1.2-r3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Setuptools revision control system plugin for Git
 EAPI=8
 HOMEPAGE=https://github.com/msabramo/setuptools-git/ https://pypi.org/project/setuptools-git/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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=BSD
@@ -11,6 +11,6 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/setuptools-git/setuptools-git-1.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=63eb8a3e863948472d64066c1e25c323
+SRC_URI=https://files.pythonhosted.org/packages/source/s/setuptools-git/setuptools-git-1.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b5d45188b8be9109fb142b59499773e7
diff --git a/metadata/md5-cache/dev-python/soupsieve-2.3.2_p1 b/metadata/md5-cache/dev-python/soupsieve-2.3.2_p1
deleted file mode 100644
index f27a4a8dd112..000000000000
--- a/metadata/md5-cache/dev-python/soupsieve-2.3.2_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A modern CSS selector implementation for BeautifulSoup
-EAPI=8
-HOMEPAGE=https://github.com/facelessuser/soupsieve/ https://pypi.org/project/soupsieve/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 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
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/soupsieve/archive/2.3.2.post1.tar.gz -> soupsieve-2.3.2.post1.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ae80c03ae009beee69857e7311face78
diff --git a/metadata/md5-cache/dev-python/soupsieve-2.4 b/metadata/md5-cache/dev-python/soupsieve-2.4
index eaeeee52f5e5..ffbe98e01bdf 100644
--- a/metadata/md5-cache/dev-python/soupsieve-2.4
+++ b/metadata/md5-cache/dev-python/soupsieve-2.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/facelessuser/soupsieve/ https://pypi.org/project/soupsieve/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 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/facelessuser/soupsieve/archive/2.4.tar.gz -> soupsieve-2.4.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a977c46ee99a44dec06957be503da27f
+_md5_=5aa82a379e618b4e94696fcdd47bea66
diff --git a/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4 b/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
index 3cef67354cda..15c4deb53c68 100644
--- a/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
+++ b/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx epytext extension
 EAPI=7
 HOMEPAGE=https://pypi.org/project/sphinx-epytext/ https://github.com/jayvdb/sphinx-epytext
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_pypy3 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
 LICENSE=MIT
 RDEPEND=>=dev-python/sphinx-1.7.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinx-epytext/sphinx-epytext-0.0.4.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=224680cb59b578ec597b2560d6dfd69a
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx-epytext/sphinx-epytext-0.0.4.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=126df535534b485d0e4ba71ddd911e53
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-apidoc-0.3.0-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-apidoc-0.3.0-r1
index 46de274885c3..3a80c0f4bb18 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-apidoc-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-apidoc-0.3.0-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extension for running sphinx-apidoc on each build
 EAPI=8
 HOMEPAGE=https://pypi.org/project/sphinxcontrib-apidoc/ https://github.com/sphinx-contrib/apidoc/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=dev-python/pbr[python_targets_python3_9(-)?,python_targets_python3_10(-)
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d6b679e64784435f44e7b6b1b260a78b
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=fccd3559134acdb6264c8043e68aedb7
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.3.0-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.3.0-r1
index 5f400b386e03..eaf8036d39b3 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.3.0-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=sphinx extension to support coroutines in markup
 EAPI=8
 HOMEPAGE=https://github.com/aio-libs/sphinxcontrib-asyncio/ https://pypi.org/project/sphinxcontrib-asyncio/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=doc 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 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ddfb10a8d02c858b129f4108cc97ce06
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b703a27cc2a4947f34af294aa0044cd3
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.8 b/metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.8
index 9210975f72f3..beeda28dea18 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.8
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.8
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Documenting CLI programs
 EAPI=8
 HOMEPAGE=https://github.com/sphinx-contrib/autoprogram/ https://pypi.org/project/sphinxcontrib-autoprogram/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.8.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d2dd7257ebd6e4a4bcd0f7604eae7f20
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.8.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=bab65d97d0a981749e62dc49073203b0
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.5.0 b/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.5.0
index ba7d55be6911..fe44ce9d5532 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.5.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.5.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extensions for BibTeX style citations
 EAPI=8
 HOMEPAGE=https://github.com/mcmtroffaes/sphinxcontrib-bibtex
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/docutils-0.8[python_targets_python3_9(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=040a8df037d0b7d8f7e9f1228ab8b629
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c2fffb8fb69cf6592f9e7c5472f4a7a8
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2-r1
index 8fbfd78bd1d0..2435c0a11b3f 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extension which outputs Devhelp documents
 EAPI=8
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinxcontrib-devhelp/ https://pypi.org/project/sphinxcontrib-devhelp/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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-2
@@ -12,6 +12,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=250a659e18bc3fd0002547c7d098ec23
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ea50b13fae909bf27890ba9b8e6998f2
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r2
index 040080e35a8c..542a28150b59 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extension which renders display math in HTML via JavaScript
 EAPI=8
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinxcontrib-jsmath/ https://pypi.org/project/sphinxcontrib-jsmath/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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-2
@@ -12,6 +12,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4a94e27ae2ec769cf889c9f2a75dac50
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=17429c4cdea7edd4c4d67fe83e2e475e
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4-r1
index 4c9ed9464e36..2d75546e1bc0 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=News Feed extension for Sphinx
 EAPI=8
 HOMEPAGE=https://github.com/prometheusresearch/sphinxcontrib-newsfeed/ https://pypi.org/project/sphinxcontrib-newsfeed/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=examples 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-2
 RDEPEND=dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7777a2a8f8c78113520624ac1413d680
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f77a3ee6db86fb89d17b254d1786d356
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17-r1
index cb8590729d14..f785032376aa 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extension to sphinx to include program output
 EAPI=8
 HOMEPAGE=https://github.com/NextThought/sphinxcontrib-programoutput/ https://pypi.org/project/sphinxcontrib-programoutput/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f73d5de2a5e30ccbd9f19c6d26efc9af
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8ce126dd0f33a8a27aed3196f599f02d
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r1
index a6396947755d..8388cf327ece 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extension which outputs QtHelp documents
 EAPI=8
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinxcontrib-qthelp/ https://pypi.org/project/sphinxcontrib-qthelp/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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-2
@@ -12,6 +12,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=dca0c25e5e2803e9f86bfb6d694fe7c2
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=56fa26692cc566f7758d6a601afc195f
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5-r1
index 3cdf04198c81..440ca2d2c4cb 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extension which outputs outputs serialized HTML files
 EAPI=8
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinxcontrib-serializinghtml/ https://pypi.org/project/sphinxcontrib-serializinghtml/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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-2
@@ -12,6 +12,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=65aae55552478ce72855f3a0b0c84666
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c5277b13513cd9783c738aac0a2251b3
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2 b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
index 9e921e31d8b0..59db06c9e542 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Make Sphinx better at documenting Python functions and methods
 EAPI=8
 HOMEPAGE=https://github.com/python-trio/sphinxcontrib-trio https://pypi.org/project/sphinxcontrib-trio
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test 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
 LICENSE=|| ( Apache-2.0 MIT )
@@ -11,6 +11,6 @@ RDEPEND=dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=462a9304242cd868d7bdae9c5867a6ab
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=1112386f2aa40a09f109548235f60f52
diff --git a/metadata/md5-cache/dev-python/spyder-terminal-1.2.2 b/metadata/md5-cache/dev-python/spyder-terminal-1.2.2
index 007e6be8054b..f3383f10be1b 100644
--- a/metadata/md5-cache/dev-python/spyder-terminal-1.2.2
+++ b/metadata/md5-cache/dev-python/spyder-terminal-1.2.2
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Run system terminals inside Spyder
 EAPI=8
 HOMEPAGE=https://github.com/spyder-ide/spyder-terminal
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT BSD Apache-2.0 BSD-2 ISC CC-BY-4.0 ZLIB WTFPL-2
 RDEPEND=dev-python/coloredlogs[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/spyder-5.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.13.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tornado[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/s/spyder-terminal/spyder-terminal-1.2.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=292536b5f68870d104f52b801a615957
+SRC_URI=https://files.pythonhosted.org/packages/source/s/spyder-terminal/spyder-terminal-1.2.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a9775448d89c7e7c1e1267b0370fb51c
diff --git a/metadata/md5-cache/dev-python/subprocess-tee-0.4.1 b/metadata/md5-cache/dev-python/subprocess-tee-0.4.1
index 1d7ea35d0d72..b3cef4f647a8 100644
--- a/metadata/md5-cache/dev-python/subprocess-tee-0.4.1
+++ b/metadata/md5-cache/dev-python/subprocess-tee-0.4.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=subprocess.run replacement with tee(1)-like output
 EAPI=8
 HOMEPAGE=https://github.com/pycontribs/subprocess-tee/ https://pypi.org/project/subprocess-tee/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test-full test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=test-full? ( test ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/subprocess-tee/subprocess-tee-0.4.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=edacd219276831c1d5f2de619b26118d
+SRC_URI=https://files.pythonhosted.org/packages/source/s/subprocess-tee/subprocess-tee-0.4.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=92241d6bb2e8b3e484476797749fbbeb
diff --git a/metadata/md5-cache/dev-python/suds-community-1.1.2 b/metadata/md5-cache/dev-python/suds-community-1.1.2
index efee071c99a5..afbf52812c29 100644
--- a/metadata/md5-cache/dev-python/suds-community-1.1.2
+++ b/metadata/md5-cache/dev-python/suds-community-1.1.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Lightweight SOAP client
 EAPI=8
 HOMEPAGE=https://github.com/suds-community/suds/ https://pypi.org/project/suds-community/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) py
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/suds-community/suds-community-1.1.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=71c5f847fcace8b08872657e11a76a4d
+SRC_URI=https://files.pythonhosted.org/packages/source/s/suds-community/suds-community-1.1.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4eee40cde6ef0547d674ea0d1223d03c
diff --git a/metadata/md5-cache/dev-python/text-unidecode-1.3-r1 b/metadata/md5-cache/dev-python/text-unidecode-1.3-r1
index 184001186679..d9cf856b6f88 100644
--- a/metadata/md5-cache/dev-python/text-unidecode-1.3-r1
+++ b/metadata/md5-cache/dev-python/text-unidecode-1.3-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The most basic port of the Text::Unidecode Perl library
 EAPI=8
 HOMEPAGE=https://pypi.org/project/text-unidecode/ https://github.com/kmike/text-unidecode/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~ppc64 ~riscv x86
 LICENSE=|| ( Artistic GPL-2+ )
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/t/text-unidecode/text-unidecode-1.3.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=eea8c25b8809f744f919f08c4d861616
+SRC_URI=https://files.pythonhosted.org/packages/source/t/text-unidecode/text-unidecode-1.3.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4ba0b531b1bd8b7ab27390ef543ef1f2
diff --git a/metadata/md5-cache/dev-python/tpm2-pytss-2.1.0 b/metadata/md5-cache/dev-python/tpm2-pytss-2.1.0
index 0e0253796b4c..29339e1f8a92 100644
--- a/metadata/md5-cache/dev-python/tpm2-pytss-2.1.0
+++ b/metadata/md5-cache/dev-python/tpm2-pytss-2.1.0
@@ -4,7 +4,7 @@ DEPEND=app-crypt/tpm2-tss:=[fapi=] fapi? ( >=app-crypt/tpm2-tss-3.0.3:= ) dev-py
 DESCRIPTION=Python bindings for TSS
 EAPI=8
 HOMEPAGE=https://pypi.org/project/tpm2-pytss https://github.com/tpm2-software/tpm2-pytss
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=+fapi test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=BSD-2
@@ -12,6 +12,6 @@ RDEPEND=app-crypt/tpm2-tss:=[fapi=] fapi? ( >=app-crypt/tpm2-tss-3.0.3:= ) dev-p
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/t/tpm2-pytss/tpm2-pytss-2.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cbed63ac7f90647971604e20b2098ec6
+SRC_URI=https://files.pythonhosted.org/packages/source/t/tpm2-pytss/tpm2-pytss-2.1.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=659e9d0a6068810777e0fe219ace4bd8
diff --git a/metadata/md5-cache/dev-python/txaio-22.2.1 b/metadata/md5-cache/dev-python/txaio-22.2.1
deleted file mode 100644
index d37de9de4541..000000000000
--- a/metadata/md5-cache/dev-python/txaio-22.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] >=dev-python/sphinxcontrib-spelling-2.1.2[python_targets_python3_11(-)] >=dev-python/sphinx-rtd-theme-0.1.9[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] >=dev-python/sphinxcontrib-spelling-2.1.2[python_targets_python3_10(-)] >=dev-python/sphinx-rtd-theme-0.1.9[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] >=dev-python/sphinxcontrib-spelling-2.1.2[python_targets_python3_9(-)] >=dev-python/sphinx-rtd-theme-0.1.9[python_targets_python3_9(-)] ) ) ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Compatibility API between asyncio/Twisted/Trollius
-EAPI=8
-HOMEPAGE=https://github.com/crossbario/txaio/ https://pypi.org/project/txaio/
-INHERIT=distutils-r1 optfeature
-IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/txaio/txaio-22.2.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bf2528388753be35aede8e0dc3b99c8b
diff --git a/metadata/md5-cache/dev-python/txaio-23.1.1 b/metadata/md5-cache/dev-python/txaio-23.1.1
index 601985251682..637b90c5cc3d 100644
--- a/metadata/md5-cache/dev-python/txaio-23.1.1
+++ b/metadata/md5-cache/dev-python/txaio-23.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/crossbario/txaio/ https://pypi.org/project/txaio/
 INHERIT=distutils-r1 optfeature pypi
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/txaio/txaio-23.1.1.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b98c62e13409607b9a846ca1366be532
+_md5_=fca47c3cfe9b347cf3fec27f38745995
diff --git a/metadata/md5-cache/dev-python/typed-ast-1.5.4 b/metadata/md5-cache/dev-python/typed-ast-1.5.4
index 9ea791d08cf8..9c54b9200a2a 100644
--- a/metadata/md5-cache/dev-python/typed-ast-1.5.4
+++ b/metadata/md5-cache/dev-python/typed-ast-1.5.4
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python typed-ast backported
 EAPI=8
 HOMEPAGE=https://github.com/python/typed_ast/ https://pypi.org/project/typed-ast/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0 MIT
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/t/typed_ast/typed_ast-1.5.4.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bfe511f7fcdd71cceaa346c68b8937f5
+SRC_URI=https://files.pythonhosted.org/packages/source/t/typed-ast/typed_ast-1.5.4.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=00cd19f22f03a454a5c2d3b1f7a21acd
diff --git a/metadata/md5-cache/dev-python/typing-extensions-4.4.0 b/metadata/md5-cache/dev-python/typing-extensions-4.4.0
deleted file mode 100644
index 798a5fb74026..000000000000
--- a/metadata/md5-cache/dev-python/typing-extensions-4.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Backported and Experimental Type Hints for Python 3.7+
-EAPI=8
-HOMEPAGE=https://pypi.org/project/typing-extensions/ https://github.com/python/typing_extensions/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 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 ~x64-macos ~x64-solaris
-LICENSE=PSF-2
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python/typing_extensions/archive/4.4.0.tar.gz -> typing_extensions-4.4.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=67856945b0d592cf244cb8921e2d0b15
diff --git a/metadata/md5-cache/dev-python/typing-extensions-4.5.0 b/metadata/md5-cache/dev-python/typing-extensions-4.5.0
index 64db049f357a..2ae1d6f52bdb 100644
--- a/metadata/md5-cache/dev-python/typing-extensions-4.5.0
+++ b/metadata/md5-cache/dev-python/typing-extensions-4.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/typing-extensions/ https://github.com/python/typing_extensions/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 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 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 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/python/typing_extensions/archive/4.5.0.tar.gz -> typing_extensions-4.5.0.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bf32fb2d147e3784eb721abb086c97d0
+_md5_=000591b911bcc562f36f857460545ea2
diff --git a/metadata/md5-cache/dev-python/u-msgpack-python-2.7.2 b/metadata/md5-cache/dev-python/u-msgpack-python-2.7.2
index 0d7146cd373d..cf6b96db9eaa 100644
--- a/metadata/md5-cache/dev-python/u-msgpack-python-2.7.2
+++ b/metadata/md5-cache/dev-python/u-msgpack-python-2.7.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A portable, lightweight MessagePack serializer and deserializer
 EAPI=8
 HOMEPAGE=https://github.com/vsergeev/u-msgpack-python/ https://pypi.org/project/u-msgpack-python/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/u/u-msgpack-python/u-msgpack-python-2.7.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d78c912ef822ae3f63eb974b9502ef29
+SRC_URI=https://files.pythonhosted.org/packages/source/u/u-msgpack-python/u-msgpack-python-2.7.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=94d68e27f908be36a474f88172c9cf5d
diff --git a/metadata/md5-cache/dev-python/versioningit-2.1.0 b/metadata/md5-cache/dev-python/versioningit-2.1.0
deleted file mode 100644
index 0650839de03e..000000000000
--- a/metadata/md5-cache/dev-python/versioningit-2.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-17.1[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-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( <dev-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A setuptools plugin for versioning based on git tags
-EAPI=8
-HOMEPAGE=https://github.com/jwodder/versioningit/ https://pypi.org/project/versioningit/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/packaging-17.1[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-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( <dev-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/v/versioningit/versioningit-2.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b84b5b272aaf0f4fa6bebed695973a1f
diff --git a/metadata/md5-cache/dev-python/versioningit-2.2.0 b/metadata/md5-cache/dev-python/versioningit-2.2.0
index 13164589f1d5..e165e13589ba 100644
--- a/metadata/md5-cache/dev-python/versioningit-2.2.0
+++ b/metadata/md5-cache/dev-python/versioningit-2.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jwodder/versioningit/ https://pypi.org/project/versioningit/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/packaging-17.1[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-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( <dev-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/v/versioningit/versioningit-2.2.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3df2969e20a7c0da7f5090ad262fb905
+_md5_=a59d856e248ca55fbe1aeeed252d8305
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.17.1 b/metadata/md5-cache/dev-python/virtualenv-20.17.1
deleted file mode 100644
index 0ea6e1554e99..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-20.17.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-freezegun-0.4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-63.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Virtual Python Environment builder
-EAPI=8
-HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 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
-LICENSE=MIT
-RDEPEND=>=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-63.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.17.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cc3d9ce707107e25fe8e36c443ad7c51
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.18.0 b/metadata/md5-cache/dev-python/virtualenv-20.18.0
deleted file mode 100644
index 31e60370f2f6..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-20.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-freezegun-0.4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Virtual Python Environment builder
-EAPI=8
-HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 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
-LICENSE=MIT
-RDEPEND=<dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-20.18.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5c38cee304211715a715860ff94c4b4d
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.19.0 b/metadata/md5-cache/dev-python/virtualenv-20.19.0
deleted file mode 100644
index f19127d1ffa3..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-20.19.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-freezegun-0.4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Virtual Python Environment builder
-EAPI=8
-HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 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
-LICENSE=MIT
-RDEPEND=<dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-20.19.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f160a00f6428cb5f6abc698a6fdf84d6
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.20.0 b/metadata/md5-cache/dev-python/virtualenv-20.20.0
index 28870c5bc71b..dfad7f50c910 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.20.0
+++ b/metadata/md5-cache/dev-python/virtualenv-20.20.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=<dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-20.20.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=09d5e8307a7083b4fff6a92757ab8a40
+_md5_=fcdd10c31f532ee54c1150bbbc4192dd
diff --git a/metadata/md5-cache/dev-python/youtube-search-python-1.6.6 b/metadata/md5-cache/dev-python/youtube-search-python-1.6.6
index eda7ef927cf3..fab578c4722c 100644
--- a/metadata/md5-cache/dev-python/youtube-search-python-1.6.6
+++ b/metadata/md5-cache/dev-python/youtube-search-python-1.6.6
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Get YouTube video information using link WITHOUT YouTube Data API v3
 EAPI=8
 HOMEPAGE=https://github.com/alexmercerind/youtube-search-python/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/httpx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/yt-dlp[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/y/youtube-search-python/youtube-search-python-1.6.6.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d6cae6b49498031227ae9bda7cf099a6
+SRC_URI=https://files.pythonhosted.org/packages/source/y/youtube-search-python/youtube-search-python-1.6.6.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8f1841ac84a4a60f06888f74ac4c8722
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.39.4 b/metadata/md5-cache/dev-python/zeroconf-0.39.4
deleted file mode 100644
index 14d42ac95b9b..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.39.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async-timeout-4.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async-timeout-4.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1: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/python-zeroconf/python-zeroconf/archive/0.39.4.tar.gz -> python-zeroconf-0.39.4.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=23d0965853490aba3792d20738a52724
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.47.1 b/metadata/md5-cache/dev-python/zeroconf-0.47.1
deleted file mode 100644
index 456bab6db00e..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.47.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1: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/python-zeroconf/python-zeroconf/archive/0.47.1.tar.gz -> python-zeroconf-0.47.1.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f91a093a3b949e01515c69adc7fec567
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.47.3 b/metadata/md5-cache/dev-python/zeroconf-0.47.3
index dbc498896bf6..27f318e255a6 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.47.3
+++ b/metadata/md5-cache/dev-python/zeroconf-0.47.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( 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/python-zeroconf/python-zeroconf/archive/0.47.3.tar.gz -> python-zeroconf-0.47.3.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f91a093a3b949e01515c69adc7fec567
+_md5_=ec043904cd0335e6b0c02cddbd5d834d
diff --git a/metadata/md5-cache/dev-python/zope-interface-6.0 b/metadata/md5-cache/dev-python/zope-interface-6.0
new file mode 100644
index 000000000000..55c33b92f39b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zope-interface-6.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( !dev-python/namespace-zope dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Interfaces for Python
+EAPI=8
+HOMEPAGE=https://github.com/zopefoundation/zope.interface/ https://pypi.org/project/zope.interface/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=ZPL
+RDEPEND=!dev-python/namespace-zope python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zope.interface/zope.interface-6.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e8529116102f90befaa15a9d50c28b09
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index fdc8b3dbc74c..067e687e2b4a 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/bcpp-20230130 b/metadata/md5-cache/dev-util/bcpp-20230130
index f12a02d259f2..e0f0321eae4d 100644
--- a/metadata/md5-cache/dev-util/bcpp-20230130
+++ b/metadata/md5-cache/dev-util/bcpp-20230130
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://invisible-island.net/bcpp/
 INHERIT=verify-sig
 IUSE=verify-sig
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/bcpp/bcpp-20230130.tgz verify-sig? ( https://invisible-island.net/archives/bcpp/bcpp-20230130.tgz.asc )
 _eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
-_md5_=6d5860deeefe718d882ae1e2c4434a74
+_md5_=d352e2f6d2a99e116cb530a6cc6a6345
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-3.6.1 b/metadata/md5-cache/dev-util/buildbot-badges-3.6.1
index 70e94fedc10a..67c01bab78af 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-3.6.1
+++ b/metadata/md5-cache/dev-util/buildbot-badges-3.6.1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Buildbot badges plugin produces an image in SVG or PNG format...
 EAPI=8
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10
 KEYWORDS=~amd64 ~riscv ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-3.6.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7ca8669e98ed1f06524903b4b5d9e5ab
+SRC_URI=https://files.pythonhosted.org/packages/source/b/buildbot-badges/buildbot-badges-3.6.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=abca0fdd78ee3b5429bec2f17e582ca0
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-3.6.1 b/metadata/md5-cache/dev-util/buildbot-console-view-3.6.1
index 6f2d011cb0ed..fd13da7a9c11 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-3.6.1
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-3.6.1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Buildbot console-view plugin
 EAPI=8
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=~dev-util/buildbot-3.6.1[python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.1[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-3.6.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9c736a3c5b9e67f4f56b557b19b89eb9
+SRC_URI=https://files.pythonhosted.org/packages/source/b/buildbot-console-view/buildbot-console-view-3.6.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a73ba03f63b6aeb7d2dc23c2e7f6e6dc
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-3.6.1 b/metadata/md5-cache/dev-util/buildbot-grid-view-3.6.1
index 0ec35d4a139c..1f8ce54306f1 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-3.6.1
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-3.6.1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=BuildBot grid view web interface
 EAPI=8
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-3.6.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7a3fc6f4637edb438547772f2ee7bea6
+SRC_URI=https://files.pythonhosted.org/packages/source/b/buildbot-grid-view/buildbot-grid-view-3.6.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=03bfd5ab280d84d155870edaea35b9c4
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-3.6.1 b/metadata/md5-cache/dev-util/buildbot-pkg-3.6.1
index 7448b9a997df..7516159339e9 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.6.1
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-3.6.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=BuildBot common www build tools for packaging releases
 EAPI=8
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -11,6 +11,6 @@ RDEPEND=dev-python/setuptools[python_targets_python3_10(-)?] python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-3.6.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ef2b0e524d74de831cff796130b6f17e
+SRC_URI=https://files.pythonhosted.org/packages/source/b/buildbot-pkg/buildbot-pkg-3.6.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=895e07c8d87567f143d1149d682e459d
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.6.1 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.6.1
index 86c448a5ab0d..8452b8e717f1 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.6.1
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.6.1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Buildbot waterfall-view plugin
 EAPI=8
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=~dev-util/buildbot-3.6.1[python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.1[python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9585a97fd52ac815bd17a1cb0d6f1d41
+SRC_URI=https://files.pythonhosted.org/packages/source/b/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=21a7ede83f719610bb4c96923c0b0ee6
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.6.1-r2 b/metadata/md5-cache/dev-util/buildbot-worker-3.6.1-r2
index d27b53dd3b92..855972750816 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.6.1-r2
+++ b/metadata/md5-cache/dev-util/buildbot-worker-3.6.1-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile config configure install postinst prepare test
 DESCRIPTION=BuildBot Worker (slave) Daemon
 EAPI=8
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
-INHERIT=readme.gentoo-r1 systemd distutils-r1
+INHERIT=readme.gentoo-r1 systemd distutils-r1 pypi
 IUSE=test python_targets_python3_10
 KEYWORDS=amd64 ~arm64 ~riscv ~sparc ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -11,6 +11,6 @@ RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_1
 REQUIRED_USE=|| ( python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-3.6.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=41593c3883891da3064900f4150eed21
+SRC_URI=https://files.pythonhosted.org/packages/source/b/buildbot-worker/buildbot-worker-3.6.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ced1387f33c74e053c4ce13f1b3cf274
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.6.1 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.6.1
index 62a57e93eb33..08ddec3c3d3b 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.6.1
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.6.1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
 EAPI=8
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d9eae9e3f03c41a533a3f6992a859461
+SRC_URI=https://files.pythonhosted.org/packages/source/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ff2e0e1634b0ff40ae2daf26b73b5911
diff --git a/metadata/md5-cache/dev-util/buildbot-www-3.6.1 b/metadata/md5-cache/dev-util/buildbot-www-3.6.1
index 437c04f99b37..796ce133d1f8 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-3.6.1
+++ b/metadata/md5-cache/dev-util/buildbot-www-3.6.1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
 EAPI=8
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=~dev-util/buildbot-pkg-3.6.1[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-3.6.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=41de776eea52eed6ee5f1bbb916db91a
+SRC_URI=https://files.pythonhosted.org/packages/source/b/buildbot-www/buildbot-www-3.6.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=09d972f05c40f50c4ed4177149662a7b
diff --git a/metadata/md5-cache/dev-util/cgdb-0.8.0 b/metadata/md5-cache/dev-util/cgdb-0.8.0
index 178f83242d84..97055c659b5b 100644
--- a/metadata/md5-cache/dev-util/cgdb-0.8.0
+++ b/metadata/md5-cache/dev-util/cgdb-0.8.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://cgdb.github.io/
 INHERIT=autotools multilib-minimal
 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 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= sys-devel/gdb
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cgdb/cgdb/archive/v0.8.0.tar.gz -> cgdb-0.8.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cf14dd3f54c5d79ea3297cf8b5799136
+_md5_=31313f0345d68c3f577141ab9cd4c856
diff --git a/metadata/md5-cache/dev-util/colm-0.14.7-r2 b/metadata/md5-cache/dev-util/colm-0.14.7-r2
index afc8c3ceac1f..ee1337864c58 100644
--- a/metadata/md5-cache/dev-util/colm-0.14.7-r2
+++ b/metadata/md5-cache/dev-util/colm-0.14.7-r2
@@ -11,4 +11,4 @@ RDEPEND=!<dev-util/ragel-7.0.3
 SLOT=0
 SRC_URI=https://www.colm.net/files/colm/colm-0.14.7.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=711132b6b2960d229fc13e8c089262ae
+_md5_=261847e396e60ced9c42e5ca1d183f41
diff --git a/metadata/md5-cache/dev-util/gi-docgen-2023.1-r1 b/metadata/md5-cache/dev-util/gi-docgen-2023.1-r1
index e7f4cdd7938c..605cfe30a763 100644
--- a/metadata/md5-cache/dev-util/gi-docgen-2023.1-r1
+++ b/metadata/md5-cache/dev-util/gi-docgen-2023.1-r1
@@ -4,7 +4,7 @@ DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) pytho
 DESCRIPTION=A documentation generator for GObject-based libraries
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gi-docgen https://pypi.org/project/gi-docgen/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test 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
 LICENSE=|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT
@@ -12,6 +12,6 @@ RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) pyth
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/g/gi-docgen/gi-docgen-2023.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d853eee082a81d386968d6211f99ed21
+SRC_URI=https://files.pythonhosted.org/packages/source/g/gi-docgen/gi-docgen-2023.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=daafb3a5f048521230681dc240cc12a4
diff --git a/metadata/md5-cache/dev-util/lttng-ust-2.13.5 b/metadata/md5-cache/dev-util/lttng-ust-2.13.5
index 68c7ab9380cb..541d31d4fd17 100644
--- a/metadata/md5-cache/dev-util/lttng-ust-2.13.5
+++ b/metadata/md5-cache/dev-util/lttng-ust-2.13.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://lttng.org
 INHERIT=autotools
 IUSE=examples numa
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu:= numa? ( sys-process/numactl )
 SLOT=0/2.13
 SRC_URI=https://lttng.org/files/lttng-ust/lttng-ust-2.13.5.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4d414cc4e6114647b80c8adabb9e41b6
+_md5_=eb0bef7ce6b21d4f846ba3c3cc3579bb
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index e5fe6e2aaa43..f9f6c40dacf5 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-big-picture-1.2.2-r1 b/metadata/md5-cache/dev-vcs/git-big-picture-1.2.2-r1
index 10ca4a66c036..0ff0dafd1258 100644
--- a/metadata/md5-cache/dev-vcs/git-big-picture-1.2.2-r1
+++ b/metadata/md5-cache/dev-vcs/git-big-picture-1.2.2-r1
@@ -4,7 +4,7 @@ DEPEND=test? ( dev-python/parameterized[python_targets_python3_9(-)?,python_targ
 DESCRIPTION=Visualization tool for Git repositories
 EAPI=8
 HOMEPAGE=https://github.com/git-big-picture/git-big-picture
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
@@ -12,6 +12,6 @@ RDEPEND=dev-vcs/git media-gfx/graphviz[svg] python_targets_python3_9? ( >=dev-la
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/g/git-big-picture/git-big-picture-1.2.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bac7bc7e913ad49ce1c80fb57e93ffac
+SRC_URI=https://files.pythonhosted.org/packages/source/g/git-big-picture/git-big-picture-1.2.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d907e3962a6d2a568c86357833c7cd2d
diff --git a/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.4.0 b/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.4.0
index 58817ccb88ad..363ca7fe8dae 100644
--- a/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.4.0
+++ b/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.4.0
@@ -4,7 +4,7 @@ DEPEND=>=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_p
 DESCRIPTION=Command-line tool to delete merged Git branches
 EAPI=8
 HOMEPAGE=https://github.com/hartwork/git-delete-merged-branches
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=full-name-executable test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
@@ -12,6 +12,6 @@ RDEPEND=>=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/g/git-delete-merged-branches/git-delete-merged-branches-7.4.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bf92d98c8facab623b75fc59acb9cfc4
+SRC_URI=https://files.pythonhosted.org/packages/source/g/git-delete-merged-branches/git-delete-merged-branches-7.4.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8e2473550e60c4a21b5b020a0fe516a5
diff --git a/metadata/md5-cache/dev-vcs/hg-evolve-10.5.3 b/metadata/md5-cache/dev-vcs/hg-evolve-10.5.3
index a062839cffa1..c653a7d0279e 100644
--- a/metadata/md5-cache/dev-vcs/hg-evolve-10.5.3
+++ b/metadata/md5-cache/dev-vcs/hg-evolve-10.5.3
@@ -4,13 +4,13 @@ DEPEND=>=dev-vcs/mercurial-4.8[python_targets_python3_9(-)?,python_targets_pytho
 DESCRIPTION=enables the changeset evolution feature of Mercurial
 EAPI=8
 HOMEPAGE=https://www.mercurial-scm.org/doc/evolution/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-vcs/mercurial-4.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/h/hg-evolve/hg-evolve-10.5.3.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7e8ebc2c916f719157d2d31fef750f6a
+SRC_URI=https://files.pythonhosted.org/packages/source/h/hg-evolve/hg-evolve-10.5.3.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4aee1d49610dab27fd23759ac476a3f4
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-3.13.0 b/metadata/md5-cache/dev-vcs/python-gitlab-3.13.0
index a0794d5e8e30..d6f7689ff529 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-3.13.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-3.13.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python command line interface to gitlab API
 EAPI=8
 HOMEPAGE=https://github.com/python-gitlab/python-gitlab/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=LGPL-3
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/requests-2.28.2[python_targets_python3_9(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-3.13.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=abf273132040e14ad06d4571aeaa0bdf
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-gitlab/python-gitlab-3.13.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b976ba14da8fa3d202da47fa6a1c872b
diff --git a/metadata/md5-cache/dev-vcs/stgit-1.5 b/metadata/md5-cache/dev-vcs/stgit-1.5
index 818a55214f90..6036442a59ac 100644
--- a/metadata/md5-cache/dev-vcs/stgit-1.5
+++ b/metadata/md5-cache/dev-vcs/stgit-1.5
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-vcs/git-1.6.3.3 doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
 DESCRIPTION=Manage a stack of patches using GIT as a backend
 EAPI=8
 HOMEPAGE=https://stacked-git.github.io
 INHERIT=bash-completion-r1 distutils-r1
-IUSE=doc python_targets_python3_9 python_targets_python3_10
+IUSE=doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/stacked-git/stgit/archive/v1.5.tar.gz -> stgit-1.5.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3ace996c07bf2bba09fefda57201c60d
+_md5_=bba5c86f4ef585cd46b9328ac0319180
diff --git a/metadata/md5-cache/dev-vcs/stgit-2.0.3 b/metadata/md5-cache/dev-vcs/stgit-2.0.3
deleted file mode 100644
index 6b0fa3f64e50..000000000000
--- a/metadata/md5-cache/dev-vcs/stgit-2.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=doc? ( app-text/asciidoc )
-DESCRIPTION=Manage a stack of patches using GIT as a backend
-EAPI=8
-HOMEPAGE=https://stacked-git.github.io
-INHERIT=cargo
-IUSE=doc debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0 MIT BSD BSL-1.1 GPL-2 Unicode-DFS-2016 Unlicense ZLIB
-RESTRICT=mirror
-SLOT=0/2
-SRC_URI=https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/anyhow/1.0.66/download -> anyhow-1.0.66.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/bstr/1.0.1/download -> bstr-1.0.1.crate https://crates.io/api/v1/crates/bumpalo/3.11.1/download -> bumpalo-3.11.1.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/cc/1.0.77/download -> cc-1.0.77.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.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/clap/4.0.26/download -> clap-4.0.26.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.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/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/ctrlc/3.2.3/download -> ctrlc-3.2.3.crate https://crates.io/api/v1/crates/curl/0.4.44/download -> curl-0.4.44.crate https://crates.io/api/v1/crates/curl-sys/0.4.59+curl-7.86.0/download -> curl-sys-0.4.59+curl-7.86.0.crate https://crates.io/api/v1/crates/cxx/1.0.82/download -> cxx-1.0.82.crate https://crates.io/api/v1/crates/cxx-build/1.0.82/download -> cxx-build-1.0.82.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.82/download -> cxxbridge-flags-1.0.82.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.82/download -> cxxbridge-macro-1.0.82.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/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/filetime/0.2.18/download -> filetime-0.2.18.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/git2/0.15.0/download -> git2-0.15.0.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.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/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/0.7.5/download -> io-lifetimes-0.7.5.crate https://crates.io/api/v1/crates/itoa/1.0.4/download -> itoa-1.0.4.crate https://crates.io/api/v1/crates/jobserver/0.1.25/download -> jobserver-0.1.25.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.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.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/libgit2-sys/0.14.0+1.5.0/download -> libgit2-sys-0.14.0+1.5.0.crate https://crates.io/api/v1/crates/libz-sys/1.1.8/download -> libz-sys-1.1.8.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.7/download -> link-cplusplus-1.0.7.crate https://crates.io/api/v1/crates/linux-raw-sys/0.0.46/download -> linux-raw-sys-0.0.46.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.4/download -> miniz_oxide-0.5.4.crate https://crates.io/api/v1/crates/nix/0.25.0/download -> nix-0.25.0.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-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.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-sys/0.9.77/download -> openssl-sys-0.9.77.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.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/rustix/0.35.13/download -> rustix-0.35.13.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scratch/1.0.2/download -> scratch-1.0.2.crate https://crates.io/api/v1/crates/serde/1.0.147/download -> serde-1.0.147.crate https://crates.io/api/v1/crates/serde_derive/1.0.147/download -> serde_derive-1.0.147.crate https://crates.io/api/v1/crates/serde_json/1.0.88/download -> serde_json-1.0.88.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.103/download -> syn-1.0.103.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.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.2.2/download -> terminal_size-0.2.2.crate https://crates.io/api/v1/crates/thiserror/1.0.37/download -> thiserror-1.0.37.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.37/download -> thiserror-impl-1.0.37.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/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.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-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.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_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.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_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.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_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.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_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.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/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://github.com/stacked-git/stgit/archive/v2.0.3.tar.gz -> stgit-2.0.3.tar.gz
-_eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5d24203ede00b4485334343295ae2e5f
diff --git a/metadata/md5-cache/dev-vcs/stgit-2.2.0 b/metadata/md5-cache/dev-vcs/stgit-2.2.0
new file mode 100644
index 000000000000..c9523ee2d927
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/stgit-2.2.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=doc? ( app-text/asciidoc )
+DESCRIPTION=Manage a stack of patches using GIT as a backend
+EAPI=8
+HOMEPAGE=https://stacked-git.github.io
+INHERIT=cargo
+IUSE=doc debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 GPL-2 MIT MIT-0 Unicode-DFS-2016 Unlicense ZLIB
+RESTRICT=mirror
+SLOT=0/2
+SRC_URI=https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.8.3/download -> ahash-0.8.3.crate https://crates.io/api/v1/crates/anyhow/1.0.69/download -> anyhow-1.0.69.crate https://crates.io/api/v1/crates/arc-swap/1.6.0/download -> arc-swap-1.6.0.crate https://crates.io/api/v1/crates/atoi/2.0.0/download -> atoi-2.0.0.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/bstr/1.3.0/download -> bstr-1.3.0.crate https://crates.io/api/v1/crates/btoi/0.4.3/download -> btoi-0.4.3.crate https://crates.io/api/v1/crates/bytesize/1.2.0/download -> bytesize-1.2.0.crate https://crates.io/api/v1/crates/bzip2/0.4.4/download -> bzip2-0.4.4.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/castaway/0.2.2/download -> castaway-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.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/4.1.6/download -> clap-4.1.6.crate https://crates.io/api/v1/crates/clap_lex/0.3.2/download -> clap_lex-0.3.2.crate https://crates.io/api/v1/crates/clru/0.6.1/download -> clru-0.6.1.crate https://crates.io/api/v1/crates/compact_str/0.6.1/download -> compact_str-0.6.1.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/ctrlc/3.2.5/download -> ctrlc-3.2.5.crate https://crates.io/api/v1/crates/curl/0.4.44/download -> curl-0.4.44.crate https://crates.io/api/v1/crates/curl-sys/0.4.60+curl-7.88.1/download -> curl-sys-0.4.60+curl-7.88.1.crate https://crates.io/api/v1/crates/dashmap/5.4.0/download -> dashmap-5.4.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/dunce/1.0.3/download -> dunce-1.0.3.crate https://crates.io/api/v1/crates/encoding_rs/0.8.32/download -> encoding_rs-0.8.32.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/filetime/0.2.20/download -> filetime-0.2.20.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/gix/0.37.2/download -> gix-0.37.2.crate https://crates.io/api/v1/crates/gix-actor/0.17.2/download -> gix-actor-0.17.2.crate https://crates.io/api/v1/crates/gix-attributes/0.8.3/download -> gix-attributes-0.8.3.crate https://crates.io/api/v1/crates/gix-bitmap/0.2.1/download -> gix-bitmap-0.2.1.crate https://crates.io/api/v1/crates/gix-chunk/0.4.1/download -> gix-chunk-0.4.1.crate https://crates.io/api/v1/crates/gix-command/0.2.4/download -> gix-command-0.2.4.crate https://crates.io/api/v1/crates/gix-config/0.16.3/download -> gix-config-0.16.3.crate https://crates.io/api/v1/crates/gix-config-value/0.10.1/download -> gix-config-value-0.10.1.crate https://crates.io/api/v1/crates/gix-credentials/0.9.2/download -> gix-credentials-0.9.2.crate https://crates.io/api/v1/crates/gix-date/0.4.3/download -> gix-date-0.4.3.crate https://crates.io/api/v1/crates/gix-diff/0.26.3/download -> gix-diff-0.26.3.crate https://crates.io/api/v1/crates/gix-discover/0.13.1/download -> gix-discover-0.13.1.crate https://crates.io/api/v1/crates/gix-features/0.26.5/download -> gix-features-0.26.5.crate https://crates.io/api/v1/crates/gix-glob/0.5.5/download -> gix-glob-0.5.5.crate https://crates.io/api/v1/crates/gix-hash/0.10.3/download -> gix-hash-0.10.3.crate https://crates.io/api/v1/crates/gix-hashtable/0.1.1/download -> gix-hashtable-0.1.1.crate https://crates.io/api/v1/crates/gix-index/0.12.4/download -> gix-index-0.12.4.crate https://crates.io/api/v1/crates/gix-lock/3.0.2/download -> gix-lock-3.0.2.crate https://crates.io/api/v1/crates/gix-mailmap/0.9.3/download -> gix-mailmap-0.9.3.crate https://crates.io/api/v1/crates/gix-object/0.26.4/download -> gix-object-0.26.4.crate https://crates.io/api/v1/crates/gix-odb/0.40.2/download -> gix-odb-0.40.2.crate https://crates.io/api/v1/crates/gix-pack/0.30.3/download -> gix-pack-0.30.3.crate https://crates.io/api/v1/crates/gix-path/0.7.2/download -> gix-path-0.7.2.crate https://crates.io/api/v1/crates/gix-prompt/0.3.2/download -> gix-prompt-0.3.2.crate https://crates.io/api/v1/crates/gix-quote/0.4.2/download -> gix-quote-0.4.2.crate https://crates.io/api/v1/crates/gix-ref/0.24.1/download -> gix-ref-0.24.1.crate https://crates.io/api/v1/crates/gix-refspec/0.7.3/download -> gix-refspec-0.7.3.crate https://crates.io/api/v1/crates/gix-revision/0.10.4/download -> gix-revision-0.10.4.crate https://crates.io/api/v1/crates/gix-sec/0.6.2/download -> gix-sec-0.6.2.crate https://crates.io/api/v1/crates/gix-tempfile/3.0.2/download -> gix-tempfile-3.0.2.crate https://crates.io/api/v1/crates/gix-traverse/0.22.2/download -> gix-traverse-0.22.2.crate https://crates.io/api/v1/crates/gix-url/0.13.3/download -> gix-url-0.13.3.crate https://crates.io/api/v1/crates/gix-validate/0.7.3/download -> gix-validate-0.7.3.crate https://crates.io/api/v1/crates/gix-worktree/0.12.3/download -> gix-worktree-0.12.3.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hashbrown/0.13.2/download -> hashbrown-0.13.2.crate https://crates.io/api/v1/crates/hermit-abi/0.3.1/download -> hermit-abi-0.3.1.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/home/0.5.4/download -> home-0.5.4.crate https://crates.io/api/v1/crates/human_format/1.0.3/download -> human_format-1.0.3.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/imara-diff/0.1.5/download -> imara-diff-0.1.5.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-close/0.3.7/download -> io-close-0.3.7.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.5/download -> io-lifetimes-1.0.5.crate https://crates.io/api/v1/crates/is-terminal/0.4.4/download -> is-terminal-0.4.4.crate https://crates.io/api/v1/crates/itoa/1.0.5/download -> itoa-1.0.5.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/libz-sys/1.1.8/download -> libz-sys-1.1.8.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmap2/0.5.10/download -> memmap2-0.5.10.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/nix/0.26.2/download -> nix-0.26.2.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.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_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.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-sys/0.9.80/download -> openssl-sys-0.9.80.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.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/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.6/download -> parking_lot_core-0.8.6.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/proc-macro2/1.0.51/download -> proc-macro2-1.0.51.crate https://crates.io/api/v1/crates/prodash/23.0.0/download -> prodash-23.0.0.crate https://crates.io/api/v1/crates/quick-error/2.0.1/download -> quick-error-2.0.1.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.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-automata/0.1.10/download -> regex-automata-0.1.10.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/rustix/0.36.8/download -> rustix-0.36.8.crate https://crates.io/api/v1/crates/rustversion/1.0.11/download -> rustversion-1.0.11.crate https://crates.io/api/v1/crates/ryu/1.0.12/download -> ryu-1.0.12.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.21/download -> schannel-0.1.21.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.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.93/download -> serde_json-1.0.93.crate https://crates.io/api/v1/crates/sha1_smol/1.0.0/download -> sha1_smol-1.0.0.crate https://crates.io/api/v1/crates/signal-hook/0.3.15/download -> signal-hook-0.3.15.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.1/download -> signal-hook-registry-1.4.1.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.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/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.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.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/terminal_size/0.2.5/download -> terminal_size-0.2.5.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/time/0.3.19/download -> time-0.3.19.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.7/download -> time-macros-0.2.7.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.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.10/download -> unicode-bidi-0.3.10.crate https://crates.io/api/v1/crates/unicode-bom/1.1.4/download -> unicode-bom-1.1.4.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.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/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.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-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/0.43.0/download -> windows-0.43.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.1/download -> windows-targets-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://github.com/stacked-git/stgit/archive/v2.2.0.tar.gz -> stgit-2.2.0.tar.gz
+_eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=50385851772c21ae94ad2e4d3299005c
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 50d25e5d9e1c..b4f943e0c186 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.50.4 b/metadata/md5-cache/gnome-base/gvfs-1.50.4
new file mode 100644
index 000000000000..3b4ec10cae81
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gvfs-1.50.4
@@ -0,0 +1,18 @@
+BDEPEND=dev-util/glib-utils app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-util/gdbus-codegen test? ( dev-libs/libgdata ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.70.0:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:0= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-3.0.0:3.0 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-3.0.0:3 virtual/tmpfiles ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( virtual/libusb:1 >=media-libs/libmtp-1.1.15:= ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2:= ) google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8:= ) net-misc/openssh
+DESCRIPTION=Virtual filesystem implementation for GIO
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson systemd tmpfiles xdg
+IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.70.0:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:0= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-3.0.0:3.0 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-3.0.0:3 virtual/tmpfiles ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( virtual/libusb:1 >=media-libs/libmtp-1.1.15:= ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2:= ) google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8:= ) net-misc/openssh
+REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gvfs/1.50/gvfs-1.50.4.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8d47e1a2999a1b0c702a9b301edf3e27
diff --git a/metadata/md5-cache/gnome-base/nautilus-44.0 b/metadata/md5-cache/gnome-base/nautilus-44.0
new file mode 100644
index 000000000000..5de9e5f96005
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/nautilus-44.0
@@ -0,0 +1,19 @@
+BDEPEND=>=dev-util/gdbus-codegen-2.51.2 dev-util/glib-utils gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=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.72.0:2 >=media-libs/gexiv2-0.14.0 >=x11-libs/gdk-pixbuf-2.30.0:2 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.4.0 >=gnome-base/gnome-desktop-43:4= >=gnome-base/gsettings-desktop-schemas-42 >=gui-libs/gtk-4.9.1:4[introspection?] >=gui-libs/libadwaita-1.3_rc:1 >=dev-libs/libportal-0.5:=[gtk] >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libcloudproviders-0.3.1 introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+DESCRIPTION=Default file manager for the GNOME desktop
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+IUSE=gnome +gstreamer gtk-doc +introspection +previewer selinux sendto test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3+ LGPL-2.1+
+PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
+RDEPEND=>=dev-libs/glib-2.72.0:2 >=media-libs/gexiv2-0.14.0 >=x11-libs/gdk-pixbuf-2.30.0:2 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.4.0 >=gnome-base/gnome-desktop-43:4= >=gnome-base/gsettings-desktop-schemas-42 >=gui-libs/gtk-4.9.1:4[introspection?] >=gui-libs/libadwaita-1.3_rc:1 >=dev-libs/libportal-0.5:=[gtk] >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libcloudproviders-0.3.1 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) >=app-misc/tracker-miners-3.0:3=
+REQUIRED_USE=gtk-doc? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus/44/nautilus-44.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=580d268c80f4bf034367d6b057b2bc6f
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index edd5b458fbc8..7ad8250f34ec 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-44.0 b/metadata/md5-cache/gnome-extra/gnome-clocks-44.0
new file mode 100644
index 000000000000..d0f624d11a13
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-44.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.56 ) >=dev-libs/libgweather-4.2.0:4[vala] media-libs/gsound[vala] gui-libs/libadwaita:1[vala] app-arch/xz-utils >=dev-util/meson-0.62.2 >=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.72:2 >=gui-libs/gtk-4.5:4 >=media-libs/gsound-0.98 >=dev-libs/libgweather-4.2.0:4= gnome-base/gnome-desktop:4= >=sci-geosciences/geocode-glib-1:2 >=app-misc/geoclue-2.4:2.0 >=gui-libs/libadwaita-1.2:1
+DESCRIPTION=Clocks application for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Clocks https://gitlab.gnome.org/GNOME/gnome-clocks
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson vala xdg
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.72:2 >=gui-libs/gtk-4.5:4 >=media-libs/gsound-0.98 >=dev-libs/libgweather-4.2.0:4= gnome-base/gnome-desktop:4= >=sci-geosciences/geocode-glib-1:2 >=app-misc/geoclue-2.4:2.0 >=gui-libs/libadwaita-1.2:1
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-clocks/44/gnome-clocks-44.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=dadf3a1837152bfefb86d32d8a998642
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index ea222ff0fa93..b67187882b32 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/grim-1.4.0-r1 b/metadata/md5-cache/gui-apps/grim-1.4.0-r1
deleted file mode 100644
index ecb4c0bafe8f..000000000000
--- a/metadata/md5-cache/gui-apps/grim-1.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( app-text/scdoc ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/wayland media-libs/libpng x11-libs/pixman jpeg? ( media-libs/libjpeg-turbo ) >=dev-libs/wayland-protocols-1.14
-DESCRIPTION=Grab images from a Wayland compositor
-EAPI=8
-HOMEPAGE=https://sr.ht/~emersion/grim
-INHERIT=bash-completion-r1 meson
-IUSE=+man jpeg
-KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-libs/wayland media-libs/libpng x11-libs/pixman jpeg? ( media-libs/libjpeg-turbo )
-SLOT=0
-SRC_URI=https://github.com/emersion/grim/archive/v1.4.0.tar.gz -> grim-1.4.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5b40cc90501f185dca2813a5e6412fc5
diff --git a/metadata/md5-cache/gui-apps/grim-1.4.0-r3 b/metadata/md5-cache/gui-apps/grim-1.4.0-r3
index 4bf61b6aab54..f1c45d9ddb82 100644
--- a/metadata/md5-cache/gui-apps/grim-1.4.0-r3
+++ b/metadata/md5-cache/gui-apps/grim-1.4.0-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sr.ht/~emersion/grim
 INHERIT=bash-completion-r1 meson
 IUSE=+man jpeg
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland media-libs/libpng x11-libs/pixman jpeg? ( media-libs/libjpeg-turbo )
 SLOT=0
 SRC_URI=https://github.com/emersion/grim/archive/v1.4.0.tar.gz -> grim-1.4.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=624d24e26085b82e43f2c5cb79ea4ed4
+_md5_=a3005845507a390b92c1c93ceadd279f
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 0f3102650c64..73be3d5c95a0 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/libadwaita-1.3.0 b/metadata/md5-cache/gui-libs/libadwaita-1.3.0
new file mode 100644
index 000000000000..4154ec68abfc
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/libadwaita-1.3.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) vala? ( || ( dev-lang/vala:0.56 ) ) dev-util/glib-utils sys-devel/gettext virtual/pkgconfig test? ( dev-libs/appstream-glib ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=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.72:2 >=gui-libs/gtk-4.9.5: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.72:2 >=gui-libs/gtk-4.9.5: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.3/libadwaita-1.3.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=4c4bc4b2120e509b5b428595eee063b1
diff --git a/metadata/md5-cache/gui-libs/libadwaita-1.3.1 b/metadata/md5-cache/gui-libs/libadwaita-1.3.1
new file mode 100644
index 000000000000..94e35f5171f2
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/libadwaita-1.3.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) vala? ( || ( dev-lang/vala:0.56 ) ) dev-util/glib-utils sys-devel/gettext virtual/pkgconfig test? ( dev-libs/appstream-glib ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=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.72:2 >=gui-libs/gtk-4.9.5: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.72:2 >=gui-libs/gtk-4.9.5: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.3/libadwaita-1.3.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=4c4bc4b2120e509b5b428595eee063b1
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 44e8f4557a62..a33a21294e69 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/wayfire-0.7.5 b/metadata/md5-cache/gui-wm/wayfire-0.7.5
index 513c12481ddb..6dfe8b5725c8 100644
--- a/metadata/md5-cache/gui-wm/wayfire-0.7.5
+++ b/metadata/md5-cache/gui-wm/wayfire-0.7.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/WayfireWM/wayfire
 INHERIT=meson toolchain-funcs
 IUSE=debug +gles +system-wfconfig +system-wlroots X
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/libinput:= dev-libs/wayland gui-libs/gtk-layer-shell media-libs/glm media-libs/mesa:=[gles2,wayland,X?] media-libs/libglvnd[X?] media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/freetype:=[X?] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X?] x11-libs/cairo[X?,svg(+)] x11-libs/libxkbcommon[X?] x11-libs/pango x11-libs/pixman X? ( x11-base/xwayland x11-libs/libxcb ) system-wfconfig? ( >=gui-libs/wf-config-0.7.1 <gui-libs/wf-config-0.8.0 ) !system-wfconfig? ( !gui-libs/wf-config ) system-wlroots? ( >=gui-libs/wlroots-0.16.0:0/16[X?] ) !system-wlroots? ( !gui-libs/wlroots ) x11-misc/xkeyboard-config
 SLOT=0
 SRC_URI=https://github.com/WayfireWM/wayfire/releases/download/v0.7.5/wayfire-0.7.5.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a01617ca0f09c47f7c574e2d229a33ee
+_md5_=a4dc0392308ff70022225628e0b322e7
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 817b905be163..cb5742dc9360 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/thunderbird-102.9.0 b/metadata/md5-cache/mail-client/thunderbird-102.9.0
index 4dac2523e345..12bb66d7823a 100644
--- a/metadata/md5-cache/mail-client/thunderbird-102.9.0
+++ b/metadata/md5-cache/mail-client/thunderbird-102.9.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.thunderbird.net/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
 IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +system-librnp l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79.2 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/source/thunderbird-102.9.0.source.tar.xz -> thunderbird-102.9.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-09jtb.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-09jtb.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-09jtb.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/af.xpi -> thunderbird-102.9.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/ar.xpi -> thunderbird-102.9.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/ast.xpi -> thunderbird-102.9.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/be.xpi -> thunderbird-102.9.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/bg.xpi -> thunderbird-102.9.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/br.xpi -> thunderbird-102.9.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/ca.xpi -> thunderbird-102.9.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/cak.xpi -> thunderbird-102.9.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/cs.xpi -> thunderbird-102.9.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/cy.xpi -> thunderbird-102.9.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/da.xpi -> thunderbird-102.9.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/de.xpi -> thunderbird-102.9.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.9.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/el.xpi -> thunderbird-102.9.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.9.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.9.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.9.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.9.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.9.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/et.xpi -> thunderbird-102.9.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/eu.xpi -> thunderbird-102.9.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/fi.xpi -> thunderbird-102.9.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/fr.xpi -> thunderbird-102.9.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.9.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.9.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/gd.xpi -> thunderbird-102.9.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/gl.xpi -> thunderbird-102.9.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/he.xpi -> thunderbird-102.9.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/hr.xpi -> thunderbird-102.9.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.9.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/hu.xpi -> thunderbird-102.9.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/id.xpi -> thunderbird-102.9.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/is.xpi -> thunderbird-102.9.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/it.xpi -> thunderbird-102.9.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/ja.xpi -> thunderbird-102.9.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/ka.xpi -> thunderbird-102.9.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/kab.xpi -> thunderbird-102.9.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/kk.xpi -> thunderbird-102.9.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/ko.xpi -> thunderbird-102.9.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/lt.xpi -> thunderbird-102.9.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/lv.xpi -> thunderbird-102.9.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/ms.xpi -> thunderbird-102.9.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.9.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/nl.xpi -> thunderbird-102.9.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.9.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.9.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/pl.xpi -> thunderbird-102.9.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.9.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.9.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/rm.xpi -> thunderbird-102.9.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/ro.xpi -> thunderbird-102.9.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/ru.xpi -> thunderbird-102.9.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/sk.xpi -> thunderbird-102.9.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/sl.xpi -> thunderbird-102.9.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/sq.xpi -> thunderbird-102.9.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/sr.xpi -> thunderbird-102.9.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.9.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/th.xpi -> thunderbird-102.9.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/tr.xpi -> thunderbird-102.9.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/uk.xpi -> thunderbird-102.9.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/uz.xpi -> thunderbird-102.9.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/vi.xpi -> thunderbird-102.9.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.9.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.9.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.9.0-zh-TW.xpi )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ae2bc6f4b79a3ea24d9d18202a98eb48
+_md5_=3a3833a4114723e5f7c52459f9d32f89
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index da3e34bf742e..e5afe31da6f9 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/spf-engine-2.9.3 b/metadata/md5-cache/mail-filter/spf-engine-2.9.3
index 9f07dafc3a6c..ef4c6c45d5f1 100644
--- a/metadata/md5-cache/mail-filter/spf-engine-2.9.3
+++ b/metadata/md5-cache/mail-filter/spf-engine-2.9.3
@@ -4,13 +4,13 @@ DEPEND=dev-python/pyspf[python_targets_python3_9(-)?,python_targets_python3_10(-
 DESCRIPTION=Policy daemon and milter for Postfix SPF verification
 EAPI=8
 HOMEPAGE=https://launchpad.net/spf-engine
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyspf[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/authres[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ipv6(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ipv6(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/s/spf-engine/spf-engine-2.9.3.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ce6085131a50eb68de558a1b7da8c3e8
+SRC_URI=https://files.pythonhosted.org/packages/source/s/spf-engine/spf-engine-2.9.3.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b3b9dd32443960e543a2d3ab78e6bec8
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index c6671775b069..f0b524bcd8e2 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/converseen-0.9.10.0 b/metadata/md5-cache/media-gfx/converseen-0.9.10.0
index f67d25cba38b..90ea5426c3e1 100644
--- a/metadata/md5-cache/media-gfx/converseen-0.9.10.0
+++ b/metadata/md5-cache/media-gfx/converseen-0.9.10.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://converseen.fasterland.net/ https://github.com/Faster3ck/Converseen/
 INHERIT=cmake xdg-utils
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-gfx/imagemagick:=[cxx]
 SLOT=0
 SRC_URI=https://github.com/Faster3ck/Converseen/archive/v0.9.10.0.tar.gz -> converseen-0.9.10.0.tar.gz
 _eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ea7336fc5435d02038bf301fc4707796
+_md5_=595ff63caf659212dc1f81de9fce00b2
diff --git a/metadata/md5-cache/media-gfx/libimagequant-4.1.0 b/metadata/md5-cache/media-gfx/libimagequant-4.1.0
index 25e18e1df814..d51c0bec437d 100644
--- a/metadata/md5-cache/media-gfx/libimagequant-4.1.0
+++ b/metadata/md5-cache/media-gfx/libimagequant-4.1.0
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://pngquant.org/lib/
 INHERIT=cargo
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~s390 sparc
 LICENSE=GPL-3
 SLOT=0/0
 SRC_URI=https://github.com/ImageOptim/libimagequant/archive/4.1.0.tar.gz -> libimagequant-4.1.0.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.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/bytemuck/1.13.0/download -> bytemuck-1.13.0.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.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/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.13/download -> crossbeam-epoch-0.9.13.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/fallible_collections/0.4.6/download -> fallible_collections-0.4.6.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/lodepng/3.7.2/download -> lodepng-3.7.2.crate https://crates.io/api/v1/crates/memoffset/0.7.1/download -> memoffset-0.7.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/noisy_float/0.2.0/download -> noisy_float-0.2.0.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.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/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/rayon/1.6.1/download -> rayon-1.6.1.crate https://crates.io/api/v1/crates/rayon-core/1.10.2/download -> rayon-core-1.10.2.crate https://crates.io/api/v1/crates/rgb/0.8.34/download -> rgb-0.8.34.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.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/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate
 _eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ba9748328da6f22003859e20232c71d4
+_md5_=3f26dc691134dba75bd8107e9e2b403b
diff --git a/metadata/md5-cache/media-gfx/librecad-2.2.0 b/metadata/md5-cache/media-gfx/librecad-2.2.0
index f83b97f40a1a..f4bc63044fc0 100644
--- a/metadata/md5-cache/media-gfx/librecad-2.2.0
+++ b/metadata/md5-cache/media-gfx/librecad-2.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.librecad.org/
 INHERIT=desktop edo plocale qmake-utils
 IUSE=debug doc tools
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/freetype:2
 SLOT=0
 SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.2.0.tar.gz -> librecad-2.2.0.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	950fbaec7deeba41b5bcc0572cca99b9	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=849c0ffa5315d16e0a8088101d42ae18
+_md5_=a4464a3e0fc635248b25d1f83eb68388
diff --git a/metadata/md5-cache/media-gfx/xloadimage-4.1-r15 b/metadata/md5-cache/media-gfx/xloadimage-4.1-r15
index 1ad8ebee902a..9f9df2fb69e5 100644
--- a/metadata/md5-cache/media-gfx/xloadimage-4.1-r15
+++ b/metadata/md5-cache/media-gfx/xloadimage-4.1-r15
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sioseis.ucsd.edu/xloadimage.html https://tracker.debian.org/pkg/xloadimage
 INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=tiff jpeg png
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 tiff? ( media-libs/tiff:= ) png? ( media-libs/libpng:= ) jpeg? ( media-libs/libjpeg-turbo:= ) !media-gfx/xli
 SLOT=0
 SRC_URI=ftp://ftp.x.org/R5contrib/xloadimage.4.1.tar.gz mirror://gentoo/xloadimage-4.1-gentoo-r1.diff.bz2 https://dev.gentoo.org/~sam/distfiles/media-gfx/xloadimage/xloadimage-4.1-fix-build-for-clang16.patch.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c771b69451ff9bf415150b064a436c3e
+_md5_=4b28137c987362bd16192969bf849470
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 9c1131ddd07d..a45947a56465 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r3 b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r3
index 6e4d6f8b5319..45b01a2cf19d 100644
--- a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r3
+++ b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r3
@@ -5,10 +5,10 @@ DESCRIPTION=VDR Plugin: displaying, recording and replaying teletext based subti
 EAPI=8
 HOMEPAGE=https://github.com/vdr-projects/vdr-plugin-ttxtsubs
 INHERIT=vdr-plugin-2
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=media-video/vdr[ttxtsubs] media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-ttxtsubs/archive/refs/tags/v0.3.0.tar.gz -> vdr-ttxtsubs-0.3.0.tgz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	vdr-plugin-2	071552253671f8678f5291b896526b9e
-_md5_=29952ac06a7f1af13a067ffb097b6678
+_md5_=5b5363230780c411fd110a183d0e0504
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index fa29c7d9834a..2c89982d8b80 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/graphite-web-1.1.10 b/metadata/md5-cache/net-analyzer/graphite-web-1.1.10
index be0feb02d09d..4194b371ed3f 100644
--- a/metadata/md5-cache/net-analyzer/graphite-web-1.1.10
+++ b/metadata/md5-cache/net-analyzer/graphite-web-1.1.10
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile config configure install postinst prepare test
 DESCRIPTION=Enterprise scalable realtime graphing
 EAPI=7
 HOMEPAGE=https://graphiteapp.org/
-INHERIT=distutils-r1 prefix
+INHERIT=distutils-r1 prefix pypi
 IUSE=+carbon ldap mysql memcached postgres +sqlite python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=carbon? ( dev-python/carbon[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) memcached? ( dev-python/python-memcached[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) mysql? ( dev-python/mysqlclient[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postgres? ( dev-python/psycopg:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/django-1.11.19[sqlite?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/django-4[sqlite?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/django-tagging-0.4.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/fontconfig python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/g/graphite-web/graphite-web-1.1.10.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=74b42e5c08b7f6a3277561681638e2f6
+SRC_URI=https://files.pythonhosted.org/packages/source/g/graphite-web/graphite-web-1.1.10.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e4ffaccfc752303df46d84997f21caab
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 01b0710cf7d2..23cd50d37ef1 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.12 b/metadata/md5-cache/net-im/pidgin-2.14.12
index 04f5f7650d72..fcc439f946be 100644
--- a/metadata/md5-cache/net-im/pidgin-2.14.12
+++ b/metadata/md5-cache/net-im/pidgin-2.14.12
@@ -7,7 +7,7 @@ HOMEPAGE=https://pidgin.im/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools gnome2-utils flag-o-matic perl-module python-single-r1 xdg
 IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl test tk v4l +xscreensaver zephyr zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) idn? ( net-dns/libidn:= ) meanwhile? ( net-libs/meanwhile ) ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) ) networkmanager? ( net-misc/networkmanager ) perl? ( >=dev-lang/perl-5.16:= ) sasl? ( dev-libs/cyrus-sasl:2 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) v4l? ( media-plugins/gst-plugins-v4l2 ) zeroconf? ( net-dns/avahi[dbus] )
 REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) v4l? ( gstreamer )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.12.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4a7e4d59ae01ada04e1298a39fc4498f
+_md5_=a0b3796683ad7065ca3d267e924af309
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index ac9789554c1b..98ed849bc695 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/c-client-2007f_p7 b/metadata/md5-cache/net-libs/c-client-2007f_p7
index ea7ec220f2b5..15961f642aaf 100644
--- a/metadata/md5-cache/net-libs/c-client-2007f_p7
+++ b/metadata/md5-cache/net-libs/c-client-2007f_p7
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://www.washington.edu/imap/
 INHERIT=flag-o-matic libtool toolchain-funcs
 IUSE=doc +ipv6 kerberos pam ssl static-libs topal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=ssl? ( dev-libs/openssl:= ) kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) !pam? ( virtual/libcrypt:= ) ) kerberos? ( app-crypt/mit-krb5 )
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z mirror://debian/pool/main/u/uw-imap/uw-imap_2007f~dfsg-7.debian.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=26510a489b9d5f7cdaddb245c15c1f15
+_md5_=4b61bb38b2ca85c75687a06957b9df01
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.76.0 b/metadata/md5-cache/net-libs/glib-networking-2.76.0
new file mode 100644
index 000000000000..d6b7e09c16e8
--- /dev/null
+++ b/metadata/md5-cache/net-libs/glib-networking-2.76.0
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( sys-apps/dbus ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=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.73.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libproxy? ( >=net-libs/libproxy-0.4.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/gnutls-3.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas ) test? ( net-libs/gnutls[pkcs11] )
+DESCRIPTION=Network-related giomodules for glib
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/glib-networking
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson-multilib xdg
+IUSE=+gnome +libproxy +ssl 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 ~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=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.73.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libproxy? ( >=net-libs/libproxy-0.4.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/gnutls-3.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/glib-networking/2.76/glib-networking-2.76.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0a69f72163a4cc5e448948ac7e9ccbc6
diff --git a/metadata/md5-cache/net-libs/libgssglue-0.7 b/metadata/md5-cache/net-libs/libgssglue-0.7
index 94ac884d59b3..3e0bc6994e4d 100644
--- a/metadata/md5-cache/net-libs/libgssglue-0.7
+++ b/metadata/md5-cache/net-libs/libgssglue-0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Exports a gssapi interface which calls other random gssapi libraries
 EAPI=8
 HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux https://gitlab.com/gsasl/libgssglue
 INHERIT=autotools readme.gentoo-r1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=virtual/krb5
 SLOT=0
 SRC_URI=https://gitlab.com/gsasl/libgssglue/-/archive/libgssglue-0.7/libgssglue-libgssglue-0.7.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b6cef1065a6ae19705a1d0e2dacae0f1
+_md5_=7e783dd0995778464b4baccaad0743b8
diff --git a/metadata/md5-cache/net-libs/libpsl-0.21.2 b/metadata/md5-cache/net-libs/libpsl-0.21.2
index 2605d77de26b..d384734b87b3 100644
--- a/metadata/md5-cache/net-libs/libpsl-0.21.2
+++ b/metadata/md5-cache/net-libs/libpsl-0.21.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/rockdaboot/libpsl
 INHERIT=meson-multilib python-any-r1
 IUSE=icu +idn 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=icu? ( !idn? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) idn? ( dev-libs/libunistring:=[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/libidn2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/rockdaboot/libpsl/releases/download/0.21.2/libpsl-0.21.2.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ecd931915b5f8d2d2a41c16416492dfd
+_md5_=9ea4211407cddf574e9dbb195039e75e
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index b8e039a1d132..d2e5956d6dbc 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/fdm-2.2 b/metadata/md5-cache/net-mail/fdm-2.2
index e371422be468..a0ad94a31401 100644
--- a/metadata/md5-cache/net-mail/fdm-2.2
+++ b/metadata/md5-cache/net-mail/fdm-2.2
@@ -4,9 +4,9 @@ DESCRIPTION=Fetch, filter and deliver mail
 EAPI=8
 HOMEPAGE=https://github.com/nicm/fdm
 IUSE=examples pcre
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:= sys-libs/tdb pcre? ( dev-libs/libpcre2 ) acct-group/fdm acct-user/fdm
 SLOT=0
 SRC_URI=https://github.com/nicm/fdm/releases/download/2.2/fdm-2.2.tar.gz
-_md5_=397d38f7c143a2d902defe6f80c1b211
+_md5_=63c2c740b38b4beee743283c85ea711a
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 4441edb9af0b..8fc97d27a4dd 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/downloader-cli-0.3.3 b/metadata/md5-cache/net-misc/downloader-cli-0.3.3
index 2687040fa92c..b3ac477beb73 100644
--- a/metadata/md5-cache/net-misc/downloader-cli-0.3.3
+++ b/metadata/md5-cache/net-misc/downloader-cli-0.3.3
@@ -2,14 +2,14 @@ BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple downloader with an customizable progressbar
 EAPI=8
-HOMEPAGE=https://github.com/deepjyoti30/downloader-cli/
-INHERIT=distutils-r1
+HOMEPAGE=https://github.com/deepjyoti30/downloader-cli/ https://pypi.org/project/downloader-cli/
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=mirror://pypi/d/downloader_cli/downloader_cli-0.3.3.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e12d82fde350915cbf0adfa85de8d741
+SRC_URI=https://files.pythonhosted.org/packages/source/d/downloader-cli/downloader_cli-0.3.3.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=69f6eceaa72020449598d3f603a67204
diff --git a/metadata/md5-cache/net-misc/ipv6calc-4.0.1-r1 b/metadata/md5-cache/net-misc/ipv6calc-4.0.1-r1
index a30745d18310..c1ce51538115 100644
--- a/metadata/md5-cache/net-misc/ipv6calc-4.0.1-r1
+++ b/metadata/md5-cache/net-misc/ipv6calc-4.0.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=IPv6 address calculator
 EAPI=8
 HOMEPAGE=https://www.deepspace6.net/projects/ipv6calc.html
 IUSE=cgi geoip test
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=cgi? ( dev-perl/URI dev-perl/Digest-SHA1 ) dev-libs/openssl:= geoip? ( >=dev-libs/geoip-1.4.7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pbiering/ipv6calc/archive/4.0.1.tar.gz -> ipv6calc-4.0.1.tar.gz
-_md5_=2d3cc18819ce2d41d239f325d71e5ff2
+_md5_=9e0e894671798020544a40c14a6e4bc6
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.2.2 b/metadata/md5-cache/net-misc/ntpsec-1.2.2
index f63a81864314..4c713cd70ac7 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.2.2
+++ b/metadata/md5-cache/net-misc/ntpsec-1.2.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.ntpsec.org/
 INHERIT=distutils-r1 flag-o-matic waf-utils systemd
 IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~riscv ~x86
 LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) dev-libs/openssl:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) nist? ( rclock_local ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.2.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=da4928f3e6f5d9d2dc126129cbb14c90
+_md5_=c95d3a359709766fcbe78d1b24daddfa
diff --git a/metadata/md5-cache/net-misc/openssh-9.3_p1 b/metadata/md5-cache/net-misc/openssh-9.3_p1
index 8be6a86741e2..c75dad8fe8a7 100644
--- a/metadata/md5-cache/net-misc/openssh-9.3_p1
+++ b/metadata/md5-cache/net-misc/openssh-9.3_p1
@@ -6,6 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.openssh.com/
 INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
 IUSE=abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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 GPL-2
 RDEPEND=acct-group/sshd acct-user/sshd !static? ( !<sys-devel/gcc-config-2.6 audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth )
 REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp ssl !xmss ) xmss? ( ssl ) test? ( ssl ) test? ( !xmss )
@@ -13,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.3p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p1-hpn-15.2-glue.patch.xz ) X509? ( https://roumenpetrov.info/openssh/x509-14.1.1/openssh-9.3p1+x509-14.1.1.diff.gz https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p1-X509-glue-14.1.1.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.3_p1-hpn-15.2-X509-14.1.1-glue.patch.xz ) ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.3p1.tar.gz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	verify-sig	167258b573910fd3f5b71c5c52d66ab3
-_md5_=be98398930220fdcae3a9a55b536f617
+_md5_=6b09192823935e04da112bd42c5adfbe
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.10-r1 b/metadata/md5-cache/net-misc/seafile-8.0.10-r2
index b6db03a6c623..4b41e8825ba3 100644
--- a/metadata/md5-cache/net-misc/seafile-8.0.10-r1
+++ b/metadata/md5-cache/net-misc/seafile-8.0.10-r2
@@ -1,6 +1,6 @@
 BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) || ( dev-lang/vala:0.56 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/future[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/future[python_targets_python3_11(-)] ) dev-libs/openssl:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson:= dev-libs/libevent:= net-libs/libsearpc[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] net-misc/curl sys-apps/util-linux sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone )
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/future[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/future[python_targets_python3_11(-)] ) dev-libs/openssl:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson:= dev-libs/libevent:= net-libs/libwebsockets:= net-libs/libsearpc[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] net-misc/curl sys-apps/util-linux sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone )
 DESCRIPTION=File syncing and sharing software with file encryption and group sharing
 EAPI=8
 HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile/
@@ -8,9 +8,9 @@ INHERIT=autotools python-single-r1 vala
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/future[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/future[python_targets_python3_11(-)] ) dev-libs/openssl:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson:= dev-libs/libevent:= net-libs/libsearpc[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] net-misc/curl sys-apps/util-linux sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/future[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/future[python_targets_python3_11(-)] ) dev-libs/openssl:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson:= dev-libs/libevent:= net-libs/libwebsockets:= net-libs/libsearpc[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] net-misc/curl sys-apps/util-linux sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/refs/tags/v8.0.10.tar.gz -> seafile-8.0.10.gh.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=9b78055bffcc3071d511c9c1fc88baf3
+_md5_=6becf790e7d0c03b461961c9cf7f8f19
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.9-r1 b/metadata/md5-cache/net-misc/seafile-8.0.9-r1
index 6d32d26c934b..00ce2d02b8ca 100644
--- a/metadata/md5-cache/net-misc/seafile-8.0.9-r1
+++ b/metadata/md5-cache/net-misc/seafile-8.0.9-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/refs/tags/v8.0.9.tar.gz -> seafile-8.0.9.gh.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=b29ca0ddd9a255ad15a732f3c07e1411
+_md5_=337156859b3c52d892b022266c4bde92
diff --git a/metadata/md5-cache/net-misc/stunnel-5.68 b/metadata/md5-cache/net-misc/stunnel-5.68
index 323df1b69758..b0d4176505ec 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.68
+++ b/metadata/md5-cache/net-misc/stunnel-5.68
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.stunnel.org/index.html
 INHERIT=ssl-cert systemd tmpfiles
 IUSE=selinux stunnel3 tcpd ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=acct-user/stunnel acct-group/stunnel dev-libs/openssl:0= tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-stunnel ) stunnel3? ( dev-lang/perl ) virtual/tmpfiles
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.stunnel.org/downloads/stunnel-5.68.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.68.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.68.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.68.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.68.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.68.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.68.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.68.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1ffcf53bae96c5cc671f12a0e26374a8
+_md5_=c2f964ec7e7873e121e6e8821d096210
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index f75db67d1388..1bb21fbe5963 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.9 b/metadata/md5-cache/net-vpn/strongswan-5.9.9
index 8a0e0e17ac81..9b3ed017ebbb 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.9.9
+++ b/metadata/md5-cache/net-vpn/strongswan-5.9.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.strongswan.org/
 INHERIT=linux-info systemd
 IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_gcm +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_kdf strongswan_plugins_addrblock strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_error-notify strongswan_plugins_forecast strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist strongswan_plugins_xauth-noauth
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2 RSA DES
 RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=https://download.strongswan.org/strongswan-5.9.9.tar.bz2
 _eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3cba069bf07313ece641246a007ffaa4
+_md5_=0bcf977eee8f5443ff06ddabbc26b711
diff --git a/metadata/md5-cache/sci-chemistry/MDAnalysis-2.4.1 b/metadata/md5-cache/sci-chemistry/MDAnalysis-2.4.1
index 2e173b5e5999..8120714d08aa 100644
--- a/metadata/md5-cache/sci-chemistry/MDAnalysis-2.4.1
+++ b/metadata/md5-cache/sci-chemistry/MDAnalysis-2.4.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A python library to analyze and manipulate molecular dynamics trajectories
 EAPI=8
 HOMEPAGE=https://www.mdanalysis.org
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/numpy-1.16.0[python_targets_python3_9(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/M/MDAnalysis/MDAnalysis-2.4.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fc114be5f8debe64cae4c7187584b7a5
+SRC_URI=https://files.pythonhosted.org/packages/source/M/MDAnalysis/MDAnalysis-2.4.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=aa5542b2a9e8c1bfb2e22f630970f9cd
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index fdb667e800d7..e243e21396b6 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 3865ce23b1bd..df230f62208e 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/dmlc-core-0.5 b/metadata/md5-cache/sci-libs/dmlc-core-0.5
new file mode 100644
index 000000000000..175e8d309020
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/dmlc-core-0.5
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] ) test? ( dev-cpp/gtest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=s3? ( net-misc/curl[ssl] )
+DESCRIPTION=Common bricks library for building distributed machine learning
+EAPI=8
+HOMEPAGE=https://github.com/dmlc/dmlc-core
+INHERIT=cmake toolchain-funcs
+IUSE=cpu_flags_x86_sse2 doc openmp s3 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=s3? ( net-misc/curl[ssl] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dmlc/dmlc-core/archive/refs/tags/v0.5.tar.gz -> dmlc-core-0.5.tar.gz
+_eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a49754856500fb848636d23b4daf8b81
diff --git a/metadata/md5-cache/sci-libs/scikit-optimize-0.9.0 b/metadata/md5-cache/sci-libs/scikit-optimize-0.9.0
index ac3ee400fe34..85eade238d32 100644
--- a/metadata/md5-cache/sci-libs/scikit-optimize-0.9.0
+++ b/metadata/md5-cache/sci-libs/scikit-optimize-0.9.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sequential model-based optimization library
 EAPI=8
 HOMEPAGE=https://scikit-optimize.github.io/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/joblib-0.11[python_targets_python3_9(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/s/scikit-optimize/scikit-optimize-0.9.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3020d7e10580a582e53ad1f29ab5baf5
+SRC_URI=https://files.pythonhosted.org/packages/source/s/scikit-optimize/scikit-optimize-0.9.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=bc233ac09e099e61e2046497846c11cb
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index f0911010ffc8..9bd96cda92f4 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-44.0 b/metadata/md5-cache/sys-apps/gnome-disk-utility-44.0
new file mode 100644
index 000000000000..225cd23245e8
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gnome-disk-utility-44.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxml2:2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=media-libs/libdvdread-4.2.0:0= >=dev-libs/glib-2.31:2 >=x11-libs/gtk+-3.16.0:3 >=media-libs/libcanberra-0.1[gtk3] >=gui-libs/libhandy-1.5.0:1 >=app-arch/xz-utils-5.0.5 >=x11-libs/libnotify-0.7 >=app-crypt/libsecret-0.7 >=dev-libs/libpwquality-1.0.0 >=sys-fs/udisks-2.7.6:2 elogind? ( >=sys-auth/elogind-209 ) systemd? ( >=sys-apps/systemd-209:0= )
+DESCRIPTION=Disk Utility for GNOME using udisks
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Disks
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=fat elogind gnome systemd
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=media-libs/libdvdread-4.2.0:0= >=dev-libs/glib-2.31:2 >=x11-libs/gtk+-3.16.0:3 >=media-libs/libcanberra-0.1[gtk3] >=gui-libs/libhandy-1.5.0:1 >=app-arch/xz-utils-5.0.5 >=x11-libs/libnotify-0.7 >=app-crypt/libsecret-0.7 >=dev-libs/libpwquality-1.0.0 >=sys-fs/udisks-2.7.6:2 elogind? ( >=sys-auth/elogind-209 ) systemd? ( >=sys-apps/systemd-209:0= ) x11-themes/adwaita-icon-theme fat? ( sys-fs/dosfstools ) gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-disk-utility/44/gnome-disk-utility-44.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b3d4e9968ecabd2b5165d36778d64692
diff --git a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r19 b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r19
index cb4d101700d5..3f5adc493273 100644
--- a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r19
+++ b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r19
@@ -4,11 +4,11 @@ EAPI=7
 HOMEPAGE=https://cr.yp.to/ucspi-tcp.html
 INHERIT=qmail toolchain-funcs
 IUSE=ipv6 qmail-spp selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=public-domain
 RDEPEND=!app-doc/ucspi-tcp-man selinux? ( sec-policy/selinux-ucspitcp )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz mirror://qmail/ucspi-rss.diff http://smarden.org/pape/djb/manpages/ucspi-tcp-0.88-man.tar.gz http://xs3.b92.net/tomislavr/ucspi-tcp-0.88-rblspp.patch ipv6? ( https://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff20.bz2 )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmail	8b4becd598c7db847f08a4384525cd18	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8d28e81748373083fd5eba4c9ab62a8b
+_md5_=952b5ee5f14e272eb6bf04c4d89313f4
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index d2aca022de94..5fcbd45330cb 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.17-r1 b/metadata/md5-cache/sys-cluster/ceph-15.2.17-r1
deleted file mode 100644
index 7f4728fe6aa4..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.17-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_9(-)?] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_9(-)?] dev-python/virtualenv[python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_9(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=8
-HOMEPAGE=https://ceph.com/
-INHERIT=check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles multiprocessing
-IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk +system-boost systemd +tcmalloc test uring xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_9
-LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_9(-)?] dev-python/cherrypy[python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_9(-)?] dev-python/pecan[python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_9(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_9(-)?] dev-python/routes[python_targets_python3_9(-)?] sci-libs/scikit-learn[python_targets_python3_9(-)?] dev-python/six[python_targets_python3_9(-)?] ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_9 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.17.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	b2e109b7341cd993b8bdfcc60652a14d	distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e81b5f4fc7e9cc7b2007b29fe290a4ee
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.17-r2 b/metadata/md5-cache/sys-cluster/ceph-15.2.17-r2
deleted file mode 100644
index 30a9be9810ae..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.17-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_9(-)?] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_9(-)?] dev-python/virtualenv[python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_9(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=8
-HOMEPAGE=https://ceph.com/
-INHERIT=check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles multiprocessing
-IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk +system-boost systemd +tcmalloc test uring xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_9
-LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_9(-)?] dev-python/cherrypy[python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_9(-)?] dev-python/pecan[python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_9(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_9(-)?] dev-python/routes[python_targets_python3_9(-)?] sci-libs/scikit-learn[python_targets_python3_9(-)?] dev-python/six[python_targets_python3_9(-)?] ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_9 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.17.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	b2e109b7341cd993b8bdfcc60652a14d	distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0a6c16c05448d8ba4f9124d350ccfda9
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.17-r3 b/metadata/md5-cache/sys-cluster/ceph-15.2.17-r3
new file mode 100644
index 000000000000..b90c606a16b1
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.17-r3
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_9(-)?] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_9(-)?] dev-python/virtualenv[python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_9(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= )
+DESCRIPTION=Ceph distributed filesystem
+EAPI=8
+HOMEPAGE=https://ceph.com/
+INHERIT=check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles multiprocessing
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk +system-boost systemd +tcmalloc test uring xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_9
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_9(-)?] dev-python/cherrypy[python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_9(-)?] dev-python/pecan[python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_9(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_9(-)?] dev-python/routes[python_targets_python3_9(-)?] sci-libs/scikit-learn[python_targets_python3_9(-)?] dev-python/six[python_targets_python3_9(-)?] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_9 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.17.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	b2e109b7341cd993b8bdfcc60652a14d	distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e6cb7905514186e45a88ba44ab5834f0
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.10-r3 b/metadata/md5-cache/sys-cluster/ceph-16.2.10-r3
deleted file mode 100644
index 9191dbb38714..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.10-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=amd64? ( dev-lang/nasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/util-linux sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig jaeger? ( sys-devel/bison sys-devel/flex ) test? ( dev-util/cunit dev-python/coverage[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) !system-boost? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=8
-HOMEPAGE=https://ceph.com/
-INHERIT=check-reqs bash-completion-r1 cmake python-r1 flag-o-matic lua-single udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
-IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_9 python_targets_python3_10 +lua_single_target_lua5-3
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) !system-boost? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 ) ?? ( jemalloc tcmalloc ) jaeger? ( !system-boost ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) !system-boost? ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.10.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ea49cbd13ae844c8726b801a671271c3
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.10-r4 b/metadata/md5-cache/sys-cluster/ceph-16.2.10-r4
deleted file mode 100644
index 41c8ea262013..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.10-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=amd64? ( dev-lang/nasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/util-linux sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig jaeger? ( sys-devel/bison sys-devel/flex ) test? ( dev-util/cunit dev-python/coverage[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) !system-boost? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=8
-HOMEPAGE=https://ceph.com/
-INHERIT=check-reqs bash-completion-r1 cmake python-r1 flag-o-matic lua-single udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
-IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_9 python_targets_python3_10 +lua_single_target_lua5-3
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) !system-boost? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 ) ?? ( jemalloc tcmalloc ) jaeger? ( !system-boost ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) !system-boost? ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.10.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=41f441f027a22fb94ce4b9867f914c61
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 64b6e63327e4..cb6faa9fa420 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.175 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.175
new file mode 100644
index 000000000000..6368c0bce1ca
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.175
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.175
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.175 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.175
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-184.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-184.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8198b4c8c78c41a00d2bdd61de2daa13
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.103 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.103
new file mode 100644
index 000000000000..3cba8c7de8e9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.103
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.103
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.103 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.103
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-108.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-108.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=911a2bb8f6ac05e06f6b34e91cbc96a5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.237 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.237
new file mode 100644
index 000000000000..82a87cab73f1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.237
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.237
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.237 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.237
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-243.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-243.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d4bb650eeb0f126876536d12fd8692af
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.20 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.20
new file mode 100644
index 000000000000..5f3236fe1ffb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.20
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.20
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.20 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.20
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-24.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-24.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b107498eafe6c16385086d7fde718ad3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.2.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.2.7
new file mode 100644
index 000000000000..0c2213077671
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.2.7
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.2.7
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.2.7 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.2.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-9.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.6-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.2.6-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.6-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.2.6-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.6-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.2.6-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.6-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.2.6-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=58682a9396bca7139146741c1c03ab81
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.175 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.175
new file mode 100644
index 000000000000..dddc72b57e76
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.175
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.175
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.175 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.175
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-184.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-184.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.175-1.gpkg.tar -> gentoo-kernel-5.10.175-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.175-1.gpkg.tar -> gentoo-kernel-5.10.175-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.175-1.gpkg.tar -> gentoo-kernel-5.10.175-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.175-1.gpkg.tar -> gentoo-kernel-5.10.175-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_md5_=f8fa00c4b0476dc3be4b1ae7e6b46403
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.103 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.103
new file mode 100644
index 000000000000..7faf9d3ca641
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.103
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.103
+RDEPEND=!sys-kernel/gentoo-kernel:5.15.103 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.103
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-108.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-108.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.103-1.gpkg.tar -> gentoo-kernel-5.15.103-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.103-1.gpkg.tar -> gentoo-kernel-5.15.103-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.103-1.gpkg.tar -> gentoo-kernel-5.15.103-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.103-1.gpkg.tar -> gentoo-kernel-5.15.103-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_md5_=501d74f0109a01891a2c259f17203792
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.237 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.237
new file mode 100644
index 000000000000..a5a5a4807ef6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.237
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.237
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.237 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.237
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-243.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-243.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.237-1.gpkg.tar -> gentoo-kernel-5.4.237-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.237-1.gpkg.tar -> gentoo-kernel-5.4.237-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.237-1.gpkg.tar -> gentoo-kernel-5.4.237-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.237-1.gpkg.tar -> gentoo-kernel-5.4.237-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_md5_=00362e8b1386bff9fc0948edaaeb70d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.20 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.20
new file mode 100644
index 000000000000..3a653ee8ddfc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.20
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.20
+RDEPEND=!sys-kernel/gentoo-kernel:6.1.20 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.20
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-24.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-24.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.20-1.gpkg.tar -> gentoo-kernel-6.1.20-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.20-1.gpkg.tar -> gentoo-kernel-6.1.20-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.20-1.gpkg.tar -> gentoo-kernel-6.1.20-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.20-1.gpkg.tar -> gentoo-kernel-6.1.20-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_md5_=94eb09196b8203bd20e442e87c3756c9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.2.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.2.7
new file mode 100644
index 000000000000..c94a7e55b281
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.2.7
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.2.7
+RDEPEND=!sys-kernel/gentoo-kernel:6.2.7 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.2.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-9.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.7-1.gpkg.tar -> gentoo-kernel-6.2.7-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.7-1.gpkg.tar -> gentoo-kernel-6.2.7-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.7-1.gpkg.tar -> gentoo-kernel-6.2.7-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.7-1.gpkg.tar -> gentoo-kernel-6.2.7-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_md5_=bf277291b9a653d45c9e133d3282088a
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.271_p120 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.277_p122
index 53fdd38b4092..af6cf5a3cb15 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.271_p120
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.277_p122
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 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.271_p120
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.271.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.271-rt120.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.271-rt120.patch.xz
+SLOT=4.19.277_p122
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.277.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.277-rt122.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.277-rt122.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=79671f006cc62d6ead0bc41cedac4020
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-6.1.12_p7 b/metadata/md5-cache/sys-kernel/rt-sources-6.1.19_p8
index fd1d48f25ece..a9e8c399b78e 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-6.1.12_p7
+++ b/metadata/md5-cache/sys-kernel/rt-sources-6.1.19_p8
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 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=6.1.12_p7
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.12.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//6.1-gnu/deblob-6.1 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//6.1-gnu/deblob-check -> deblob-check-6.1 ) https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/patch-6.1.12-rt7.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patch-6.1.12-rt7.patch.xz
+SLOT=6.1.19_p8
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.19.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//6.1-gnu/deblob-6.1 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//6.1-gnu/deblob-check -> deblob-check-6.1 ) https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/patch-6.1.19-rt8.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patch-6.1.19-rt8.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f6a9c79ff5e6b5ea13a6fa587de67550
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.175 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.175
new file mode 100644
index 000000000000..9914769cda21
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.175
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.175
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.175
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.175.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.175.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
+_md5_=6d46e875226d6340b91d52c28b2e9147
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.103 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.103
new file mode 100644
index 000000000000..b8530a1fac7e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.103
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.103
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.103
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.103.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.103.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
+_md5_=2eac001ceafd53f76d270f933dce1217
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.237 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.237
new file mode 100644
index 000000000000..9ca82f7128e0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.237
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build verify-sig
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.237
+RDEPEND=virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.237
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.237.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.237.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
+_md5_=a8d9882e72b6a1a3ab6202bed1ccc813
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.20 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.20
new file mode 100644
index 000000000000..f8f230d944ea
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.20
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.20
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.20
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.20.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.20.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
+_md5_=6af3201a419530fc1a9351b0f433c39c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.7 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.7
new file mode 100644
index 000000000000..4e3dc23482d4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.7
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.2.7
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.2.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.7.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.7.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.6-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.2.6-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.6-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.2.6-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.6-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.2.6-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.6-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.2.6-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
+_md5_=f5de18f39ce527765b237c7af2776b14
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 13f0a6fbedba..fbcf616f785b 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libchipcard-5.1.6 b/metadata/md5-cache/sys-libs/libchipcard-5.1.6
index c9c756d1a8d0..062ef0f4d206 100644
--- a/metadata/md5-cache/sys-libs/libchipcard-5.1.6
+++ b/metadata/md5-cache/sys-libs/libchipcard-5.1.6
@@ -5,9 +5,9 @@ DESCRIPTION=Library for accessing chip cards via chip card readers (terminals)
 EAPI=8
 HOMEPAGE=https://www.aquamaniac.de/rdm/projects/libchipcard
 IUSE=doc examples
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/pcsc-lite-1.6.2 >=sys-libs/gwenhywfar-4.99.22_rc6:= sys-libs/zlib virtual/libintl
 SLOT=0
 SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/382/libchipcard-5.1.6.tar.gz
-_md5_=08f31c1e16168e118e48c22383448a1d
+_md5_=1b6692f3e75991eed33806c17608fb92
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index c442f3569ee1..6e9da55bb5a8 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.175 b/metadata/md5-cache/virtual/dist-kernel-5.10.175
new file mode 100644
index 000000000000..fab223ce235f
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.175
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.175 ~sys-kernel/gentoo-kernel-bin-5.10.175 ~sys-kernel/vanilla-kernel-5.10.175 )
+SLOT=0/5.10.175
+_md5_=2b14c705dcd61ca0cb392a256fbcb273
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.103 b/metadata/md5-cache/virtual/dist-kernel-5.15.103
new file mode 100644
index 000000000000..e4dd0693be6d
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.103
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.103 ~sys-kernel/gentoo-kernel-bin-5.15.103 ~sys-kernel/vanilla-kernel-5.15.103 )
+SLOT=0/5.15.103
+_md5_=2b14c705dcd61ca0cb392a256fbcb273
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.237 b/metadata/md5-cache/virtual/dist-kernel-5.4.237
new file mode 100644
index 000000000000..6bbc6a8a0f92
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.237
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.237 ~sys-kernel/gentoo-kernel-bin-5.4.237 ~sys-kernel/vanilla-kernel-5.4.237 )
+SLOT=0/5.4.237
+_md5_=844ac6f7a5f9492ed01a8c238a631cd8
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.20 b/metadata/md5-cache/virtual/dist-kernel-6.1.20
new file mode 100644
index 000000000000..6781f7b3cc20
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.1.20
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.1.20 ~sys-kernel/gentoo-kernel-bin-6.1.20 ~sys-kernel/vanilla-kernel-6.1.20 )
+SLOT=0/6.1.20
+_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.2.7 b/metadata/md5-cache/virtual/dist-kernel-6.2.7
new file mode 100644
index 000000000000..8a2a71fc42df
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.2.7
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.2.7 ~sys-kernel/gentoo-kernel-bin-6.2.7 ~sys-kernel/vanilla-kernel-6.2.7 )
+SLOT=0/6.2.7
+_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 9af2141b0c9d..c3f337e7d117 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/firefox-102.9.0 b/metadata/md5-cache/www-client/firefox-102.9.0
index d946863d7be7..8fb646a82676 100644
--- a/metadata/md5-cache/www-client/firefox-102.9.0
+++ b/metadata/md5-cache/www-client/firefox-102.9.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.mozilla.com/firefox
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
 IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=!www-client/firefox:0 !www-client/firefox:rapid screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79.2 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
 SLOT=esr
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/source/firefox-102.9.0esr.source.tar.xz -> firefox-102.9.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-09j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-09j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-09j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/af.xpi -> firefox-102.9.0esr-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ar.xpi -> firefox-102.9.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ast.xpi -> firefox-102.9.0esr-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/be.xpi -> firefox-102.9.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/bg.xpi -> firefox-102.9.0esr-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/br.xpi -> firefox-102.9.0esr-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ca.xpi -> firefox-102.9.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/cak.xpi -> firefox-102.9.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/cs.xpi -> firefox-102.9.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/cy.xpi -> firefox-102.9.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/da.xpi -> firefox-102.9.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/de.xpi -> firefox-102.9.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-102.9.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/el.xpi -> firefox-102.9.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-102.9.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-102.9.0esr-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-102.9.0esr-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-102.9.0esr-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/et.xpi -> firefox-102.9.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/eu.xpi -> firefox-102.9.0esr-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/fi.xpi -> firefox-102.9.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/fr.xpi -> firefox-102.9.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-102.9.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-102.9.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/gd.xpi -> firefox-102.9.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/gl.xpi -> firefox-102.9.0esr-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/he.xpi -> firefox-102.9.0esr-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/hr.xpi -> firefox-102.9.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-102.9.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/hu.xpi -> firefox-102.9.0esr-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/id.xpi -> firefox-102.9.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/is.xpi -> firefox-102.9.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/it.xpi -> firefox-102.9.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ja.xpi -> firefox-102.9.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ka.xpi -> firefox-102.9.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/kab.xpi -> firefox-102.9.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/kk.xpi -> firefox-102.9.0esr-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ko.xpi -> firefox-102.9.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/lt.xpi -> firefox-102.9.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/lv.xpi -> firefox-102.9.0esr-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ms.xpi -> firefox-102.9.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-102.9.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/nl.xpi -> firefox-102.9.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-102.9.0esr-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-102.9.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/pl.xpi -> firefox-102.9.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-102.9.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-102.9.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/rm.xpi -> firefox-102.9.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ro.xpi -> firefox-102.9.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ru.xpi -> firefox-102.9.0esr-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/sk.xpi -> firefox-102.9.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/sl.xpi -> firefox-102.9.0esr-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/sq.xpi -> firefox-102.9.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/sr.xpi -> firefox-102.9.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-102.9.0esr-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/th.xpi -> firefox-102.9.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/tr.xpi -> firefox-102.9.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/uk.xpi -> firefox-102.9.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/uz.xpi -> firefox-102.9.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/vi.xpi -> firefox-102.9.0esr-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-102.9.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-102.9.0esr-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ach.xpi -> firefox-102.9.0esr-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/an.xpi -> firefox-102.9.0esr-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/az.xpi -> firefox-102.9.0esr-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/bn.xpi -> firefox-102.9.0esr-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/bs.xpi -> firefox-102.9.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-102.9.0esr-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/eo.xpi -> firefox-102.9.0esr-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-102.9.0esr-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-102.9.0esr-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/fa.xpi -> firefox-102.9.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ff.xpi -> firefox-102.9.0esr-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/gn.xpi -> firefox-102.9.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-102.9.0esr-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-102.9.0esr-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-102.9.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ia.xpi -> firefox-102.9.0esr-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/km.xpi -> firefox-102.9.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/kn.xpi -> firefox-102.9.0esr-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/lij.xpi -> firefox-102.9.0esr-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/mk.xpi -> firefox-102.9.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/mr.xpi -> firefox-102.9.0esr-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/my.xpi -> firefox-102.9.0esr-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-102.9.0esr-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/oc.xpi -> firefox-102.9.0esr-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/sco.xpi -> firefox-102.9.0esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/si.xpi -> firefox-102.9.0esr-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/son.xpi -> firefox-102.9.0esr-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/szl.xpi -> firefox-102.9.0esr-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ta.xpi -> firefox-102.9.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/te.xpi -> firefox-102.9.0esr-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/tl.xpi -> firefox-102.9.0esr-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/trs.xpi -> firefox-102.9.0esr-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/ur.xpi -> firefox-102.9.0esr-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/102.9.0esr/linux-x86_64/xpi/xh.xpi -> firefox-102.9.0esr-xh.xpi )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b2f25acc33a04261a214fe18315525b2
+_md5_=345f17799d30d476587b3c0f33521580
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index a6913570cc12..f7b69693d83a 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/luit-20230201 b/metadata/md5-cache/x11-apps/luit-20230201
index 4143e416d5a0..621848cf4f64 100644
--- a/metadata/md5-cache/x11-apps/luit-20230201
+++ b/metadata/md5-cache/x11-apps/luit-20230201
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://invisible-island.net/luit/
 INHERIT=verify-sig
 IUSE=verify-sig
-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
+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=MIT
 RDEPEND=sys-libs/zlib virtual/libiconv
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/luit/luit-20230201.tgz verify-sig? ( https://invisible-island.net/archives/luit/luit-20230201.tgz.asc )
 _eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
-_md5_=3251e49a70a76ee0ae07a2bf4a113776
+_md5_=545b9c94bc1069d21628db3b73b8a1b0
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index b8119aa16966..55a06dda2ab5 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1 b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1
deleted file mode 100644
index 61e31e69650b..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.17.2:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
-DESCRIPTION=Unified widget and session management libs for Xfce
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/libxfce4ui/start https://gitlab.xfce.org/xfce/libxfce4ui/
-INHERIT=xdg-utils vala
-IUSE=glade +introspection startup-notification system-info vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.17.2:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.18/libxfce4ui-4.18.1.tar.bz2
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=93a13be2c61e65a15c66b8783128571b
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.2 b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.2
index 254183fce657..3baddb21203d 100644
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.2
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/libxfce4ui/start https://gitlab.xfce.org/xfce/libxfce4ui/
 INHERIT=xdg-utils vala
 IUSE=glade +introspection startup-notification system-info vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.17.2:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.18/libxfce4ui-4.18.2.tar.bz2
 _eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2941b9535e91093c9292e2b1d791ba25
+_md5_=93a13be2c61e65a15c66b8783128571b
diff --git a/metadata/md5-cache/xfce-base/thunar-4.18.3 b/metadata/md5-cache/xfce-base/thunar-4.18.3
deleted file mode 100644
index 53f1ee6fd144..000000000000
--- a/metadata/md5-cache/xfce-base/thunar-4.18.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.40.0 >=x11-libs/gtk+-3.24.0: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/libpcre2-10.0:= ) 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://docs.xfce.org/xfce/thunar/start https://gitlab.xfce.org/xfce/thunar/
-INHERIT=xdg-utils
-IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.40.0 >=x11-libs/gtk+-3.24.0: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/libpcre2-10.0:= ) 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? ( >=gnome-base/gvfs-1.18.3[udisks,udev] virtual/udev )
-SLOT=0/3
-SRC_URI=https://archive.xfce.org/src/xfce/thunar/4.18/thunar-4.18.3.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7e92424a87302be49f33cdb144a01155
diff --git a/metadata/md5-cache/xfce-base/thunar-4.18.4 b/metadata/md5-cache/xfce-base/thunar-4.18.4
index f07328ef05f4..35214f2b23a3 100644
--- a/metadata/md5-cache/xfce-base/thunar-4.18.4
+++ b/metadata/md5-cache/xfce-base/thunar-4.18.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/thunar/start https://gitlab.xfce.org/xfce/thunar/
 INHERIT=xdg-utils
 IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.40.0 >=x11-libs/gtk+-3.24.0: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/libpcre2-10.0:= ) 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? ( >=gnome-base/gvfs-1.18.3[udisks,udev] virtual/udev )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/4.18/thunar-4.18.4.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a8966f42d9cb85988baa926264d7529f
+_md5_=7e92424a87302be49f33cdb144a01155
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
deleted file mode 100644
index 94efcf3593a3..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.56 ) ) 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.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0: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-1.66:= )
-DESCRIPTION=Panel for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-panel/start https://gitlab.xfce.org/xfce/xfce4-panel/
-INHERIT=vala xdg-utils
-IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0: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-1.66:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.18/xfce4-panel-4.18.1.tar.bz2
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1e0a814ed26a0ac55a2addfbb8494bcf
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.2 b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.2
index 6bfa33aa1c31..4b1508103ca5 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.2
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-panel/start https://gitlab.xfce.org/xfce/xfce4-panel/
 INHERIT=vala xdg-utils
 IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0: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-1.66:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.18/xfce4-panel-4.18.2.tar.bz2
 _eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4efe05a01c6bfba07e855a5ad0bf81b8
+_md5_=1e0a814ed26a0ac55a2addfbb8494bcf
diff --git a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.1
index 1c1606817b16..7b9e7c528c15 100644
--- a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-power-manager/start https://gitlab.xfce.org/xfce/xfce4-power-manager/
 INHERIT=xdg-utils
 IUSE=networkmanager +panel-plugin policykit
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.18.2:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/4.18/xfce4-power-manager-4.18.1.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2e119290304ef261d8b55e033278f7a4
+_md5_=4836f34359e0073b8a6beac2f2613096
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-session-4.18.1
index 0b23c4ff256a..ef1d0270229d 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.18.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start https://gitlab.xfce.org/xfce/xfce4-session
 INHERIT=xdg-utils
 IUSE=nls policykit +xscreensaver
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 x11-libs/libSM x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.18.2:= >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102 ) x11-apps/iceauth x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( xfce-extra/xfce4-screensaver >=x11-misc/xscreensaver-5.26 x11-misc/light-locker ) )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.18/xfce4-session-4.18.1.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1eaa9455bef7711fb84c44182c9b2c09
+_md5_=cc38bbebfe3395420c9550328e588bd6
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1
deleted file mode 100644
index 0a3d867cbbb4..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DEFINED_PHASES=configure postinst postrm setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.66.0 media-libs/fontconfig >=x11-libs/gtk+-3.24.0:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1 x11-base/xorg-proto
-DESCRIPTION=Configuration system for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-settings/start https://gitlab.xfce.org/xfce/xfce4-settings/
-INHERIT=python-single-r1 xdg-utils
-IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.66.0 media-libs/fontconfig >=x11-libs/gtk+-3.24.0:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.18/xfce4-settings-4.18.1.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f24e866d6b119422c84a8c61f81df395
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.18.2 b/metadata/md5-cache/xfce-base/xfce4-settings-4.18.2
index e3d50d79441e..84eef7701e6a 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.18.2
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.18.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-settings/start https://gitlab.xfce.org/xfce/xfce4-settings/
 INHERIT=python-single-r1 xdg-utils
 IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.66.0 media-libs/fontconfig >=x11-libs/gtk+-3.24.0:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.18/xfce4-settings-4.18.2.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=411148c4d7a16e38c1392f2004d6b8a6
+_md5_=f24e866d6b119422c84a8c61f81df395
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index e9fecc011fd6..fe1d1a73ca77 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.3.0 b/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.3.0
deleted file mode 100644
index 131a9c98fa15..000000000000
--- a/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=media-libs/taglib-1.6 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-0.11:= >=xfce-base/thunar-1.7:= dev-util/intltool virtual/pkgconfig
-DESCRIPTION=Adds special features for media files to the Thunar File Manager
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin
-KEYWORDS=amd64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/taglib-1.6 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-0.11:= >=xfce-base/thunar-1.7:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-media-tags-plugin/0.3/thunar-media-tags-plugin-0.3.0.tar.bz2
-_md5_=b5253577bd978cb13c2101c17f40e818
diff --git a/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.4.0 b/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.4.0
index a7700ad3ce6b..c40625a0f0b7 100644
--- a/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.4.0
+++ b/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.4.0
@@ -4,9 +4,9 @@ DEPEND=>=media-libs/taglib-1.6 >=dev-libs/glib-2.50.0:2 >=x11-libs/gtk+-3.22:3 >
 DESCRIPTION=Adds special features for media files to the Thunar File Manager
 EAPI=8
 HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin https://gitlab.xfce.org/thunar-plugins/thunar-media-tags-plugin/
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=media-libs/taglib-1.6 >=dev-libs/glib-2.50.0:2 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4util-4.0.0:= >=xfce-base/thunar-1.7:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-media-tags-plugin/0.4/thunar-media-tags-plugin-0.4.0.tar.bz2
-_md5_=d42a877925a54c3d09a10a11f4277121
+_md5_=d0c647d6c6461494dd0f2ec414ea722e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.2 b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.2
deleted file mode 100644
index 6d594c7ed8d0..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=install
-DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
-DESCRIPTION=A panel plug-in with date, time and embedded calendar
-EAPI=8
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin https://gitlab.xfce.org/panel-plugins/xfce4-datetime-plugin/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.8/xfce4-datetime-plugin-0.8.2.tar.bz2
-_md5_=c2428c7acacb9f81955e3b6f3f2202e0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.3 b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.3
index 8cabe89434c3..3d570d664b31 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.8.3
@@ -4,9 +4,9 @@ DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
 DESCRIPTION=A panel plug-in with date, time and embedded calendar
 EAPI=8
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin https://gitlab.xfce.org/panel-plugins/xfce4-datetime-plugin/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.8/xfce4-datetime-plugin-0.8.3.tar.bz2
-_md5_=7f76b5d833b84e5ba04c34aaac4a6f37
+_md5_=2754e4a7e59fcc6fcc57f14484bdf783
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.8.2 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.8.2
index 99f1079b5767..6a835dddedf0 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.8.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.8.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/apps/notifyd/start https://gitlab.xfce.org/apps/xfce4-notifyd/
 INHERIT=xdg-utils
 IUSE=sound wayland X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/glib-2.68.0:2 >=x11-libs/gtk+-3.22:3[wayland?,X?] >=x11-libs/libnotify-0.7 >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.14.0:= >=xfce-base/xfconf-4.10:= sound? ( >=media-libs/libcanberra-0.30[gtk3] ) wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-notifyd/0.8/xfce4-notifyd-0.8.2.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7ab04a604dc2b235af2e6a4a4e9d2b13
+_md5_=bc6e8e6cc93ae3b18a1d591cc1c71995
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.7.1 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.7.1
deleted file mode 100644
index 4264d3bb3964..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=virtual/libintl x11-libs/gtk+:3 xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
-DESCRIPTION=Alternate application launcher for Xfce
-EAPI=8
-HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin/
-INHERIT=cmake xdg-utils
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=virtual/libintl x11-libs/gtk+:3 xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.7/xfce4-whiskermenu-plugin-2.7.1.tar.bz2
-_eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cef1e8ffc0fd96bd59f670ddc5b75d4e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.7.2 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.7.2
index ede3ff93764c..12e064d290bc 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.7.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.7.2
@@ -5,10 +5,10 @@ DESCRIPTION=Alternate application launcher for Xfce
 EAPI=8
 HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin/
 INHERIT=cmake xdg-utils
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=virtual/libintl x11-libs/gtk+:3 xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.7/xfce4-whiskermenu-plugin-2.7.2.tar.bz2
 _eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=78c5f56361d8ee3ae8c756a0563f6ff6
+_md5_=8550ae2a8810838fe4dde86666ac3113
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index c910bd776b2f..d507f8cf0c38 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-03-17T12:09:48Z
+TIMESTAMP 2023-03-17T18:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQUWIxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQUrPNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCeTQ//bgyXsH90ctHojXNZj096aQJD6FQmPf03XBBQymCoN13b84CWSOi9uW8D
-V65Mpp/HeMQte3nVaMbB3/ODzq1y3jMgWoDhldfWTeZPW2cFpzxlP/ssnFaL13lu
-JwY9YMpbvLf6rp11eDBftdqv+OrguIjOpHHP9oix2xCVyn8LIczgD4A8F+FsuZ/Q
-1CjzJgOFsmNZqkuw4esjKH6rxDZ64mslcYkAcAhfuc4Z8tI7fxZT5zoD3vuiaByP
-HonRaJSyTwqpQUZYQbh9thaKdAEjJjCPDskDiLG+nR7GipvaxVKnAHVAEvJaRnkB
-ptaTBx9gU+tT56Rht5kchQ4am31mr9Fc30PLJhUZUtkQWTOZ55P6hZrCgUshzn/L
-DyvZlJv0pcFKGb3mytYVcAxfaToiquzMShIpavfDVg+wH3N7RlqJutNDg0bInXrR
-zd4rxYHyeXYVA3PLLskfoGnqkhMc1HcEI9tlEIUonr3EIExs+9Q7xFPGXbKzNDjf
-PKa39sYCiJ6tHrwpngkU/Y0Ls0oh4SXRR1VgZrjUrZzv0WK5E6n2o3uQiF9vNK1K
-CqOgm035sTl6gSDDiTsxSKch1a3hUY4DL8ToqUgdNm8D1ihUUPgJ/TIpAoxGeJjI
-6qSg38olkoW0kZuAAb1iCmhiN7Gy33tq4imtXYSM+oHBP6kJcWg=
-=uJYN
+klDrHRAAg8C8LZUQC7pqC5aaCg8VP0DmBl/PuE0WmLXGlE4ezR/FT4XRZ/+PKOdo
+pSf7UuC6eINjFLCsiOQ7q2+ZRhNJFNUGO7EqWow3wUdRDWCXYQXmARroEhtrsca1
+SA/WK3H8ELdc1vtoitQWPPDh8mqBS+NFZee+9Ktkr+YrxNKDza+mMEc7i4VgsNp8
+KSunI3pu0MyHTAb1iLR348E9TyYYgouBdZOT+pJAheTGuYDfTO76EgZMb1YwAbXf
+QwCBTyRWgem0SPP/rAxfb136apRlY/0I+uo0JVYdpO1XoqWZr5TxXV5C2XXxbyuz
+IhIba+daw6nISt3Vc+/6NWcPdkhYYJV8yWsmdqD8/eYgYub5Z62oI7UJJL5bj/L7
+2+lpZQ+yIPzkS08CpW9DJQgZA1Mqx8CpPJHLsw8QXZQOPUqzTg3pvSd+5EAYqtXW
+apfbE/8WqTjpcRRor4UON3TXEcEm1ceQUHD4exz6hqmIpk9KQXvexcmoDZVQGppl
+86cDEBuNDqAqTlpK7K4fUIWCcCGq2T/8p8VYv41TVJvjjzjXSxzej7o1huwgq5p+
+qx/vWEe0Tt4xHKN8Uv+ZI4R9yBxauZpviLoY3Rts6rGGgI2sM8zIVWKWrFyiYvDF
+ATtxMT5FQ85erqU0EiYmOKArRmYTbLdpEiYUsSmxMCEgqhUjXZw=
+=Hnq5
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 765c9303807b..7b7c9309dda7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Mar 2023 12:09:45 +0000
+Fri, 17 Mar 2023 18:09:52 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7babdc367cf3..68655b0d5312 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Mar 17 12:09:45 PM UTC 2023
+Fri Mar 17 06:09:52 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1ea679264db9..2653e422b3a1 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Mar 2023 12:15:01 +0000
+Fri, 17 Mar 2023 18:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 376649a15f42..5b581683e684 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d071789533eb50c30c5c6372fa695cc9e6290274 1679054455 2023-03-17T12:00:55+00:00
+a6bd1cd11e41ee3d678b0bdeafaf03af6b0b254f 1679076272 2023-03-17T18:04:32+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8924db58cd95..4dbf2c135d2b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1679055001 Fri 17 Mar 2023 12:10:01 PM UTC
+1679076601 Fri 17 Mar 2023 06:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 765c9303807b..7b7c9309dda7 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Mar 2023 12:09:45 +0000
+Fri, 17 Mar 2023 18:09:52 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d3ebbf2abb5b..354fa001f976 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index 6373bcd320c5..dd53345186a1 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -2,6 +2,6 @@ AUX graphite-web-1.1.7-fhs-paths.patch 2691 BLAKE2B fbb09dfef58d94ef7099e98134d4
 AUX graphite-web-1.1.8-pyparsing3.patch 2529 BLAKE2B 644b729b439a7fca9b8e2df1bede1cda48323694686a6c05378cb7a6112353add56ede35136e1c4f73611c5606be8345ee926f6e99b8dfac15c5ab72e133ac48 SHA512 8f837db47d66d859c247b96077ad4e44168123409fb43a074ab6f625c9235c010557da56dfa788851c8a0d18b4ad314dae085cf63bcaf8ec97e8e6f33f9f7b4c
 DIST graphite-web-1.1.10.tar.gz 1192965 BLAKE2B cd60e38a70c124c2be53c12394e994f4772a3fcdbae5fa8f26097e79de3de326ec90d5ee23b4e2e8c696e50d7d7ba897b6bb441a1fc7692d1b6e581c11a3da04 SHA512 fb0a2ed5cfa4a8c12bbb7f64f0c7846b439d8094a0b415e5750fe175bbcc2c047fccad50fdeda7696aee0ed9532eb75948f3a376ee34e188cacf226c02bbb3f9
 DIST graphite-web-1.1.8.tar.gz 1177214 BLAKE2B 20e058feff0fa7f12393cfd41acca7cf05ff6a3995aa5f6547764fae3b8824e8b424efb8d5d47227eb2b5591ae6b45ab960da30f810acb4f1fbd0b9ae78ec47b SHA512 4637a541e61f56c1ac69bf18e7eab88ecf93f59099dc3e8022d8bf8fb1b204672bc0a1b5302e5031701714db17aabb316ba40f4cfabb2bf4fb0dedb8f412e4a9
-EBUILD graphite-web-1.1.10.ebuild 3178 BLAKE2B 50cfadb39064a7f570965caa956cdd443aef2bd855223d99ebe689256c82565cb8150d82364348c758a9bbcb6d6c610b222d9712421c9a71e31e415cd222dd96 SHA512 3931a53d24a2d95fedd8cacd2add7a5396e26b941e02ffa9449e7ead280d9fa23400a53651c179e692f9959da9b7342539f9f3bdddce58f8ff3a4a106f3b41ee
+EBUILD graphite-web-1.1.10.ebuild 3151 BLAKE2B 381f6da2fdcd52bf1ebcb227ea1aa60b28903a28e0c3fab95adc6cc85f3490e02f4648724cd29ff60bce32c70618ecca811428d7ac192d8800a4e3f5f1615aaa SHA512 12463dbec6ca7a3bac33ebd67203228a16918e06ce3bdcb4a99736c3f6fea4f5772221291a5c59a5d91494b132ef4761525dc72991fb7b90e5543a0dd7686e5c
 EBUILD graphite-web-1.1.8-r3.ebuild 3268 BLAKE2B f1337d6b597690be3f0d29fac629b0945a8f76af49a027cea66db6eec906b1d0768e10e58a400422edf38e77b3429629cae26e2da19930b6f26eb5c03ab7291b SHA512 f7303604d341619bf6f33f842e09d2c2ccb74db735cd1451a006bc6b22e69a55cf2304d835252c31958ae69ec5d374767a12fbeea3bb98a4d3e838aa40f6ffc9
 MISC metadata.xml 593 BLAKE2B 35159475d570570bde9acc2dd8d6abdf742d03ced88259125cc474f9ea2b9bfcf80c64da1dd44bcb69e55390d72c11c8aaa3b947f68571940c3b8676e6024387 SHA512 7a07c214a85f09ded5ecb5a353d96fc746c5c67f5c71f7539647651fd1519e78e1a3887a4865e9dab59d9804a9b0d801cc1ee72e0fd7225fe75273790e31e28f
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
index fac6c20abffa..3488db936e23 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
@@ -4,12 +4,12 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_USE_SETUPTOOLS=no  # export USE_SETUPTOOLS to activate
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1 prefix
+inherit distutils-r1 prefix pypi
 
 DESCRIPTION="Enterprise scalable realtime graphing"
 HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 41898c71dfce..5c864e0c6e49 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 514b6f697b26..e3a2a06a88f2 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,5 +2,5 @@ AUX pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d497435
 DIST pidgin-2.14.10.tar.bz2 8229328 BLAKE2B 9f004abda0f00b315e763e8b17e4e938b44b8a971d5411d775b9428363ab2ae071462d6d16654fcc09270123c434ef2d1f639d7f6d85c08a83b05c0ba4342c21 SHA512 53241e9f62170fe7a8ea27ac03176d442f8aad4ed16da0033164b0949b00c3d476539b182e761950e7d6c385f22a891524c5f40a9cf8fe543b3003c37693314d
 DIST pidgin-2.14.12.tar.bz2 8226145 BLAKE2B 0f0bec301c196fb722b88998a2a420af4084aedb7563215bb44c2c74a670a20db030ac207f226cef7989477dba04a9655c71269564ccc3680b42946ee84fdb16 SHA512 ce016ab4c48448653ae22eead1ddc16f1d10f446c601f8abd2c85b4ea83a4e80092e1ce8182834d998b6587f42a92a9a91105b4db976e170ec7043bb6af3c54c
 EBUILD pidgin-2.14.10-r1.ebuild 7551 BLAKE2B 339382c262cfef76c3cf5901d2b724a456927cff0beaf358c71f3895e7d7a839efc6522c49ba9e075d8dff3d103e0de9ecac7802e796d365f5b2fa05f4a334eb SHA512 5be02e8c7e76b8717f4cd36186d256d06a7dd8803dee708e575f66e0bc670cb7c97532ec5f4a4db9b2ef01fd79bd2c39dfe928776ef26f84aabe99bad451c149
-EBUILD pidgin-2.14.12.ebuild 7493 BLAKE2B 1613cd564a6431b9aa997d31967ac61d6af2db6576044c3a72cd2b284f74475f0beebe85c0ae9cf9c87c5e78359a98ab98bd7c581b9a0c0703a41d9cd97f0017 SHA512 b7e8d2b6af1380ca05f50fb1c7e49fdb35f66bc3234acccac4ba245a9e576ca28b4c60b2c97093fd014da16a5cea9af33fa4ce57d1bf739e5cf867a9ae4f9907
+EBUILD pidgin-2.14.12.ebuild 7490 BLAKE2B a3534c4472e6fe6d8f24d12a20fb9c2479ce6135403ff230ea1679402c31d2018d4f701f073f1cbf8bf0cd1ef93a0d9077284108ec8daea8f05cac0b50b18338 SHA512 fc441e46025905c446a3ad734d4f16440585680c9ee1f33d76b9333792ecced4ac1925b3d7f42ba6295cb1fa244d6107e8b01c1c496990ccb52a244bc22e076a
 MISC metadata.xml 1342 BLAKE2B d292c0acd20a7f23a484d2e7fc77a9a3ed96a741826740ed9001e98d3582ab21e5c3f9d10a87fedcc269c1de682cfd186e066ddb4cdb5198f26ea7749d54bcfe SHA512 f828ce1faab5a9ad0b2d243dbe2473767d1df3792e14f22f7309dc7f7893b8b78f51c7eab1e148a33a07d31b06fdb4cd67c023bdf62836c17c1992f9b5cf69d3
diff --git a/net-im/pidgin/pidgin-2.14.12.ebuild b/net-im/pidgin/pidgin-2.14.12.ebuild
index 3f2e59459b9a..ddea359f36b2 100644
--- a/net-im/pidgin/pidgin-2.14.12.ebuild
+++ b/net-im/pidgin/pidgin-2.14.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
 meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
 test tk v4l +xscreensaver zephyr zeroconf"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ba7945d1a371..43bfaf0b494f 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 24487abb199e..a4767d0b181c 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -12,5 +12,5 @@ DIST c-client-2007f-chappa-115-all.patch.gz 30571 BLAKE2B 707ec7718f764d5fea4142
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
 DIST uw-imap_2007f~dfsg-7.debian.tar.xz 44960 BLAKE2B 836dfd9a5922cd3043278a89c87276c974c8e91c5831a94caef6e73b2839d246bda879f67bdad88ae59888b5dc8b6ca366aa48b6d197508cd10cdc68f1e7027f SHA512 3a903062c782c942d4c7a1122be686e301ea4d4c6f6ff1dbc78ae29c7ee7b8e02fb25a903401e6a7047ddccaf6bcceba953f6cad1c1890cd6410ea909b014af6
 EBUILD c-client-2007f-r8.ebuild 4682 BLAKE2B 112dc23a462b3bb2c6655e7a76250346de062dfa59edd0112c3bc410a1195f6e80e81d535c3bacd786b9c1965e2a60ba5464236e714d900390a30c7844214d20 SHA512 c076573cc0df3983119f0a0b30cf25206d2072091d7ba108b68681c4a3650cd5d726b468183c17ab429ac083ecf1cdbc248332d24830989d916a35d0997e9f05
-EBUILD c-client-2007f_p7.ebuild 4681 BLAKE2B 998923edd63ac0396974065d8f5dc971f1d47c40c8c0ccbc576146526fa3b1740593e92037b20e44d15c05e49546c9d8ee73dbd2a51e182bfdabaea523f2e8ab SHA512 3d4400d48752c19551736a56a67d56b4a3c24fdab79aa434250f9c3a2c7c2e48da7d1bc356f73dc5ff77ba7b8ba955f3489254590abf6b0f3bec35768c5a9911
+EBUILD c-client-2007f_p7.ebuild 4674 BLAKE2B 1cc401399fc694e91053fa9541a0934141945d59f6f961b81b94964740f8a0ce5e2272431025d06d4bc1ea6d69633a96c88605c356de7cf3ed546b0be53e067e SHA512 c068d2b3e1376a4945db97f821d87cbd544a20f276a79375892a3e907067e156dc46687dff43260de2d4419a9ca87021ee4669432b8cc5b05f43d63a26069259
 MISC metadata.xml 481 BLAKE2B c10dea9f32197ea0f48c7d4c4de5d082640bbb424be1e8e371668bcaebfdbd878b21dbe1a43dda5d347f186874c119047485f27ea067495f2eb2d7fa7fbbdb5d SHA512 b153757f61ebba9aa79b1a57b52e3c5e7a3299c17f9ccb2b0f815b2799469c5b29dd4a598f923f9037c6804175f2014c2ec3803cd092a9b21f470b0e5e764c53
diff --git a/net-libs/c-client/c-client-2007f_p7.ebuild b/net-libs/c-client/c-client-2007f_p7.ebuild
index c803f540141f..0d2d1cde0269 100644
--- a/net-libs/c-client/c-client-2007f_p7.ebuild
+++ b/net-libs/c-client/c-client-2007f_p7.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_PN}-$(ver_cut 1-2)
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc +ipv6 kerberos pam ssl static-libs topal"
 
 RDEPEND="
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 985b59d6f889..e3500099c89a 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,6 +1,8 @@
 AUX glib-networking-2.74.0-gnutls-tls-1.3-test.patch 4342 BLAKE2B 5957d92382127f1f340f35fefa2e8b85355bc559985e950ae2ec89582832c3b603966a2bb1dd73562032f1970ceb4d5a6159fadaa6a11a8e02b09e862cfedf3c SHA512 a5fe07d92794e2917c7ae5c28323173d94e01b2cad71e88b79924774836a04cba0d1b373e1b28e1da51445b226f06acd64f95346ed0fe5ea3173105cc74ab334
 DIST glib-networking-2.74.0.tar.xz 277232 BLAKE2B d0027a3beff276b2d0b008d1ed0bdeef231d8fb03c26c2e301a3eaef76ad4b704a5db36f6265c5516d73c5dbdb98c7c0919b6924038506dad0123f5ec77577b2 SHA512 f266c106f2c9379b95773a852c1b5c62ae1d6a758d25c436c3558f620d8e0a211201b3c4dfd89cdbe28b88430bba0cca621e62c01ea23d473983e203919bb1e6
+DIST glib-networking-2.76.0.tar.xz 280852 BLAKE2B 418d747473054d00c0eb0258538f919ac077728157523a157a6e6c43a4cdd4554411a486dcdc6af05b1ece8b35884e4954a056d5a01c5118a37721c151b77b8b SHA512 dae704ad70312239379e1e66a4171e9315ee44e1785c9cb2563adc3f0bbab43d08a75873bfd2be12e3ed4210d4a7e177c9540815c8eb4bda89032c5354c4be30
 DIST glib-networking-2.76.beta.tar.xz 280780 BLAKE2B d64d6de6e43405a16ff54dce5d27d8ca340338c4d8d7d0965f61b6219684e048911bfe1745eb637ddae7a7e8cdbf3122e5a241a50544ba10bf629f237c8b6c9e SHA512 8c5f77a76ae283247c079164c65cd91b7b2f6919efd89fd6393de2926b35845c83f153fab3b0b7ce4d60d0c9495f2f3dee3009fea3d94a69a8bb26337886233d
 EBUILD glib-networking-2.74.0.ebuild 2111 BLAKE2B fb19e3208b9939fed7a89bc729b8552003d2734e22cd0135f35954c03f02bea86737dcf10de3f111ce0ca4d6eda5e228ff35f3a5da414b4bffd460121755eee8 SHA512 e5c30da45361b5415083ed9ff172514c0c4734cc8e3ac52e33e44a1b92581cb340eaaec1d192a519beed4732ad3836b931f5921d0543698ce9eb38e20da2bb5b
+EBUILD glib-networking-2.76.0.ebuild 2049 BLAKE2B 0316be2065bebdc6c0f18cb4df6b594fc0f6b4c64c521904bbf0218ca16a63ccfb0a49c60a3c66ad707829c1ed8964fef37936a635c1d9166620e3cd11122187 SHA512 05f1c31e25e11e4e0149f47da7018915bba47e19d2008c498ce8395b596baed5fb516cbbeaf724fcb74d6cb2505c0a8a3bca71fd5913c33cf4db9b644d81dbd4
 EBUILD glib-networking-2.76_beta.ebuild 2161 BLAKE2B 545c47f6e574cc8f94208e3814f80cfe72b1717435d58a0fac1861824bad4cb8df72055aaffadce6bd73097e175f45eae78d53a89cc0c91c8e7f94295c70ae03 SHA512 39278cde546cbe0f64d30dae2da3a0825a60db496ca80bf83f277730f72ccacc83d660c48cd579b38627966c302b7583b0ba8c0cb70b358ab07c27c394b3c242
 MISC metadata.xml 590 BLAKE2B c74ff24be718581a894745c99a4a6ace914fd396958f988986ea55ca4c2e271e1a417a27c7b63a9e3496260985fde1796a0f2fd9c0b5ee212eb2c8d0d33076a2 SHA512 c83668d49e2353f4608e15c0a5ba3b3700a042e8aa94e4214e5246db6fe31f6d668e5d190c9c3032798ece3725508b7063461dee9bbf039c1cf54dc2230f4b6a
diff --git a/net-libs/glib-networking/glib-networking-2.76.0.ebuild b/net-libs/glib-networking/glib-networking-2.76.0.ebuild
new file mode 100644
index 000000000000..e251c597d94b
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.76.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson-multilib xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/glib-networking"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+gnome +libproxy +ssl test"
+RESTRICT="!test? ( test )"
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.73.3:2[${MULTILIB_USEDEP}]
+	libproxy? ( >=net-libs/libproxy-0.4.16[${MULTILIB_USEDEP}] )
+	>=net-libs/gnutls-3.7.4:=[${MULTILIB_USEDEP}]
+	ssl? ( app-misc/ca-certificates )
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}
+	test? ( net-libs/gnutls[pkcs11] )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	if ! use test ; then
+		# Don't build tests unconditionally
+		# This is a hack to avoid needing gnutls[pkcs11] when USE=-test
+		# It may become a real runtime dependency in future
+		# Please check!
+		# bug #777462
+		sed -i "/^subdir('tests')/d" tls/meson.build || die
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgnutls=enabled
+		-Dopenssl=disabled
+		$(meson_feature !libproxy environment_proxy)
+		$(meson_feature libproxy)
+		$(meson_feature gnome gnome_proxy)
+		-Dinstalled_tests=false
+		-Ddebug_logs=false
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	multilib_pkg_postrm() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/net-libs/libgssglue/Manifest b/net-libs/libgssglue/Manifest
index 3d9b06a34e5a..8b38417f6b91 100644
--- a/net-libs/libgssglue/Manifest
+++ b/net-libs/libgssglue/Manifest
@@ -5,5 +5,5 @@ DIST libgssglue-libgssglue-0.5.tar.bz2 32115 BLAKE2B cc66e66e76e0cdbc006b22dd81b
 DIST libgssglue-libgssglue-0.7.tar.bz2 31415 BLAKE2B 4017ff17b876b00d93d5120ca8fe2a1f472b61c7b73dec0194d0ebaa244176b5d6f85fbfe5ce52cd77bcce9e1718f979b36e8926577640bbad38208fcea78f5a SHA512 04ea9af9f56afeca40b1dd22708dfa2e844d587106f370820a8976a22e8b95c646cdc5c5ef4256e34780cdb34c5617c45187fe3866670662f15ac579ef22dcca
 EBUILD libgssglue-0.4-r1.ebuild 903 BLAKE2B a39345262e7bba32ae36f9f5eefa51c67ce2a9b5f814eb7d039b72495705242d9aee2f051ffc28cd3376622f5e60e2d520334c4d2c622aebae49ed0437119cb5 SHA512 46e8474611fc03c69c8de11c3f5bb5d106187e0a49b53284012262af666cdc31cd5eedbe70aec7c627d711ba9571307ec68a6735a9a7fb76106c6c1cbf17c5bf
 EBUILD libgssglue-0.5-r1.ebuild 1340 BLAKE2B edbf69849dcef63ec114c764304627725c73494cb4fc16460b0263de0b19017442f518fd1c1a02ea6c8635609b1c80056bd3f8f3e1c1e806f514e0848cf526ed SHA512 b9ef88ab9e1ca4dce7b2b425c1dced8a7c802cf29d681b11ea8d1a4da390f311f2ae8882e09abcdb83aa30f2a455ff9c29ca06a32e76b0621d8ddd790a871ac4
-EBUILD libgssglue-0.7.ebuild 1161 BLAKE2B 84c77ddcd8d75bdce85900db442ddb4497b1f5749ecbccf1a4ed1b9378c1233feb6d2ea2210b30690741aefba315b51da3d3de7e17be4fd03c9cefa0490c0de0 SHA512 55116182622e62ce2870a270d65c3b066c60d790d997032cd66e201ad276003cee2f2460a3e6e358fdc742c14bb625f9b00271793478217c834eecab6eba776a
+EBUILD libgssglue-0.7.ebuild 1158 BLAKE2B deeb34a7605527d416bcd4211d22a970d772de8405a2fcdce450ba79eb3aa08f5ba31fd6e0edb532753260a6803c2d8773f7a802307a48d36d7d00a23b8cd1ea SHA512 44705703654362ba73f57a31c3e24eea07b0226be112cc98f329422b48a06556d0057a442a6824389b89b9f24342856407d68c9c28dffecfea6c1ba7678df954
 MISC metadata.xml 249 BLAKE2B 83b0c3cbb109f3a5fe471176078244f62b6db5cd38cc72a2a4ca3d7accc1bf39c12bf0e3e902cd8ecf4f80b72159f658e31cd55065893da3882c7b471551ec5a SHA512 235a0cd45a87d913d5f64cb14acad34258055a7f7cac2808aec35cc022fdfb5c76780016dc22131281235634424d23a6ddaafdaa4ee62a577ac5e3ef40cce843
diff --git a/net-libs/libgssglue/libgssglue-0.7.ebuild b/net-libs/libgssglue/libgssglue-0.7.ebuild
index 18c63d2f6e37..405ba0135ea1 100644
--- a/net-libs/libgssglue/libgssglue-0.7.ebuild
+++ b/net-libs/libgssglue/libgssglue-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}-${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="virtual/krb5"
 
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 9d54ed19bde6..f5c9e08163fb 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.21.1.tar.gz 9199351 BLAKE2B 87c72651303a7870fd3f742e9ce8028e0dd48d3ded78ae7dea317ce54b98975f372429399b6a2d6746fd8e074d6a3ed13772b6c173f96c3a86aa7d726fd75586 SHA512 a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5
 DIST libpsl-0.21.2.tar.gz 7617025 BLAKE2B b50f805bb467dc3284bc91645a37a2208098ad809d3771c74ef13c3b8f6029a07ad80a56702c7e3d1a1125d272403c85dd97b64a28465b9ff2d095eaf94b9a4d SHA512 f1df72220bf4391d4701007100b0df66c833a2cbcb7481c9d13f0b9e0cad3b66d2d15d4b976e5bad60d2ad1540355112fa1acb07aa925c241d2d7cd20681c71d
 EBUILD libpsl-0.21.1-r1.ebuild 1586 BLAKE2B 3d841d84d4286bba718b89be473b1735604600248e2e7b62a521b6737074c4141b2252918b7aea91af4f5aec6d0ae9d61b568acb5a416e1ff2db4f2a92ca034f SHA512 690f17d27b96c1c66bb94917c8d71c0884f79e5e6b75f36912a5b56f3ae4420ab754dbe52e82a04fa40fa9132aa755764278078ba0a9e6293fc0323c24556daf
-EBUILD libpsl-0.21.2.ebuild 1204 BLAKE2B db50a3fa934a7dc9eedc79379e0b3a1cd97c9e516021f5d14049be32b350ed7cd1235556a64952e2db9fa21919fee00f6de054388d74e046b385b4ab16f75ae6 SHA512 ebb45c8131e152428c2e3014ae96e3684d950cc9161ebf855d9578e51bec9a40e98176de0cd4905266ff08c20d4caa935a5fd1bf8e8cf2e3272145f4e0035f4f
+EBUILD libpsl-0.21.2.ebuild 1196 BLAKE2B c1c93ce6d89b3436019da1279a2232ba2ca488ed40622d182e0aaf52e3a9d10ecbd5e7255d7974c36e4f9e9cb95e8ab79f2613cdf65584092387e237ad261262 SHA512 9d428de4fb598a4b687d66424fab2a6ab5fc9d4165007bd7921c740d0690ab6de35629d9c0df89208fbd22a978dfd78dd4eab8b72d62a608d24e6a2e3a16aba3
 MISC metadata.xml 255 BLAKE2B 36ae66735664b8ed69846146d268e59f89bbea0d01d46f692709b9bfc521f70875a331b0995442435566e1896d9090bc9d9a6b9a63bf5de51b55d9a095f60d7a SHA512 4ce190fd174d39c74bce7eec22d651f9f15248ebbb7a2ffb68f7c9bae01ed412b6652285fcbb055770896d8ea0a1241c3aea30c2a0f4c223aba3b1dd723f1b9e
diff --git a/net-libs/libpsl/libpsl-0.21.2.ebuild b/net-libs/libpsl/libpsl-0.21.2.ebuild
index ae52171f7f90..221ce7a987cc 100644
--- a/net-libs/libpsl/libpsl-0.21.2.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="icu +idn"
 
 RDEPEND="
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 479327768bca..47c4adb2d1e8 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,4 +1,4 @@
-AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
+AUX disable-apache-tests.patch 1389 BLAKE2B ebf169ca3a362104b1e93a80fb01c3b194ac6a1b89617a32b2224eb91ef52b94d4b3aa4517a957a878e6c42cfc34d5295d2e14881740894a78a836b92617f046 SHA512 751d6d8bbdb27cd77e6fc4f48830e025107a0cf7e178bfe6cb376a6c8e672dc91b56c67fbaf2787c19a5bc1e0914985bc24bf7d54f4c06edff4e07eab3b46d8d
 DIST libsoup-2.74.3.tar.xz 1504804 BLAKE2B 91f441197414314bb78cf15e7c13b54714e669145784812fb7a68cc41c8965ea29c53dc686d690e00f28f711be9f767038e5cc43b11aa0136f190dd2d41ec2a0 SHA512 72f8a055df984cb35105fe67f4ca67d3fb110d40a9cacb660fccd89f93b06bc32e25d94375dcc76608a245f7c5e081d968d7aaf5952eb16013d81c741247cb4c
 DIST libsoup-3.2.2.tar.xz 1530460 BLAKE2B 8df66651a0bdcdb3337ced0031e4e8a32883241f6b7310a2b91396883368fa849d1e7dbab3766ec38ec05fdd81fafabd1f165cfe22a168e87db9a431ca86274d SHA512 1f2b49244f8bac4d112b39ac9c6a942acbc1ae1cff33262ed02e7682af3994cf6ba6741b365b3c80c45c6427d391599fa6f31df6caa4ffefe7d078ac373bad1b
 EBUILD libsoup-2.74.3.ebuild 2942 BLAKE2B 83795dff978db6701967be68903382ce13f25a138a7d851cdaf25c18d0a21813ef8366c38102ed9cad349b2a4aae3492e89830029128a7ac3c7e4c64b46f780c SHA512 4d018f152a378112785f6af8d040a969a3ba8bcb81423261126f3971d8118e4e5ea550690b1d48b9b3f1c7ecd98271d0f30334264b5ac7281c6ce24e2c3ef005
diff --git a/net-libs/libsoup/files/disable-apache-tests.patch b/net-libs/libsoup/files/disable-apache-tests.patch
index e7d306bde971..e5e2c9c7618b 100644
--- a/net-libs/libsoup/files/disable-apache-tests.patch
+++ b/net-libs/libsoup/files/disable-apache-tests.patch
@@ -1,3 +1,5 @@
+See also: https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/119
+
 From 6c9bbf0d91688e831f8f19232e18619bfc57e12e Mon Sep 17 00:00:00 2001
 From: Mart Raudsepp <leio@gentoo.org>
 Date: Fri, 23 Aug 2019 21:11:57 +0300
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 086adf8d5ca8..6a0c976bdbbd 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest
index 4c22cc77119d..b48cf8dd63ff 100644
--- a/net-mail/fdm/Manifest
+++ b/net-mail/fdm/Manifest
@@ -3,5 +3,5 @@ DIST fdm-2.1.tar.gz 318803 BLAKE2B 2bb693177c69665d2354c382ab663a3283c5edae2cdf6
 DIST fdm-2.2.tar.gz 319140 BLAKE2B dde9126aaf3183444123bb3b546f8997a5a25f5dc58bb7fc08818e491e2193543f4f06e758b479e61da7feaf752e3d3ddfd8103c616a49f0d65c41972bae7e12 SHA512 13efa0f272c5f6146b90e094602e8a9b52016af79ae0b6cd80dc9f36b2ba37f64cadae7313bd8db90bcb007dd07206a3614987f11bb82c3535e04f0511c9fc6d
 EBUILD fdm-2.0-r1.ebuild 751 BLAKE2B 0d3e2cc3699d60c4d1d288ccab9a95e584d92f411b7f9c8303fbeaaed1b5fe4c6b6b7619a107d847f091a932da616552c70cad1fb4491cfa3077287594a3ac74 SHA512 138aca9c80a5fef3a4879e52c82b091e4750bc5578f7088c7b183806ab4edd6d014f394b2af5f61eb7dfd417887eeb9127d62790121173049cbea363fe1e8b2b
 EBUILD fdm-2.1.ebuild 753 BLAKE2B 14fce7155144f908b8258dcdabc56606c908383c537adb6125c9a1f8d70ffda721cc3661a49bcfa5665b1aa26b90f75b8b29e4d816f2523ea412d4847717d9ef SHA512 8232dd4a63836ed5230c2430915cf3bbab0f2af522b7c3e4eeefd9bb639e96b8db216fe4fc66fd08b6f5a031f3d5a5f973ae22f6fa8d2d0d4ab508071a5fee38
-EBUILD fdm-2.2.ebuild 759 BLAKE2B bb4ff44558c513251c41c331c66995e231fa6194a5d7bcbc5399ab29869b699da6598686e36529b639b28cb2c781c1b583dd4cc2ca2850d3abc6bb710577986f SHA512 1b6a209ef51ba7a9f238c1a74f279d1ebefabffb4865a0674539b880f0d6782e9e9f8aee08de06ad70cf4c8986b07712c43fe96e0445b482f69d9dd92f44e563
+EBUILD fdm-2.2.ebuild 757 BLAKE2B f625a7b1d8b78c418018cfb6f8ef8e0433c52416d1326df74841f5ead8dbe455f4b9c8d2d583ad72318c67c9a4f007a655cebde77cbea7ca4c71c9ed78c15351 SHA512 ce44e3ab8d40c76fab4d87186e2f27df5b1a22d24f440a2d94f82facbf3f8d9fccf3225a9d509a0a4c75539bf3f87e80314d00b20c4c6bf310dfd140661e39f0
 MISC metadata.xml 296 BLAKE2B 340645d0a215d131e992a64b54a2e45091542b92c60c29df762b2e75a7d3e081a83cf529959f2ce0e171f6c1b6412a83ab597c55c094aa9c08c93eaa53365934 SHA512 dc241981c679d9b7a57ebd104f4ebc54daaa8d7eb10e5b558bd7f8ff85512e8104a89cbcd876c13d1e6a1a3919186769ee103fd127e4cfe1afa89c5a1fea86fc
diff --git a/net-mail/fdm/fdm-2.2.ebuild b/net-mail/fdm/fdm-2.2.ebuild
index 6f672a81bac9..895dd72d1b2c 100644
--- a/net-mail/fdm/fdm-2.2.ebuild
+++ b/net-mail/fdm/fdm-2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples pcre"
 
 DEPEND="
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 906e9c5187fa..c4af6c9aed93 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/downloader-cli/Manifest b/net-misc/downloader-cli/Manifest
index 32a8381e89fc..1729b5aa5915 100644
--- a/net-misc/downloader-cli/Manifest
+++ b/net-misc/downloader-cli/Manifest
@@ -1,3 +1,3 @@
 DIST downloader_cli-0.3.3.tar.gz 10881 BLAKE2B 489e49d679be3570ee348ec73091cc3458953d4b37c552a9a417af2421e9c032624214300418ff8c93decda6bad7622e6208a08dc216f40d1195f849dc11d0d3 SHA512 4210cc3c09f4c9d07c3ea7335b6ea356393f539ef26e3a231b3278359e853165b8145c1f6186b657e2cee02b515748f7ffc87966cc30e082b0d2b282b9557c72
-EBUILD downloader-cli-0.3.3.ebuild 503 BLAKE2B 3da813e36d159ab840f1f39b30e0670c8922a44d76d9d2334e8622aa434126eb1efcd760033a35ce53370554f96e4f077c50d67e6053568719e9adb6d83490f4 SHA512 0e6c794ddc866210cffd124ca309dea51eeaaa664f461ac5ce62faa3d56790775ba7f0a1052662ab68c02a6bdb85d37a1ae218e0d908a305f38db14f27db4784
+EBUILD downloader-cli-0.3.3.ebuild 469 BLAKE2B b669b7228c5e9e017ac903054552a461ae83c8f2ed093c3d6dd7204ca977930fc92c49f9b548923c53f8a75ad68489657462bedea347dbcfebfd34a003188ef1 SHA512 d0f2162b1b3cde0578a925c50f301d3f0cc464eb16fdad581f64ace278870f1f50854ad380333ca5016831b86812eb4dbd31fecfbae749816b5ef47ad22115ac
 MISC metadata.xml 477 BLAKE2B 4b2e74ef3c28a676745976feecdc1f6f0d341ce223b1d92a25a44eb0bf81d3f3d091145f7fef901dc49b6f8d157419408b1e203965c294b48a42be40853113ae SHA512 92893a29b67aabc13badbf69f3ad8147faff5d65d235f487a744719a9002a968581b2a2aebe64776dcba3ddeb8ba849a72e3a96d6551a22c72a0e0866ab16a90
diff --git a/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild b/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild
index dac9ab745d17..12f30759df62 100644
--- a/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild
+++ b/net-misc/downloader-cli/downloader-cli-0.3.3.ebuild
@@ -6,12 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Simple downloader with an customizable progressbar"
-HOMEPAGE="https://github.com/deepjyoti30/downloader-cli/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-S="${WORKDIR}"/${P/-/_}
+HOMEPAGE="
+	https://github.com/deepjyoti30/downloader-cli/
+	https://pypi.org/project/downloader-cli/
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 93f7e434cfa8..c0c11547f785 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -9,6 +9,6 @@ EBUILD ipv6calc-2.2.0.ebuild 1574 BLAKE2B f1a636fe26ceb3618358222498bd68e517c0ed
 EBUILD ipv6calc-3.1.1.ebuild 1531 BLAKE2B 6ec62ec4b7b14c5ac33672c35b2699f02d1c0d07e71c3718cbfdeb3b5c577bd8897c2803239c600edaa580c8b472bf932855b63c3af607de16fd7edb446a90dd SHA512 85189a0d6df24ae0c09369ea7a0a1fb567c77bee782443f633fff509fc874101fed583cb0991c59e55c4e5138449ba30874134a3ededb64264c60ad914e3809d
 EBUILD ipv6calc-3.2.0.ebuild 1535 BLAKE2B ba17e83c53f680a204cbc5467fa30323c07c5c009ebd33b7a820b70b371beab6359ced1f5f5ddc390ea09fba8896205d82d8dcefa96e4b800be78c3e78cfc18a SHA512 d6a0445fb3ef4eca4e0c57312f34d1d94289f7feb6d79d10e4589845b57f7d18401c91555f76757d76e0d970f902df3e907f65e6ee11dfc54fa9e605e4c8c42c
 EBUILD ipv6calc-4.0.0.ebuild 1613 BLAKE2B b6257c007601fe976a9ac89ea80d282b0425139490e6e3f426b0942a90a9e5c80e61017976ee6e97e2fbd5abb92a08b3be6d0966d04e01b949c5cf74f0bbfbe8 SHA512 302fbdce9435dbf1042d1561ef03738ed3b9a870280679e182c5308df99c13898825f7c83add111587551afe534e7e8f9431509b21a66314e2bd571c4cd59292
-EBUILD ipv6calc-4.0.1-r1.ebuild 1710 BLAKE2B 2a4df1b1d5443acbd01fecdf9db55821325375f14e8b1f7efee6ea3d2738041b7966b8e43abcfd39ab385854ce221458c251522d322870cbf844dd7ed1359b8a SHA512 b166c51fbce64210a9507bc9bed84771dec3bbabce92fe44148b9b47d2f67af4a50cd38b2eeb0f14ddef8c6cbc401b2ae5d9e888512227addbf747203d6de88d
+EBUILD ipv6calc-4.0.1-r1.ebuild 1707 BLAKE2B e63dfe85687806f865506e3f2d8c3a5f9567e7c12fb7da80a060df51d2619a9ccb558cb34bb9468bacabf400c3aee48ae3d86c5f6f5ca3c34c1c272d744f7520 SHA512 c4b6f6c0044ccc1fc030b707d25a04b2b9f0941b49281a7379340dd55698e19bcc54db488dac25663818bbefeb30bacc86ef9d4afa4086b71f0324c1c45d9495
 EBUILD ipv6calc-4.0.1.ebuild 1651 BLAKE2B 5ba62fe0ff17a6fefb84c9e2b37251b9fd76a75a1cd42a9a5bd74223b1bdb641600a7ef2de11a440b0a219fd21a172e8fa8eb29224e99eeddedd81848cc4d696 SHA512 d850a4ee003e032c5b55d504c8ea155b10d1b76a2186e20b1c114295f3194578f9aa9fa1884e229971e1cf655c4b244575983e800650e2adb542cd9a4919fdd2
 MISC metadata.xml 250 BLAKE2B fb90e15ac18c8cd0f94506947ebd334e09b4ce8a83a2aa9ec16486b42f4b4458d42739993881bcaba9e4398dd70f3547c5eb1e3fbabdc786e69b7fa0e5522399 SHA512 b147ffef3b698ce8823a88bdedbde5ff96c71941874380fad7b9bda7f87b408218d5193e0a4bd61d87d2edfdf9af023db26f84d60cf7442b714fc538dba7f91b
diff --git a/net-misc/ipv6calc/ipv6calc-4.0.1-r1.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.1-r1.ebuild
index e784349e1260..7e45d3115086 100644
--- a/net-misc/ipv6calc/ipv6calc-4.0.1-r1.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-4.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cgi geoip test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 8796c1b51da4..700077217487 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -12,6 +12,6 @@ AUX ntpsec-py3-test-clarify.patch 993 BLAKE2B 85df81d6301e3f057601bbb2e01590a11c
 DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277
 DIST ntpsec-1.2.2.tar.gz 2710329 BLAKE2B 031412d0fc7ecb5aba73501e63f8d0c416b23fe69114dd32422b03b4827e1ac9c92a4dfeb2e7d074cf6fd410d00cf86632f241dffd22987e4c03b21d21d8693a SHA512 864afb72c4bd8bc439ee06d343893cf92b3893c26c972a7bd1ff2713f0ad1f50704b6d0c6f155e6373c9747efff3ea36097a590be0d53e1a7ea7f429ba409cd1
 EBUILD ntpsec-1.2.1-r6.ebuild 4409 BLAKE2B 3214e5e2ffc5b06ec8b086bc87e6e623c6a929107388a03e1bef2a28f651657dd23267483e94e5acecdf0664a9c349d4b075b833599c971da1062b0877b6de93 SHA512 d28107a05e9e208af20a70473f8cc918a82a04c71fe3e076332c29980ad6364b0cbf77678367816278c5a4cac94754f05d2e3686784f73324bd7a2b1f7ac9dc4
-EBUILD ntpsec-1.2.2.ebuild 4152 BLAKE2B f7f63083a7e86fd4048377d62ba37e9c598743856986191766a0c636b1737cdb7a273c99abbf37e1e174bb6c16d6613882fee55fa157712dd0fb6f6ac378d756 SHA512 42466608a924fa01bba11d7a17f30b4515a70d01b2001aa0c631757825a817a516f606cd5240fb95093af87b860a7e67318277fda1046173aa4b5a6350b5d63d
+EBUILD ntpsec-1.2.2.ebuild 4149 BLAKE2B d494c97f4ee0630d3e20a5b16513b41386eef9b0d953ee24a5b5e410a8977560740bf31c06a4d83fae56006433d75d1051d906e1901f869f4eecb7bb72a31063 SHA512 62399621ac3b15a9a3cf39811e05be841f80d573c5eb237bb08bafd90e4ed5ff1b7e97e677686bc7b31fafa11ffdeb8f5292017e71d82a2e3c532a0be90d71ce
 EBUILD ntpsec-9999.ebuild 4152 BLAKE2B f7f63083a7e86fd4048377d62ba37e9c598743856986191766a0c636b1737cdb7a273c99abbf37e1e174bb6c16d6613882fee55fa157712dd0fb6f6ac378d756 SHA512 42466608a924fa01bba11d7a17f30b4515a70d01b2001aa0c631757825a817a516f606cd5240fb95093af87b860a7e67318277fda1046173aa4b5a6350b5d63d
 MISC metadata.xml 1777 BLAKE2B e324b32f904e5f076331594aefa32e5174e917a78fb0e1ca0361a2a0cae8f7813637e044d6c351e3f1d07d01733062def59666b89f73d134a507332585f29ae9 SHA512 db03c0268e00fea3701979e30b3bb3b1677de9f2c6692c99eb78cf5a929ca39cb8f379add7ba6786f1ddbb80e1b9263ec46bf459706996c12f3fd38bbc9452ea
diff --git a/net-misc/ntpsec/ntpsec-1.2.2.ebuild b/net-misc/ntpsec/ntpsec-1.2.2.ebuild
index 2fec1857639a..61dbd9ff8c35 100644
--- a/net-misc/ntpsec/ntpsec-1.2.2.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~riscv ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 09cc4a3a11bc..ced382b295ea 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -50,5 +50,5 @@ DIST openssh-9.3p1.tar.gz.asc 833 BLAKE2B e6533d64b117a400b76b90f71fa856d352dea5
 EBUILD openssh-9.1_p1-r3.ebuild 18562 BLAKE2B 8fd485e9a362653105f7eaededc3785b21e7e183ed555cc007adb936c3182721d68a637b10fb83a655ccc3bb82dc22a06301457a25a699ddf20e670bfe053cc4 SHA512 81f8748b45b019e7c1025efa6d5b7b5b22bd37792915206c0dc262db8befdfb143d072de10c9bb8fa0002e09ad0309e740598e9bb8d91f830797b571fa86d269
 EBUILD openssh-9.2_p1-r2.ebuild 18240 BLAKE2B 6b7f36b1824fb129f753735bb86f91a3f287b66dbb51b6cface3d2c994c2d774ff97493838ead636e3845111bdd8acd9a548aadb2550033c1ebc952b195417a4 SHA512 4b1c956b2ce4633fbc55b30763accb4489a9ba0cb55c14f45e3735ca056e557f6f365cdc4c4104ac77d2e77ce0f4841bafa88f122f589dfaa8af2a858a31cd72
 EBUILD openssh-9.2_p1-r3.ebuild 18312 BLAKE2B d36544a23f8ff2950d7efe48a19e8ec66d7766f1338c13df2613df607ae07e8532b486ce40df0cad4760ff488ac696fd03795ad210afd7ba7c228f46e37b22a5 SHA512 c35b1672854d2bc8a200e24d09e07a7d119d16183117f790dbba1b87ccb270722dc3e4fd6c1d5345f2c2410089f6409c1eea484414067d067baaf153ce74dc6a
-EBUILD openssh-9.3_p1.ebuild 18312 BLAKE2B 61069c0b86a5fcf696ebbc67b9190e7b06e3c30b079685e310dcf7fdd3e237c785d85c84bd83cee4d6bc4d39921f798cc534bac3b927a2593020f5ac491983bd SHA512 062715b9eb760aad9bee8f3d084c026548f8dc1a841efbb8c5a833eb23605288f1de4e115618bbf917800620a23cf2d6f28da31bcdef1e68657792fd5311a0ee
+EBUILD openssh-9.3_p1.ebuild 18311 BLAKE2B ceca87cd8fbcde4bd1a455158ff32188e637b85d46959dc06507699400ec7a47feffd293f6a689263645c97a2f28e1ba7c450c6e74bd8450bf139fa5b5f6f404 SHA512 504bb6bef778c0081e6f5eddbc07cb2663b4c5acd71da2d7a4e5b67559911ce5525c866418e37be37155dbe6b18c44fb0e055e4e0b6d0480fa8c292a8cc62e63
 MISC metadata.xml 1957 BLAKE2B f5921abe3735fc6b8f8c6e88f3c3c11201c32ac91f7426150a51619b430f8c15c2afb0a9dcb9b3b5099fe7e5f193a05514064029392df6d0815a7fb67c2b96cf SHA512 6189845b640943147020d4a0fe04be66f58433809edded6fe98824b51c704faef9c3fc4c0d7a604391afcfcee62c0a47e25d36024b9145c4f1e332fe27db7f0a
diff --git a/net-misc/openssh/openssh-9.3_p1.ebuild b/net-misc/openssh/openssh-9.3_p1.ebuild
index 3173cbc8d705..52b5df3521e8 100644
--- a/net-misc/openssh/openssh-9.3_p1.ebuild
+++ b/net-misc/openssh/openssh-9.3_p1.ebuild
@@ -50,7 +50,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 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"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
 
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 18b573c4306f..b020a608901c 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -4,10 +4,10 @@ DIST seafile-8.0.6.tar.gz 738248 BLAKE2B c36904c459429985bf5a6b34546be7af2ba913b
 DIST seafile-8.0.7.tar.gz 738238 BLAKE2B edb6ab4f1e61455a24ed43c4b516b58f0cd44fd57f63ebb7aca6daaa206888689c9139fd443acfb2fb35ace100921470e207c338ae5bcdd093e02e79ab57ef80 SHA512 4ce16b2abed36ff33237df1119be7ecb3a01caa9d29c954a6618dfbc94d4ba32c0e30bcf259a6f05bf6bfe0e2aaca7d394c6b6adf69c37447e27a9ed5ac0d3df
 DIST seafile-8.0.8.tar.gz 738321 BLAKE2B ec8719890c5945c1dab0433c86e5e2b7ec7dc45ce9edb0b82760a4fffaf719892c1a650d2eb5df463f413df1c09c8062e45f35b13669fbc2c6312e0056590016 SHA512 a531acd582ce1f80918979305a2c822e37e25ad8cd80551359834ddb22434f2de5c63b9a364886bd12fe3aa8307087f85238271dbe9e3258e9e9c65f18ea9307
 DIST seafile-8.0.9.gh.tar.gz 740920 BLAKE2B c62c7ccea536934a92166db5d2acea45b65f5508c1e5d4f70749c922c12d29da11bc2265203c91e87fe0096cc3f4b6ec4f6125b538a4de88725583871b05e67e SHA512 c4621ea4c08fcd9c5d4cf683152f7504c37212272b5a9535da869de846b71a7f5e9a72c5544f9b7487ad8025a6cdf2866c15788828cc27937209d8242fc13cb8
-EBUILD seafile-8.0.10-r1.ebuild 1576 BLAKE2B 5601bea26f74db3c3ef52f68487b6482118cf67a850421c48ecd58e8efa39d9f42b57f7fe8471549a1d0451c25d3992cbb4035b2376a1f3e82277d4149388b3a SHA512 531d0b9fd2bddab8d2de39322ff744a79875fa6ea09bb23587d8e8b8b059cf0cc699173d33bd5f2f15548daaa7f991c4bb76afa769075516ffc66b6fbbc9966d
+EBUILD seafile-8.0.10-r2.ebuild 1602 BLAKE2B 5500f08ed47a8f509c1a3d72f977131545aea61114f327cf5c24d87dce1fc029c6c067ffe430786db81c3f0fc3e286d354dad2c008b6cf4536a9b841d59cd5bd SHA512 7f77179dffcdac8dcd79f852b76959aadc7381e3d7e4b3acd4ebb3c5810447c35e681144bd9b52573d5ea6e43fc6d20388a0805f7b66636947386d17efb1ac96
 EBUILD seafile-8.0.5.ebuild 1329 BLAKE2B 11e9838c757c48ca90916ade9cfac9db5b545db03f71f17c928ea6aaf14aad820a5961629da249dd4770b575f8aa27a2e1a927365ba690b9fc7529eb902615ef SHA512 0b4393e7f88a584e246fa8df4f44dc2c96ec29250c551ecfa160b89441a3cf17d09358142972f7435747318d56d9a99d664dee3bc3bf7a274fbcd6b963593631
 EBUILD seafile-8.0.6.ebuild 1393 BLAKE2B 3fa0a34fb17399d3724ad7cbfac6ea558d5c0965cfe1dafec8d12faf3e35b3357b02de0d4b49136eea00c7021b1038eb76c5ff9d3104e91e3d366ea37e2db8cc SHA512 67e08eb445368814eb331f168b13001996e86c804e524884d4263fd18fa5cfc5bc7363dfa8b2ca9154579aa09ee0ca2689bb3cd05b60581a64513ba7c53d7321
 EBUILD seafile-8.0.7.ebuild 1393 BLAKE2B 79830e7751da393f7b3559c753e4864754596970d43b442385bda1c43b77ca6b62c57a7602e57bc7850b4021d77c0a34b60503857bf6f8ad65d9b69ba0f488e4 SHA512 5ff682a144348454ad881738723a0b530278ada4dea0d1d9c62547c25ba6dd07c8027eb2f598f141e1d7d5adda8750825b3bbc0f1a566f30bc95801336656977
 EBUILD seafile-8.0.8.ebuild 1393 BLAKE2B 5eb618589caa71cbde3a5447b9753d793b300983afe0c334318ebad090df184ce84c93de18e369a27fe76c1e3faaa675bc07b77c8da40584d260dbabe83f02ae SHA512 ab2ea3becaac538103a74f3a951a877825a1cd88d2da61bef38c42462317c49ad5f8b2dcb80ab0d4e6991b68245dfc3e22394fccbe18b9a11e0ec27b3e1a89fe
-EBUILD seafile-8.0.9-r1.ebuild 1575 BLAKE2B f30a6a9854f244e2f9ff4c338339ffcac8af2ce89bad6c5ba8568e11bbb642d00229049065c21c6089e6820654923199fc5954945635e56b8f8a4959d884112c SHA512 f3348808c3d918f3bdd162fda47ddae183035535740a6c5e27a6536f193d075dbe55da8c3c593575bee77a2a65c9fa62d6f071c35d9cee03830f24e59a1c5642
+EBUILD seafile-8.0.9-r1.ebuild 1575 BLAKE2B d90e189478226b3b29fd821e1ac16b181bc4ea9af48dd08ff40030751b1baf85cc87fb0a32b5582727f884d0f43475b5e556b8a5101d47c62fba183f1fb41472 SHA512 40d26ad3957f234c22ed0ef06893857b9c8ca90e12442860220a6a409ae21af78f4e3572101e790895c911c86a4b6c2b80c97581c2e6cc792014fdf796f6d43f
 MISC metadata.xml 478 BLAKE2B 2c1506537c1d19f3aa9f731cecf2f53181bdfb92c33d3100e8338e778e222b396ebfd5c7f5745e133583615ca61be625787792d39d3772cede50f8b923ab1a4f SHA512 20620dd548eec869bb219011b157d821cc3fd939602d2662c26e1148582c2a593375b36085fae939880e01d76a251e91f35b9ad657cbad0a1e27bdfdc46b932c
diff --git a/net-misc/seafile/seafile-8.0.10-r1.ebuild b/net-misc/seafile/seafile-8.0.10-r2.ebuild
index 6f496eb7bd8b..a6281e0df2ba 100644
--- a/net-misc/seafile/seafile-8.0.10-r1.ebuild
+++ b/net-misc/seafile/seafile-8.0.10-r2.ebuild
@@ -14,6 +14,7 @@ inherit autotools python-single-r1 vala
 DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
 HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
 #SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
+#S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
 SRC_URI="https://github.com/haiwen/seafile/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
@@ -30,6 +31,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/glib:2
 	dev-libs/jansson:=
 	dev-libs/libevent:=
+	net-libs/libwebsockets:=
 	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
 	net-misc/curl
 	sys-apps/util-linux
@@ -39,8 +41,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}
 	$(vala_depend)"
 
-S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-
 pkg_setup() {
 	python-single-r1_pkg_setup
 	vala_setup
diff --git a/net-misc/seafile/seafile-8.0.9-r1.ebuild b/net-misc/seafile/seafile-8.0.9-r1.ebuild
index 36000e2b7d6f..a00e58b3b0fa 100644
--- a/net-misc/seafile/seafile-8.0.9-r1.ebuild
+++ b/net-misc/seafile/seafile-8.0.9-r1.ebuild
@@ -14,6 +14,7 @@ inherit autotools python-single-r1 vala
 DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
 HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
 #SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
+#S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
 SRC_URI="https://github.com/haiwen/seafile/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
@@ -39,8 +40,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}
 	$(vala_depend)"
 
-S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-
 pkg_setup() {
 	python-single-r1_pkg_setup
 	vala_setup
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index ee087c31e9b8..c2abce1f7e0d 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -6,5 +6,5 @@ DIST stunnel-5.65.tar.gz 872293 BLAKE2B 45cc4dd0ec91cb9a99c10d26910b05325af29ec2
 DIST stunnel-5.68.tar.gz 884989 BLAKE2B e2551b2052db0719203b24dcf16a2ef74c078dccd1200d25502defcef1301456e755a71a1a2b6ab7b43fc9ddc04cd031fca83ffb760528133a0e22ae22e64d40 SHA512 cdc3b8ab4cd35ba722b5248c005ae58a39d79a80600447417b1d0d01fd3aa9e8b22f8568c3177423be99d7395bb15a8754e975fb953556cd80a9cc11e185e9fb
 EBUILD stunnel-5.64-r2.ebuild 2914 BLAKE2B 3983e2163da5f52ac0515eaf28ebe7d993a8c665ffbdd20f9823b57427a1409d5f1065903d503ee13f17b54cf3a12600f8bbe5b1a6e9d34e873dcf090da41ceb SHA512 6a3a22bbd63ee234a280df39dd97245b40dd8a4420e3956d32f8f1a2617fb6edcc2cbc7149734a515c750b98b747960212acd5ace9fd4a6c6e6ed02a836bdc12
 EBUILD stunnel-5.65-r2.ebuild 2888 BLAKE2B ef210090dce4fae228bdb4400155e384c4b9a5e6dc7ff2fe7f3a805880b33593071438367ea943557acc3c3604457c1fdb1951273a6e0f656fe28f473f74e8b2 SHA512 48d7263cb1c6e68f8a56736c39f01e62a1f7b93ae8827b1e17da8a7f78d6bef6b71cac5d60783cf691fc862715d6f142cbb34359da7192957c857de0c65d8d58
-EBUILD stunnel-5.68.ebuild 2894 BLAKE2B 855818cda850df7cc5718a60a41115e010fd63b8636469abaf974a0cc1430364001b79383b0b82eb3f0f8ec171f4e2965d0e0f5e8503ef7bed88f7c84e0e2890 SHA512 4955a57b15754be383ac22ac7461c5f28b33685d50baf0f42b6346f9eeaa2e7eeff7a8db8e07b3a5c0b07bd654164c0dd65a71188f6b811384053414fd446922
+EBUILD stunnel-5.68.ebuild 2888 BLAKE2B ef210090dce4fae228bdb4400155e384c4b9a5e6dc7ff2fe7f3a805880b33593071438367ea943557acc3c3604457c1fdb1951273a6e0f656fe28f473f74e8b2 SHA512 48d7263cb1c6e68f8a56736c39f01e62a1f7b93ae8827b1e17da8a7f78d6bef6b71cac5d60783cf691fc862715d6f142cbb34359da7192957c857de0c65d8d58
 MISC metadata.xml 712 BLAKE2B abb0d57cf71591afbd71b86118435b149bb2a12ade506bac04e93fc0a334c7c458e58be0d428343582aa5738f2062307206bbfe4b79a809ab09e0e69e673459c SHA512 c6538a699b0135a536a8df4ab8355d7a8ca0ed25ff32e822a2e27dfdd896a2ba4b2a5398b75f692bcf5e77a88f9c64af358c14fdbaab213cafad882cb3f0deb3
diff --git a/net-misc/stunnel/stunnel-5.68.ebuild b/net-misc/stunnel/stunnel-5.68.ebuild
index da5e7cfd5e1e..70102e5fd41d 100644
--- a/net-misc/stunnel/stunnel-5.68.ebuild
+++ b/net-misc/stunnel/stunnel-5.68.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index b52d4a501b78..2241675fc3d9 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index f76ad2b3287d..dccaccc27b1f 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -4,5 +4,5 @@ DIST strongswan-5.9.8.tar.bz2 4747096 BLAKE2B 2a7e346931f909aefa17a7e2f4a2d5b491
 DIST strongswan-5.9.9.tar.bz2 4764675 BLAKE2B 9cbc73192527254a2d20b28295e7583a0d9ec81e4d6eb1b7d78e54b30ba8e5304a33e813145d8a47b2b4319d7b49762cd35cdbdaf1d41161d7746d68d3cef1b5 SHA512 7f5d94527193ce7716292f30db75303a0594169647e41e8c9530a7dedd914ad7fecf94885356738fd54d3781a066fa591c621d531923b20780b1fca76ad7bd46
 EBUILD strongswan-5.9.10.ebuild 9564 BLAKE2B 00c924424a97174058dd8c1416d0ae0b7615bb38abbcb09aaad9506aa72ba65d7261035229e9b00bdb19dcd2c48bb850e66f15a34102fa594af6c3b2a85dcc96 SHA512 6a9f25a9337f677bd6ae8dfb887295632f06b9d7f936813a1879d780daf1715e2d4a56e335736d058da90ebe2f77abcfcba72b64d4cdb60d0d1e9318c392e91b
 EBUILD strongswan-5.9.8.ebuild 9561 BLAKE2B 21d9d8dc44c0c29285411be37eb2c5ebed05434ea83d3b96b88eb31600f2bb32c3a87fcb7c00e212b0cf6901f75ccbdc0a102ce773d017bd7c5f04c284462c2f SHA512 361dfb69148c9ff95c5826d43c574df94d8033d11e58fa80c8d89bde026a9e8198205837c077ec406f0deaa5a7356199ecca3edd9d06f993f4c8e7e5c92bb454
-EBUILD strongswan-5.9.9.ebuild 9564 BLAKE2B 00c924424a97174058dd8c1416d0ae0b7615bb38abbcb09aaad9506aa72ba65d7261035229e9b00bdb19dcd2c48bb850e66f15a34102fa594af6c3b2a85dcc96 SHA512 6a9f25a9337f677bd6ae8dfb887295632f06b9d7f936813a1879d780daf1715e2d4a56e335736d058da90ebe2f77abcfcba72b64d4cdb60d0d1e9318c392e91b
+EBUILD strongswan-5.9.9.ebuild 9563 BLAKE2B c8abd8181f56a001cb1436b91b7f9c8261ffa37197b6763401c2a9532128eed145aad8fffb15b8187e86ae3252a54124e3dc8a7c7f6cdc3613842ceb530e6668 SHA512 ab9e7fcefd724d430f689225bce46fe120f84376947ca20600cf65203a418d9c66eb79fa7a07159abca9d49a24c7469afb9f97a270137c85f91dc351a8923baf
 MISC metadata.xml 4888 BLAKE2B ffb26d9fec8ad8c5fbb68ae92a92efbf32c40b4a0a4b829d8fd287ebc80d135e3ca95ca50663acb6fc7d629570ed7f4264921a8838e2ff0a8e5dbbadb3f0fc50 SHA512 84491cbd33b325b1d960c32eafb479927d5651244fb13ee9ec8b2abddfff71f1b90b18524e044dd0cc63ccd49ef9bb0c2437ab6cf504994b8ad0a9137cd04fb4
diff --git a/net-vpn/strongswan/strongswan-5.9.9.ebuild b/net-vpn/strongswan/strongswan-5.9.9.ebuild
index 057c1e8f3e05..1fbcbb9907a8 100644
--- a/net-vpn/strongswan/strongswan-5.9.9.ebuild
+++ b/net-vpn/strongswan/strongswan-5.9.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="gcm led lookip systime-fix unity vici"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8718a2421d37..06c956140ac8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d2050c34d55b..a2e382f6eab1 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1751,40 +1751,40 @@ dev-lang/perl:ithreads - Enable Perl threads, has some compatibility problems
 dev-lang/perl:quadmath - Enable 128bit floating point arithmetic via libquadmath
 dev-lang/php:apparmor - Support FPM application confinement through sys-libs/libapparmor
 dev-lang/php:argon2 - Enable password hashing algorithm from app-crypt/argon2
-dev-lang/php:bcmath - Add support for libbcmath
-dev-lang/php:cli - Enable CLI SAPI
+dev-lang/php:bcmath - Enable the BCMath Arbitrary Precision Mathematics extension
+dev-lang/php:cli - Enable the Command-Line Interface (CLI) SAPI
 dev-lang/php:coverage - Include gcov symbols for test coverage and lcov reports. Only useful for extension developers, and requires GCC.
-dev-lang/php:ctype - Enable ctype functions
+dev-lang/php:ctype - Enable the Character type checking (ctype) extension
 dev-lang/php:embed - Enable embed SAPI
-dev-lang/php:enchant - Add supports Enchant spelling library
-dev-lang/php:ffi - Add foreign function interface (ffi extension) support
-dev-lang/php:fileinfo - Add fileinfo extension support
-dev-lang/php:filter - Add filter extension support
+dev-lang/php:enchant - Enable the Enchant spelling library extension using app-text/enchant
+dev-lang/php:ffi - Enable the Foreign Function Interface (FFI) extension using dev-libs/libffi
+dev-lang/php:fileinfo - Enable the File Information extension
+dev-lang/php:filter - Enable the Data Filtering extension
 dev-lang/php:flatfile - Add dbm support for flat files
 dev-lang/php:fpm - Enable the FastCGI Process Manager SAPI
-dev-lang/php:gd - Adds support for gd (bundled with PHP)
+dev-lang/php:gd - Enable the Image Processing and GD extension (requires media-libs/libjpeg-turbo and media-libs/libpng)
 dev-lang/php:inifile - Add dbm support for .ini files
 dev-lang/php:intl - Enables the intl extension for extended internalization support
 dev-lang/php:jit - Enable PCRE JIT support
-dev-lang/php:json - Enable JSON support
-dev-lang/php:ldap-sasl - Add SASL support for the PHP LDAP extension
+dev-lang/php:json - Enable the JavaScript Object Notation extension
+dev-lang/php:ldap-sasl - Add SASL support for the PHP LDAP extension using dev-libs/cyrus-sasl
 dev-lang/php:lmdb - Enable support for dev-db/lmdb db backend
 dev-lang/php:opcache - Enables built-in opcode cache, replacing pecl-apc et al.
-dev-lang/php:pcntl - Add support for process creation functions
-dev-lang/php:pdo - Enable the bundled PDO extensions
+dev-lang/php:pcntl - Enable the Process Control extension
+dev-lang/php:pdo - Enable the PHP Data Objects extension
 dev-lang/php:phar - Enables the phar extension to provide phar archive support
 dev-lang/php:phpdbg - Enable the PHP Debug Command Line SAPI (like gdb for php)
 dev-lang/php:session-mm - Include dev-libs/mm support for session storage
-dev-lang/php:sharedmem - Add support for shared memory use
-dev-lang/php:simplexml - Support for SimpleXML
+dev-lang/php:sharedmem - Enable the shmop extension
+dev-lang/php:simplexml - Enable the SimpleXML extension
 dev-lang/php:sodium - Enable support for crypto through dev-libs/libsodium
-dev-lang/php:sysvipc - Support for System V-compatible inter-process communication
+dev-lang/php:sysvipc - Enable the PHP System-V semaphore, shared memory and IPC extension
 dev-lang/php:tokenizer - Add support for the PHP file parser
 dev-lang/php:tokyocabinet - Enable support for dev-db/tokyocabinet db backend
 dev-lang/php:webp - Enable webp support for GD in php-7.x
-dev-lang/php:xmlreader - Enable XMLReader support
-dev-lang/php:xmlwriter - Enable XMLWriter support
-dev-lang/php:xslt - Enable the XSL extension
+dev-lang/php:xmlreader - Enable the XMLReader extension
+dev-lang/php:xmlwriter - Enable the XMLWriter extension
+dev-lang/php:xslt - Build the XSL extension
 dev-lang/polyml:portable - Build the portable interpreter version of Poly/ML instead of native
 dev-lang/python:bluetooth - Build Bluetooth protocol support in socket module
 dev-lang/python:ensurepip - Install the ensurepip module that uses bundled wheels to bootstrap pip and setuptools (if disabled, it will be only possible to use venv `--without-pip`)
diff --git a/sci-chemistry/MDAnalysis/MDAnalysis-2.4.1.ebuild b/sci-chemistry/MDAnalysis/MDAnalysis-2.4.1.ebuild
index 346d11a4f660..5e7d91b36bf3 100644
--- a/sci-chemistry/MDAnalysis/MDAnalysis-2.4.1.ebuild
+++ b/sci-chemistry/MDAnalysis/MDAnalysis-2.4.1.ebuild
@@ -6,12 +6,12 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..10} )
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A python library to analyze and manipulate molecular dynamics trajectories"
 HOMEPAGE="https://www.mdanalysis.org"
-SRC_URI="mirror://pypi/M/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/sci-chemistry/MDAnalysis/Manifest b/sci-chemistry/MDAnalysis/Manifest
index 52db80c0c103..4a7f9b1dbab3 100644
--- a/sci-chemistry/MDAnalysis/Manifest
+++ b/sci-chemistry/MDAnalysis/Manifest
@@ -1,3 +1,3 @@
 DIST MDAnalysis-2.4.1.tar.gz 3746899 BLAKE2B af63f74a31dcde8a68cbffe5158f2f955d5eda1345bcff6a19e8df3284101b1e85006de3326d29d4fe1867dc6b0c5f55467b9e3242704f97440c6a43b52f47b8 SHA512 796dad98c26bd36f30db166bea5ff782aa5e3ac5cddb1675b628fb753a4f645fb27e06d3986047e2ba21a22cd91f96d0ba8e529256ed960a2b7cf95204076927
-EBUILD MDAnalysis-2.4.1.ebuild 1163 BLAKE2B 4f92587340d9a69a35c7ec6613e931e941baa471e3e169259f248c7db73ddba84bf612f8cf1000de59aac0569410841f2d0dac25aff6a12c4d14f4f884e533bd SHA512 61e7e83ef368c04816e1815613bbd3bd19100b1aec76a7d6f371fee8ad2bf714aadd6c920d31dc24d6d6c90226d24a465b6dccbce859e454837399ff7d631553
+EBUILD MDAnalysis-2.4.1.ebuild 1144 BLAKE2B b2fc1e7f4c328ec7b30a75c6328ab9b6191c22e5f7f47209a935b148a982a605a843c469a27c27cfe909181b8167df6c3d3d28644f4627fd511fc4ed077ad4ac SHA512 307f37fd9acf7044599cfe86a51796d67afda7308eff5dbab6ea12511003ba8ad1c902cdd099f6a9fcf23d43c81ccdbb12b0de17b083abd5d5bf5606f09f53b2
 MISC metadata.xml 497 BLAKE2B ddd8c6379dfe6b6fe33160d31bda254774e0c8eb5f862cc51560097efc5c273fa972388c6fe8fb1bbedc11ab125a5487bb1d19002489be967fa3e8e209d7cc81 SHA512 03c1eb9bef1bc10d600169b221c65c87794f8b9bf8d0efb1dc6ddaa61a09d665722ed7d32087e3137b36aa7256b76371b9ce2cc92b34b1ed7d1c78ede6550287
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index ebfd583b7d2d..0a44ec925324 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index bde5cab01cf1..34475be39902 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/dmlc-core/Manifest b/sci-libs/dmlc-core/Manifest
index 11a4da14c74b..bc119893e76f 100644
--- a/sci-libs/dmlc-core/Manifest
+++ b/sci-libs/dmlc-core/Manifest
@@ -1,4 +1,6 @@
 AUX dmlc-core-install-dirs.patch 1206 BLAKE2B df1f1520f3e6b21ef7dc30d6f2d73f888c639bdbbfe824ed89a5a7a9fa7b9dabb94704d6ba1ee9a95274b66b5160c560538cdb252804cfdeb304f7b8727cddb5 SHA512 ceee3e6f6f02e4a96167f12ffb50cbbc3bfbf07d025acb002139072ac73cf02adcd9c8f7a7b371055a68a61a104bf16ad95d7a3769edc3ad2dc63be36ff45ff5
+DIST dmlc-core-0.5.tar.gz 256340 BLAKE2B 1a2fd548c704e89adbba397b9f4306ad9439b969755bfd4fa24aad2e58855882dbe69b9c0550b830f8a81dfa41139e22c7ceed0ed707608e31fea1868b707ad4 SHA512 e8292bf71f9d7e31f17add69c984473f8f4d51768c5ac1451dceb9ff3c3e607dd85eea7fb3999f00cf34e962c5956ef1426713b7d8baa5fdbc3aa88e58bed66d
 DIST dmlc-core-0_p20170719.tar.gz 160242 BLAKE2B 2752968c831b5468cb926fbd2783098d1d66f5dd7f06b1abf138e165c637a3c16d477b04b709a05826528ee8e35ed61b563bdaae958fb91c78591dd57761a5f4 SHA512 2e2d79800839652772f07deb5ea3aa470cc5a18d2d0e480b8f4a1598aca72443546a438f3309708268cc49cf2d65684c3366cfc6c33c085baf1b804b4c04f02e
+EBUILD dmlc-core-0.5.ebuild 2481 BLAKE2B b79d93a5cc68775b9eb0d7fecab04bb69b603cdc9eea82b8210f7ffda79d9a68596fde621058d6fa348dcbb3c0cc6e3720170301dae7c3b5d42de5bf1e314d05 SHA512 2c01a5db92b8043288225cc11bef7a904a1ddc2f26624dc1247a271d48a544fcf5d4f66b15de981391d7be7997ca6ed52c35667768d45c451791bb1b283e6a92
 EBUILD dmlc-core-0_p20170719-r1.ebuild 2260 BLAKE2B 9d594bd7f58f7070d32480a5512859f65afbbdd355d558e9f13e05c622f2871ad75a5159b04c5f34ad6d2f352bb0326395e859e095b719511cd4def2129ed01a SHA512 cfd9d3b3a14be0a225db85ed00b19c7b0ac846af424a6de43807385095745fd5146719142b4a8eec58256c5bba9c0aa8feae09d9e22a4d4411d40510f1d93254
 MISC metadata.xml 703 BLAKE2B 62473feed3c698cf3f2155aaad65ca27c504f6009932d0b402848f4c0192448ef74f1a8a789fbb97f7970f49eb4b8279535e539d2fe5a68dd97714f45ba500a7 SHA512 4328a90286999ba528b6d4c46d69d46ebb973ff41528b97560ec6759281cefbd271ef89f9344c22779321ca7e89e8f4a462ac344fd5e1624b971bcc1d4c215a6
diff --git a/sci-libs/dmlc-core/dmlc-core-0.5.ebuild b/sci-libs/dmlc-core/dmlc-core-0.5.ebuild
new file mode 100644
index 000000000000..ae6cb41b64e6
--- /dev/null
+++ b/sci-libs/dmlc-core/dmlc-core-0.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Common bricks library for building distributed machine learning"
+HOMEPAGE="https://github.com/dmlc/dmlc-core"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/dmlc/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/dmlc/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# hdfs needs big java hdfs not yet in portage
+# azure not yet in portage
+IUSE="cpu_flags_x86_sse2 doc openmp s3 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="s3? ( net-misc/curl[ssl] )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )
+	test? ( dev-cpp/gtest )"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/-O3/d' -e '/check_cxx_compiler_flag("-msse2"/d' \
+		-e '/check_cxx.*SSE2/d' \
+		-i CMakeLists.txt || die
+
+	# All these hacks below to allow testing
+	sed -e 's|-O3||' -e 's|-std=c++11|-std=c++14|' \
+		-e "s|-lm|-lm -L\"${BUILD_DIR}\" -ldmlc|g" \
+		-i Makefile || die
+	sed -e "s|libdmlc.a||g" \
+		-e "/^GTEST_LIB=/s|=.*|=/usr/$(get_libdir)|" \
+		-e "/^GTEST_INC=/s|=.*|=/usr/include|" \
+		-i test/dmlc_test.mk test/unittest/dmlc_unittest.mk || die
+	# Don't ever download gtest
+	sed -e 's/^if (NOT GTEST_FOUND)$/if (FALSE)/' \
+		-i test/unittest/CMakeLists.txt || die
+	cat <<-EOF > config.mk
+		USE_SSE=$(usex cpu_flags_x86_sse2 1 0)
+		WITH_FPIC=1
+		USE_OPENMP=$(usex openmp 1 0)
+		USE_S3=$(usex s3 1 0)
+		BUILD_TEST=$(usex test 1 0)
+		DMLC_CFLAGS=${CXXFLAGS}
+		DMLC_LDFLAGS=${LDFLAGS}
+	EOF
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGOOGLE_TEST=$(usex test)
+		-DSUPPORT_MSSE2=$(usex cpu_flags_x86_sse2)
+		-DUSE_CXX14_IF_AVAILABLE=YES # Newer gtest needs C++14 or later
+		-DUSE_S3=$(usex s3)
+		-DUSE_OPENMP=$(usex openmp)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && emake doxygen
+	use test && emake test
+}
+
+src_test() {
+	DMLC_UNIT_TEST_LITTLE_ENDIAN=$([[ $(tc-endian) == little ]] && echo 1 || echo 0) \
+	LD_LIBRARY_PATH="${BUILD_DIR}" \
+		test/unittest/dmlc_unittest || die
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r doc/doxygen/html
+		docompress -x /usr/share/doc/${PF}/html
+	fi
+}
diff --git a/sci-libs/scikit-optimize/Manifest b/sci-libs/scikit-optimize/Manifest
index a7255753ea35..cda2e9e7d06e 100644
--- a/sci-libs/scikit-optimize/Manifest
+++ b/sci-libs/scikit-optimize/Manifest
@@ -1,5 +1,5 @@
 DIST scikit-optimize-0.8.1.tar.gz 278751 BLAKE2B c53b921ed47a2146510a041e34129918cc1b9118e8ae3614f39cc16c87ba5a749e268b9694ade9d95132ec4fb11777f2ef2ec509b1be59c8864ff7b6edde2250 SHA512 8ffacb62869810e1812bdbd2f9f3fe83cad2be03cd795ae2e9aa4e1143ed613c3901ae06be85aecd63c1e3e5b4805e88331d2d8848cc9953988fddfbe62a0287
 DIST scikit-optimize-0.9.0.tar.gz 275570 BLAKE2B ab481bf1cfc2b8c7cff213ae0ce2fa937de8f6269b491cf63ae115eea5c936c8a5c26b7fb339fa6cd2927c5105068635c008d6dc8b3f99b4b5d3abfed1a1c5a2 SHA512 a4c1bd589686dbbabcc5de38a4eb581c040cc2c3f83bc250ddcbe66314f03fc68b7b12d7679049da34c42445b446e1af3873f7ce90bec2a5361f0077ff3e9b74
 EBUILD scikit-optimize-0.8.1.ebuild 638 BLAKE2B 05871d63159b7c2c23a7101c5382e04611bca8cea499d77e6d62147c1f6b06506e279e094dd0f12f4ae345705a7af958ecbcc64f4a30e631e65e3bb4ba49275a SHA512 745f474e616199ca4cd10771bea10b8019b031052e25597a60c637fe0a760b0e75a79ccba41791ca7b75efff4230c8d4f4768eb8a4670402f1a2216c1dd7fae5
-EBUILD scikit-optimize-0.9.0.ebuild 837 BLAKE2B 773b6161a015711c6c0823281837e75567d99cb945b5b852aba5c58f6510157e34ef1ff6280ad9a60cf17183b67d2143cfd6539f0f9b8f7ed3ec5f210ebe6506 SHA512 d87e88a646a2c8bad1fedff7d78aedce2ec62284d512bc04a28b427081782630cf9a997a3a358a787bfcb0d7605b0e4c0032e9e4545f66c2bb76226bd93aad59
+EBUILD scikit-optimize-0.9.0.ebuild 810 BLAKE2B 4547d60f4efbb1a35da5b878ee2de8ba956dbb84ddad8d23f8deb9c61b9b47221aa169b42b96d582c6aca9ffdb8027ea99d1631704cc90aa458a45e5e166b73d SHA512 8c31bc0322d7ba807a3cf09a59d33b877e043cbf8be6aa841165166a8729d25b68e507a8525b51e47c617a74316e79bb1213a7e80db96c7f160cd3dcd835ebcd
 MISC metadata.xml 415 BLAKE2B 3bfa58da8f117a7b62399a17e5259dbfb0e74b9b9acd16e4515bcceaafc2928733f047f229c58bc437907cddf3b8a93c9576a9645e0c910129900072bed94aff SHA512 6343c76ca9a28f321c3fd8c94dfbb912f305ce43025ab6d666ed0aa5a496f08f258e1ab4e11c14844baa3c04c63a43c1d79bc8067a0d02a4eccf0e37c0c686f7
diff --git a/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild b/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild
index 1644aadae338..644fcd2382dc 100644
--- a/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild
+++ b/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Sequential model-based optimization library"
 HOMEPAGE="https://scikit-optimize.github.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1f811f2668b0..c2c18977f0bf 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 7d1d95a60f75..a47ac01a92f8 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-disk-utility-43.0.tar.xz 1752240 BLAKE2B 906183e7f61c4e9d2206fe2c99034f06a0aa3869d253587325ae18b336dffc6d8523a2f4d89c4338ed64947e73c5a24de15dfdb15a9d42d77fe51fd2321bf159 SHA512 8cb1b10fba21c90bceec9521103defe092dea9a4c89a39ae44e4d5981dd0d1958649e7a2743535f0135a3c9179cad0e0aced98dfc805e19bdec81651abcecf48
+DIST gnome-disk-utility-44.0.tar.xz 1768392 BLAKE2B 1e066934afa09cf4dc19bd5473106a1e6b992eacf2712e10974229aa920c64c034174028df59c4047d8cc5fdc21adf8b4934cf91ab937779bbdcc5d76263a235 SHA512 b97e8d6ae3d89a73616d7110dc4edf31e2a88a3109df99926ba0f17db7bd07257812c40e0af5a62b291c5a4e924af463f952496cbe7072eb923897076c1704f7
 DIST gnome-disk-utility-44.rc.tar.xz 1768008 BLAKE2B abdff1507373daa887097780a77761c207d9ab44932bec028d4b22bd9378db6cd47774482bada7ebd9ca734b6cf7b73f9a4fefff5e486ee3b672f62ef57b2769 SHA512 1f462de2830396e6129187e6302ebe509edee532a85b9e7b29528929f4a776b90ec14193a00631d0ae322e6eed7f3cbaff7a06b6006b6489bdb65ce281870f30
 EBUILD gnome-disk-utility-43.0.ebuild 1404 BLAKE2B 38e0f76004764c61e637287671297c19061e231291b992ff1f95963c933cd0f85697e816cb59b28d8f0754533b0b6183e7e75984a0bb29bcc4fbff691ece2ede SHA512 eae8e7135443d55e1015010a3784daecade77b0cb2009a90d5d492f65d39583460d47f7bde7b7a1ac22dce22f4b77438f2ab3b350f8415e7b35f21c14de0136d
+EBUILD gnome-disk-utility-44.0.ebuild 1407 BLAKE2B 158408b964891e8f90dc5ced12706ced6a5f7783a0221dcb4f40b6f85982a8c3b656783a7bccef5b68cb1572852ab9c3825579d486c14ee46a541032853c4e64 SHA512 f25fc5442847d5f7a46f1374415d9b6eca72a457613a7a10ca6ce375c50509821026d96165e08fc2468957878b3d67e60a6e6b3fcd8be03243bed7e83010529f
 EBUILD gnome-disk-utility-44_rc.ebuild 1507 BLAKE2B 7e1f0c6f153b0d527d40aeab2a189df1e79da229c46acd34970a85d4dc526f778bf8c4757c904917b9b1687ed7a24af2d48b57cf99ab8c9de55f020be02c080a SHA512 6b2b1924ea47a61724f5c42a15896f86a83628b968310a4fc43daf26a04ce5462b6fc7658135169abe75a226972dbfca197919b83b4499116cdb9562afbd79b2
 MISC metadata.xml 725 BLAKE2B 173521fe25d9d15cc28c6c4abb434b246222a2c6e15392fdf655e4be1006f83026e9fabf7d29f9d41421c5f13f114c6649971defe18bde1ae1c40f7355859902 SHA512 88e461ac9ac3c8d2a321ef3a1ad44d17b8b3e4355f92320857c77b1a5c6d707d3b3613518dda5cfec9fe4e44067f97a9bac9b1b56ac037b7f0d86da82ecc93b3
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-44.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-44.0.ebuild
new file mode 100644
index 000000000000..1899f63d92d5
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-44.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat elogind gnome systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=media-libs/libdvdread-4.2.0:0=
+	>=dev-libs/glib-2.31:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=media-libs/libcanberra-0.1[gtk3]
+	>=gui-libs/libhandy-1.5.0:1
+	>=app-arch/xz-utils-5.0.5
+	>=x11-libs/libnotify-0.7
+	>=app-crypt/libsecret-0.7
+	>=dev-libs/libpwquality-1.0.0
+	>=sys-fs/udisks-2.7.6:2
+	elogind? ( >=sys-auth/elogind-209 )
+	systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	fat? ( sys-fs/dosfstools )
+	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+# libxml2 for xml-stripblanks in gresource
+BDEPEND="
+	dev-libs/libxml2:2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
+		$(meson_use gnome gsd_plugin)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 0482dcf706e4..5a111fe8c0ed 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -18,5 +18,5 @@ DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2f
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
 EBUILD ucspi-tcp-0.88-r18.ebuild 2113 BLAKE2B 888ce733f7f4e86c3706c5009c77e67ca398f50511dfdf3b14ecfb98bb02d33619d05f40135250d909b19688530ecd10e24cb2dce822756a3cd2b46cb6a3c519 SHA512 7c222bd080916fcdac32f551d29a79c89dc81eb442ec7119d93f6de97a54c594946718aab584234ba43f2e2c9d41970875437c96e5933da78bb5292e75116c40
-EBUILD ucspi-tcp-0.88-r19.ebuild 2220 BLAKE2B 35fee864663748d97f5751cd161d67c57a9afaa695186f80e790311d1eb88225184d3e8145227b07c4134e92caa9ab6f782d967ce5f64f36f96d5554ad5acac0 SHA512 6cd2fce31b8c15ec7e619b8d67405ee93d6c40fa057c215e22a1972d309957ccfceb399bc0c6e9af141bddb37db592c12026f08250f325b47b441a5da4a7f31a
+EBUILD ucspi-tcp-0.88-r19.ebuild 2213 BLAKE2B 1120a929590217f084bbcbcd83341b338807b114bda48533a701f1f6f9e522991ca21bd1dd3689553726c720998012ca0dfe07ab8a9cbd04b3923359af764e31 SHA512 5458f0c0e13bd90499f12c598feb1e26aa2172502c4dc0892f5c87563fb91973e877c9e7a2bff4709c50bb345fffa47a6cd4e3fbf9a0cd3e37e93efe158a33ba
 MISC metadata.xml 601 BLAKE2B f93f353c688147d0f0430e176de1f75e22321b6ddd621a8be45efba153a70ac697a2c383aec03a7ce860d79fffa7a3f3f5eed084d1ddf48c23c31fbf8d0ad3cf SHA512 41f81dd288b2ec4b48830876a7fc16f7361038803707e8f5f93fc4dfa6e8fb58c7836e762147917102621a2eb76cefd293d0cf260df6638d9b4427a261597214
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild
index 89c830ef2cfe..109f9d7a48c4 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 6103f40f6346..370af4beb686 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index d2e5bd1dd0af..87e0c136e604 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -56,10 +56,7 @@ DIST ceph-16.2.11.tar.gz 157171361 BLAKE2B f9b7398da50b9c5a7a553de0d8db5412745d1
 DIST ceph-16.2.9.tar.gz 157168096 BLAKE2B 0a667a9699925cfc920ca0cc535e5331cbcd95997fb0b9816a4d84c8add454b6b17813018bc1d1de07c802167ef50aa528704b10b01f42759189392ccdb5088f SHA512 bf369038ad6383f88abbed267f0239e9d8a1d33b46b34ed260aeeb1fda1b374cb6e658238e1ace013fbbb68e73b8cd2922b7def318d7a110e5f4560eeae8fca3
 DIST ceph-17.2.5.tar.gz 169004360 BLAKE2B b6d8df5f9b58de5e42fed5d16b1c82d2178297f8bb1b6cf9c42ff55d6a5b2e20fe413feeab038738f62342576ef59fff7091b87648c10cf71401377b0ffa5dc8 SHA512 10cd3d9eb01c91c148a92f1f7d040bbd78af5bb1ab15d071d93f54b37097dc9e1268eed9e788fe32794d137f6af81abd6a2aeaee39cef44d2c45234a15cc6020
 DIST ceph-xsimd-17.2.5.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
-EBUILD ceph-15.2.17-r1.ebuild 10738 BLAKE2B b1ba87c79787ba06a70d4b1bfd4ca7fc75f1bdf1e17109d0176b85c09f678d520fef321d2eca59b35d21dbd53b9b7a9336b9ab428f6c3d58f040af00fa798853 SHA512 25e1a7654e257d74d0217c5b7bcf58aaf847f5abe21389e2b80ed09a8f5cf06254d2a5814b70c12c76ca278ea6e3683c6258a04f98853669dc6518d19480259d
-EBUILD ceph-15.2.17-r2.ebuild 10803 BLAKE2B e899995e255acfb9b9a2c83c53c5d5836aaaea60248457e3d06af3f4e88ae2ebf23f89bbd8e4189d5050b7a99cc10d6057f8d3a3b31e9e0a272a1f9e8b988d61 SHA512 96075ab8049839e75f50e1b7deb64502ed29081df0b80a8532bb271c4b584084ada4a375cd99a8d1d7eede7463972851e94d39d6a7a123f960c1478ac31ad731
-EBUILD ceph-16.2.10-r3.ebuild 12509 BLAKE2B 668b65f8f9b18e3ca5d3f141285f82e8a87dfdc5a4f6e12b8ba9e05db7fb5e7fef467e33c5318ec829431b12ee7669a480a24575d3708a36e2358c8ff38f05ec SHA512 1aa022806a948f1d414d2a16d504e78a4f260899083562d855701a5919489cd08db0bd1304e9a12827f4f0c807f5d7bafadcc31fab6e89137e76ff38c207ee60
-EBUILD ceph-16.2.10-r4.ebuild 12561 BLAKE2B 28586877dbe1cf3b593a035ab383df88add75f13fad03d2f31b6e22afbb6db55ae86c1b8c5278a676f9fc7ecfe793c5e6c1bee0b3461a82168b6f51fead063f2 SHA512 f761562926b506ed688021a22a87ea937605fce7a5cfb7848694e57ba0bb83670842af4072b1bc1f245ebf3827aafbb2dc3fd9537afd52587a26c946a423032c
+EBUILD ceph-15.2.17-r3.ebuild 10745 BLAKE2B 73584d18033bc065702000560ffece68a4625d69dea8fc7ab4f76ccf55700789f2b60c312a05eb89d31deb8309b704be7fd382ae7b44ee613912cd5a59d2b8ec SHA512 9d0efbc857db270f00d243f38232628965828d706bd7fa651914df83a5a5d313ba983622387438e758b727362835b2401c9f171b9cc7613c08009954e2425914
 EBUILD ceph-16.2.10-r5.ebuild 12604 BLAKE2B d957a915facfb2ba4b3cbbdd6d5d73e89c670d4cdc1e103d253d76e7b65295915c7964e9587d1d1da1a9341f19309bb0bf0017f6e4ef554ab7b728ee3dd7cd75 SHA512 0e1d45f51ab863482cb5c91e78abd554fe9a4c5b676c15157fd1e6059ec7fdde23027b77e0e3c403766b895c804b2757fc11a525de7a8e123b6fe52787560190
 EBUILD ceph-16.2.11.ebuild 12513 BLAKE2B 2b4befa85baceca8add05ca29702642f11ed06176b762136f853ccbe5b33f660328768008c9070b1012fa3db3b8902b3b42e2819a4b7e5c11ae569720b1e476d SHA512 142dc905aac6dd3bd1d94a95d2ec8886554841630a872eb30c5c8ac7a5ccceca7197926113d01af328bed780c5ec6ce5f4ee6baf021ec553ac4e6ca16ccc4674
 EBUILD ceph-16.2.9-r3.ebuild 12577 BLAKE2B 2fc89ce85821460a715a605f73d4ebe2ff6626ac65c6e193112af2f12025cbebbe1561a01e3eaa94f02a1fbfca6f5cfb562c90ccc34943ab281fad2a07d4813f SHA512 ff757822896783a6584f352456780396dacc5ae9caf58b2c41b2dc782291d46aeaf217456650a78b63e52c24642bf1d5595b7b642473839f28b5b8ddc3075fa2
diff --git a/sys-cluster/ceph/ceph-15.2.17-r1.ebuild b/sys-cluster/ceph/ceph-15.2.17-r1.ebuild
deleted file mode 100644
index f66294813c56..000000000000
--- a/sys-cluster/ceph/ceph-15.2.17-r1.ebuild
+++ /dev/null
@@ -1,404 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_9 )
-CMAKE_MAKEFILE_GENERATOR=emake
-
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
-		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles \
-		multiprocessing
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
-	kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk
-	+system-boost systemd +tcmalloc test uring xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-DEPEND="
-	acct-group/ceph
-	acct-user/ceph
-	virtual/libudev:=
-	app-arch/bzip2:=
-	app-arch/lz4:=
-	app-arch/snappy:=
-	|| ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 )
-	app-arch/zstd:=
-	app-shells/bash:0
-	app-misc/jq:=
-	dev-libs/crypto++:=
-	dev-cpp/gflags:=
-	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
-	dev-libs/libaio:=
-	dev-libs/libfmt:=
-	<dev-libs/libfmt-9:=
-	dev-libs/libnl:3=
-	dev-libs/libxml2:=
-	<dev-libs/rocksdb-6.15:=
-	dev-libs/xmlsec:=[openssl]
-	dev-cpp/yaml-cpp:=
-	dev-libs/nss:=
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	net-libs/gnutls:=
-	sys-auth/oath-toolkit:=
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/hwloc:=
-	sys-apps/keyutils:=
-	sys-apps/util-linux:=
-	sys-apps/util-linux
-	sys-libs/libcap-ng:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	sys-process/numactl:=
-	virtual/libcrypt:=
-	x11-libs/libpciaccess:=
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse:0= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
-	kafka? ( dev-libs/librdkafka:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	lttng? ( dev-util/lttng-ust:= )
-	pmdk? ( dev-libs/pmdk:= )
-	rabbitmq? ( net-libs/rabbitmq-c:= )
-	radosgw? (
-		dev-libs/expat:=
-		dev-libs/openssl:=
-		net-misc/curl:=[curl_ssl_openssl]
-	)
-	rbd-rwl? ( dev-libs/pmdk:= )
-	ssl? ( dev-libs/openssl:= )
-	system-boost? ( dev-libs/boost:=[context,python,${PYTHON_USEDEP}] )
-	!system-boost? ( <sys-libs/glibc-2.34 )
-	uring? ( sys-libs/liburing:= )
-	xfs? ( sys-fs/xfsprogs:= )
-	zfs? ( sys-fs/zfs:= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	app-arch/cpio
-	>=dev-util/cmake-3.5.0
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/cunit
-	dev-util/gperf
-	dev-util/ragel
-	dev-util/valgrind
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/which
-	sys-devel/bc
-	sys-devel/patch
-	virtual/pkgconfig
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)
-"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	app-admin/sudo
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-apps/nvme-cli
-	>=sys-apps/smartmontools-7.0
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lsscsi
-	sys-fs/lvm2[lvm]
-	app-alternatives/awk
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	mgr? (
-		dev-python/jsonpatch[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/routes[${PYTHON_USEDEP}]
-		sci-libs/scikit-learn[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	?? ( jemalloc tcmalloc )
-	diskprediction? ( mgr )
-	kafka? ( radosgw )
-	mgr? ( cephfs )
-	rabbitmq? ( radosgw )
-"
-RESTRICT="!test? ( test )"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# create a non-debug release
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI=no
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-14.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-15.2.15-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
-	"${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
-	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
-	"${FILESDIR}/ceph-15.2.4-system-uring.patch"
-	"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch"
-	"${FILESDIR}/ceph-15.2.15-snappy-1.1.9.patch"
-)
-
-check-reqs_export_vars() {
-	CHECKREQS_DISK_BUILD="5400M"
-	CHECKREQS_DISK_USR="510M"
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use system-boost; then
-		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
-			| xargs --null sed -r \
-			-e 's|Boost::|boost_|g' \
-			-e 's|Boost_|boost_|g' \
-			-e 's|[Bb]oost_boost|boost_system|g' -i || die
-	fi
-
-	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		-i src/bash_completion/CMakeLists.txt || die
-
-	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
-
-	if ! use diskprediction; then
-		rm -rf src/pybind/mgr/diskprediction_local || die
-	fi
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_BLUESTORE_PMEM=$(usex pmdk)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL=$(usex cephfs)
-		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_SPDK=$(usex spdk)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_GSSAPI=$(usex kerberos)
-		-DWITH_GRAFANA=$(usex grafana)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=OFF
-		-DWITH_NUMA=$(usex numa)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PYTHON3=3
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
-		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
-		-DWITH_RBD_RWL=$(usex rbd-rwl)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_LIBURING=$(usex uring)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED="ON"
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)")
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_SYSTEM_ROCKSDB=ON
-		-DWITH_RDMA=OFF
-		-DWITH_TBB=OFF
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-Wno-dev
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	# needed for >=glibc-2.32
-	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON)
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
-		|| die "failed to remove cmake cache"
-
-	cmake_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 clean
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake_build VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	python_copy_sources
-	distutils-r1_src_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${ED}" emake VERBOSE=1 install
-	popd >/dev/null || die
-
-	python_optimize
-}
-
-src_install() {
-	cmake_src_install
-	distutils-r1_src_install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-
-	fi
-
-	udev_dorules udev/*.rules
-	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
-
-	readme.gentoo_create_doc
-
-	python_setup
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
-	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
-		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
-
-	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
-	dostrip -x "${rados_classes[@]#${ED}}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	tmpfiles_process ${PN}.conf
-}
diff --git a/sys-cluster/ceph/ceph-15.2.17-r2.ebuild b/sys-cluster/ceph/ceph-15.2.17-r3.ebuild
index 36824af9e16b..931743cffc69 100644
--- a/sys-cluster/ceph/ceph-15.2.17-r2.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.17-r3.ebuild
@@ -40,7 +40,6 @@ DEPEND="
 	app-arch/bzip2:=
 	app-arch/lz4:=
 	app-arch/snappy:=
-	|| ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 )
 	app-arch/zstd:=
 	app-shells/bash:0
 	app-misc/jq:=
diff --git a/sys-cluster/ceph/ceph-16.2.10-r3.ebuild b/sys-cluster/ceph/ceph-16.2.10-r3.ebuild
deleted file mode 100644
index 061114221670..000000000000
--- a/sys-cluster/ceph/ceph-16.2.10-r3.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-LUA_COMPAT=( lua5-3 )
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit check-reqs bash-completion-r1 cmake python-r1 flag-o-matic \
-		lua-single udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
-
-SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
-SLOT="0"
-
-CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="
-	babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana
-	jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq
-	+radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost
-	systemd +tcmalloc test uring xfs zbd zfs
-"
-
-IUSE+="$(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-DEPEND="
-	${LUA_DEPS}
-	${PYTHON_DEPS}
-	acct-group/ceph
-	acct-user/ceph
-	virtual/libudev:=
-	app-arch/bzip2:=
-	app-arch/lz4:=
-	app-arch/snappy:=
-	>=app-arch/snappy-1.1.9-r1
-	app-arch/zstd:=
-	app-shells/bash:0
-	app-misc/jq:=
-	dev-libs/crypto++:=
-	dev-cpp/gflags:=
-	<dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?]
-	dev-libs/libaio:=
-	<dev-libs/libfmt-9:=
-	dev-libs/libnl:3=
-	dev-libs/libxml2:=
-	dev-libs/libevent:=
-	dev-libs/openssl:=
-	<dev-libs/rocksdb-6.15:=
-	dev-libs/xmlsec:=[openssl]
-	dev-cpp/yaml-cpp:=
-	dev-libs/nss:=
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	net-libs/gnutls:=
-	sys-auth/oath-toolkit:=
-	sys-apps/coreutils
-	sys-apps/hwloc:=
-	sys-apps/keyutils:=
-	sys-apps/util-linux:=
-	sys-apps/util-linux
-	sys-libs/libcap-ng:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	sys-process/numactl:=
-	virtual/libcrypt:=
-	x11-libs/libpciaccess:=
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse:3= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
-	jaeger? ( dev-cpp/nlohmann_json:= )
-	kafka? ( dev-libs/librdkafka:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	lttng? ( dev-util/lttng-ust:= )
-	pmdk? ( dev-libs/pmdk:= )
-	rabbitmq? ( net-libs/rabbitmq-c:= )
-	radosgw? (
-		dev-libs/icu:=
-		dev-libs/expat:=
-		net-misc/curl:=[curl_ssl_openssl]
-	)
-	rbd-rwl? ( dev-libs/pmdk:= )
-	rdma? ( sys-cluster/rdma-core:= )
-	spdk? ( dev-util/cunit )
-	sqlite? ( dev-db/sqlite:= )
-	system-boost? ( dev-libs/boost:=[context,python,${PYTHON_USEDEP},zlib] )
-	!system-boost? ( $(python_gen_impl_dep '' 3.8 3.9) )
-	uring? ( sys-libs/liburing:= )
-	xfs? ( sys-fs/xfsprogs:= )
-	zbd? ( sys-block/libzbd:= )
-	zfs? ( sys-fs/zfs:= )
-"
-BDEPEND="
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/yasm )
-	app-arch/cpio
-	>=dev-util/cmake-3.5.0
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/gperf
-	dev-util/ragel
-	dev-util/valgrind
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/util-linux
-	sys-apps/which
-	sys-devel/bc
-	sys-devel/patch
-	virtual/pkgconfig
-	jaeger? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-	test? (
-		dev-util/cunit
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)
-"
-RDEPEND="
-	${DEPEND}
-	app-admin/sudo
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-apps/nvme-cli
-	>=sys-apps/smartmontools-7.0
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lsscsi
-	sys-fs/lvm2[lvm]
-	app-alternatives/awk
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	mgr? (
-		dev-python/jsonpatch[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/routes[${PYTHON_USEDEP}]
-		diskprediction? (
-			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
-		)
-		sci-libs/scikit-learn[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	${LUA_REQUIRED_USE}
-	?? ( jemalloc tcmalloc )
-	jaeger? ( !system-boost )
-	diskprediction? ( mgr )
-	kafka? ( radosgw )
-	mgr? ( cephfs )
-	rabbitmq? ( radosgw )
-	!system-boost? (
-		python_targets_python3_9
-		python_targets_python3_10
-	)
-"
-
-RESTRICT="
-	!test? ( test )
-"
-
-# tests need root access, and network access
-RESTRICT+="test"
-
-# create a non-debug release
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI=no
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-14.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-16.2.2-cflags.patch"
-	"${FILESDIR}/ceph-16.2.8-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
-	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
-	"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
-	"${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch"
-	"${FILESDIR}/ceph-16.2.0-liburing.patch"
-	"${FILESDIR}/ceph-16.2.2-system-zstd.patch"
-	"${FILESDIR}/ceph-16.2.7-string-includes.patch"
-	"${FILESDIR}/ceph-17.2.0-fuse3.patch"
-	"${FILESDIR}/ceph-16.2.9-python310.patch"
-	"${FILESDIR}/ceph-17.2.0-gcc12-header.patch"
-	"${FILESDIR}/ceph-16.2.10-flags.patch"
-)
-
-check-reqs_export_vars() {
-	CHECKREQS_DISK_BUILD="6G"
-
-	if use system-boost; then
-		CHECKREQS_DISK_USR="350M"
-	else
-		CHECKREQS_DISK_USR="510M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if ! use system-boost; then
-		python_setup 3.8 3.9
-	else
-		python_setup
-	fi
-	lua_setup
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use system-boost; then
-		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
-			| xargs --null sed -r \
-			-e 's|Boost::|boost_|g' \
-			-e 's|Boost_|boost_|g' \
-			-e 's|[Bb]oost_boost|boost_system|g' \
-			-i || die
-	fi
-
-	if ! use systemd; then
-		find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \
-			| xargs --null sed \
-			-e '/^from ceph_volume.systemd import systemctl/ d' \
-			-i || die
-	fi
-
-	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		-i src/bash_completion/CMakeLists.txt || die
-
-	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
-
-	if ! use diskprediction; then
-		rm -rf src/pybind/mgr/diskprediction_local || die
-	fi
-
-	# force lua version to use selected version
-	local lua_version
-	lua_version=$(ver_cut 1-2 $(lua_get_version))
-	sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \
-		-i src/CMakeLists.txt
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-}
-
-ceph_src_configure() {
-	local mycmakeargs=(
-		-DWITH_BABELTRACE:BOOL=$(usex babeltrace)
-		-DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk)
-		-DWITH_CEPHFS:BOOL=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL:BOOL=$(usex cephfs)
-		-DWITH_DPDK:BOOL=$(usex dpdk)
-		-DWITH_SPDK:BOOL=$(usex spdk)
-		-DWITH_FUSE:BOOL=$(usex fuse)
-		-DWITH_LTTNG:BOOL=$(usex lttng)
-		-DWITH_GSSAPI:BOOL=$(usex kerberos)
-		-DWITH_GRAFANA:BOOL=$(usex grafana)
-		-DWITH_MGR:BOOL=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF
-		-DWITH_OPENLDAP:BOOL=$(usex ldap)
-		-DWITH_PYTHON3:STRING=3
-		-DWITH_RADOSGW:BOOL=$(usex radosgw)
-		-DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=$(usex rabbitmq)
-		-DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=$(usex kafka)
-		-DWITH_RADOSGW_LUA_PACKAGES:BOOL=$(usex rgw-lua "$(usex radosgw)" "NO")
-		-DWITH_RBD_RWL:BOOL=$(usex rbd-rwl)
-		-DWITH_RBD_SSD_CACHE:BOOL=$(usex rbd-ssd)
-		-DWITH_SYSTEMD:BOOL=$(usex systemd)
-		-DWITH_TESTS:BOOL=$(usex test)
-		-DWITH_LIBURING:BOOL=$(usex uring)
-		-DWITH_SYSTEM_LIBURING:BOOL=$(usex uring)
-		-DWITH_LIBCEPHSQLITE:BOOL=$(usex sqlite)
-		-DWITH_XFS:BOOL=$(usex xfs)
-		-DWITH_ZBD:BOOL=$(usex zbd)
-		-DWITH_ZFS:BOOL=$(usex zfs)
-		-DENABLE_SHARED:BOOL=ON
-		-DALLOCATOR:STRING=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_PMDK:BOOL=$(usex pmdk 'YES' "$(usex rbd-rwl)")
-		-DWITH_SYSTEM_BOOST:BOOL=$(usex system-boost)
-		-DWITH_SYSTEM_ROCKSDB:BOOL=ON
-		-DWITH_RDMA:BOOL=$(usex rdma)
-		-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
-		-Wno-dev
-	)
-
-	# this breaks when re-configuring for python impl
-	if [[ ${EBUILD_PHASE} == configure ]]; then
-		mycmakeargs+=(
-			-DWITH_JAEGER:BOOL=$(usex jaeger)
-		)
-	else
-		mycmakeargs+=(
-			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF
-		)
-	fi
-
-	# conditionally used cmake args
-	use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) )
-	use systemd && mycmakeargs+=( -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=$(systemd_get_systemunitdir) )
-
-	if use amd64 || use x86; then
-		local flag
-		for flag in "${CPU_FLAGS_X86[@]}"; do
-			case "${flag}" in
-				avx*)
-					local var=${flag%f}
-					mycmakeargs+=(
-						"-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})"
-					)
-				;;
-				*) mycmakeargs+=(
-						"-DHAVE_INTEL_${flag^^}:BOOL=$(usex cpu_flags_x86_${flag})"
-					);;
-			esac
-		done
-	fi
-
-	# needed for >=glibc-2.32
-	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=( -DWITH_REENTRANT_STRSIGNAL:BOOL=ON )
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
-		|| die "failed to remove cmake cache"
-
-	cmake_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	ceph_src_configure
-}
-
-src_compile() {
-	cmake_build VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	python_copy_sources
-	python_foreach_impl python_compile
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	cmake_build VERBOSE=1 clean
-	cmake_build VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" cmake_build VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_install() {
-	python_foreach_impl python_install
-
-	python_setup
-	cmake_src_install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sudoers.d
-	doins sudoers.d/*
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
-
-	readme.gentoo_create_doc
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
-	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
-		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
-
-	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
-	dostrip -x "${rados_classes[@]#${ED}}"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${ED}" cmake_build VERBOSE=1 install
-	popd >/dev/null || die
-
-	python_optimize
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	tmpfiles_process ${PN}.conf
-	udev_reload
-}
diff --git a/sys-cluster/ceph/ceph-16.2.10-r4.ebuild b/sys-cluster/ceph/ceph-16.2.10-r4.ebuild
deleted file mode 100644
index 785867d546c5..000000000000
--- a/sys-cluster/ceph/ceph-16.2.10-r4.ebuild
+++ /dev/null
@@ -1,473 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-LUA_COMPAT=( lua5-3 )
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit check-reqs bash-completion-r1 cmake python-r1 flag-o-matic \
-		lua-single udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
-
-SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
-SLOT="0"
-
-CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="
-	babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana
-	jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq
-	+radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost
-	systemd +tcmalloc test uring xfs zbd zfs
-"
-
-IUSE+="$(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-DEPEND="
-	${LUA_DEPS}
-	${PYTHON_DEPS}
-	acct-group/ceph
-	acct-user/ceph
-	virtual/libudev:=
-	app-arch/bzip2:=
-	app-arch/lz4:=
-	app-arch/snappy:=
-	>=app-arch/snappy-1.1.9-r1
-	app-arch/zstd:=
-	app-shells/bash:0
-	app-misc/jq:=
-	dev-libs/crypto++:=
-	dev-cpp/gflags:=
-	<dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?]
-	dev-libs/libaio:=
-	<dev-libs/libfmt-9:=
-	dev-libs/libnl:3=
-	dev-libs/libxml2:=
-	dev-libs/libevent:=
-	dev-libs/openssl:=
-	<dev-libs/rocksdb-6.15:=
-	dev-libs/xmlsec:=[openssl]
-	dev-cpp/yaml-cpp:=
-	dev-libs/nss:=
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	net-libs/gnutls:=
-	sys-auth/oath-toolkit:=
-	sys-apps/coreutils
-	sys-apps/hwloc:=
-	sys-apps/keyutils:=
-	sys-apps/util-linux:=
-	sys-apps/util-linux
-	sys-libs/libcap-ng:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	sys-process/numactl:=
-	virtual/libcrypt:=
-	x11-libs/libpciaccess:=
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse:3= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
-	jaeger? ( dev-cpp/nlohmann_json:= )
-	kafka? ( dev-libs/librdkafka:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	lttng? ( dev-util/lttng-ust:= )
-	pmdk? ( dev-libs/pmdk:= )
-	rabbitmq? ( net-libs/rabbitmq-c:= )
-	radosgw? (
-		dev-libs/icu:=
-		dev-libs/expat:=
-		net-misc/curl:=[curl_ssl_openssl]
-	)
-	rbd-rwl? ( dev-libs/pmdk:= )
-	rdma? ( sys-cluster/rdma-core:= )
-	spdk? ( dev-util/cunit )
-	sqlite? ( dev-db/sqlite:= )
-	system-boost? ( dev-libs/boost:=[context,python,${PYTHON_USEDEP},zlib] )
-	!system-boost? ( $(python_gen_impl_dep '' 3.8 3.9) )
-	uring? ( sys-libs/liburing:= )
-	xfs? ( sys-fs/xfsprogs:= )
-	zbd? ( sys-block/libzbd:= )
-	zfs? ( sys-fs/zfs:= )
-"
-BDEPEND="
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/yasm )
-	app-arch/cpio
-	>=dev-util/cmake-3.5.0
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/gperf
-	dev-util/ragel
-	dev-util/valgrind
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/util-linux
-	sys-apps/which
-	sys-devel/bc
-	sys-devel/patch
-	virtual/pkgconfig
-	jaeger? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-	test? (
-		dev-util/cunit
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)
-"
-RDEPEND="
-	${DEPEND}
-	app-admin/sudo
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-apps/nvme-cli
-	>=sys-apps/smartmontools-7.0
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lsscsi
-	sys-fs/lvm2[lvm]
-	app-alternatives/awk
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	mgr? (
-		dev-python/jsonpatch[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/routes[${PYTHON_USEDEP}]
-		diskprediction? (
-			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
-		)
-		sci-libs/scikit-learn[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	${LUA_REQUIRED_USE}
-	?? ( jemalloc tcmalloc )
-	jaeger? ( !system-boost )
-	diskprediction? ( mgr )
-	kafka? ( radosgw )
-	mgr? ( cephfs )
-	rabbitmq? ( radosgw )
-	!system-boost? (
-		python_targets_python3_9
-		python_targets_python3_10
-	)
-"
-
-RESTRICT="
-	!test? ( test )
-"
-
-# tests need root access, and network access
-RESTRICT+="test"
-
-# create a non-debug release
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI=no
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-14.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-16.2.2-cflags.patch"
-	"${FILESDIR}/ceph-16.2.8-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch"
-	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
-	"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
-	"${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch"
-	"${FILESDIR}/ceph-16.2.0-liburing.patch"
-	"${FILESDIR}/ceph-16.2.2-system-zstd.patch"
-	"${FILESDIR}/ceph-16.2.7-string-includes.patch"
-	"${FILESDIR}/ceph-17.2.0-fuse3.patch"
-	"${FILESDIR}/ceph-16.2.9-python310.patch"
-	"${FILESDIR}/ceph-17.2.0-gcc12-header.patch"
-	"${FILESDIR}/ceph-16.2.10-flags.patch"
-)
-
-check-reqs_export_vars() {
-	CHECKREQS_DISK_BUILD="6G"
-
-	if use system-boost; then
-		CHECKREQS_DISK_USR="350M"
-	else
-		CHECKREQS_DISK_USR="510M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if ! use system-boost; then
-		python_setup 3.8 3.9
-	else
-		python_setup
-	fi
-	lua_setup
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use system-boost; then
-		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
-			| xargs --null sed -r \
-			-e 's|Boost::|boost_|g' \
-			-e 's|Boost_|boost_|g' \
-			-e 's|[Bb]oost_boost|boost_system|g' \
-			-i || die
-	fi
-
-	if ! use systemd; then
-		find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \
-			| xargs --null sed \
-			-e '/^from ceph_volume.systemd import systemctl/ d' \
-			-i || die
-	fi
-
-	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		-i src/bash_completion/CMakeLists.txt || die
-
-	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
-
-	if ! use diskprediction; then
-		rm -rf src/pybind/mgr/diskprediction_local || die
-	fi
-
-	# force lua version to use selected version
-	local lua_version
-	lua_version=$(ver_cut 1-2 $(lua_get_version))
-	sed "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" \
-		-i src/CMakeLists.txt
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-}
-
-ceph_src_configure() {
-	local mycmakeargs=(
-		-DWITH_BABELTRACE:BOOL=$(usex babeltrace)
-		-DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk)
-		-DWITH_CEPHFS:BOOL=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL:BOOL=$(usex cephfs)
-		-DWITH_DPDK:BOOL=$(usex dpdk)
-		-DWITH_SPDK:BOOL=$(usex spdk)
-		-DWITH_FUSE:BOOL=$(usex fuse)
-		-DWITH_LTTNG:BOOL=$(usex lttng)
-		-DWITH_GSSAPI:BOOL=$(usex kerberos)
-		-DWITH_GRAFANA:BOOL=$(usex grafana)
-		-DWITH_MGR:BOOL=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF
-		-DWITH_OPENLDAP:BOOL=$(usex ldap)
-		-DWITH_PYTHON3:STRING=3
-		-DWITH_RADOSGW:BOOL=$(usex radosgw)
-		-DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=$(usex rabbitmq)
-		-DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=$(usex kafka)
-		-DWITH_RADOSGW_LUA_PACKAGES:BOOL=$(usex rgw-lua "$(usex radosgw)" "NO")
-		-DWITH_RBD_RWL:BOOL=$(usex rbd-rwl)
-		-DWITH_RBD_SSD_CACHE:BOOL=$(usex rbd-ssd)
-		-DWITH_SYSTEMD:BOOL=$(usex systemd)
-		-DWITH_TESTS:BOOL=$(usex test)
-		-DWITH_LIBURING:BOOL=$(usex uring)
-		-DWITH_SYSTEM_LIBURING:BOOL=$(usex uring)
-		-DWITH_LIBCEPHSQLITE:BOOL=$(usex sqlite)
-		-DWITH_XFS:BOOL=$(usex xfs)
-		-DWITH_ZBD:BOOL=$(usex zbd)
-		-DWITH_ZFS:BOOL=$(usex zfs)
-		-DENABLE_SHARED:BOOL=ON
-		-DALLOCATOR:STRING=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_PMDK:BOOL=$(usex pmdk 'YES' "$(usex rbd-rwl)")
-		-DWITH_SYSTEM_BOOST:BOOL=$(usex system-boost)
-		-DWITH_SYSTEM_ROCKSDB:BOOL=ON
-		-DWITH_RDMA:BOOL=$(usex rdma)
-		-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
-		-Wno-dev
-	)
-
-	# this breaks when re-configuring for python impl
-	if [[ ${EBUILD_PHASE} == configure ]]; then
-		mycmakeargs+=(
-			-DWITH_JAEGER:BOOL=$(usex jaeger)
-		)
-	else
-		mycmakeargs+=(
-			-DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF
-		)
-	fi
-
-	# conditionally used cmake args
-	use test && mycmakearts+=( -DWITH_SYSTEM_GTEST:BOOL=$(usex test) )
-	use systemd && mycmakeargs+=( -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=$(systemd_get_systemunitdir) )
-
-	if use amd64 || use x86; then
-		local flag
-		for flag in "${CPU_FLAGS_X86[@]}"; do
-			case "${flag}" in
-				avx*)
-					local var=${flag%f}
-					mycmakeargs+=(
-						"-DHAVE_NASM_X64_${var^^}:BOOL=$(usex cpu_flags_x86_${flag})"
-					)
-				;;
-				*) mycmakeargs+=(
-						"-DHAVE_INTEL_${flag^^}:BOOL=$(usex cpu_flags_x86_${flag})"
-					);;
-			esac
-		done
-	fi
-
-	# needed for >=glibc-2.32
-	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=( -DWITH_REENTRANT_STRSIGNAL:BOOL=ON )
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
-		|| die "failed to remove cmake cache"
-
-	cmake_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	ceph_src_configure
-}
-
-src_compile() {
-	cmake_build VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	python_copy_sources
-	python_foreach_impl python_compile
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	cmake_build VERBOSE=1 clean
-	cmake_build VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" cmake_build VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_install() {
-	python_foreach_impl python_install
-
-	python_setup
-	cmake_src_install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/ceph/stat /var/log/ceph/console
-
-	fowners -R ceph:ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r13" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sudoers.d
-	doins sudoers.d/*
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
-
-	readme.gentoo_create_doc
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
-	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
-		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
-
-	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
-	dostrip -x "${rados_classes[@]#${ED}}"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${ED}" cmake_build VERBOSE=1 install
-	popd >/dev/null || die
-
-	python_optimize
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	tmpfiles_process ${PN}.conf
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 3e35fead6978..0a3f93a388bb 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e9975e6a4a01..bf5d2c4cb42f 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -4,10 +4,14 @@ DIST genpatches-5.10-181.base.tar.xz 4964488 BLAKE2B 2b05c676da465b1627c92400f12
 DIST genpatches-5.10-181.extras.tar.xz 3872 BLAKE2B dd1d27a04cd2215fdf9ae7301d6c90dd0a1e9e4ffe7e295dfe2d6b637de69303d9cd2a00a5adeb33d2c4cc7d984e57e69bd9f998df1da188ae006511fe70302e SHA512 b91ec330f3f87bf7ec5cdc10e6352070161d38d09fea82142b2dc475a0a25d176a262cc0bf24d4a4902e84abea84f6263c3e859f1ebf8f44155e42c5f565dcce
 DIST genpatches-5.10-183.base.tar.xz 5092416 BLAKE2B d4c674fdd2891051748ab33257ed3dd1e85c7f15ee2cb5e73932752ab31ce6aee4a5a3b7a68767f9c1b5f0274693a140c3911fff7fd4a5587814861010cf0fb2 SHA512 bed74ee91b86e61bb2bfd02293a2590d0b5b9a7171c794c768970dcdc8cbd004ac6df87a63cbc9f5f6d1d2372e2960e29d68586b84a077275b61dbf80608a365
 DIST genpatches-5.10-183.extras.tar.xz 3868 BLAKE2B 4f42863c501d8636ee3d991f2e434123a891446182dfd5c45482e8aa439675f62db9388eac0ab00683001d7a7ae49f576968912a048d4e4a947a5e20f2830ccc SHA512 8c2229286e958d1d88c9d93dc3e6d26d98e91fc67f7040d0a96d35b89da8f15d11b339372a3055eeeb448352372cde839e7fc6fbfb0600d03337d224af4a8178
+DIST genpatches-5.10-184.base.tar.xz 5117468 BLAKE2B 6e8e0781f40b520377a2ce331cf46e9aa5aa41423b49283ae7dfcb727bff4adeb54ecc3cda91a31af36d05a1681c7ca5fc28b58a7ecc93a9b909f55436b9a665 SHA512 9b1cb8aa0f9f576fb8944ecad5cd39c97e6a9b9a97b7c80c9c649ea6590be522f393f2f363cbdd47471d6e5abcc469ee166adfc4d3bcc254207f26bceda29181
+DIST genpatches-5.10-184.extras.tar.xz 3868 BLAKE2B b3fbf5c425fc23d0a80eb7a738b3fcb3c4cd0948c103a2db42f976ebf9ca04e3c10606bbc29dee8816c9812d962aa648a729dc6887ca780adbdbefae1c62b696 SHA512 d1e3a5feda8d135685164bfaef15061751c0ee90e2f66cf36e0d2756a02cac0927f5ea5cd1ad15debc6788978c2afd2f883fc5fe7cc1b7e13200d610d1dd591a
 DIST genpatches-5.15-102.base.tar.xz 4041416 BLAKE2B ab6ac9c8d03d41594f1f3c0b59cdeb3d045fdc0bc89926026a7b3f34eef38a869da1c9adfa1ccf465486f885dc4abb6c8d09a8c36f2732bb961b365a749e8985 SHA512 2df353c92659d8f41a45bd3caaf33e21542cb01ab210495a632e65fe71e8bee7c31ae7283827bc7e0683737f3a451b617db95b5a8b559cedc8296496e2fa3302
 DIST genpatches-5.15-102.extras.tar.xz 3936 BLAKE2B 4069a121383a58eedd557cfe3c421ca8c033e4b7a976845c557b3faf66b33d9efc6c7b3d4dad20cdeafb7d62588a4c49bb7102abfbd7acb1c98b1afb86e8f87a SHA512 b12c07aa5c9974856482f44ecc39ae03f7ec8879d07bff562d56b0c18752d748455b519f7bd53cde5f22df1787c15d52037ee236c1150edcc20416b9c6c1e272
 DIST genpatches-5.15-107.base.tar.xz 4209440 BLAKE2B 48fcb9a837d9f13ffa96194e2ec2209decd2d7c50a8d18ce4dadcd15f720496f5a82b821788bc20631b6ca4679cc3f93e48beae4a0c1c515747086476b5c1d5d SHA512 e66a46e0460dc940a021b37f673953d527d87c92f323d3f49d891339bc0040de492193e7415589b47b15ba37fcb05a7c1aeac31d612904afefaf2f748e1ec173
 DIST genpatches-5.15-107.extras.tar.xz 3932 BLAKE2B 59b1279051d08009a8c6e15c5083d7056f7eab8b5beed72dd3421631e9730c7306ce7cae8c3c82f508db261c2a4b2076a2c6c7d3a5fe98419b240e87a0d1e636 SHA512 8897cf7b1d42fcb4a0a87417913c624dbc65b9ce5689dee3998b65cba54659e7ecea759c97f4993dca4b928fe7844e025aa8dbe54f5ca492d8f858fdeb9ba3d9
+DIST genpatches-5.15-108.base.tar.xz 4254892 BLAKE2B 9c13ebe3e3bec8bd90260432b8cfdcebbdbdeeb00d74a852a4dfc97fbcb3358c581ec38f50e03e1426c0d81afe469618015486f3edcf0d2fd4a3a7b31ab59f75 SHA512 2f259065760edb240ddbc43634f8db2e7cd6e399a2d3afa3e2f49219152e255c58a30ef27562e9b0ffb380f40fac16b327bf261be741ec851d3c2d562626ed5d
+DIST genpatches-5.15-108.extras.tar.xz 3928 BLAKE2B 544d4db829812206b568ef6167907b94515c69b2082954c1e842180f29b58792369bb40e1f62e6c882f9f6a805eba82cbd69ddcf0c1b8c11208f9013e68386ba SHA512 9006fedf585cafb238b0597b3892b549a4574d4188c1f8d2773dcb84ea62bb1511071a8649191a41f07132c74ada13f2753b23f72ff957899d0c7fbd3c1c4cb5
 DIST genpatches-5.15-98.base.tar.xz 4003192 BLAKE2B 79d4fb60a5192137571109ffaefdfba23ac589102539cdde89046f627f39e65a52a44a83607232b499509b8bb4c341e2fd26ae971587c9574d4ac87d8b220893 SHA512 946a7638d19d5fd610075520e529a6c5a47aaa433b7986493f62571a7dc541278013a5006bf1e745496e4eb98de44af56f61d23679c139a719a8d5bc20c9e734
 DIST genpatches-5.15-98.extras.tar.xz 3932 BLAKE2B 4e5dd4f8ba6d14764a6546cf7e64dffb3ddcc77678b7d96d2498917f30561792c904c635b0fce7191b7c0c65549fa769e89befffbea5e53a3cef64c673937c20 SHA512 337d95159432cba3b85511cf80c350a8a2f67c65b72a90b26ddc98c01d2d8de70d9b6067e0573c5c339a5bf64973d10c06b42001ee19a7add3d672e4577d0622
 DIST genpatches-5.4-236.base.tar.xz 5467512 BLAKE2B 5c2ec5abee963eda0373e04d4f0da94d7e49b7a1fdc05f7a2f7cafba61771124503f1294289f79629afb62075855c176887f525a95a73bef4247b57915dd4877 SHA512 0a3ba2742ab21407ccc9060f37d528cdbe64dade85927aa1908613221973f14765a78ef6a71e157a71defcf1ee9158ffa1c2e7c082f508fc1140792e2311a073
@@ -16,14 +20,20 @@ DIST genpatches-5.4-239.base.tar.xz 5520768 BLAKE2B 9023bb6baa304282c516ae3d8ecf
 DIST genpatches-5.4-239.extras.tar.xz 1812 BLAKE2B f16995331f57d04a5e92164dcb09eab416c56184d9df7546bac597f25614af08053823f3877dcb4ffd54253ad610e9a8c39818290ffde145c3839041ca79fa7e SHA512 c0f6e320892485d8806efc553bef45b9bda7f35bf357af562136d6f10d41c2dcac767595902f2084ddce9ebce9dcc1952e9e72833b79b396dbf398a66017898d
 DIST genpatches-5.4-242.base.tar.xz 5610464 BLAKE2B 54d7c2e11a6b21ed8b16d26a56ffd392f35b82e1bd4548f65c40018ee6607eaea37d791734a31abb30ee061ac85089fbaede39f1ac35c2b0f48220f266d2db17 SHA512 cf7d24286d88319eb872f14c3907956c1ef9e0cba4d1a86e740e9eba3a450a2060c1f03d519ac49ad97e9afefb2a32fa7e77790387819c4d60d15039c425ef28
 DIST genpatches-5.4-242.extras.tar.xz 1812 BLAKE2B d2b8f6655e540964c1c6fd81a5e74bc2e7001bf86ec8a7e8293b2088ae24ce4bd41d0eb5097011a2c9669b9ff479bc828c2f8425924c920f35193d466b4dba58 SHA512 8d76a855216ef7dc89babce2d35a7b6b58b641105c117e246a01a779396fdcdb6cbcf7b599683ecbfeb53df09504244cca5569b08b15a4fbe6b81b10d51c8d86
+DIST genpatches-5.4-243.base.tar.xz 5625924 BLAKE2B 5f0df2acaa454f6544e56ed23017ee39e085c7145d5acd6ec696c603caed7732d4858b0dd06b39438df3198edf69f598d42a3a62b5237a9a39e50d1e5753580f SHA512 36281506b470556bf21d374c3570cbf804429978c000634dd0b3904fa97d0b107fea8fdb4177b7a2d8d217bde32e7d05165730ee3823002fa8c7dd5bd5ec170b
+DIST genpatches-5.4-243.extras.tar.xz 1812 BLAKE2B 41f15599d6e24946a023a349a572a89bae06ea2171bd23865b65ff418454da58b9b36c4df8676ac60d74291f6f243a4c25ac58148da5704c567073429382eb69 SHA512 f89dee9b5bebd46a16c7e2f6e543d1df1aabe0f26c6232c8c8c9e62bd29b205bd65f7cb103baefc21f33da3556e4e0fa95ee25bc4b2eb26b655417bc1cbdeea2
 DIST genpatches-6.1-14.base.tar.xz 774040 BLAKE2B 8e0866c762e2711b766cc75630d66c7c46221bdc47357a903c7e8506ad122b7b5ba84d102b19743d236ac5579b44d24f77b9f52f3c23695ab6a279cf7875e735 SHA512 6a753146013baf0b94d83abd690118517679d4d7dcf6e9f86cf8de35e24f80a792e9c0692f237098671c316d046d6f65f8d3512255e572daf6a8ca81853beca0
 DIST genpatches-6.1-14.extras.tar.xz 3804 BLAKE2B 7f016579b130c9a4f7a8ec946254dbd682f22e5654ae777d11b265dafe2b177a4c40c5a979a760a5bd6ed3dac057b90a3120c60b958f6b748ea4731b9a5f1ea6 SHA512 2807d359459dd11b9d3356fcac609dbfb8487e8c924cc543ef37698667b1c8b74cff7b015839ca0677cf1f96b566e0b5018c057b517275886ab500cd2ca49653
 DIST genpatches-6.1-18.base.tar.xz 833216 BLAKE2B f1b86487c82d4354347171df635192a6276a4d0a9561a415270a85caa46401e4b9089f847346cbf441f8c6a4d4012234d83b31fca5797cc6296010f225392990 SHA512 155207127c1c58b2497788d5b7541ba1872fefea3d2c7804356e5bb6d28dae2f0400dbab44cf39b847f89e7a058710b8528059d75f0e92b63d3d37fd0a515ca8
 DIST genpatches-6.1-18.extras.tar.xz 3804 BLAKE2B f31c07ec6318b91e6e7eabeb62bc28af362fc097297b31521d464e298effbdf52cdb94b43a1811fc10ea3dc9387fa47501c4987d6709d73603ed15ac7949dd92 SHA512 8611f8cd72f54b7c4360d314eabcccfaa99722f568da32710a39f47ffd1770b14502130be5ce3d3a14a0bd93fc9fbb73f65a9c9636a8d0e9051892d1e5221ef7
 DIST genpatches-6.1-23.base.tar.xz 1114724 BLAKE2B 35cef45469a4e42a736c5e94529a211dfc1b60a44e695243d4b936e85933efd685a6e8617abc4b20cd42f736979bda6b85fb66fe33f1d48ebe2cb53fb672a913 SHA512 c7cc6f174e7b1b3c5036b4861da9c5b5110c6857c4bca2585bc4090e84382688fe785ae23c3383246682bcf807368a31793921e160882a1dad5b929501c1001a
 DIST genpatches-6.1-23.extras.tar.xz 3808 BLAKE2B 328dc3054c6ce8f31bcef2d682301b7b9b06a6d8b3ae96adcaf187cc6bc85561dccd219bfedffd4171c3e8df9ce998d4e615bcf364223afe8e268198d3a9d403 SHA512 74e378f6efe8fcadd39e29aaec0d0cc3b2ae8edf909f06a0395a2732d4af1337a966490ff3986237f98086a8779deb1fa980506fcd6385061742187b9bb89da6
+DIST genpatches-6.1-24.base.tar.xz 1155780 BLAKE2B e6be4766ec5aba82d12d5209c1ac86b013482c2c1d40a9d5f72afa0f86555816c859795db9fa229415dc813e8b35851c98f11d17884d3e928684827b6c434778 SHA512 5e0c17ed36ccfe2d926e835a74b283ad40a21fdab33220c82c9e87ec2cbe17c3e6cc356bb62e17a1ca12901bd56694819708af438725c67b68c142c64f0a938c
+DIST genpatches-6.1-24.extras.tar.xz 3808 BLAKE2B 31803bf14b9c85373217e5b25fec9c401103b7ac996da14ddf03c69331b6073d6aab4c5c85241454fed43b559cdc6ce1be09c0a61315e79e9482907253e5fe4e SHA512 d5035bb0d8e99597e61a8939842a765e592db6133e923985268bfd7f69c512f5ed2cbf97c7372934794e103309c3649b3da11cbd26d4ba19464fdfc96f3759b4
 DIST genpatches-6.2-8.base.tar.xz 378352 BLAKE2B bfdf83b6ed486ad759f6021e48fad9b980a87ba5c54c0f06dbb2af3dccc79b41c7065d5a3a11933d761da759d9b33b314c456b458c9c65f49de75dd2cd4402ee SHA512 48521d82fbb2475b7a477bcd87dbba073f6c72cfde784adb77e9b92c44bc1fae188179199aee9face7bf53538cc5f2cae491173da686a54182579d69585b54e6
 DIST genpatches-6.2-8.extras.tar.xz 3808 BLAKE2B 3bb072914898f6f80f3ceef2ac92d44b3dba7aba6232febd7f7ad48232a2d76c3de4414a0822d0c7d45f632f02441e640a0911fa38a24ca88373807e04806ed0 SHA512 a4c3ca924859b487463b20fd470c2f157e404c0380cc8721d9a9c787519b1471c88f72daf57398d0c8582ec966bd9939c2082ad3b3cd71f93b761bf4443f3a35
+DIST genpatches-6.2-9.base.tar.xz 419680 BLAKE2B 9c206118605a2da947feb5b7e4b5c0a022a8f88936af354679ea50fba6f7b99b27794693ea18b7511feb5c46ef9d7cfaa55a1d426d6181e977c73e8c41a5343e SHA512 ccc911b481597853d5ce05fb8c2e2436c1d67a30f567ceb219cc724f5ffc311b7e6a3c13c66ed964ca9d314ab9f00bcd27ea7f078260956b003c59de903c6e6d
+DIST genpatches-6.2-9.extras.tar.xz 3804 BLAKE2B 77458946a2f0e48de6222a91dfbc6393d04e453a7cf3015bbf947265dece444ee7457a60620ca8c580e167a500a33d0e7c886668a3424ca10ca023f1fa99db4a SHA512 7b01d4b89004fca27fb589a23e04068ef330f61d44cc0f6897bcb260636ccb7b0a26becddf20f5c069e9ea00eb084e17a1a549881d87c63851913a386537daab
 DIST gentoo-kernel-5.10.167-1.amd64.gpkg.tar 66293760 BLAKE2B 86933f7a1da3888fcc8ce67602b49afcb22e442bf125eac3acd0e15169832cc16221603cdc95f7d343b0885329dea59613f551f77dbd64be92e991ce07d8e26a SHA512 c267a31e2800863fbd2fe3b1ed5570cf36263764df53845bc25762ebee49e268e9175b4f5d61d4ee67a4132f9af3e5d360b0426f4c350140d301506c0341215a
 DIST gentoo-kernel-5.10.167-1.arm64.gpkg.tar 59351040 BLAKE2B f8e0ba24eb686e38704fce1c296c978105f953b801ada73eb83f03f9dcee542d223e23e103281035e1e7f78be2bceba52616f84dbc998fc391e6ed136b6ea9ec SHA512 5d373fe35cee7142af63fac61282d2e71e5b9c80bac7c03ac3987a058aee7ac4915bebfab02cc995ff1344070d158a83d042dbb6573fe0bf5d13b9656e60f07d
 DIST gentoo-kernel-5.10.167-1.ppc64le.gpkg.tar 54906880 BLAKE2B 85f324ca7221ba94b2fddf364b3e3b2f2e95549453f9b5d938ab6f711a4bc719559ef8f4e9b6adf259e7864877b888ddf09f5c22054164f098abfc0d2c71556b SHA512 b4cacbdeb21ba0d1f72afbbd321f696aab71c150fd936e0e365c45df2d4fb7bc35e397fb32c788dbed8f45275225560e0bc894c724afcf23ae5dcf9bd507f897
@@ -36,10 +46,18 @@ DIST gentoo-kernel-5.10.174-1.amd64.gpkg.tar 66355200 BLAKE2B 31420521f1091843dd
 DIST gentoo-kernel-5.10.174-1.arm64.gpkg.tar 59351040 BLAKE2B 6bc84035984561e569d61b33dd5c5c9a5ab265539403eac4d298e8766a261c47183b83d46fec4bc637d7769dc242570185e2a49f6e170e87ae1b0bf935b4db58 SHA512 b667b83b3f0b2448609e5a1111da0b56b09df8cf9ad6a6f02770cb11d2505d01d363c3fb9d4fccdefda052332630fde5abcf7a7f15d331ede2141502e8e510a4
 DIST gentoo-kernel-5.10.174-1.ppc64le.gpkg.tar 54927360 BLAKE2B 1c8b8f31a695c5c59ffed474513b17654fbbb50bc0302ff5b7da31b08c835e995d98d603a87fedaf14022cb236963156ab8a2d2d24de2e25ee3ee40ae3728546 SHA512 01bc32cd6c832bd9ea53ad096e4b6a6666c662a88990d8dcf72a44d2ba4f0c65e5d3df08e2071c510b76a42d875195aacf699116249b1b8bd6b7b85242725f69
 DIST gentoo-kernel-5.10.174-1.x86.gpkg.tar 56442880 BLAKE2B b19ef77aa8f2e3fc56046ab0a060e6a86b4558c279e9af0f323bed13fb20c23a4e45b82822cacae9216e6be1cd403447bcf240f6d9490393746dbc36e806e8f6 SHA512 a05b581a86b2f0759b0bb6327e8dd9b847d71971a923301bfec925bca6cb93ee915369acf825af5dd03f24f12d651453381d3e571835978b2565a734dd5d9bcd
+DIST gentoo-kernel-5.10.175-1.amd64.gpkg.tar 66344960 BLAKE2B 7dfea339fe1beffef8dfceec0ee433f3f42431dc1ad4878d0f2c534df914bc7e86776aa52ad5037aca96b953277126e76c6c530471e415a01edeb0f50bc8188f SHA512 9d61855872c3883e641f0c620e4a3017e9ebd5e3c9fee411b3d7f1d6a204e9069edd2ec378f69c34b35e8c28c4a2ec514eb8094eb463f48e8c7871ef65febbef
+DIST gentoo-kernel-5.10.175-1.arm64.gpkg.tar 59340800 BLAKE2B 406eee035d6fd4e4104dacc935c8738f2c302ba39b6c9f765700a31895e88fcac0fd9faaa02f4261576fe31d518a974ca2c3a40efdc058d119f881084cc6cf06 SHA512 1bb96637b48f9524105b4e6292d54808d8a71cea75c2daf5a83ab97d3fdc2bb0bc1a3cb9d08c623c8fe52afbfc2815d4916a7e5021b454a65e52b0e2196754d0
+DIST gentoo-kernel-5.10.175-1.ppc64le.gpkg.tar 54917120 BLAKE2B 93d28d976d8929ab473488b695a6ffe69dfeb033a27a1ebd9511c1eaf22b22c52d28b2eb3c2b344507c5379718a1ff95b9aa49aabb28419afbc1fd4d81fec2c2 SHA512 e59b2e0ed6d7fd8a084f0d5e15e0f2415e344ee5a2f5566f062712ea19adc2ed41f99d7bcc459fbaded2ba43183965cd0a98898337535a9a597ee3532c4dca78
+DIST gentoo-kernel-5.10.175-1.x86.gpkg.tar 56442880 BLAKE2B 0ca2433b87f7ec0e3bc5530b973495608dded3a8eedd42e618d02a1012d36a5af20c32b1ff4cf107efd0d211c640a1a1199537a35fb37c4d1e63b039fbc03346 SHA512 75a4a4be86114de89197c6f1a5c5a5133ea0812522f4414cd2dfa946232925d2369141282d8399cbbf626c130068142f9f80f709dbf0bead3e88b28dc6bb4bf8
 DIST gentoo-kernel-5.15.102-1.amd64.gpkg.tar 69632000 BLAKE2B 7214665a176b2ae00dd2ff77164b531b690aa971935e4a0c12506d94755003b367e89036c0996c75b5727625db1d59af71881bfc2e82a324f111a95bda5d753b SHA512 b7449349cbf086577bcda85b6a7218b80f2c01b761b9d3480fce0f4890548ed5bbb7a65cbc649e398e830e750cab763f00c0b0c8ce48c53dc31f0073e3b72086
 DIST gentoo-kernel-5.15.102-1.arm64.gpkg.tar 62576640 BLAKE2B 8ff724481bdc3a80baed7ed61722e8e872721fd071fd505d8fd9f829818a93a92a8c2848cb50abe95d82ad621ff5290adde5850af2cdc32c94e72ebf8e0d7b1f SHA512 ee49caa42661510e8b7fe2208cf01c4beca0b2a3ff5807f4cb0d2781b9fe81df1573b303ebaa0bd22bc7a00039eb98355af33790f6aa4e459eb9d91c8557d116
 DIST gentoo-kernel-5.15.102-1.ppc64le.gpkg.tar 57088000 BLAKE2B 7ca0d0ff5c67beec55020af7c6ab03e4aff67e527f8fc03d4cbc414198dddaca69b5c150f1cea41f93bad6432a492f61be6c3bd70d3503aec363bb198f9c2f13 SHA512 1fee94830c9e81a516bbb317cce689174a48416be6a4bc1872dea15fe63acaedb97a16c01e25c9408d97c4dabfdec31b29306510c97294947fdd879e1b8d6e56
 DIST gentoo-kernel-5.15.102-1.x86.gpkg.tar 59176960 BLAKE2B 86ad78f9da70e7d59d9056f5ff6a50d93208551a7d836257807236cde2b19a372888ea11b4ca979e58378e9b384ce7d2c4171aa600500d864568c59a1977256e SHA512 a454a95fe5e42167cda1f61cfc9129e27834f78d59342aef1050a8ad92571438d638aeb554b937ee44e9f03278698582eac6c641f57d856fe74e33c0ce2b944a
+DIST gentoo-kernel-5.15.103-1.amd64.gpkg.tar 69632000 BLAKE2B 868bfe44cb45e1631f8a58dcac7e97cbdc7481c28a43fd7d01352e60c8731a076ed6675db4988cfa561566a64d80c835c4c8aa6eaba7fe02e10b7ca64da3f83a SHA512 bf3135ab9d7c90ca3b203ee39c7719c2c92f7cd16d1abf2c568e2fd6f467808d9ee952abb51af6dd840acecdb723228460527f319ae5128ded99ae6db3fd9ce9
+DIST gentoo-kernel-5.15.103-1.arm64.gpkg.tar 62576640 BLAKE2B 44a4c1e32cb409d3a8df8e40c3714634558187b4cf197513e1fce46293c463c36fcf2c39134309d425e5f14135af36c3e8e6d4796c0f44d3b28e7792f94892d9 SHA512 dbab04ae6b9ff38a76f15fdf96aa4bb50ddca7a27f70cf648d73f2073cb939bc8cc89bdacbe8c96cd0ab58e0eb469cc082ceb80110a390ca4d6d0979f29a5d14
+DIST gentoo-kernel-5.15.103-1.ppc64le.gpkg.tar 57108480 BLAKE2B 4d4dca697f57858dde3b136f1a86995f98786e50b60a9ae7a808156f7c31209c70a75847bea6714e395d4de5a2bdc9dc60283e118cbe266644e6f0ce1cf6cfad SHA512 df583612064b049391cdecd2b57c642786bb7759580c3a2f89c02a9847fdd0c0ba2b9305af8a7ae15ce2fadc608ec072efc781cf73c7de201d8f6d3a7288d295
+DIST gentoo-kernel-5.15.103-1.x86.gpkg.tar 59176960 BLAKE2B 5a310c42fcfd81fd0ad4630dc0aca2623966176833e47bbe448234c6289ab22b3973373f6d28ddcf2fe8721965ef3979bdc9da268f348288fe6ff6efc764bd98 SHA512 d624ab43f9f79b620d34591051749293ff03ebd2aa218f60552bdece75fcd7038c0e5f61f8f8d7d8ac72fb3b9506df0b7fa1caf24b85fb4a1f23aa9d5941fb90
 DIST gentoo-kernel-5.15.94-1.amd64.gpkg.tar 69591040 BLAKE2B d8659c0584ae851b05d933fed2a94f05eb8c93591b07ae77b8160d397fcf69d2ea8819cbdeecd294d3238377a4450789c653012a9e50223ab98aa5a229a98f11 SHA512 72bdc70aa6c8e51b1896b5872d9bea372305866509a34fc4ac99cd88b01d191041d02c18a0499b03d119b79499825eb97d105460968ac96848274b8fb8175f13
 DIST gentoo-kernel-5.15.94-1.arm64.gpkg.tar 62556160 BLAKE2B fc2122980f798c1313913adf8a28436906ccdd7bb565166ffc5039fa66360b2a7ff1c2e97d579c85cce4dfa6fb471f92d973991998fd4b2a2637adda55130921 SHA512 9f8566bba0bde6ede619a9379e8acae7d3cb1364c888509755cabf0c64daaf3d93ff0085102a2301b0d5c38aceed44e609947099ea9d9d32edb1f04e3b0ae54f
 DIST gentoo-kernel-5.15.94-1.ppc64le.gpkg.tar 57088000 BLAKE2B c5533a6a4842a765346270addc6ff1590ad60ac5df94be8ac0b3209098ee058e09d54d61d8c639bc09e652cb38b179257b62eb33343adad53d5c7d076c5b852e SHA512 4c4385f4b4a2776e67c95d1be5f59c1f00e312dcab740a07344a9118716f574f97064032c93e7b1c4ef97b9ce29efcfbae598297674f4768c09b787b5630db4e
@@ -60,6 +78,10 @@ DIST gentoo-kernel-5.4.236-1.amd64.gpkg.tar 60497920 BLAKE2B f5369c5daba253d93ac
 DIST gentoo-kernel-5.4.236-1.arm64.gpkg.tar 56524800 BLAKE2B c0f3befb350e1cce8d5c09d27bb5713597cd887b94d968b2e72699b83b427347aebe1d2e5a38dad22b7d44d0aba948a853f223339caa6ecb055fa26a37dd83de SHA512 5616bd9ff8d0e91fe799acaae47fa0b7c201a04b7dc32b6ed807bed206e3847e275ee8c9e578ae3e705c047abcc5ad232bcdb888a7f0e9cf3d0a4a7c5bd6c591
 DIST gentoo-kernel-5.4.236-1.ppc64le.gpkg.tar 54231040 BLAKE2B fae905cae9e4927c58970ece0a3925d629d0cd21076f728403431acddc2c67b98f798b74595384e2a85191b9f5ebc07fbc428e387079b6b1b862353e6e47c3fb SHA512 a80dc6a5c1839db75338ead8e1678b1aded80a0d935e3495076c8cfc3cbdf6dc51e655aadb92dcdcb966bed374a80d401c0289a9898da3081feb379e1fd3cc66
 DIST gentoo-kernel-5.4.236-1.x86.gpkg.tar 52439040 BLAKE2B 08d7bfb6ac39b40ae1709a4a40e1da20af8fd656e28865ebafeb0c011b926de3e595e5da9596f1804ae47266bc5ec7eb3084c2468b55d74921bddf15e27bb9fc SHA512 dcf9a9980123d3325c31ab88f05eb67b8e78cd5d0f4c89930c86ffc43fa5e92fe98c9b5a1c581e83f3df81a41caece02d4892910bad2f3619bcd4c529addcaa8
+DIST gentoo-kernel-5.4.237-1.amd64.gpkg.tar 60518400 BLAKE2B 50185bef959d7745868fe2946efcfb6982ab76fe5bf5287e967096fca85dd316f7a304a2c0777c95f51ad3d9122063496cb11238121f87b192538246aad00d88 SHA512 8cd867428d09a0b7c31f4564a91278449863ea6df3c15e958a12f988106a8d39e2981aac645d79120cb39ce58df53ebc245dcf4f46b6adb80881bc84ce2f3c45
+DIST gentoo-kernel-5.4.237-1.arm64.gpkg.tar 56514560 BLAKE2B d4f044c8dfda07bb84dffadb5f2c03a9707ed20c76472e197fc2c291dcc1a32df04454cdacf5244d454c3a517380c852d127d2ff6e71d77f5b7a567956893f8d SHA512 17e338fb9beda3791ef97ef914924d7fdd03871bfcc3c60b86a8f337247295991b8b483e0440441f25880df9e40824e6a6017687f8a7078f88550f571d9777a3
+DIST gentoo-kernel-5.4.237-1.ppc64le.gpkg.tar 54200320 BLAKE2B 4da74599f94ee77ea2958ab71dcd6c4cc3acc5929973ec5fb3af449bb3a7d5387028e8d779bb0cb99b256ef3091fc8ae0680e9537f08c0d8fe7e78b1f941aab1 SHA512 5e561dbe9bb4d56c581a5237d2ab89dd91b39317cdbd9dc005b31773beef1ee0c37e946a5920ce8bb0558911a974f7f2acfe4bec4d0c96b59005870512dec28d
+DIST gentoo-kernel-5.4.237-1.x86.gpkg.tar 52418560 BLAKE2B 5843b7999ed938a993f5511811f6dbf0d34514bf7c455ed7be03fa595a6c4bf2f68e7bd0bdcf5026fd0b1de6fe7709caa514dcf4035ced200dacf69133daa50b SHA512 21c3c84f54a63b1a83b716c682ea38d5a0b110466f037a7f5fc6f57a27c4bb8db8787e698acafb983bde52251d6d7351f38e1e4eef97327b0f51bd5c371d438b
 DIST gentoo-kernel-6.1.12-1.amd64.gpkg.tar 76759040 BLAKE2B 2f2e485ff705b26fa3b1db861acafbdac6362151e30dc73cb2829fbf871cc022641cc15cab82e0d19a25c720f84b6382b74c02d34f658a0cde90a267160f3af2 SHA512 d67fd7cf59df2e648bfdc7543995d7f46160d708a2fdd172002fc94d81d4b1bf1b1870754a6d5223a3728484170bbc6f5650c845dad27aab45da8f9f9eeb9232
 DIST gentoo-kernel-6.1.12-1.arm64.gpkg.tar 69447680 BLAKE2B 83f5eea4ca23eb6e79fad8fd746759982fa1d7e6cbd4cd63d43901aef9be3e7eeb64864f6538bdea6efe2486d13a37042a5533825f924a2af393fe0f66db7a72 SHA512 500abfa834826bc3ea7bc97c1b8991e68e72edb8c69ddb316621ff3029bb7962d8c8cb34e73f71ebed2f9db4600b5bf03f925953f67ecc6b46e9db5f35c265fe
 DIST gentoo-kernel-6.1.12-1.ppc64le.gpkg.tar 62781440 BLAKE2B 5a29a7f274f8b3122209603fc1b05ec7940dfaa0bf9dbcf658897b99203eb091d74f8df8dc9a7fec4b2bb913695c7d78650d062d4b58ade48598f2cbfbd6ff58 SHA512 edef917a088aef0b6ec572f678febfcb448c64f70de39697e01be50855e81fc9f3638d432c98ff75bb8963ecc25bf783ad9ce7752cf4705f875415feacda9974
@@ -72,10 +94,18 @@ DIST gentoo-kernel-6.1.19-1.amd64.gpkg.tar 76625920 BLAKE2B 70fba952a43951ac9e83
 DIST gentoo-kernel-6.1.19-1.arm64.gpkg.tar 69273600 BLAKE2B 5da6f74318181d4dc0a5ae602e0ce60812afa8ca98e0a31716cf6d5fd5b827184c8d0c0a323af01a854a1d89b9b78f1fd8fe0c3e88dfbe51a45c52653fd4b4d1 SHA512 7238789a5fa481a61fe5ba7af576e4a056744b069b984b2293de5f81b7c18381befb7d3043d446705a50f14136cab7c23ac13ca7a322483e645b5bbb5e79ff3e
 DIST gentoo-kernel-6.1.19-1.ppc64le.gpkg.tar 62699520 BLAKE2B c66e2841c011e9fbd0cbe20d918caba803bde65df4e0666d654effe9ee13329d3578967cc2d73ea7b0d7d26eaaefb4c1034ee7aba75f14f61298b9ac31881a29 SHA512 a8ad202ac6d97d3aa9e64b428178552ddb6368899bb7474c97de250f72db7b3a99afaff67054249acb547d7f8febc7e29f48bd0cdf0e0ac0c6b8da6e943e25eb
 DIST gentoo-kernel-6.1.19-1.x86.gpkg.tar 65863680 BLAKE2B 2c8f33ea60fe9e05142f23c6899bd2d66f6d438ec5d13d26c62ec815a7f97fff37e68f9ae308f8ce7dae609a06bfd8e984bb57213596c7388c2454b7ff27e730 SHA512 8b7951da5fbf8a88be98e5489c74b453b5cdb73dc446c7f6406591f790f5f294630b3280b7385f17c97801394b10247fb59da5b959229b01d1021bb78a833dae
+DIST gentoo-kernel-6.1.20-1.amd64.gpkg.tar 76656640 BLAKE2B 4c4a3cb54d6cbc4576b79af5605adbaf5443ded418f35c9e0e1365f7f3fce702fe2b7e91e4ac6c83c47c2396247ed6b0fc2a48ffd4fe35fe83f8da2462234327 SHA512 4c2da7961ef5c2cbd81688d338584329e14e18adb75b72d5d26d62255e208c41c02eb1cafce89b13005c436669f3259338f746b0e22c6d5d385945c794e4eba6
+DIST gentoo-kernel-6.1.20-1.arm64.gpkg.tar 69294080 BLAKE2B 474e147b0e42854e742956b474e13825ea667b3b98abd1eb3f87a038c2a9c9c9449b3e4b06a4cfe6a5318e7a0e85c340e5f373c70d3a92ce663f8fa8a7178b8e SHA512 ff7afedd909fd0c0652a4f42f3d72b5d35c64edba592669437d30f63839cfa8f95706289ea82de585b41b08fa2f47613a33f4b491b265bc7013bc428cf228f68
+DIST gentoo-kernel-6.1.20-1.ppc64le.gpkg.tar 62679040 BLAKE2B 08df3b9613477efc2623544d27f473d5a2bb9fe62f769ce1dba3b5525873b7f00030f1324fc5c78a6cbaf8f4984a1f55004c753a540e8f5aee5b9e70cf2db6cc SHA512 94fa1b6d4b3046053d28fd79d8074ed0ba18c84944424c276d00a72ba83144d41c0ad6023f367be6b05067fa8b38f22eff5db90b7930883cdd6f430b028a2b0e
+DIST gentoo-kernel-6.1.20-1.x86.gpkg.tar 65863680 BLAKE2B fcb2ea60541f3f9d1dde5f4f6738b3d81adb167f4aa79d47677d112ddd452200c1c0319bc39d9017d836e166ce19e7fca182ec5d2eb86f8d0cf604ece5f9931f SHA512 2f3deb92d791a888df6620c567d73ceb913a0b3cbea9d48de661277e253d814a0774c51d2df88349434df4b8a33ea94755b198c19e2a6258972874c500e62c5d
 DIST gentoo-kernel-6.2.6-1.amd64.gpkg.tar 82411520 BLAKE2B 81b3141ffff9af51265d94e5fba03365f0ad203e00b1cf5d609caf6c7fc04717cc8d4530cfbd0db5cf811473c5e4fc4ae6af51e54bac46d4a55d5aa965baf826 SHA512 c5ad329e56bf1151effed1289a65646f83e116f545934a08757358451f94462177e8c0a7eaefed86ef9ff3ae8ab1e842f77174ebf4d92f4e9fa0c6ee407ba8c4
 DIST gentoo-kernel-6.2.6-1.arm64.gpkg.tar 71628800 BLAKE2B 12bf704c287aa5854d6952fd1945325174b9353bc8a5235d557fc22af6d0601836a3f86895d8ad3aa956594664628555583fdd54c8f0a7bf9367ebc8ca09ab46 SHA512 313a4122005a9e77509e9ff7bce97f32b31c3baebf6fea0e1c52ea131ed44242392b237b33dc9334f8307185c959a6bae4f22c673ab5d212b2f21fe693627d77
 DIST gentoo-kernel-6.2.6-1.ppc64le.gpkg.tar 63744000 BLAKE2B 81b079534ee172c8710c0177b595bbca8a9d5d48b7297ea6e3111ddfd7d55b4887591a1848a9f831414c317465337131e5fc12d7f9570b8f31c16c137bc566b9 SHA512 d8e7d7dbc1243054fd7e5a3501e74b93f49ebe5577501a41f329f87d8cd743e78c5a7894eb746bb5f3bf1efff1825ab81840e720a01ecc21c7e87cda9deeee7e
 DIST gentoo-kernel-6.2.6-1.x86.gpkg.tar 66140160 BLAKE2B 04b0cd2cb030c427a2f62e08939858d1bb4fa7cbefa0560ef5b11af219baf7210e86963e47b19a9fb2422ce2d1b9c496646a41f65dc016936746360683483593 SHA512 36a54d41c51ff83bb4beb10f3f6b9e1c23e360293b0a35ae32cf6bbce87121060600cb05e0f2c4d66008764370469f950586512fcc9a04f104905699862a7e50
+DIST gentoo-kernel-6.2.7-1.amd64.gpkg.tar 82616320 BLAKE2B 36ff2a06c60bb31b081f46677a8bdb04f5155a3b841e5f8bb69c74dea23ce71133cef89c48d4f42210c03eaf9c1adf5e4d021b7e47ecd00494db71ea6305e889 SHA512 6100afde24c8aa9c00fa31bb7652038b166031d1e658a65822e4ff1701ebb46e4542d844ed68f352e48875d6148169525b9d7de0c1308410bd2033eb6033660f
+DIST gentoo-kernel-6.2.7-1.arm64.gpkg.tar 71792640 BLAKE2B 2d7e2d43309da029b4c33b62487fea8c4e1d9973999d34981f5cc1ca847bc4d72848cea8c29397b8b14925bd85a1aed32a0933e57f6c90b1eb09c87fa41786a5 SHA512 16fb1aa2dabc97fb2427a358badf191ff6f245c8f595774a98c93c70cf569c0ff549ddf9a9462b91ee875d3a389b7770a99e434d26a7a5be0342abf11409f5b3
+DIST gentoo-kernel-6.2.7-1.ppc64le.gpkg.tar 63907840 BLAKE2B ced502ebdf9a8250d766b9a9b748688ba6bdaf1a3d571c473f25ef6c87ff9852cffb0b350a8988e001b17a365659de8ae6ff840a3d6223c46570becc7581e544 SHA512 9e388d2be16e094758919cff16f06e6b82a01e4b05324d2b8085f5d10618320a8730ea2516992a68ded4d7d053320e7c03b3c82ee85729827125ed33d0900c97
+DIST gentoo-kernel-6.2.7-1.x86.gpkg.tar 66293760 BLAKE2B 4f6dc7311df2471ff4ebc18e92dd0c74f7b8818ee42c16912d931541f4a1ff17378bcdf6b7a87c1675eca4768b300252bcf8af9406fccea62365c512c0fd7230 SHA512 214d931da41171e781d46582ebece5de1491a4eaed6be93c2d1f5e778d0e0f878c411a93edde1ca0260d58a9bba31e7c13abc2861be6086f58ac30e587bd2cf1
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
@@ -84,14 +114,19 @@ DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7
 EBUILD gentoo-kernel-bin-5.10.167.ebuild 3024 BLAKE2B 5c9a656c167dbe2af9c96a69319075b0583d84c9b552b5be2d67de160375a3fc7abfaf75b71e893a01b7b403b7501d5f128aa63392582156af5ff4cb70643c5a SHA512 e400bea4b00533a52321fb68dc8960238c48dee0a60041cee59c6ddb03b12b45808f2cab06360b4bd2113bf83db9642145db315424b7192b0caf136fdab24eca
 EBUILD gentoo-kernel-bin-5.10.172.ebuild 3028 BLAKE2B f09e5f0570fd0166abc54b10b93433d1068d4f3a4713cfb6857697532f30b6e2a1df8d4afd66eaa665f4bd2023205334900392f020c62b0574c87a119479bc1a SHA512 e6a6510263e9cf194b9336e26cade4b76f190e1765b7000be003203f4e23fd2b2d64b645e37c0c69a35ba93c3a2e9c5e6f6b9d14eedc1b506b3b68debcf95911
 EBUILD gentoo-kernel-bin-5.10.174.ebuild 3022 BLAKE2B 4d48610cede329301e808448d1f9843c29d1578a7dca1a8a96b6fa71826bd72fe85689ecf93204abf2453eef80c3ed0e4e1ce9fb9b4299091785a265f3ca441d SHA512 b4f9235359fe3cef76c704c2f7740e7ee679297af4c8707c7f49a0b498dcb1a3e85b42918cc748cc924ebfa638c430b86b4189fe4f98b91fa81248979199805b
+EBUILD gentoo-kernel-bin-5.10.175.ebuild 3028 BLAKE2B f09e5f0570fd0166abc54b10b93433d1068d4f3a4713cfb6857697532f30b6e2a1df8d4afd66eaa665f4bd2023205334900392f020c62b0574c87a119479bc1a SHA512 e6a6510263e9cf194b9336e26cade4b76f190e1765b7000be003203f4e23fd2b2d64b645e37c0c69a35ba93c3a2e9c5e6f6b9d14eedc1b506b3b68debcf95911
 EBUILD gentoo-kernel-bin-5.15.102.ebuild 3022 BLAKE2B 91e83910c65893c494d6c520d110909b7ec7ab6760790040ec72f582ff54d7046f84bd56b87f9cd75f3ca7e21c65366138fbe12fceefbe300c775147f4243d91 SHA512 17bfced63a27091cd9817d5b715e8332f14c1856ec5d42c77c63a910062ce3712e8ca19f28f70c2951d64c449b43bb0f78c073bdd32073901bec67efa3f1096f
+EBUILD gentoo-kernel-bin-5.15.103.ebuild 3028 BLAKE2B 7a28cc5643a1c6afa3c2b48437051b5d7de8badc5cc4ac25f6703f2bdbea58b42b008195b7ee4ef086eefdfb11c0296af9b8ec08bcbc559ae559ca96bf9a9214 SHA512 729a5fa238947a2495106e4a6b4f56956fac9bc86e37f14667186e282fb15effe2555bba128bb3d664378609cbcf962e2a80a7700ce9ff3ba87eeee996a252a9
 EBUILD gentoo-kernel-bin-5.15.94.ebuild 3024 BLAKE2B 900a5622d9b0ecfbdd3d51d3b7673332107be5af36e211db5663e8edc6dcc97b96648b06cbaeb3cf5ca2e467e4da30748eec6ce67ae3367328ceff7f207adadb SHA512 8a95fbd8ee9d36da9bbbe28823d035eb6bce287aba95602c75c0dee5ee2d92a765c547f9f661f4eb7b331ffe0012beedd42769eaa02340e5b376b3e8f3305d3c
 EBUILD gentoo-kernel-bin-5.15.98.ebuild 3028 BLAKE2B c8314539c6ea447c8645bc304bfcf6cfa99398ad38f6106dc2fa6c9a9a759ccd288646b95f77a2e9a3e9ec2ab045ffd1544a70d9060096a0e04a91ecff46ad42 SHA512 22fbd6a7597f0a6b489e6e6cace828fa7df95cbffe48a6c79b7a4d568c2e79f7ffa7d8bc717fa2746015b0e4da295f446c6d7f20bc679fadf7d9ee6574921e2d
 EBUILD gentoo-kernel-bin-5.4.231.ebuild 3024 BLAKE2B 999b56ddd10be1eaa056b5512c6fe05f17a9e8f6aa73e9d21d4c4e83e5544d3b410fce745805b970ca6f5e5d3f437f7b259360626d0d45990f3132cd142b7a08 SHA512 c76e3fb597b62966b6758f73b85328bb7433ebc53621efd5545c9befc2fa8623e11286c09dd21e7aa551d1106ee5eede2a55f2c33fa264637c84b7fa9a9c64db
 EBUILD gentoo-kernel-bin-5.4.234.ebuild 3028 BLAKE2B 7a28cc5643a1c6afa3c2b48437051b5d7de8badc5cc4ac25f6703f2bdbea58b42b008195b7ee4ef086eefdfb11c0296af9b8ec08bcbc559ae559ca96bf9a9214 SHA512 729a5fa238947a2495106e4a6b4f56956fac9bc86e37f14667186e282fb15effe2555bba128bb3d664378609cbcf962e2a80a7700ce9ff3ba87eeee996a252a9
 EBUILD gentoo-kernel-bin-5.4.236.ebuild 3022 BLAKE2B ece41a24ba16392ca18ce78f30a34271483cf7dedec661bfea44e3465ca088210d0b42663b0fef33da08d8f0d790b1edce361cf015d1222f37140d0dab1d19fe SHA512 47e985f1b5455c5c1e8eaca422434f114ba0c729bf90848e999f04911bea6607e40fbacacf78a6730cc868791bbff0a8622679219a4341dfedd8b0fb370594df
+EBUILD gentoo-kernel-bin-5.4.237.ebuild 3028 BLAKE2B 94411a7abace3ea829d8f84fe2c686d0dfadff2df738132f100482fc9d35fd3825f76f097c78fb62f1bdf104b2211f821b42e4c6cf7de577d750ad484888ff8d SHA512 0a6de15c86162c97f6cc3dffb63f373654d5310ec269b5d67f7725898d1994e8101826923e68b140d3ef5a81ec6ac0a67735e76a42d493196038805fec00035f
 EBUILD gentoo-kernel-bin-6.1.12.ebuild 3024 BLAKE2B 48491989af83df66e5c0eb06e54948863f8f7259d31645b21a8455cc360eb139741d39e4776f6e6de79c14935937c651b4c6501de283166fb2a096575e9bca69 SHA512 bfbc21a42bc824f80d405285348c66d8241ad960c5ca70e10037dc16e71b4edef480769d9245a0d04fd40f56231293d81b9479114d41db395cde4a94dab8f070
 EBUILD gentoo-kernel-bin-6.1.15.ebuild 3028 BLAKE2B b075f6b0c35cd169c3fe25a5f2dcbc6b543a24c2a61d77fb5857ac22a9c4bebdd0b6696f7b630726f021c5f0a73431520df4cb97a1e8b5cbf34e2a4165bfad0b SHA512 39cacd7455bfcdc240e10f8ed7a21009ddbf21e65879f22e6b48dfdca4163a8179f7cb529a29e8f4f4d823da1bdd93ad9d8ca12712e05e526d74d755aa84d0db
 EBUILD gentoo-kernel-bin-6.1.19.ebuild 3022 BLAKE2B 0c5e2db2ba2ed3a113cccf888f07bcce6454f7c8a6884c3cb8160af38827c3d1efc4e37c5a3afba037eea50739b94a67052cb461b46c70f69316db7047ab1c0f SHA512 5d9f3198efa0c1609d9e6872121429ea5b935486b87a8f98aabfc369a07444732e6baf229efe33b71b708937084344fd806efc4b8285adcbc9a8f0dfb9ee4613
+EBUILD gentoo-kernel-bin-6.1.20.ebuild 3028 BLAKE2B c8314539c6ea447c8645bc304bfcf6cfa99398ad38f6106dc2fa6c9a9a759ccd288646b95f77a2e9a3e9ec2ab045ffd1544a70d9060096a0e04a91ecff46ad42 SHA512 22fbd6a7597f0a6b489e6e6cace828fa7df95cbffe48a6c79b7a4d568c2e79f7ffa7d8bc717fa2746015b0e4da295f446c6d7f20bc679fadf7d9ee6574921e2d
 EBUILD gentoo-kernel-bin-6.2.6.ebuild 3026 BLAKE2B ccdc93b658f86586a658b0d74e948109e2d43b09e7af261eabb0ffb49111becb2ced35741408acfb42f4e5c89018c3e666705893592402bb87c9b23bf52e5d42 SHA512 126e399c4fe32e1439bb59a87afc89b559419cfc4878bb1e5be1678f251234d406262c7ba54e28b1f4ab56cb70384dcbe209c50bc5a10b5a5ecdb79f98342fb8
+EBUILD gentoo-kernel-bin-6.2.7.ebuild 3028 BLAKE2B f1a8609dc0df691418f250273a84d7d645ed2c84f3ec70d4bdf494938b2305053949c31dc1ca1020d602de2ecc66a5bf0a231205ecd5c1fc500d80577cab7071 SHA512 c01314ba4cdad6a38de547bf178cd75d2c3cd5b8ee732bf60facda3d1ebdfef371fc1bea1603111fc96e36426996ff247150751f6a23f67dc1eaa688910f2f56
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.175.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.175.ebuild
new file mode 100644
index 000000000000..8f6c357c55e5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.175.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.103.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.103.ebuild
new file mode 100644
index 000000000000..64a82c2b8323
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.103.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.237.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.237.ebuild
new file mode 100644
index 000000000000..7e040c8ce69b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.237.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.20.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.20.ebuild
new file mode 100644
index 000000000000..27016e1b991a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.20.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.2.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.2.7.ebuild
new file mode 100644
index 000000000000..ed76d510db0b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.2.7.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index b2cc62580a87..65f40557030b 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,8 +4,12 @@ DIST genpatches-5.10-181.base.tar.xz 4964488 BLAKE2B 2b05c676da465b1627c92400f12
 DIST genpatches-5.10-181.extras.tar.xz 3872 BLAKE2B dd1d27a04cd2215fdf9ae7301d6c90dd0a1e9e4ffe7e295dfe2d6b637de69303d9cd2a00a5adeb33d2c4cc7d984e57e69bd9f998df1da188ae006511fe70302e SHA512 b91ec330f3f87bf7ec5cdc10e6352070161d38d09fea82142b2dc475a0a25d176a262cc0bf24d4a4902e84abea84f6263c3e859f1ebf8f44155e42c5f565dcce
 DIST genpatches-5.10-183.base.tar.xz 5092416 BLAKE2B d4c674fdd2891051748ab33257ed3dd1e85c7f15ee2cb5e73932752ab31ce6aee4a5a3b7a68767f9c1b5f0274693a140c3911fff7fd4a5587814861010cf0fb2 SHA512 bed74ee91b86e61bb2bfd02293a2590d0b5b9a7171c794c768970dcdc8cbd004ac6df87a63cbc9f5f6d1d2372e2960e29d68586b84a077275b61dbf80608a365
 DIST genpatches-5.10-183.extras.tar.xz 3868 BLAKE2B 4f42863c501d8636ee3d991f2e434123a891446182dfd5c45482e8aa439675f62db9388eac0ab00683001d7a7ae49f576968912a048d4e4a947a5e20f2830ccc SHA512 8c2229286e958d1d88c9d93dc3e6d26d98e91fc67f7040d0a96d35b89da8f15d11b339372a3055eeeb448352372cde839e7fc6fbfb0600d03337d224af4a8178
+DIST genpatches-5.10-184.base.tar.xz 5117468 BLAKE2B 6e8e0781f40b520377a2ce331cf46e9aa5aa41423b49283ae7dfcb727bff4adeb54ecc3cda91a31af36d05a1681c7ca5fc28b58a7ecc93a9b909f55436b9a665 SHA512 9b1cb8aa0f9f576fb8944ecad5cd39c97e6a9b9a97b7c80c9c649ea6590be522f393f2f363cbdd47471d6e5abcc469ee166adfc4d3bcc254207f26bceda29181
+DIST genpatches-5.10-184.extras.tar.xz 3868 BLAKE2B b3fbf5c425fc23d0a80eb7a738b3fcb3c4cd0948c103a2db42f976ebf9ca04e3c10606bbc29dee8816c9812d962aa648a729dc6887ca780adbdbefae1c62b696 SHA512 d1e3a5feda8d135685164bfaef15061751c0ee90e2f66cf36e0d2756a02cac0927f5ea5cd1ad15debc6788978c2afd2f883fc5fe7cc1b7e13200d610d1dd591a
 DIST genpatches-5.15-107.base.tar.xz 4209440 BLAKE2B 48fcb9a837d9f13ffa96194e2ec2209decd2d7c50a8d18ce4dadcd15f720496f5a82b821788bc20631b6ca4679cc3f93e48beae4a0c1c515747086476b5c1d5d SHA512 e66a46e0460dc940a021b37f673953d527d87c92f323d3f49d891339bc0040de492193e7415589b47b15ba37fcb05a7c1aeac31d612904afefaf2f748e1ec173
 DIST genpatches-5.15-107.extras.tar.xz 3932 BLAKE2B 59b1279051d08009a8c6e15c5083d7056f7eab8b5beed72dd3421631e9730c7306ce7cae8c3c82f508db261c2a4b2076a2c6c7d3a5fe98419b240e87a0d1e636 SHA512 8897cf7b1d42fcb4a0a87417913c624dbc65b9ce5689dee3998b65cba54659e7ecea759c97f4993dca4b928fe7844e025aa8dbe54f5ca492d8f858fdeb9ba3d9
+DIST genpatches-5.15-108.base.tar.xz 4254892 BLAKE2B 9c13ebe3e3bec8bd90260432b8cfdcebbdbdeeb00d74a852a4dfc97fbcb3358c581ec38f50e03e1426c0d81afe469618015486f3edcf0d2fd4a3a7b31ab59f75 SHA512 2f259065760edb240ddbc43634f8db2e7cd6e399a2d3afa3e2f49219152e255c58a30ef27562e9b0ffb380f40fac16b327bf261be741ec851d3c2d562626ed5d
+DIST genpatches-5.15-108.extras.tar.xz 3928 BLAKE2B 544d4db829812206b568ef6167907b94515c69b2082954c1e842180f29b58792369bb40e1f62e6c882f9f6a805eba82cbd69ddcf0c1b8c11208f9013e68386ba SHA512 9006fedf585cafb238b0597b3892b549a4574d4188c1f8d2773dcb84ea62bb1511071a8649191a41f07132c74ada13f2753b23f72ff957899d0c7fbd3c1c4cb5
 DIST genpatches-5.15-98.base.tar.xz 4003192 BLAKE2B 79d4fb60a5192137571109ffaefdfba23ac589102539cdde89046f627f39e65a52a44a83607232b499509b8bb4c341e2fd26ae971587c9574d4ac87d8b220893 SHA512 946a7638d19d5fd610075520e529a6c5a47aaa433b7986493f62571a7dc541278013a5006bf1e745496e4eb98de44af56f61d23679c139a719a8d5bc20c9e734
 DIST genpatches-5.15-98.extras.tar.xz 3932 BLAKE2B 4e5dd4f8ba6d14764a6546cf7e64dffb3ddcc77678b7d96d2498917f30561792c904c635b0fce7191b7c0c65549fa769e89befffbea5e53a3cef64c673937c20 SHA512 337d95159432cba3b85511cf80c350a8a2f67c65b72a90b26ddc98c01d2d8de70d9b6067e0573c5c339a5bf64973d10c06b42001ee19a7add3d672e4577d0622
 DIST genpatches-5.4-236.base.tar.xz 5467512 BLAKE2B 5c2ec5abee963eda0373e04d4f0da94d7e49b7a1fdc05f7a2f7cafba61771124503f1294289f79629afb62075855c176887f525a95a73bef4247b57915dd4877 SHA512 0a3ba2742ab21407ccc9060f37d528cdbe64dade85927aa1908613221973f14765a78ef6a71e157a71defcf1ee9158ffa1c2e7c082f508fc1140792e2311a073
@@ -14,35 +18,45 @@ DIST genpatches-5.4-239.base.tar.xz 5520768 BLAKE2B 9023bb6baa304282c516ae3d8ecf
 DIST genpatches-5.4-239.extras.tar.xz 1812 BLAKE2B f16995331f57d04a5e92164dcb09eab416c56184d9df7546bac597f25614af08053823f3877dcb4ffd54253ad610e9a8c39818290ffde145c3839041ca79fa7e SHA512 c0f6e320892485d8806efc553bef45b9bda7f35bf357af562136d6f10d41c2dcac767595902f2084ddce9ebce9dcc1952e9e72833b79b396dbf398a66017898d
 DIST genpatches-5.4-242.base.tar.xz 5610464 BLAKE2B 54d7c2e11a6b21ed8b16d26a56ffd392f35b82e1bd4548f65c40018ee6607eaea37d791734a31abb30ee061ac85089fbaede39f1ac35c2b0f48220f266d2db17 SHA512 cf7d24286d88319eb872f14c3907956c1ef9e0cba4d1a86e740e9eba3a450a2060c1f03d519ac49ad97e9afefb2a32fa7e77790387819c4d60d15039c425ef28
 DIST genpatches-5.4-242.extras.tar.xz 1812 BLAKE2B d2b8f6655e540964c1c6fd81a5e74bc2e7001bf86ec8a7e8293b2088ae24ce4bd41d0eb5097011a2c9669b9ff479bc828c2f8425924c920f35193d466b4dba58 SHA512 8d76a855216ef7dc89babce2d35a7b6b58b641105c117e246a01a779396fdcdb6cbcf7b599683ecbfeb53df09504244cca5569b08b15a4fbe6b81b10d51c8d86
+DIST genpatches-5.4-243.base.tar.xz 5625924 BLAKE2B 5f0df2acaa454f6544e56ed23017ee39e085c7145d5acd6ec696c603caed7732d4858b0dd06b39438df3198edf69f598d42a3a62b5237a9a39e50d1e5753580f SHA512 36281506b470556bf21d374c3570cbf804429978c000634dd0b3904fa97d0b107fea8fdb4177b7a2d8d217bde32e7d05165730ee3823002fa8c7dd5bd5ec170b
+DIST genpatches-5.4-243.extras.tar.xz 1812 BLAKE2B 41f15599d6e24946a023a349a572a89bae06ea2171bd23865b65ff418454da58b9b36c4df8676ac60d74291f6f243a4c25ac58148da5704c567073429382eb69 SHA512 f89dee9b5bebd46a16c7e2f6e543d1df1aabe0f26c6232c8c8c9e62bd29b205bd65f7cb103baefc21f33da3556e4e0fa95ee25bc4b2eb26b655417bc1cbdeea2
 DIST genpatches-6.1-14.base.tar.xz 774040 BLAKE2B 8e0866c762e2711b766cc75630d66c7c46221bdc47357a903c7e8506ad122b7b5ba84d102b19743d236ac5579b44d24f77b9f52f3c23695ab6a279cf7875e735 SHA512 6a753146013baf0b94d83abd690118517679d4d7dcf6e9f86cf8de35e24f80a792e9c0692f237098671c316d046d6f65f8d3512255e572daf6a8ca81853beca0
 DIST genpatches-6.1-14.extras.tar.xz 3804 BLAKE2B 7f016579b130c9a4f7a8ec946254dbd682f22e5654ae777d11b265dafe2b177a4c40c5a979a760a5bd6ed3dac057b90a3120c60b958f6b748ea4731b9a5f1ea6 SHA512 2807d359459dd11b9d3356fcac609dbfb8487e8c924cc543ef37698667b1c8b74cff7b015839ca0677cf1f96b566e0b5018c057b517275886ab500cd2ca49653
 DIST genpatches-6.1-18.base.tar.xz 833216 BLAKE2B f1b86487c82d4354347171df635192a6276a4d0a9561a415270a85caa46401e4b9089f847346cbf441f8c6a4d4012234d83b31fca5797cc6296010f225392990 SHA512 155207127c1c58b2497788d5b7541ba1872fefea3d2c7804356e5bb6d28dae2f0400dbab44cf39b847f89e7a058710b8528059d75f0e92b63d3d37fd0a515ca8
 DIST genpatches-6.1-18.extras.tar.xz 3804 BLAKE2B f31c07ec6318b91e6e7eabeb62bc28af362fc097297b31521d464e298effbdf52cdb94b43a1811fc10ea3dc9387fa47501c4987d6709d73603ed15ac7949dd92 SHA512 8611f8cd72f54b7c4360d314eabcccfaa99722f568da32710a39f47ffd1770b14502130be5ce3d3a14a0bd93fc9fbb73f65a9c9636a8d0e9051892d1e5221ef7
 DIST genpatches-6.1-23.base.tar.xz 1114724 BLAKE2B 35cef45469a4e42a736c5e94529a211dfc1b60a44e695243d4b936e85933efd685a6e8617abc4b20cd42f736979bda6b85fb66fe33f1d48ebe2cb53fb672a913 SHA512 c7cc6f174e7b1b3c5036b4861da9c5b5110c6857c4bca2585bc4090e84382688fe785ae23c3383246682bcf807368a31793921e160882a1dad5b929501c1001a
 DIST genpatches-6.1-23.extras.tar.xz 3808 BLAKE2B 328dc3054c6ce8f31bcef2d682301b7b9b06a6d8b3ae96adcaf187cc6bc85561dccd219bfedffd4171c3e8df9ce998d4e615bcf364223afe8e268198d3a9d403 SHA512 74e378f6efe8fcadd39e29aaec0d0cc3b2ae8edf909f06a0395a2732d4af1337a966490ff3986237f98086a8779deb1fa980506fcd6385061742187b9bb89da6
+DIST genpatches-6.1-24.base.tar.xz 1155780 BLAKE2B e6be4766ec5aba82d12d5209c1ac86b013482c2c1d40a9d5f72afa0f86555816c859795db9fa229415dc813e8b35851c98f11d17884d3e928684827b6c434778 SHA512 5e0c17ed36ccfe2d926e835a74b283ad40a21fdab33220c82c9e87ec2cbe17c3e6cc356bb62e17a1ca12901bd56694819708af438725c67b68c142c64f0a938c
+DIST genpatches-6.1-24.extras.tar.xz 3808 BLAKE2B 31803bf14b9c85373217e5b25fec9c401103b7ac996da14ddf03c69331b6073d6aab4c5c85241454fed43b559cdc6ce1be09c0a61315e79e9482907253e5fe4e SHA512 d5035bb0d8e99597e61a8939842a765e592db6133e923985268bfd7f69c512f5ed2cbf97c7372934794e103309c3649b3da11cbd26d4ba19464fdfc96f3759b4
 DIST genpatches-6.2-8.base.tar.xz 378352 BLAKE2B bfdf83b6ed486ad759f6021e48fad9b980a87ba5c54c0f06dbb2af3dccc79b41c7065d5a3a11933d761da759d9b33b314c456b458c9c65f49de75dd2cd4402ee SHA512 48521d82fbb2475b7a477bcd87dbba073f6c72cfde784adb77e9b92c44bc1fae188179199aee9face7bf53538cc5f2cae491173da686a54182579d69585b54e6
 DIST genpatches-6.2-8.extras.tar.xz 3808 BLAKE2B 3bb072914898f6f80f3ceef2ac92d44b3dba7aba6232febd7f7ad48232a2d76c3de4414a0822d0c7d45f632f02441e640a0911fa38a24ca88373807e04806ed0 SHA512 a4c3ca924859b487463b20fd470c2f157e404c0380cc8721d9a9c787519b1471c88f72daf57398d0c8582ec966bd9939c2082ad3b3cd71f93b761bf4443f3a35
+DIST genpatches-6.2-9.base.tar.xz 419680 BLAKE2B 9c206118605a2da947feb5b7e4b5c0a022a8f88936af354679ea50fba6f7b99b27794693ea18b7511feb5c46ef9d7cfaa55a1d426d6181e977c73e8c41a5343e SHA512 ccc911b481597853d5ce05fb8c2e2436c1d67a30f567ceb219cc724f5ffc311b7e6a3c13c66ed964ca9d314ab9f00bcd27ea7f078260956b003c59de903c6e6d
+DIST genpatches-6.2-9.extras.tar.xz 3804 BLAKE2B 77458946a2f0e48de6222a91dfbc6393d04e453a7cf3015bbf947265dece444ee7457a60620ca8c580e167a500a33d0e7c886668a3424ca10ca023f1fa99db4a SHA512 7b01d4b89004fca27fb589a23e04068ef330f61d44cc0f6897bcb260636ccb7b0a26becddf20f5c069e9ea00eb084e17a1a549881d87c63851913a386537daab
 DIST gentoo-kernel-config-g6.tar.gz 4562 BLAKE2B ad9e1b28f84916f12cd8b21feb2f4396d3d63f4cfae3e6b6fe93f919c98b0b4523b205711ab7acafa7121360f696eecb63b9f162dd12950e56dab1429cc13633 SHA512 d180122eb00d40126ea7d79224559904eb0ea574314f9a8d6be6b10f0f6a49f526eba1366ae8cd0a4fe23cd8ff5e292c8cab7e856a2c915d4162b75a03f8076b
 DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e SHA512 2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.6.1.7-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 DIST kernel-aarch64-fedora.config.6.2.0-gentoo 255134 BLAKE2B 22dacbeb2f2f3a403bf1e3d777701fe5fbd5fbe41974b28774a1e0b3543e3e21821e60d8262b3034409a365a446e4289d18572c96cd6e05f471ed38a8106bf74 SHA512 59dc1233dfa82c5a9a5831070504ddcb3f4a5b4f593ae14315dd42c66ddc069cdc4674a93cb740b50e8b271afbbe6e2a2a2079f83f8a9f217ee57b75e2a433dd
+DIST kernel-aarch64-fedora.config.6.2.6-gentoo 255386 BLAKE2B ecae61e292a9491cadb63a7709c790d25cd74baf4ba8a2b6259105e40e3b6d19a786e032a7f2630c9d6167e1d41a1e42de723a93982aa0087742b40ef29e09aa SHA512 676752fce91f936b12eb079c0d9ebec52ac0b7c1ea2862311faccba83057d64ab8184e30c7d1839c951ba562aea2d5c9eb3f5d98eab87b780f8d15b3c4921e6f
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.6.1.7-gentoo 228053 BLAKE2B 1b06ca68465d7833905b6236a6ccf9a594f44613cbd102990c1667c1ece53ad982fa3abbfe475333e3297331ce1cfadf27c00c3e7de6293e213278e8ca97cd3b SHA512 1ed70eb5254a04d99d28ad901d4556dfa7e8ec8b739a0a33040315718effe9348e75ca8ac19d3b33fa7b3dcad9b4bb0531075692087c0dbe57ec6a4d873a4b27
 DIST kernel-i686-fedora.config.6.2.0-gentoo 229541 BLAKE2B 67628f079713119b54d57664ad2c94f08c22d3a476ef872f473b2898c27a54a887e73a468285dc4636268a4d5572f21bc73bc17e14b57fc79028ac75f3ffa239 SHA512 d13f7a446722309ac2a687b864bddcd2406d56826801e2e8c8f695b492713fc4d60c66580875098200332973eaea6c59a74301089b43837aa9c0c26f33cb4a09
+DIST kernel-i686-fedora.config.6.2.6-gentoo 229782 BLAKE2B 454a08b67638042004303e08b8106f46270dd73092fbc6da0251d84251e23dbbc6d608b95c48cde8d0d18ee7ecd202374e8295ebf884e616b307254728ad57e5 SHA512 950def3dbda61e6b35f32454e6230144e32cece797b78d9fd0a0afdb4a1c1a55e6f7c30ce3ad9bb5316ff6c95263711a2be6d6c69c5303d62a3cfdfeaf7da391
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.6.1.7-gentoo 218278 BLAKE2B f4dda4430e9801c4660be4bbf6e4b37052e720656e77c928adb7176ff3dba55feb2fe66dd564d41a181809488941cf392ec9c94d786e4a3d813fbe5d683d305f SHA512 a5e12ab1045fae61b494938047cf1c2a3c34693d3d242968e4ab564a012c70e6d232b9d5333347f5ba114a64bb59dd96919b38c5a1327fb8c5154ef40ad28d2c
 DIST kernel-ppc64le-fedora.config.6.2.0-gentoo 220103 BLAKE2B 19bc7f239aa97053d4f2944af9933e042e47f3e102cefaf29ab530dfc95aac6c89439e9b36488c990057c6ab95d44e40a9a3011b0aa7d412c54763323604789e SHA512 1e3d35bce93650601fb39eb5c43fb947f85c735f2a8626eb5a24ec0df08cd79eacf293efdf3ee0f836003d603a78cee2a0e721e8e7ecbad4fa007600edf09742
+DIST kernel-ppc64le-fedora.config.6.2.6-gentoo 220355 BLAKE2B 09646d6132365c5ade80db87953ce545213b8a88fcf4bd2efe2da42de77844f490bda18a0107087b28dcd57fece4332bea77cdbfbef9256c559f89327c784f09 SHA512 f6fbb4fb8cee616eebf3c18801cfab0cca0222e1ec91e10dc58e3ce44223de021811731be2d399ffa0e41f656670ddb1279517c0a3ec7cd5164c31226d8e0b7d
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.6.1.7-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
 DIST kernel-x86_64-fedora.config.6.2.0-gentoo 230214 BLAKE2B 8d636219434741ae3203e317179038b2febbb7e8b602b9ec1d146b9a731bbfb0e820372584d6d5099cc0b3600d18280e969944cf7a8de3add081e0b10cbb76b1 SHA512 94664bab5e3e3dd7f0240fc9a9656d187c6c9a53a1af93d43728571be92e12906d50c59741093e095318b3e9face63578b4ceaed02186bc9869a2de5203cabb2
+DIST kernel-x86_64-fedora.config.6.2.6-gentoo 230455 BLAKE2B 5fe5cce9264480d2cb733bedcf060327e01fd6f1665d00ded7dc414d6439f94d5af8e01b46c36a8cd864f62033cc34cd4b3fb4f35d8316d07ab3d38d8ceb93f2 SHA512 c1962a824cf2a9d5f1c98c153beb5b29641c21e3462e59e42380eb9cbbfc3fb65129bfb1bced0f7f699e15bbaf1141f2ad4245b8f76f4fd662d779e7e0d452a2
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
@@ -52,13 +66,18 @@ DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7
 EBUILD gentoo-kernel-5.10.167.ebuild 3659 BLAKE2B 06714ef1d3cd89626dc1f446ef14e79a94af94d53809a2ca62d3c549b39bae511576b7d682acbb3dd8ba3f34aad0a10a8c78fd98a80b851544c751f24b263550 SHA512 e87a9058c42858b22fdfb4f942b153cb9d67b471a301f18ff9face5baea447233265ac51348fe2a60e445ba557c6f4a2268806c5bf2e9013a6d6b9ac7202aef3
 EBUILD gentoo-kernel-5.10.172.ebuild 3663 BLAKE2B ff1886edfded2e3912cbcf2bf03a91fb49e40c0ec756dc81ba3db92654fd7964f79280f8423bb13c34a941f8076ef0a18d1df7d9d3528fe93ee7a1e4e6da25f7 SHA512 01039d321cef56eba69e15313301646de36baae97b3562bda002205950aabe22c90c1145256d60dd458893f76616474f5cdd5a75b8b52d33a9c56bd76724fe76
 EBUILD gentoo-kernel-5.10.174.ebuild 3657 BLAKE2B 6fd7e7ae4db18028e9299254f7347cdfcb95c8caaddfeb5f8b43a2b76c12c04b334e558a0ad423285305bc8db2837e916a0d34d56d92f7538127d72124aea0bd SHA512 6a39d7be91911bdea94e0d8b0431b0f8fb8f2052f43cdb181a461a255168b08f548b1000aec4a68ad6e9fdf002c97cf83bc4d12541bb81c72f146be639ecd0e4
+EBUILD gentoo-kernel-5.10.175.ebuild 3663 BLAKE2B ff1886edfded2e3912cbcf2bf03a91fb49e40c0ec756dc81ba3db92654fd7964f79280f8423bb13c34a941f8076ef0a18d1df7d9d3528fe93ee7a1e4e6da25f7 SHA512 01039d321cef56eba69e15313301646de36baae97b3562bda002205950aabe22c90c1145256d60dd458893f76616474f5cdd5a75b8b52d33a9c56bd76724fe76
 EBUILD gentoo-kernel-5.15.102.ebuild 3654 BLAKE2B b2b5a885f42e9b76bf39244d50fceef70fb1a4ee91f6560d5eeccac2d98040645157d54b6de9b773e0f7b583eb5260f061a1485f4e8aa63c12a3e2ec356ed263 SHA512 609e0ec003f96924548861dae9910bc3e40039c6dbbee95f641e3d563132b46aed3deabc3177a9a5335c75eb3e8ba7c03867765bb9da1ad1af27332147ce5f75
+EBUILD gentoo-kernel-5.15.103.ebuild 3660 BLAKE2B 8ecd2e65821a4d181f8c42e1676386820c59bdfa3d27b26f62114727e12dc2d58636d245f17954f05990dbadbfbddfb9c487731827f5eb311505c67b25152a52 SHA512 632bfbc9a13b6a9597765f0ce1c1d8f4d007f9ac64ec008f727fb374dd30677f93adfc452f9119b27dd2c2427b567214a68e1ef620b5f702f221e636b0965a16
 EBUILD gentoo-kernel-5.15.94.ebuild 3656 BLAKE2B 8e1294146a170f847975ff97b1fa1595b284464587d382520db41a71dcf1dc1e88f677fe71c4521934d8f9c9876e1028a5601117f1901778bc261cca66f74beb SHA512 c7e03bfe540745c24e1a9aec613f3f893fda34238cc390b02ee0e349c79a314e71ebebef0cbfa620adc4f4ec3b3db0f4f6a0b0e57bc65781ee5ac47e21c40ccc
 EBUILD gentoo-kernel-5.4.231.ebuild 2860 BLAKE2B d3ce0003d8dc6fb443e53055a786c7fb45881cc6b40fd478cfbbd5bb17fe67fc1e11ee4f8e2598d4baf4832136e61623e5291908d8e1a62a12f7a96a95668ad7 SHA512 a44124e8b224f17f9c60403b9fb5f98e16feb52846bc933f56d027a75d63a126424e94b598212d64a10e923cf1fba626442130a06fda2f61a951676ad8f233c2
 EBUILD gentoo-kernel-5.4.234.ebuild 2864 BLAKE2B 60a4dc88918721e8fdc979c64138ec081c4da7e01dcb2f89ab24a7b0b24ffc764030ba4b21a0bc04869509bfd6fdda910e0eb31e0b74ab1f3b3b334926de7643 SHA512 b41db6de60eaaf6a8e6b4d930699bf6731f6430b11403660041a439c8f709ed63234c2986f2c82e18f34fa15fe973201871b58f90fea8cf2a96cea81bd354756
 EBUILD gentoo-kernel-5.4.236.ebuild 2858 BLAKE2B 9ddb5263dece2f44972ce86318e90663a967aa29ef98a14510715a819cb16723c2bd5f08c07a7e38bb5b02292e81af743bd97016de36f7fce6f3d53b80813ea0 SHA512 6d86b60630b39f58d19e6e445d5627a7b781548cdc41c153a04a91d16649132878be718fb63acf77d99dc9b02c412982cb4de369305d2ca3cf30100a8abd6091
+EBUILD gentoo-kernel-5.4.237.ebuild 2864 BLAKE2B af5e66e47201b56f0eca771e8a4d4c2dc9b90f3523b870d042edfd641d85c5bea29ddf76a37ffe5a5e9a52ad8b282daf6edc2cc2ecbd945e4237a3e69d6914e1 SHA512 e9a813c604f9de9638d947c647751f76ba8a17a1e8cedf563942c0559af08695a67c51b8354c193a4350bf1e397228a03696d80f7a8dc44f67290037669a6a23
 EBUILD gentoo-kernel-6.1.12.ebuild 3915 BLAKE2B 1fbb00648a4976639ea7bb2876879465fe72675989991e981730657c741565eca29370ca8b3b9ef713840c9c18aa545d300533fb90ab09d659e4ecab0c169907 SHA512 4f17adaaa0da56f6c8a238d36d2b07b384b4ece4fd4aec5193b202524da58ace0821feae5a254bd445a179465374618acad273dfb55df28731bdd37b6c7c95ee
 EBUILD gentoo-kernel-6.1.15.ebuild 3919 BLAKE2B d0af04f3ff855b263afb00e61e2c03e0bd0e9a6820e246944a5d3cf8a614b13d3795d26e8bbc95f6b73bdc3701a67858eed0baab02d3ad97f81354e01b42858f SHA512 5f4803d5a8776dc5acd0513c532dcf810e0f3d19fafb3e5a4f0a4c35437e4cabf5966df9c9ffdca458be60dfa4cd23a72504d410faf5cffd7a2c0eaff1929e59
 EBUILD gentoo-kernel-6.1.19.ebuild 3913 BLAKE2B 9074f4fbfa53b1062287bbae9f0e458fab4747b69b72d33fd89e377cf00935ecf5777edca1cc0a547de6bd837dc33d776038a5355113e2d1b3d3b58454793860 SHA512 475c58ef5d111e92fa729ed90b7425cecad094bba1c02611539c17d6783b94b1cf16c00b1e8dafdee9401e37656f02bc0c661274c241edc58c5a033bd460a3f5
+EBUILD gentoo-kernel-6.1.20.ebuild 3919 BLAKE2B 64c9b54b79a6af1830e09c699540230a9592e6a0f1c1740616bb67558a21630ac9ab836cb15d0353f777523bf610e2f0c1c0e16955db7ee9343c85ddcb6100f8 SHA512 8bdf517026f34b3cc94e47a37a4624024a01482d51c734188ee06512b1ab9f4c7b1aced63df074956fe17c56f31290f802f9a8e0d435bd95df776866250494f9
 EBUILD gentoo-kernel-6.2.6.ebuild 3917 BLAKE2B 806d6dae76bc53f0ef696c90c99d1427495ed8d02ba54581d8a2f967b09b53c8d6e872c9202a8438f99c5799098097572ef9728b711b007aa3c57869251af378 SHA512 892abfc44c337aa0c24edfcef665b9d9a106c01cfd1720c8df7e26b9ba0285de5d188be66518df27f168135a963cdad5cbbea57a654d34819f42d68b29da06b0
+EBUILD gentoo-kernel-6.2.7.ebuild 3919 BLAKE2B cb715dc703a28905e5b51200455eeedcf9ff322e5cd2963485588c9ded95c5a11e1ebd0bec9cfb0ecf8b6e608e9f87ab6393e6abe458f695d382bfb6f244c9f5 SHA512 b5748a70552464cc6f1b724bf3a226f1f2ba661b33b87c8e382e9d54e3a94dba245aebafb7e52cc984c78beb56ef9c9c8359914970ae0873360aa29e2d13f016
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.175.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.175.ebuild
new file mode 100644
index 000000000000..5bbe99781a9f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.175.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.103.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.103.ebuild
new file mode 100644
index 000000000000..2749381783b5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.103.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.237.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.237.ebuild
new file mode 100644
index 000000000000..8c5a95ce6454
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.237.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g6
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.20.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.20.ebuild
new file mode 100644
index 000000000000..dd5577ddd24b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.20.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.7.ebuild
new file mode 100644
index 000000000000..31aa7cb503a0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.7.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.2.6-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 9f2d309f108e..274bf60c368d 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -16,8 +16,8 @@ DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST patch-4.14.305-rt143.patch.xz 243100 BLAKE2B 5c2018d24874ae6ba5868867d9ce44a3c4e3b50a2c4c265e311cd66b7934eb55ef738d66e8d464bb99f514f2e6b2cc6120daa91eb8206533a641ae10bd666840 SHA512 d2e68ff37977c3422d3b81430ad1e601ad8f0d544fe2e13a639f94636f20dbda9c44749cde0f12c6304d3d9da84d3a76c467ded8e06583005daf094ab4d24454
 DIST patch-4.14.305.xz 5022012 BLAKE2B c56cbcbad13922081496cea5ba7613352e195256eb247be570a57125c263506e73eaf34b6c0c85c3d6a8cae58f4ac5bcd3383601f0ac76c1659924d861b77507 SHA512 728f210c9fe167241cd466dfb289068b39b329659d16ffe9386a11e4cc2bfc0ba55f26e65e078adcf2a995a2a320476c0a9f3a0f838bb8daf48a1fc04f9a312e
-DIST patch-4.19.271-rt120.patch.xz 168236 BLAKE2B 6b5f68ab96f350fef7dff579a55c574b73230d1a8363a8f5ef39e56faece2a9fbbee2e9f1587c026bffcced27f8d5c8cc98a37716936ff4f3c67db2fd7d4be2a SHA512 f98e5e13b4759f37df7190849fd1f9e7c87e9a1f1e41219a12686fd969b4f0a34fa854f709226b5a2949f486161702ba92aa7b391538f42da8d77f50acf1c2d3
-DIST patch-4.19.271.xz 5011412 BLAKE2B 236a7a5b79e9b004b175df8e9ce62abc593d208af15692b577252535acdf7663b6b4c415604c2b0a02a3e2f03fadfbc4ed5c97b241d32c8756a0a15d954bfb6d SHA512 f2a0dd6e893bb4bb783776f6ffadd456818b1cb1bbba1c8c7abbe85102dcf708fa0c8ad8fdeb09ce80962f3290391fee8695b58b9c430c3e90958d04c20e658a
+DIST patch-4.19.277-rt122.patch.xz 168180 BLAKE2B bed6969bf730296c5d5f46e130778ae527cc2bc32284535301233933971c2c9e31a2035dd5c314e0b41832a7b90040b100b773d173dfccca30ac3a4b6640a33f SHA512 913708a103e09b1861e2538992ea69400ebc2291e3d125b5f2bae4461b4610c7565d7a10a533d5354591f51172b0da834ae6532ecf36889698596e551876853b
+DIST patch-4.19.277.xz 5169348 BLAKE2B 71d57bfe34376cdee263ad9dc974e302908c77f5337948c677619dbb230bc2612e81db394969c3af18593f0521805614ae01e1ebc21076a65829c855b4427392 SHA512 1db760d21f5485f5515814b55b1a0ad05a6563701008e19966e6efabb0cafa8e506b77fc17ef58f3d8d5adba973b197da8fe71e2360c350d99f546f30cb3e729
 DIST patch-4.9.327-rt197.patch.xz 169900 BLAKE2B 432b68f260db4970c3bd844a4d1a8709ceaaee86df6a77bd4be6260f53b1491f900cb63fd59efbcd55161e6c5629274fd555a05d97baef15bd68103194b2c6c1 SHA512 acfbe50962fb2fe6b215be10f076427161950098f33278bf5a51c3a28dd70203923e92b2a43b635fb2fe4fb791f4fd532eb4db378b094baa8abaa9fbfeaed822
 DIST patch-4.9.327.xz 4449004 BLAKE2B b48aa23af600cafe5117854b76105c9c65adf9f2f026927367781cd360c61c551b174d2ea73eb02543e626408b27bf3bb8cfed62d9c36e9bac6d22c7e1099a48 SHA512 d6a5421cfbd70ff20664cbf05f9c955f03b55c3e22306f7adfd87ed760794817fd7d2211e5d92b169df64d8578717a9250c7ea6ca312bf10287a7283bf66d0e6
 DIST patch-5.10.168-rt83.patch.xz 170464 BLAKE2B 75edc2e070f60ae7e7d77edb67a531495b63df29e94c29fd1c7c8c3fa32a79c272ec85a84d0ad586d26dbe66ccee2314ef44d300cf0d0ac098b1f332f7bad8dd SHA512 46f1d5c6bfb2b13a622c9980e7dd84771502e97d9ce564ef0144650fed9c55f7562ce9a73d29edc7767add40a24a04257894b00499e84dfb6102c01de14d35df
@@ -28,14 +28,14 @@ DIST patch-5.4.230-rt80.patch.xz 183116 BLAKE2B 4a28dfb2ac1cfa81a1d97a0b86e4ae7e
 DIST patch-5.4.230.xz 4519916 BLAKE2B a88f386ba71ce0d9972154644c7ec46b10f20fbf1760f1a7ca73afdd2e424985156f127974758bf4870647f53b9c341d56b625f56c51f584ab4156f0dc5e6522 SHA512 8686631fc84aa7f6650051cd3cfebec4059ef54f53a5f86c09d61129c67615a433daf5b443462b10bb93965cf945c6c3e431ec080c96388aff2626abef6f36f3
 DIST patch-6.0.5-rt14.patch.xz 59916 BLAKE2B be06477b7733cb280bbb8ab1cc2b4c611d5b133d97e2459877a8aac0c82a6fa74cba7a7640b49ba6dd9d0abd61a9f9682affb032a8b9f0097874fff35fea9b71 SHA512 3e36e45f16499ddbd7029723363ff4cf6e7cd9503ba49f9ce0dbb960b34855c8411abccd32838f9f162412b4a1749f676432e463fce8066496f256313c99d79e
 DIST patch-6.0.5.xz 274580 BLAKE2B b1fd53745b1858f92ded90a78d8060e1c916a8b6c256f96188331e5ac80242a40a83d14377ad0befec5415135925821cb264489cee63fe4ad432ba00c64983ff SHA512 c4ac4387c490e73b8d91d13fbea9a1e065be4bacf9535177e625561adb2411908a546f9c4327748aab6bbfc021f30887f3e5df5d6019c6cfe00fe5bf64aad2eb
-DIST patch-6.1.12-rt7.patch.xz 48992 BLAKE2B 803d2c8a275487f69eaa26305a650d658882676fb82547e5b7abbfa307c973365b8509cff8a76cafbc1d66d58dc338b9c298c42e5aee4acdf49e5bfbc3263b0f SHA512 3901e7ac84004815be723bbed10b6ffd2a32c98f78547e439478c8592c3dd518ad5e5c272586039392ac580a3775a031d8b176a961bd73add4bf69dcccfeba45
-DIST patch-6.1.12.xz 749796 BLAKE2B c382e0d30346fcf3325c51549994dca01fcb14b99b37986e97cc4decd461eec147eddd73d0d870862946737e44c628e1e6986ca48848fe0acc3b92e951ea79c7 SHA512 02a058eb50464e0819f5b05ea5d154d2e7a944cf590224c4f4ff07e4f57f9173962e1b04e1a0cb4a55795f4f66fb80afb6686c9c75bce435c8dfb2b733bfe21f
+DIST patch-6.1.19-rt8.patch.xz 48676 BLAKE2B d251b6440f4ad99ed65a1a02a99dd961cafecee048459db1a5a19703cdc05981f6cae1e748849657d7546d2332c90b7938b7c1f65b6f7b7f42422f113d7a60d8 SHA512 bf03d67cfd36080ce676369b76b7c592dee2a0a80b4bccdefee235d0e3c6906cc7fbf3ea6fde59182f16f5ea698ac3f6a3283e84d2555dd03c61c9a82107efa1
+DIST patch-6.1.19.xz 1073624 BLAKE2B 313596f43234b22af1964e06bfb66de653362040b04c33cc1dd79667e3ec33d33ded39245fbd71ae67c80eda6ac34d070f9e69fe450bfa4db07cdfd02f02fb1b SHA512 88b203ab038f85b6af418c4bad6e4fe2b95dd8f0039502eacb9203eb6fd5b08fb7f9ba668edeb912681db45f1fc9fcc923fd3670175683747516764f7d998598
 EBUILD rt-sources-4.14.305_p143.ebuild 1422 BLAKE2B fce4ffdda967dff1564cd13c9b05cf198b3dbc8af655bd1798e2bafe04fa4fa9136b9b0a8c45520e7d94a9b8391f2e8f1264172bf73eb460c6403efc2490b10c SHA512 f333ad7f5a2cb12941bc11027b6a8ce7765e9288cf35bed7e22ee47aebbc13a84eb590e3d9f3196b387a8687a69d5b2b62fed3497d61ef0c0270d136e2a143b2
-EBUILD rt-sources-4.19.271_p120.ebuild 1422 BLAKE2B fce4ffdda967dff1564cd13c9b05cf198b3dbc8af655bd1798e2bafe04fa4fa9136b9b0a8c45520e7d94a9b8391f2e8f1264172bf73eb460c6403efc2490b10c SHA512 f333ad7f5a2cb12941bc11027b6a8ce7765e9288cf35bed7e22ee47aebbc13a84eb590e3d9f3196b387a8687a69d5b2b62fed3497d61ef0c0270d136e2a143b2
+EBUILD rt-sources-4.19.277_p122.ebuild 1422 BLAKE2B fce4ffdda967dff1564cd13c9b05cf198b3dbc8af655bd1798e2bafe04fa4fa9136b9b0a8c45520e7d94a9b8391f2e8f1264172bf73eb460c6403efc2490b10c SHA512 f333ad7f5a2cb12941bc11027b6a8ce7765e9288cf35bed7e22ee47aebbc13a84eb590e3d9f3196b387a8687a69d5b2b62fed3497d61ef0c0270d136e2a143b2
 EBUILD rt-sources-4.9.327_p197.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8123db0cd5fcb4626cc5a60550ce1a9573631bfeb71de9018c9609efa95a29971fbd73e00217ad2b56a840efc6391bf045b04 SHA512 00aa2b9086b99ff329ff856457aef5cf6d366533b72ecd85aeba4d6b29afe19c986d17c12e4d40edbdbce52a992eb619bd5fbb6019519d2a192d7c31eac1d308
 EBUILD rt-sources-5.10.168_p83.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
 EBUILD rt-sources-5.15.96_p61.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
 EBUILD rt-sources-5.4.230_p80.ebuild 1422 BLAKE2B fce4ffdda967dff1564cd13c9b05cf198b3dbc8af655bd1798e2bafe04fa4fa9136b9b0a8c45520e7d94a9b8391f2e8f1264172bf73eb460c6403efc2490b10c SHA512 f333ad7f5a2cb12941bc11027b6a8ce7765e9288cf35bed7e22ee47aebbc13a84eb590e3d9f3196b387a8687a69d5b2b62fed3497d61ef0c0270d136e2a143b2
 EBUILD rt-sources-6.0.5_p14.ebuild 1440 BLAKE2B 3f21c1c4a224731b17de0ce5f62e3713f90e6df36e2e243fbff8308da8316737eedc275174771a8a6666adef069a74a3a6098e34868d0a99bb5d17526f7dd44a SHA512 c34766b92f4f8a8f16d17b63103cb2cca3cfc4d73d71b5284ff715a9759689dd289145bc5ddbaa62244f5e81db9959f54dd1c68effdda8d71dacb1636dec15b2
-EBUILD rt-sources-6.1.12_p7.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
+EBUILD rt-sources-6.1.19_p8.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
 MISC metadata.xml 426 BLAKE2B 89cc1d5f99d265e074847c32bd90c678e47e5a6a01706f3bf92211d82db4bf2d4397fb8dd62aa11bfbd25ab463633fc62a991d89e719ae0c5e608f1bafa0c3ee SHA512 bbed525e3e382d7fce0ac05a015b816b423b426fac03519d6c8f49a9dfa1b1c6035e9fc85d97198a680e4e0dc20af2f44815b3de7a0393b06d7ce0b5c0dd0145
diff --git a/sys-kernel/rt-sources/rt-sources-4.19.271_p120.ebuild b/sys-kernel/rt-sources/rt-sources-4.19.277_p122.ebuild
index 0ec82ff6dffb..0ec82ff6dffb 100644
--- a/sys-kernel/rt-sources/rt-sources-4.19.271_p120.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.19.277_p122.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-6.1.12_p7.ebuild b/sys-kernel/rt-sources/rt-sources-6.1.19_p8.ebuild
index 03c59e4fb6e4..03c59e4fb6e4 100644
--- a/sys-kernel/rt-sources/rt-sources-6.1.12_p7.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-6.1.19_p8.ebuild
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 79206b16a505..54c57ca2e2dd 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -7,24 +7,28 @@ DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71
 DIST kernel-aarch64-fedora.config.5.19.13-gentoo 246842 BLAKE2B 4a824d02999749a0404437cae28721576511e06a5eaa9ebb1b1479c74e2b54402c440be7ea9159bf304661d4baaa5381c36b266ac0bba0b9bf3820eb04c6e4e0 SHA512 8862cf24b177ef3871f118712ceace2b496b04a488b045bbe3d83ab22942f064995486f5534630321faaa96ce60e5f237c4ded24a5468bea6e365aa3ea9f09c4
 DIST kernel-aarch64-fedora.config.6.1.7-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 DIST kernel-aarch64-fedora.config.6.2.0-gentoo 255134 BLAKE2B 22dacbeb2f2f3a403bf1e3d777701fe5fbd5fbe41974b28774a1e0b3543e3e21821e60d8262b3034409a365a446e4289d18572c96cd6e05f471ed38a8106bf74 SHA512 59dc1233dfa82c5a9a5831070504ddcb3f4a5b4f593ae14315dd42c66ddc069cdc4674a93cb740b50e8b271afbbe6e2a2a2079f83f8a9f217ee57b75e2a433dd
+DIST kernel-aarch64-fedora.config.6.2.6-gentoo 255386 BLAKE2B ecae61e292a9491cadb63a7709c790d25cd74baf4ba8a2b6259105e40e3b6d19a786e032a7f2630c9d6167e1d41a1e42de723a93982aa0087742b40ef29e09aa SHA512 676752fce91f936b12eb079c0d9ebec52ac0b7c1ea2862311faccba83057d64ab8184e30c7d1839c951ba562aea2d5c9eb3f5d98eab87b780f8d15b3c4921e6f
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.5.19.13-gentoo 223571 BLAKE2B d56f8e019b0c58023b08ee358a9af46679ca0f734c075ba6cd65dd6e3277640c0b7683e5707c48f687644d815a3840eb58351c0dee84fe9ec1dcea525fb2e1e8 SHA512 0d9fa0592b6a9414f2967677c048a9e014a0e0d43274eea4fe10f8099befae7389bbcd033f4fb36c7c44bd30c2fb197e860151e27c10dc354fe9a86a8bb65e94
 DIST kernel-i686-fedora.config.6.1.7-gentoo 228053 BLAKE2B 1b06ca68465d7833905b6236a6ccf9a594f44613cbd102990c1667c1ece53ad982fa3abbfe475333e3297331ce1cfadf27c00c3e7de6293e213278e8ca97cd3b SHA512 1ed70eb5254a04d99d28ad901d4556dfa7e8ec8b739a0a33040315718effe9348e75ca8ac19d3b33fa7b3dcad9b4bb0531075692087c0dbe57ec6a4d873a4b27
 DIST kernel-i686-fedora.config.6.2.0-gentoo 229541 BLAKE2B 67628f079713119b54d57664ad2c94f08c22d3a476ef872f473b2898c27a54a887e73a468285dc4636268a4d5572f21bc73bc17e14b57fc79028ac75f3ffa239 SHA512 d13f7a446722309ac2a687b864bddcd2406d56826801e2e8c8f695b492713fc4d60c66580875098200332973eaea6c59a74301089b43837aa9c0c26f33cb4a09
+DIST kernel-i686-fedora.config.6.2.6-gentoo 229782 BLAKE2B 454a08b67638042004303e08b8106f46270dd73092fbc6da0251d84251e23dbbc6d608b95c48cde8d0d18ee7ecd202374e8295ebf884e616b307254728ad57e5 SHA512 950def3dbda61e6b35f32454e6230144e32cece797b78d9fd0a0afdb4a1c1a55e6f7c30ce3ad9bb5316ff6c95263711a2be6d6c69c5303d62a3cfdfeaf7da391
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.5.19.13-gentoo 213984 BLAKE2B 9abc1d2e03bb34908019dbbc4e54d3d176acddca6e7af72fe73461e60eb249486c4e8a81bfe2515849aa26939d9abef5e981deeaa55605b34bb59552cd3444fe SHA512 d857ce4178950a96ff029c3c9870211424e1c5e95dfef88d25d6d1d517493a6fd95d9d398f42b8a6cf72482b07789be38f674dd4a2b9855da57c8391b0c2708d
 DIST kernel-ppc64le-fedora.config.6.1.7-gentoo 218278 BLAKE2B f4dda4430e9801c4660be4bbf6e4b37052e720656e77c928adb7176ff3dba55feb2fe66dd564d41a181809488941cf392ec9c94d786e4a3d813fbe5d683d305f SHA512 a5e12ab1045fae61b494938047cf1c2a3c34693d3d242968e4ab564a012c70e6d232b9d5333347f5ba114a64bb59dd96919b38c5a1327fb8c5154ef40ad28d2c
 DIST kernel-ppc64le-fedora.config.6.2.0-gentoo 220103 BLAKE2B 19bc7f239aa97053d4f2944af9933e042e47f3e102cefaf29ab530dfc95aac6c89439e9b36488c990057c6ab95d44e40a9a3011b0aa7d412c54763323604789e SHA512 1e3d35bce93650601fb39eb5c43fb947f85c735f2a8626eb5a24ec0df08cd79eacf293efdf3ee0f836003d603a78cee2a0e721e8e7ecbad4fa007600edf09742
+DIST kernel-ppc64le-fedora.config.6.2.6-gentoo 220355 BLAKE2B 09646d6132365c5ade80db87953ce545213b8a88fcf4bd2efe2da42de77844f490bda18a0107087b28dcd57fece4332bea77cdbfbef9256c559f89327c784f09 SHA512 f6fbb4fb8cee616eebf3c18801cfab0cca0222e1ec91e10dc58e3ce44223de021811731be2d399ffa0e41f656670ddb1279517c0a3ec7cd5164c31226d8e0b7d
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.5.19.13-gentoo 224246 BLAKE2B 6dd95fc7a8bd38387a3bfd6c00733220b34091961c8437cdac61e4376de8b35529808f3b8e2db91c1a0c90e1115395df153f94107e6f9884a61bf646cb40d25e SHA512 1393e6315581a4934a35f3e66146d014ad154025fbc71245bd4b6e7639952387449b69df41605df8590a4d363a5aab5111b442b1a9f56b4d2996ca416f7e5c23
 DIST kernel-x86_64-fedora.config.6.1.7-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
 DIST kernel-x86_64-fedora.config.6.2.0-gentoo 230214 BLAKE2B 8d636219434741ae3203e317179038b2febbb7e8b602b9ec1d146b9a731bbfb0e820372584d6d5099cc0b3600d18280e969944cf7a8de3add081e0b10cbb76b1 SHA512 94664bab5e3e3dd7f0240fc9a9656d187c6c9a53a1af93d43728571be92e12906d50c59741093e095318b3e9face63578b4ceaed02186bc9869a2de5203cabb2
+DIST kernel-x86_64-fedora.config.6.2.6-gentoo 230455 BLAKE2B 5fe5cce9264480d2cb733bedcf060327e01fd6f1665d00ded7dc414d6439f94d5af8e01b46c36a8cd864f62033cc34cd4b3fb4f35d8316d07ab3d38d8ceb93f2 SHA512 c1962a824cf2a9d5f1c98c153beb5b29641c21e3462e59e42380eb9cbbfc3fb65129bfb1bced0f7f699e15bbaf1141f2ad4245b8f76f4fd662d779e7e0d452a2
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.167.tar.sign 993 BLAKE2B 2e67cccd194ba019038a23b75d4a8410bd8492200914d546c42ead38a1059394f3518f522117cb9d377f453d4033dcad54a0de89f9a43063c62da46c64895610 SHA512 fb3a5d01e0489eb118ce6b6cfa8fdbda74b30be872a5854c13b9be32caf383b8b014b954bd1a617cdd5b3acd435ec96c1087baf914f9ae9be41068c0ede992a0
 DIST linux-5.10.167.tar.xz 120557548 BLAKE2B 2af3b16a9be8133cec49b95b1303063c684a980532899ff7cb40e4adfed9bd5c3312bd7bb5b41394cc11689cb34d9ab6e8f89175797d8066d42cb4cf45c33a75 SHA512 e9ec7f353bd49bca747c03defd4935b905222bb66c64bf23b27d3ebdc7b9bca267ca05e0f91b215cd788c227265c5aa7e26a9f0a73989c66e65ea4d4c2c42e6f
@@ -32,8 +36,12 @@ DIST linux-5.10.172.tar.sign 993 BLAKE2B 29f39419ee257ab5fee025797255df6c994fc37
 DIST linux-5.10.172.tar.xz 120591456 BLAKE2B 002260913f33be97ed30ae5838cac0502b2966283f2c3a6682957f3595c3c707cb449ecf84a41b4af72dc4ebcfe46da34e9ecc7ea3855ee40231ee7115643b11 SHA512 23d4397436073e57867dc9f51ee5be3a532c6fc05a8645670c2244ee1bbca6d6a7c9e06f5b73e11b6a886773261de348e72c1fce8ff70316ff98e3d7ed88e9ea
 DIST linux-5.10.174.tar.sign 993 BLAKE2B 7e6ab10db45e8e724c0785ab370c67ab5f1ca1e1875cff76f6719d76c106e07553523f6abe16578041cecd518e23cbe0b07446652782af6018a95dafc7a52b6f SHA512 c96c4acc26784be041cc84ae5e49115315ae919a42820acbeab57b68243c4b84ce07a76b4a00abfe85b7976bafb4519369919d4b0b2daa125877ea086d96c1d9
 DIST linux-5.10.174.tar.xz 120588524 BLAKE2B 45a8446a5e270e5fb606ea391aa2295a64f14dbac7a62087896dd4743c59b201acf258d66a4215c8cc43a3c4b72585c5415c2f2c2cdbb7ecedc2ebcb985585f2 SHA512 48fc08eb26731a8533b96fb703c8a52071c0a339791392d9f28b70d566ced4b96e98391b6119ef05ca675eaff8f1adfa65da3aae8a26fd68769ab8e9f18c430c
+DIST linux-5.10.175.tar.sign 993 BLAKE2B 3c5badf600308dfe8cc45bf95dd68cbefef4a85db2259d99165a6c17e04ff8d4add874d95f147a2ddcbe96cbbee0166436a4db683bc14180f1d005f87409e4e1 SHA512 ae602a856a9344189ce70cf72cab51bc53c8f2589eccd149655847b6cb6ae2a8f8508ece86b3017124e9e569ebb14dc1ee0cf31de52b2d9ed0e90e500da6dde5
+DIST linux-5.10.175.tar.xz 120582512 BLAKE2B a2450d4f160524ad3e5cc17f69663b1628752ea7f4b1f5b5acbc288978bfdda0ef2108383f51cdfd2caf79421f5cfdf144f44cf446afc497d4551fa0afd1fb24 SHA512 0656c3ec0a22c8a4dccc5e87bd2c87c57834dab1ce031db4eb44a5c69ba36a2f272c65f28bee9090aa3c1ef202d31bdf814210022152cd8a3cd94479cb176035
 DIST linux-5.15.102.tar.sign 993 BLAKE2B f2ae615654242195a00480686c8c7f3c19dd61c01fe04de208105396734b43dfca32c14257c39d7132213b2506a1bd4b9a96829baf022241cac845dc21264e19 SHA512 b7d8629416cb813bf37ab7c84e1ac85ef8ef9326e16f94de8037b81bb6fcaf26d575ded1cb75f204a8fbd1c5f10b2dda1eaa046e4b1d017c1885334e38fc9a72
 DIST linux-5.15.102.tar.xz 126525488 BLAKE2B 0cb3ba4f76821c30ceea2af6378c088e86cf8f4a221a37e203d2d898902f22cfeac256d79d54b8a9cb2d3f44d98d0ae368f6b5eac78a011b42d8571f4cba363f SHA512 699077c80aaa0c57e4e13411894db0e1aa01efefc30bc13e4289e2ba3916582f3e1354f90e3eac1b6b182e5ea751c9bc3fc46f0f062f1bc3590945673b12604c
+DIST linux-5.15.103.tar.sign 993 BLAKE2B b33ff466fe2278a5c1c777b18f2f9184ce80cbef7a7d3d1b1c398cdfc1c81fa1e4f27cb24ba51f0af8cae3b727b98ec217034dcc3f6cdb7ade73f84839ffea2b SHA512 bbe25153152bd9ec741b415cddbf2f843a5eaeb081fbe50f0c66af687257b1b69c4cbf84956185e36d20f782f35faf3ae51a57ff71b823e6b06e2f75cd738a1b
+DIST linux-5.15.103.tar.xz 126552352 BLAKE2B aeafbcd79c8cec780fce4546535671fe2f0efc63d5f18d525b6289d46774165af469a50d12513b7dd037ab36bacf97e595310d679b41205e80dfb5613fd191f6 SHA512 a25ca32f1ca3c046cdbdcc2293dabee5e3d1e9b1a449b77fd1731f254ecf41149a9509f610a23a77bc8761fe781b982e40e5ae00021c82e23872900aa031aa67
 DIST linux-5.15.94.tar.sign 991 BLAKE2B 648f4c183bf955ee25efdb575551ef1e9c20e0b3e3fbe0ae5cf5d1c08cf5b4bc5b5a6cce603f3f17d9ddfce976fa42b480f93ac8ce2ee6f64d5ca11f56e899f5 SHA512 ab6eaf5a44df0ce2dd7ccfa4c72788ac212ef42eb1c4d8464f59b73638a08cf5361792e6be5fced152343f4c278e45379e76659a96bf623e7da33f13c3b16133
 DIST linux-5.15.94.tar.xz 126497028 BLAKE2B e300a52339b587f58315fbe49ee3a856945b2ee34d9f367c67ba42234875de318dad8bb5f2ec35c7309c91a7b3d4c43d36fc8fbbadaa3b68e6c8e10014dffdd1 SHA512 7ced15a23345dbf17f51a8ccaca78559acfd907b9fe811bb44a9930ae2f64c528db61cc1276fc0e44ba1c76b4f5223145d3ba7fc01924f38b629eb868492b6a9
 DIST linux-5.4.231.tar.sign 991 BLAKE2B ee6a28ae72164377649440f241ed431d6a49c50d26976e1bd85cf353651545afd80532ae27e270ef79bce55971d8bd19acabb0f43ccd6a84c4a7f2fa68f6a62d SHA512 31d4dc8b2f56e5344b3185ea0340c73d95257b6712cc2ce3b8c5dc851cc92763e417ee9a51ce3b2e637d58e3e8c7035b696413df3facac5c78991646a4048bd0
@@ -42,27 +50,38 @@ DIST linux-5.4.234.tar.sign 991 BLAKE2B 7de2660c6fe2001fc0c3b0f0c938c1490089f145
 DIST linux-5.4.234.tar.xz 113019048 BLAKE2B 93efb145f53e9072c63169637361bfa74e40de999300f27a684cbaa23678f61593edf06b46a1d03c84d1881489b560c436827589ab04bdf92dadbd51c77dae87 SHA512 58684c5106b1fc6d50bb2297d7d6894babe79addc055e5e4c78805bd4da88e01f8751b64e4c410f60827d2562494fb333fb609e251264aa91e37d25f89e65559
 DIST linux-5.4.236.tar.sign 991 BLAKE2B efd7352ca03c80b7c81a1c794cbb4b050d1c5e7856e08e09ba3134c58b04c0c47f51ab6c81ca4da830fef4cf81f9fbc7798be6f0d76cf6ede892b2a1766bb0ef SHA512 b48da5093f8556306153f603bbbc718170ac5cdc0f14a2d8f1468ead08282ec90488f3b07305e6aea6b1d4cd891e2a655fba8f1db8e5fe31b8d6e5dfa54c3325
 DIST linux-5.4.236.tar.xz 113007788 BLAKE2B fa904f692d5e7b16592df5d1b44400788502613c3157e672d22262c52f65ad1b53cdade1fbd61cf1a122ce1ddd7461cb8b32de300c0fca7c7aee75fa7b3ee012 SHA512 ddc0c265b66ac33223d893689f8079e0f1a882f8b69433bfe8272e7888ba53cb87cb26771bea62a839b6d2cf042ecc40405c00a380d2d39cc796a40c3eecc5a3
+DIST linux-5.4.237.tar.sign 991 BLAKE2B 554f8cdfb4bbacf85dc3e782143083be6ba540630a019b535713fa27a3a2a2b02a6d3adcdc7160e4aa567e942958aa734b20601d4bb7eccca6dcab75e02485f5 SHA512 f4d3ccdfe7a2a0b0c1285d9d84a43949c11facd1598d1e0d30af8b439e6a4d9685c022f190bd7eee44cfa266121d491f0e096f7451033e98c997ba5e699c03f5
+DIST linux-5.4.237.tar.xz 112995268 BLAKE2B a67d4a2851f29ad6e110462bde47ed5c97b09c03bb0d635dd08d5ca2961450b37af3281f2804672824d0f499d54714b82b664e4488269c470cf21a961cb8f2a4 SHA512 ad239075d264b9f95570713357c88927ec76a7fc5fb3e3b42ea25b011c3be2702f135468f6998da0e5bc6d5ab14c03688b970107edc02c4c069cc31d3bf585c2
 DIST linux-6.1.12.tar.sign 989 BLAKE2B b55e15679dbf0a29dcd5ece9cb68fb2123132818810fd03492a6d8fc5556814bfc8604b38a25dd0b71acc4ea8f515ce60d36d6e24eb944fa8a48bc851b2c25f3 SHA512 7459ad3491bfcb2dccfde4a929da7b78e842dd34e0230ba49da152891b5157dcd54cf84696988da560cc918852b1d59b76f7184d39e7c444385e20266aed8b05
 DIST linux-6.1.12.tar.xz 134848688 BLAKE2B 1ff8d14fa1544a9d613fe372073e6735cc9444383e598a1c6a546177e1a9516b7f5a0d16aac4fc141fef134ffe14a0e40ab5db4200c11c953fec7f70a7bc9079 SHA512 e870aa9038f0508c50af5329721a5649c3537deb333d18f006bbf6d3c310b64262630eed5682022b7eceece9ef0956d2c110555cc9257591b7a221d063976735
 DIST linux-6.1.15.tar.sign 989 BLAKE2B b7232f040bc4be3d24223aff245306571b8e63243e11acb99ea95644d490598bccc02e6abe84be7007f074178b9c10fbcc87f2238f25b07ae7e091b502fe18e4 SHA512 a3212cc8b1fae98508caf16b783e6408d0abeb7b903157285fc65f49297d5f68cd0555376cee85fc50afa5ffe03330cf86055280fa948903a047f7416448182a
 DIST linux-6.1.15.tar.xz 134854068 BLAKE2B 3481d756a4daee96f732388a93d7423a784ddd573a0ee973e2e6d44ddc0ba5bb6ab84279c117c3ef6b2b086ccb6128bcd025286180848e89411d03e2e9797bc7 SHA512 0f98aee21ba902254881317148a78dcc3bc2dc3b6a8651bc0c35e8d63850ed1a9ac4271d5f74ed0ec110c219c80674d26abf9ffdd2631278cf1c7c85d6cc209e
 DIST linux-6.1.19.tar.sign 989 BLAKE2B 56673fda63b67cc326774c3fcd6a5e08cc1aa81380f931940e8a0ef9ad76d475999678b6af5270181f6b8f27df71c367984ee471b73f8b56fd7a6ea1a1dca07b SHA512 68e72679cdd92ebd592eb77bb126b4721cf808e0a69c32e51977d9284a20114d7f13565b2de503a99a2da4de5ebf59d92e25f37444b35b52033aca5eaf40f200
 DIST linux-6.1.19.tar.xz 134856432 BLAKE2B 2988daff435d09babfe6e501a4b481b99206badf803c2e3510b283a42c4bb0c217e5bc479010c12c15e2d056d1dbb9d72c10f4e7fca3c9b500229e9ab90ba5d4 SHA512 06e714a70b6014a4f56b551952db899a526b9b3f7fdb11ca0f354d99e65fff1be9a3bc9522af98a93753568266233eff2f5e6f032921293ca2802587ff866ffd
+DIST linux-6.1.20.tar.sign 989 BLAKE2B e9f6715585d096e18fb091ada1ae02ed69ed6552951b6b9144c27f52dbe86dcc2db9d220955988f24b42adefc5a5426fd63ddb0b69952a44b76a5299f73722f3 SHA512 932f04db75c12149814c67eaaf5b7d9bd5c1374700522311714faaf044401975122c45d5f9ec8afd91f6876bd67c4cc401ae33247380d881c7d020d98265448d
+DIST linux-6.1.20.tar.xz 134856852 BLAKE2B 9ea5ced4b7d42537bafce8c1cc803896ccecf93971ecaff40a3606b850ea59a160284709bf10c2d1dea3c2d1a04fc81de1bad23f709542d70a24bd08604753af SHA512 1b2660fa5464410649b2d78d08cc060de4eb38bcb158154e74fee3383cae3ff4cc373235e874eceeac3abfda9689571f3b3aed8ad2ac82ec2975e21688458a9b
 DIST linux-6.2.6.tar.sign 987 BLAKE2B dc30795c15693b3ebdf05418aa418e4545d95731963035dbcc837367227e882a314a72a1e5110482df2b53d3ac54626384f4f7d26b41951b69f4413d76e01c73 SHA512 dd6ba22c6ad1a6ccb64b4b7cd77ef1ce8c6c5550026bdbda636f58e88ed91dc36aa7cf1c362ec1a42bb46d82369e5dd66a7aad1e663c20577b68d69962592887
 DIST linux-6.2.6.tar.xz 136460416 BLAKE2B 6c8e064752a4c3fa16d3f8ee2cf05716e82b0154f67c198f10864174d95169c99396390094ee5b1ce661b74b7d1e749ff86796af53428006bb882ea17d7ad21b SHA512 6164e45b003c9cf17e26a35cf43b20884fc0a5886bf759639cce414b4dc2af7da7a0d39a50b41ee7844cc52fc9e75190999a06880916dbcef68af35009006877
+DIST linux-6.2.7.tar.sign 987 BLAKE2B 527bf1b3daf6b0d37f21c30a8bc4195193eb99119081ac47b1ce0973352acef64e706a9c321649929dd4e168bc553423912b4f2e41fa632bddd70290dca43fac SHA512 63822c312e085859b1890a3b8da3edbbc30fb8048d7f3283fff9e2bafb8d107ac41e3d39726df41f35c701fe83a19c622d6c22287cdfbe0a94d5d0abaaf6e008
+DIST linux-6.2.7.tar.xz 136484084 BLAKE2B 9f2b39992c9e56e37ce0544f1a19d8d5285250bd5ef25e5df726b7c865dd0ee5555f1536a139583fad4d268e959c5b12b16d224e6630d621c1c10125ac6bb123 SHA512 d666508c3ea1fab92a7e05113c76eee0cae83450a16efb63fc414bb03c56390500c49699700f5b1799ae0eb0c5257792201ae480f6a71f6fab1ab2f268d76f27
 EBUILD vanilla-kernel-5.10.167.ebuild 3776 BLAKE2B f17a71ce2af16261001d766fb6e9d280a9939bebe3d6df50dde64a04b662f43df2df41ff222d903fafd58ab981122103fb6020771eb82a4615fb532a8ad0dc5d SHA512 5a7d0ce4b2b601a6c1a891b09376d81a84d518f7faa387f68ffa707a916b7d325aa11424781e32042b392598bae5c99f718c408aeb96270f8256e287a8305d33
 EBUILD vanilla-kernel-5.10.172.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.174.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
+EBUILD vanilla-kernel-5.10.175.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.9999.ebuild 3295 BLAKE2B 191d46975c539cc082db84ee88fd5a19cbd62fb1062c811e8250baa1175192d0cd1786f6a051cc6f27b41f5e9d5f5348a6ad913f427ca4e13438f408bd7ce1dd SHA512 6a60dc8f452c732628848ba37149e647e3106789b14cce9fa177287dc535c9ebd3a30020d181d9979fc43baa1dc035a1747fd0a3719b11f655ed90f6e5538d2a
 EBUILD vanilla-kernel-5.15.102.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf31061467f8f077ace3721ebae232fd81639e95def5bd06c950f73b5823f9d2667cef4f31f24ccf8d308d1b1b480ba4af7a794179c SHA512 aebfea3cc05d1af79fdb155328d54c5d9beaa86259c543b3b24f4b11115cf7c9b6e433aede426925eee67cd84524eafb223c3e75e32380b22cb630e750475054
+EBUILD vanilla-kernel-5.15.103.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf31061467f8f077ace3721ebae232fd81639e95def5bd06c950f73b5823f9d2667cef4f31f24ccf8d308d1b1b480ba4af7a794179c SHA512 aebfea3cc05d1af79fdb155328d54c5d9beaa86259c543b3b24f4b11115cf7c9b6e433aede426925eee67cd84524eafb223c3e75e32380b22cb630e750475054
 EBUILD vanilla-kernel-5.15.94.ebuild 3776 BLAKE2B a28c4ca056951cecc4d1486afdeacb96902cbb8e44dbf07413621aa05aab76071296b3a80b0133a45c8958878b9fc1c10f557cdbe9e1eb2b235cce238b6237ab SHA512 81f0883a003a767ff273db20b379f00ca1b979af7749a6d4aa3cdf1fd926be5f1991fc8ce2f3e3e88d1c409dc4e61f802f3ffc61937c94089c07bec494bc6e7a
 EBUILD vanilla-kernel-5.19.9999.ebuild 3415 BLAKE2B fccd59b033a2c78ed80927aef1fb8c2e56ac60ae94cdc29569ab038af25d7d4a3234e978eb5ceb63f4527a2ec65682ea1a7fec076a3f63ababab520f3ccd1889 SHA512 7e7d154e927d8617e9fac062242388cd5372632cc9d7fb9183315d5ab2e0e116ce3531cc9965ed132b911a72bd956969ab9bfc39f999805b82a96a3320d3d7d4
 EBUILD vanilla-kernel-5.4.231.ebuild 3062 BLAKE2B 596abc4cc489a193e1e573661789ff36d8da65e7416caa52cd3d0b74d472b6079d9859f40fc346818147ad9f7d95337d42792567997c612ce1da164c9968c325 SHA512 2fa5be41becf64b346d2dc63a30f687394c2797079a4f5db5112f294d550e6590bcc202740de1afa40d259cee18a4731ecefd2ae4ef72a7be1fc8758bff7a8f8
 EBUILD vanilla-kernel-5.4.234.ebuild 3062 BLAKE2B 596abc4cc489a193e1e573661789ff36d8da65e7416caa52cd3d0b74d472b6079d9859f40fc346818147ad9f7d95337d42792567997c612ce1da164c9968c325 SHA512 2fa5be41becf64b346d2dc63a30f687394c2797079a4f5db5112f294d550e6590bcc202740de1afa40d259cee18a4731ecefd2ae4ef72a7be1fc8758bff7a8f8
 EBUILD vanilla-kernel-5.4.236.ebuild 3062 BLAKE2B 57f0ff3da486dcf8c18cd11607ac6835b7dadd1d792c2499ff6530f0a28a017695ef9ef6e7a0fc15d31b857bfa0359694572cea594cf1a473d639ebb55ff0e58 SHA512 a7c2010a4ac27038d55adc11bc2f5340015266b60f61d93d41fbc20346fdd5ac624673fd08da709d5a144b78ff6a46f28cfc94663f627e0a87ea97db24cb7f42
+EBUILD vanilla-kernel-5.4.237.ebuild 3062 BLAKE2B 57f0ff3da486dcf8c18cd11607ac6835b7dadd1d792c2499ff6530f0a28a017695ef9ef6e7a0fc15d31b857bfa0359694572cea594cf1a473d639ebb55ff0e58 SHA512 a7c2010a4ac27038d55adc11bc2f5340015266b60f61d93d41fbc20346fdd5ac624673fd08da709d5a144b78ff6a46f28cfc94663f627e0a87ea97db24cb7f42
 EBUILD vanilla-kernel-5.4.9999.ebuild 2635 BLAKE2B 16aaff3ea21368478a85a6bb93cf79a1074e68a7510101586cf6d06d11884c99d474cb19fb47e46fa64b34397528e32719667e2895e01c946a5da3a842f2d7ea SHA512 dd115a18e6005ab5a7d22fde68c5866118e26cb3151dba2ceb8c96cd843a7992fad0edfab8adef57d58653871c6b59ad7fbc0371396ff5cc56ade469626d3019
 EBUILD vanilla-kernel-6.1.12.ebuild 3894 BLAKE2B 33a0975c3412120cc5cef7d64e4c89e261676ea8b932f051cfae2b62c0c7e960b0c820a9af00e3ac8978630f103c88b2548a9dbfa9b8777b98fed45b5d993fb9 SHA512 abe01b978e9f4b6260856e13076367e2115845f13d017f8e85377dc6f3523561ab26824e785c7954bc71afd26a5577264c1e3d75e58cf3ff086252a5a9cb55f2
 EBUILD vanilla-kernel-6.1.15.ebuild 3894 BLAKE2B 33a0975c3412120cc5cef7d64e4c89e261676ea8b932f051cfae2b62c0c7e960b0c820a9af00e3ac8978630f103c88b2548a9dbfa9b8777b98fed45b5d993fb9 SHA512 abe01b978e9f4b6260856e13076367e2115845f13d017f8e85377dc6f3523561ab26824e785c7954bc71afd26a5577264c1e3d75e58cf3ff086252a5a9cb55f2
 EBUILD vanilla-kernel-6.1.19.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
+EBUILD vanilla-kernel-6.1.20.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.2.6.ebuild 3894 BLAKE2B 255c844fd54ae440e02ee41e09a1c7932bbf94039d733aea21cc6ce013a81448fbabdc12b842dc149109fa3a56d340f04fb3889140e48ad5df4b61ad923ce763 SHA512 04af9a4f274095bcfe414ade9c7836ec2d20acbe520b99643012eaa1960739b6b51d85cb0cd1226d12164cd3d5f944ff3f7ca1d606df8cc0768de4e1bb394cfa
+EBUILD vanilla-kernel-6.2.7.ebuild 3894 BLAKE2B 82f8980163a94f5d15e8e9b0602c0801d2388694df96b9406b4e8c14eeece694cf8f1cedfc93e86bf620795c67c3f35314eafc16c52a655b9a4c505b9faf82f9 SHA512 f57b5ad9e4d7016e89356288c725624ccbbdd7d3ebd66950137015f9567c267245b46fc54ec4fb7d882cd23d2b0d0212cd320d2a221f42088c27428962e7e3e7
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.175.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.175.ebuild
new file mode 100644
index 000000000000..3d406f474e2f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.175.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.103.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.103.ebuild
new file mode 100644
index 000000000000..f68caf0fd433
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.103.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.237.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.237.ebuild
new file mode 100644
index 000000000000..e60639c72379
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.237.ebuild
@@ -0,0 +1,111 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="debug"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.20.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.20.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.20.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.7.ebuild
new file mode 100644
index 000000000000..1ec99df30db5
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.2.6-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 9028245ba452..01c6058eabfd 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libchipcard/Manifest b/sys-libs/libchipcard/Manifest
index b71011cc1dbc..27eea1028d88 100644
--- a/sys-libs/libchipcard/Manifest
+++ b/sys-libs/libchipcard/Manifest
@@ -1,5 +1,5 @@
 DIST libchipcard-5.1.5rc2.tar.gz 877820 BLAKE2B dfe82e3d6aea26e95e5f69298ea17ad4bb9a1d106cca02a9fc23f5aa5ea338471ae5628248350e01571f4819567da2a0f5a3699d56d8f02ed58971d6ac715abe SHA512 5e86068bd688f72e04073dbd076f21646a6b75d2a7a73c25bba4396e8657c4df28cf5cfb61eef7b243186f8313cea1262e415f2acad5348fa5179b46d7f96ed1
 DIST libchipcard-5.1.6.tar.gz 874865 BLAKE2B 995dec0ce1dd9a5c4eb1173c114a19292d5c9a96f44c0ad969390ab489a6ac4e9001596995eb06db98a4bee2fa8b2310b844efd2e1b18fe1138be00398e60bd3 SHA512 a6e22f2a92203529a8b35387b6d8a3de0ce16a8d845b6ebee53bc151fcaa7626a61f63e71480cd85c01c9c5975a17632be8ba2d71a604f7ec2eab9d40b9ddfd5
 EBUILD libchipcard-5.1.5_rc2.ebuild 1132 BLAKE2B e595dd4da537ef86caf96d889cbdecdf29f3643c8ee1a81552306645d0708f564e04f6372325014c55643c913fe4bf6b1e4152c23d94a95382511544445b3b33 SHA512 7ce8ce7a4fadab689a2cb424a44012ba2bf0109002f1651bf6335d9a47718a6896bbe6ff41c5479b6231c58b334168ae2e1b2c717b1214489fd2bb07b79a3ee2
-EBUILD libchipcard-5.1.6.ebuild 1089 BLAKE2B 02b8d7b091eec0704f47d7d055eb79313abf1c404c2856cb3f8655dd40ef130f2ca02e1682ee8a831e1e8f87d89e5ae31faa996559261a273fc9b0cfa3ca19d8 SHA512 477c1238a5e573e0220903bbdc621546406f0ac224d848684477d6687571254a4276c5f84bdfc457671e20ebd80fa10eec19fd5a02834f3317fa4c71d1ce477a
+EBUILD libchipcard-5.1.6.ebuild 1087 BLAKE2B fcaec6b71e93e382ba23a7ec5fd349f1ecb5ff3dc98ece092c2f44a1252f2fdabbcc6690879f4ac791142eba8683fe70a281d97f8606da32f1f921489c4e2a2b SHA512 18d489d022a788d46e6eee57ee0f6aba14203eafeddae27ecfb34301c9ed89afba188af0fcf8c9e52270dd5116baf734b16b8dabcce6303d65491070f360efa5
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-libs/libchipcard/libchipcard-5.1.6.ebuild b/sys-libs/libchipcard/libchipcard-5.1.6.ebuild
index a8aa14efc76f..a0ead743e5ef 100644
--- a/sys-libs/libchipcard/libchipcard-5.1.6.ebuild
+++ b/sys-libs/libchipcard/libchipcard-5.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/382/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc examples"
 
 BDEPEND="
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 64e73ba1b38f..9277f56fa7a8 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 443169d3e84b..6e0f44d68014 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,13 +1,18 @@
 EBUILD dist-kernel-5.10.167.ebuild 399 BLAKE2B a864eaf52c6d073cabeb88a64ec5b20bcd4cf059ea71647dde5da02c1f76889ee103ff28d36eeb2904eb472020d77c2271193dd23a8206f5c52daf2fd83fc6ad SHA512 46a819292efff1614e7d7ebd344f528db66002ec43b72c1bd0ca6af4a3c504c299e46f99a7efd29150c84a20d47e55cee60593242f13dfb61fdb2c8014c49929
 EBUILD dist-kernel-5.10.172.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.10.174.ebuild 399 BLAKE2B a864eaf52c6d073cabeb88a64ec5b20bcd4cf059ea71647dde5da02c1f76889ee103ff28d36eeb2904eb472020d77c2271193dd23a8206f5c52daf2fd83fc6ad SHA512 46a819292efff1614e7d7ebd344f528db66002ec43b72c1bd0ca6af4a3c504c299e46f99a7efd29150c84a20d47e55cee60593242f13dfb61fdb2c8014c49929
+EBUILD dist-kernel-5.10.175.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.15.102.ebuild 399 BLAKE2B a864eaf52c6d073cabeb88a64ec5b20bcd4cf059ea71647dde5da02c1f76889ee103ff28d36eeb2904eb472020d77c2271193dd23a8206f5c52daf2fd83fc6ad SHA512 46a819292efff1614e7d7ebd344f528db66002ec43b72c1bd0ca6af4a3c504c299e46f99a7efd29150c84a20d47e55cee60593242f13dfb61fdb2c8014c49929
+EBUILD dist-kernel-5.15.103.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.15.94.ebuild 399 BLAKE2B a864eaf52c6d073cabeb88a64ec5b20bcd4cf059ea71647dde5da02c1f76889ee103ff28d36eeb2904eb472020d77c2271193dd23a8206f5c52daf2fd83fc6ad SHA512 46a819292efff1614e7d7ebd344f528db66002ec43b72c1bd0ca6af4a3c504c299e46f99a7efd29150c84a20d47e55cee60593242f13dfb61fdb2c8014c49929
 EBUILD dist-kernel-5.4.231.ebuild 388 BLAKE2B 74ec9dad235bab972e849e0e63809fd44ebf07f15209f9528694016b0e456aed1d5406810e882b1632cd99bea780e92c040e3cd61a16b79a4aeeeed1226fc3d5 SHA512 5caae3c3baa9607bb90971cebd958b9792e4596201433cb9727da362fd4c521dfdba8d559ad7d23021e4e221da8ac27b4d04a33dc01cc7e3397321d739f2f572
 EBUILD dist-kernel-5.4.234.ebuild 392 BLAKE2B 23e7307e3b46e1823a981583dc446eac90be56b46e0a4e8cc1a921d15e5fd3856a3c471c3a53a546c29e597fab22e16bfb511b7e5ac543923c8708db34ffd453 SHA512 dea200ee38d46c859203a4acafe41a505e860d8353a63a4c6629df091a022bfd1f9c5d3bc9be57e31fc823d952a5425651e0a98bb65b55d78edea0d73915e7c1
 EBUILD dist-kernel-5.4.236.ebuild 388 BLAKE2B 74ec9dad235bab972e849e0e63809fd44ebf07f15209f9528694016b0e456aed1d5406810e882b1632cd99bea780e92c040e3cd61a16b79a4aeeeed1226fc3d5 SHA512 5caae3c3baa9607bb90971cebd958b9792e4596201433cb9727da362fd4c521dfdba8d559ad7d23021e4e221da8ac27b4d04a33dc01cc7e3397321d739f2f572
+EBUILD dist-kernel-5.4.237.ebuild 392 BLAKE2B 23e7307e3b46e1823a981583dc446eac90be56b46e0a4e8cc1a921d15e5fd3856a3c471c3a53a546c29e597fab22e16bfb511b7e5ac543923c8708db34ffd453 SHA512 dea200ee38d46c859203a4acafe41a505e860d8353a63a4c6629df091a022bfd1f9c5d3bc9be57e31fc823d952a5425651e0a98bb65b55d78edea0d73915e7c1
 EBUILD dist-kernel-6.1.12.ebuild 406 BLAKE2B d2a57d03473571929e7e2e0b24ab0de1a166019a411c63c7aac8f52d43a363e9e17d4af8845d6338b22a6b0cc3dd2bd139f884bbcb1ffd794d091c75bfbc0898 SHA512 51b4d7b63502533d411188e04f36f665d112e294e855ccab411fa6aa9b855e30a250e0f8330f2fceac1d3e08d0b1e831c86d72a2a16142e52007d78491764e85
 EBUILD dist-kernel-6.1.15.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.1.19.ebuild 406 BLAKE2B d2a57d03473571929e7e2e0b24ab0de1a166019a411c63c7aac8f52d43a363e9e17d4af8845d6338b22a6b0cc3dd2bd139f884bbcb1ffd794d091c75bfbc0898 SHA512 51b4d7b63502533d411188e04f36f665d112e294e855ccab411fa6aa9b855e30a250e0f8330f2fceac1d3e08d0b1e831c86d72a2a16142e52007d78491764e85
+EBUILD dist-kernel-6.1.20.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.2.6.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
+EBUILD dist-kernel-6.2.7.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.175.ebuild b/virtual/dist-kernel/dist-kernel-5.10.175.ebuild
new file mode 100644
index 000000000000..407f5d349eb1
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.175.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.15.103.ebuild b/virtual/dist-kernel/dist-kernel-5.15.103.ebuild
new file mode 100644
index 000000000000..407f5d349eb1
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.103.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.237.ebuild b/virtual/dist-kernel/dist-kernel-5.4.237.ebuild
new file mode 100644
index 000000000000..a0793715344a
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.237.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.1.20.ebuild b/virtual/dist-kernel/dist-kernel-6.1.20.ebuild
new file mode 100644
index 000000000000..d3f0fa8764cf
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.1.20.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.2.7.ebuild b/virtual/dist-kernel/dist-kernel-6.2.7.ebuild
new file mode 100644
index 000000000000..d3f0fa8764cf
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.2.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 9aee78bb1cd1..88047ab9a3b7 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 20a19c10301d..afa14e9b9155 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -405,7 +405,7 @@ DIST firefox-111.0-zh-CN.xpi 602345 BLAKE2B 22d0d3cf8c580514f7ac3c2b75aaa77b108f
 DIST firefox-111.0-zh-TW.xpi 604910 BLAKE2B f5a04e08f87f5432994f2765b86616331d51ce8101b7abc8881af97dfdf88f384a0dccdcdd1c1845e221683d0dbda5a95d59c1285a06b0409164e71423db5fd0 SHA512 bf90c89fb6797fcaf83f13811e6a6c285deedeb70c7f48f310fb4cd2e664a3c633bb83ef829987ad80e3956189b67777b4b41c0742cdb1dade9dd3288f95adff
 DIST firefox-111.0.source.tar.xz 495743080 BLAKE2B 5262557c7e3460c5d4013040b653b5ed357a6ee3fa196a8b862ac4e884a8be64bb06896a6ef468fe702f6ab09fc2af7088de4e4c14cf832d2a3d47a18ac68f0e SHA512 cdb300fdbb2b60068b0fc10a18df587b417e484901d36f52dd174d320d3440a42b02ea000f325c5781fd8853a5171b1a5184562fb535ece90619e4c64d46bb82
 EBUILD firefox-102.8.0.ebuild 36784 BLAKE2B 1989a4c9234c49e13d1aeaf2907c9bb89fe73def5de60ab63d33a1e250a1ec1ca1f35faa84bd4684176dac672e41f9cbc952b52adb9994eb0fb3a07195e7cd10 SHA512 a8c74b62467954a3962cc9f6603e4b92473864057c2900d70dcd2198ed887b3ed11ed19cb33130ba5444217e319f4c294b9c197a13eefc4a1b8a7c1ce31ee685
-EBUILD firefox-102.9.0.ebuild 36787 BLAKE2B 34bd13e61a387949f788acf73433721f082b01e080bc31b4d38f83f87d8a6c75eee069861ff26893841b1d3368c99d834fe6cf3001d4bc12c07a233016556490 SHA512 6334067d6c401507ee0fc4830d8a2b6d6bd4bd125902af35bb95d5183df83431790d7c3a07c5e92cded865eb36b37f43bdfdd6f271d15293f2109c154932fa24
+EBUILD firefox-102.9.0.ebuild 36784 BLAKE2B 1989a4c9234c49e13d1aeaf2907c9bb89fe73def5de60ab63d33a1e250a1ec1ca1f35faa84bd4684176dac672e41f9cbc952b52adb9994eb0fb3a07195e7cd10 SHA512 a8c74b62467954a3962cc9f6603e4b92473864057c2900d70dcd2198ed887b3ed11ed19cb33130ba5444217e319f4c294b9c197a13eefc4a1b8a7c1ce31ee685
 EBUILD firefox-110.0.1.ebuild 39952 BLAKE2B 290edae219dda47fca8bb197b2732c682ad7b2128d25f2f8ce627fa3abf38b2049184fbc41ba3ee221875d63a0b1af283b92a06642798da74994f2a03a0385b5 SHA512 dbf0acb8ee4f0471b90f6a14e0639929f30b17b452ebcf553ae503cf82963c4515a85d174d20a6bc0a65fedf336aefd0067677a8f39b8768a20f385d64e9ca36
 EBUILD firefox-111.0.ebuild 39933 BLAKE2B 0a38cdb0692b6f7948cbf215a7a084f5b526fe68ae8bf6d3f6952f12bd9da19167b02c374947c2d48535fb2be5d20c01686d44a4a341f78e9e67f81b820aa27c SHA512 2c78065eecc696a309a189f380014fdd70276b499516a18bebe3ecede2c461f7ce22767771f6f6d58625b712521f6f53ab8059ba4071e5c045b739b4b50495af
 MISC metadata.xml 2219 BLAKE2B 064f486eecd2a66ef4c9cccef46803f877039bf16bc40b699a48e28e04e816d0ad434ce65ae2e056e1a4126a67a7dd7eff16040276159c1f5aa8966b1c0d7b6c SHA512 522b09ffc2857553e240b1e7c82c11ccc281dd87c720c6292ec9314b91319e0a55ca2838f17e878f5c1e58e4f22caa1b0c3b90506b65b350beff06f3f397d897
diff --git a/www-client/firefox/firefox-102.9.0.ebuild b/www-client/firefox/firefox-102.9.0.ebuild
index 5d0513cd71c2..52cb88971193 100644
--- a/www-client/firefox/firefox-102.9.0.ebuild
+++ b/www-client/firefox/firefox-102.9.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 SLOT="esr"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 643e9ab2c5d9..27c0db1dd362 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
index ef3be61d167e..fdde117b00f9 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -3,5 +3,5 @@ DIST luit-20221028.tgz.asc 729 BLAKE2B 0bc964a275cc46616ca4730c2dde55cda1fc95e25
 DIST luit-20230201.tgz 209547 BLAKE2B b303ed8b7a85acfb2f3a43476d4f22596c2e41609dc7b7dcfcbd32b6fad6d7efe47aa46338aef028d2a1f86130f3617ae00ce089b590a3a77f8bae8819270bb9 SHA512 919b3ffcf1ea7f490c959e38eda92cc023aa8b777f3d1de85fd9dd3384604c6e13c9db942bdd4756f76e1d57ae64a395c549d61a1f1f5ff982e9efd3410087c6
 DIST luit-20230201.tgz.asc 729 BLAKE2B a6234bab0ef7b83c6a1518d7603774791638cd25876397b60add236ae1da494061376b6b5d855b9cede9438a35ad33634c07a1d085019c938c10f184f4819bd4 SHA512 985149784ab17aefe833226a2cc63e699ab1c1a8aa785d305f2be186e99310171b1d89eebf0c1992bb7b8e0caac0ccb42f1bc73e4074033b2e5eb41f66493bc1
 EBUILD luit-20221028.ebuild 885 BLAKE2B 0c98a9dca47a398ca65b453a325c14e33c3130dbdd1ebbaff1afedfe5eb7c1a85610dda17045929d2c2aa88b29f86c976ba08e303a43da8f488ca4780ec0dfc3 SHA512 dcc51583c1971c1ccbd7b173e3d6348573d2f483139a6f2d825cb73b40603bf9afe4453aaa303c88bd2338112994118f617fa2ad4fde5354aa1f21aab2134380
-EBUILD luit-20230201.ebuild 892 BLAKE2B 3650f0c15d3c361c4b183f9fd7f30d89c6f38d5506e6b8c1dcb4d0e523d409d29858fcdaf236154d5cfc837948e6666b9084f73788f0d303b0cc6579e6ef9577 SHA512 91a67c5228270fc266438f26b67043ef5b32cbcf86968e85ee880645aed4a40b1fe857f90d25367f229445c5e7a58f9d9df1b099d819cd36df87a8656e841994
+EBUILD luit-20230201.ebuild 885 BLAKE2B b9de80aacb9ba85b82d5cb3b9b3264cf845fa7a36b5ca0aa926c97a813b7dd3425671bbfeb05c37e59176a79f376e0e5c430e07fc964bc4bad982bb95a2ed845 SHA512 872573897c89d86a862e43b57e22e02bf8d1852a94ab471edbeed88e7450d3c787407e950f4247022bbacd0acd1625464e17a0f3eca2235be503eccff19ee8aa
 MISC metadata.xml 333 BLAKE2B 5f4b1f673dd8208a3b23c5f522e08e0762c30f5a073cbda959e74b8949d747e83a97cb2908a295f9d3ed4d25f296a9a8c65f4d15f3ed3b5c46afd1e49c3f9c4f SHA512 1819ed06cf5efe5ac10cd04ba571788df4002de323bbb4785888eaacb7034a1d15996ffeecf6284591ff6851325abff391ec816ea09c05ea2bdacc8069712c2e
diff --git a/x11-apps/luit/luit-20230201.ebuild b/x11-apps/luit/luit-20230201.ebuild
index 475c45df9b80..6ea4f8f0f57f 100644
--- a/x11-apps/luit/luit-20230201.ebuild
+++ b/x11-apps/luit/luit-20230201.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 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"
+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"
 
 DEPEND="
 	sys-libs/zlib
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 1e66ac67f2a4..f58b2ef0aa68 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index d0e1c0ad99ad..dbb7526bb725 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,5 +1,3 @@
-DIST libxfce4ui-4.18.1.tar.bz2 910047 BLAKE2B 196ded69668b27fd10d99042789e1b2b38eb1a54df6015d1c268dabbec747469d0883087c2f2dcc121f44091a4e19857d51e607ab50fe2aaa20b3b3bf10ad760 SHA512 3bd8a52755c8542ff6952bb91bf57203605991963865f3d88896850ac5b98aec649c229d8743c1d472e6ac19ada853c428c1706aad0613a951aca1c001d9977d
 DIST libxfce4ui-4.18.2.tar.bz2 901949 BLAKE2B 17bf0541646735ec54da5f322d858896fa2fd132fe93864372a67d4936b4467def749f4a0dd4f3d23ecb7a2b3843367f88ccf74b7e040e7ad6f6c15fec45055f SHA512 758466e2e3096791b99e1a00c9f499d95327581ad336fc1ab0d51e3d150206d522f44c2e6053b0032499dd0cb337510cf6940dc77499cef3ecbb484de7787457
-EBUILD libxfce4ui-4.18.1.ebuild 1733 BLAKE2B 77e3722a235e09c5e802fb57b648030baa054b269788c6f661492ecb27b08ef4e9893b491495ae5c7d14d559a32b8823f45827897a2e72f16ee21ac2286d3b5b SHA512 94534883d35f2dd5458cf58de698eb3b7596c8e032fdc60584a6bb7ec563cc2eb1607b1056876cdf19db4f99afacd52824a0f9451425da1a2a5f04ba1054394f
-EBUILD libxfce4ui-4.18.2.ebuild 1739 BLAKE2B 0da39cc9521bddbe924e82d216e2f2834daf2f0762b0c0c7e2ee6eaf0bf7f30c3a458f161f29a7a68d8b710dcbf02dcd45b7ba29e91c85ff34acccd78f658042 SHA512 c496066821e64e30df458642b5e316e569693b2589257c326f96ebef7077dca8d77e03ebd837a85406c06fab6c3b76ef7ec3fc0e1c8937cdf05d0af9f4e81c61
+EBUILD libxfce4ui-4.18.2.ebuild 1733 BLAKE2B 77e3722a235e09c5e802fb57b648030baa054b269788c6f661492ecb27b08ef4e9893b491495ae5c7d14d559a32b8823f45827897a2e72f16ee21ac2286d3b5b SHA512 94534883d35f2dd5458cf58de698eb3b7596c8e032fdc60584a6bb7ec563cc2eb1607b1056876cdf19db4f99afacd52824a0f9451425da1a2a5f04ba1054394f
 MISC metadata.xml 415 BLAKE2B 96ab20930d257e21f8cb46d95f24e7d0fe7568aba5cc097ffb9ec46a5341d58dcf366522de79d8c04b575cd0cf6b96724ed969b8d6338cb842bd50787620ea9b SHA512 9712241bf2f9bb14ac6969f02768e7c4a159f7349eff4a7c9bc8fb779955a555b4cb5770ed32203933e603acb2fa9456cd989a62e274c94320e81e820555644e
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
deleted file mode 100644
index 93c505782b0c..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils vala
-
-DESCRIPTION="Unified widget and session management libs for Xfce"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/libxfce4ui/start
-	https://gitlab.xfce.org/xfce/libxfce4ui/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="glade +introspection startup-notification system-info vala"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gtk+-3.24.0:3[introspection?,X]
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	>=xfce-base/libxfce4util-4.17.2:=[introspection?]
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-	startup-notification? ( x11-libs/startup-notification )
-	system-info? (
-		dev-libs/libgudev
-		gnome-base/libgtop
-		>=media-libs/libepoxy-1.2
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable system-info glibtop)
-		$(use_enable system-info epoxy)
-		$(use_enable system-info gudev)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.18.2.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.18.2.ebuild
index 31a8ab010145..93c505782b0c 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.18.2.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="glade +introspection startup-notification system-info vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 80181f77fa2a..d5d03d239fed 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,5 +1,3 @@
-DIST thunar-4.18.3.tar.bz2 2797232 BLAKE2B 4193273e75e6a5a1f9bc1f10934f17b2796b04a59ad2b9a01e4f95e922195a7d8912b35850cc86e91607d7aed78c613bd7776a41a7c0a1b2b60933e1930f3036 SHA512 c6795b691938044d4e15a86c50d60c3c58c203964f2f0e9e69f2432a0d5159b1a7654adb4932a81fcc1f6a89e6fd465297d72dfcb7792fd644ecbd820892a6a4
 DIST thunar-4.18.4.tar.bz2 2836333 BLAKE2B 22ab64ae14bbd15e16d314f2252f02fc8a5ae3043502bfc6a1f43c3e28e735e42d1e040db4dc9c3c7d4df6426c16233da78f30284b1679d59b9ada2cf9051fe2 SHA512 c182abc9fbde79f802c2fac01375be8b29b5da36c665f1de1c005ec09561a865c502e9741a3336ef467d05b215041b452200b063bc33d572b0857f901728d9ae
-EBUILD thunar-4.18.3.ebuild 2102 BLAKE2B 6b265e98b993a780bcd0419ca08c0cffcc77bcbc5c604a11d559d69aafb56e5f5e5540a04fdf3462127520ae1ae029edbe0ff342daf0ccba1de2e668d274c8c6 SHA512 98e689e81569705ba631225cba62c65ebd877a30909389f5e0b1efa34baf6c70190216f9e6e79a1e19534fa47fd7f4b109f77192135c57417c8d0f1344e7a6ad
-EBUILD thunar-4.18.4.ebuild 2108 BLAKE2B f5520d18862ff4c7ffc6b37237f955da368a4e37210dbea5621197354b6b10e9d621db9009c901716d094b3277f2fcb4f77b20f95d8e01ed637b5a1222fdf3e5 SHA512 aed4c181021d97d380d7ba0dc6d911487fcc76e22c737cf8db050543a7eef2f0a2e408c453011457b017723d0741de65cfdf30309772a2d6a06d61b79e81c3f5
+EBUILD thunar-4.18.4.ebuild 2102 BLAKE2B 6b265e98b993a780bcd0419ca08c0cffcc77bcbc5c604a11d559d69aafb56e5f5e5540a04fdf3462127520ae1ae029edbe0ff342daf0ccba1de2e668d274c8c6 SHA512 98e689e81569705ba631225cba62c65ebd877a30909389f5e0b1efa34baf6c70190216f9e6e79a1e19534fa47fd7f4b109f77192135c57417c8d0f1344e7a6ad
 MISC metadata.xml 373 BLAKE2B 8565ee8f50389c9ecd482437d0081ce6c9ed0ade1fffd724c2485c03c708565c91bf89a974a37a3deb541e2e0cf35a19881c8b3ee39182f26d1c522088466ff1 SHA512 b73f53699dc6b936d1baa9bffde644a86481083b4ca333b2d5148bcd03c43e9ff9577c6b35a2e40d89071158c4b4deea4d6317e40959f4344b7f974ac3d22c71
diff --git a/xfce-base/thunar/thunar-4.18.3.ebuild b/xfce-base/thunar/thunar-4.18.3.ebuild
deleted file mode 100644
index 32ba663f578e..000000000000
--- a/xfce-base/thunar/thunar-4.18.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 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://docs.xfce.org/xfce/thunar/start
-	https://gitlab.xfce.org/xfce/thunar/
-"
-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 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gdk-pixbuf-2.40.0
-	>=x11-libs/gtk+-3.24.0: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/libpcre2-10.0:= )
-	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? (
-		>=gnome-base/gvfs-1.18.3
-	)
-	udisks? (
-		>=gnome-base/gvfs-1.18.3[udisks,udev]
-		virtual/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 pcre2)
-		$(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/thunar/thunar-4.18.4.ebuild b/xfce-base/thunar/thunar-4.18.4.ebuild
index c3bb395fb212..32ba663f578e 100644
--- a/xfce-base/thunar/thunar-4.18.4.ebuild
+++ b/xfce-base/thunar/thunar-4.18.4.ebuild
@@ -14,7 +14,7 @@ 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
 
 DEPEND="
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index b716965443ad..243eec69aa72 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-panel-4.18.1.tar.bz2 1446504 BLAKE2B b7b8c0d26d21a543af7bb05b66e4435cbb059043502f34bed27915eaf2684b324e9e9ca8407d666bf2258fb80e559e9b11e87ffea4067c9dc6a42737bc1345a4 SHA512 6c79b305676fc6f8088f5579352be1379e87cf88b4207be0c579e6ebc9661a76f8decc434ef9973e29ca363bb7a4caf980c41b1800fae7d55f47c0405dd48075
 DIST xfce4-panel-4.18.2.tar.bz2 1448776 BLAKE2B 5c6f0f3eb85348c6181a94d19331a42ba02e36fd32c747c2dd1d8d762b795e5c8f7a21d4c54765fe498f1d0604ef7229c40f625cb3350dff41c7ec32caa49072 SHA512 8f8aa29a3dc1133477bc7075a2bbb7e7811ebd26f94e9771e4b6987e4aaa2733295e3260cf5b9052545181195ddac50e93c421e4518cdd1ccf18c39c4c972712
 DIST xfce4-panel-4.19.0.tar.bz2 1485117 BLAKE2B a70654a1d8633f04310a1a9fb8554254de2f272f6fbbfede3c709a9bdc9b7d6138d5ab26ea83ccc75c9152ee0fb9d2ce7e7b174ace6369eb7d60e14db0828cec SHA512 a1c3c5f535581332c1b5e93bfecabae32cbe610d168f4452bed321466b73e4ca9ca09ca2e7c7f54cb82fe45a6102022bb30f77b57841a9bba03809b703bddf91
-EBUILD xfce4-panel-4.18.1.ebuild 1590 BLAKE2B cc1136060fcb7cfdfcf51523efee9c17af783e95ec410fe5818a22ec9a439e96afc5fabd0a54c9c26d875c5e4a0efd8bcdb26e97ef0f1f47de1b0a851ae61537 SHA512 123a616f309295e5a3a199d90c209bd22ecc7f33820bf8577976c719d872bd54a05aebb69952230784cb1270c90d3540a849e616e9e06ad7f1e4d037cfa426fb
-EBUILD xfce4-panel-4.18.2.ebuild 1596 BLAKE2B c3a1b270c82b55831e96da1a09ca5b7a4d0bc3f94968ec59619ba085bbc802bed69e1a7135d0f4dfefdb601390e90550cf67d9a56032eaf46ef18209140e4422 SHA512 66035ad611a7c795d5f362f30539bc8868b703775c9431297b37c89710f72f99fd918b15088092137e01dddafaed31599334b779f01208358f49d65b25f5a7fb
+EBUILD xfce4-panel-4.18.2.ebuild 1590 BLAKE2B cc1136060fcb7cfdfcf51523efee9c17af783e95ec410fe5818a22ec9a439e96afc5fabd0a54c9c26d875c5e4a0efd8bcdb26e97ef0f1f47de1b0a851ae61537 SHA512 123a616f309295e5a3a199d90c209bd22ecc7f33820bf8577976c719d872bd54a05aebb69952230784cb1270c90d3540a849e616e9e06ad7f1e4d037cfa426fb
 EBUILD xfce4-panel-4.19.0.ebuild 1826 BLAKE2B 0a8407966507b07e8c34073d3c88e8d46f713b8e5bf24a14a007a3f51e108468b1eefe1aac65f7b45321480debfe371bd19bec2951f2a01cde3c59354a83a46b SHA512 f20c5910fc8c732e3db02ae9f57a5f58356bfec42767d9943f6deee803ebdaee414553f202fd3fb1f7f18c1100ef5a7350b040485de633dba73c92b68f7cdb88
 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
deleted file mode 100644
index 1554ed519788..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 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://docs.xfce.org/xfce/xfce4-panel/start
-	https://gitlab.xfce.org/xfce/xfce4-panel/
-"
-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 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbusmenu introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/cairo-1.16.0
-	>=x11-libs/gtk+-3.24.0: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-1.66:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-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
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.18.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.2.ebuild
index 7d772282a7b2..1554ed519788 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.18.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.18.2.ebuild
@@ -14,7 +14,7 @@ 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfce4-power-manager/Manifest b/xfce-base/xfce4-power-manager/Manifest
index f56c601ae3ad..001eb186bbe0 100644
--- a/xfce-base/xfce4-power-manager/Manifest
+++ b/xfce-base/xfce4-power-manager/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-power-manager-4.18.0.tar.bz2 1239515 BLAKE2B 1fc2ffcde64e873693322694ef638cc1e3e0773cc3dec663a03bfb7c4833e410e96ab2726fd5b7600149257e8add17ce51da6db5f31895c66007a83ed1837e18 SHA512 5cfa5285b479a0341b4afbf3141f773ff217cd1003cee55087a33f27e392dacf4930bc08b4faa7296dfe9e738d114a56efcecca32145a4cf68856d5d6feb9d24
 DIST xfce4-power-manager-4.18.1.tar.bz2 1217727 BLAKE2B bbd2a70cdb4fbac6146a28895b17896a10aff4a8d5e32ab82852e034977e9d1872d78eca6f8181ff16c74fcdd65ef27d891682bb93ef7ea4d846ccfee07ab034 SHA512 bb84f5a35058fa4aaa8cbe871acd898afb86885172c74d4b811d5b2c1204c0f7865c8488064622c364350c47d9aaecd07f1b65b56f72a547325e6e73bc2eb4ff
 EBUILD xfce4-power-manager-4.18.0.ebuild 1614 BLAKE2B 82efd4979b75e696e36d075481a8461586945b9b4769edfbd9da931e75cdab10e09344cc643e4bb71880d73bc026cc3bfb3135259224a33cf0f2365d91821d41 SHA512 1d0e097580e2b33edb446c6036dd6a442d7beb94840b0318d3b38afae9f21a3637a028c45e6557c8e871a9b6b2e1b93e6bbbdf3a54ee231d4830e2e13e113f6e
-EBUILD xfce4-power-manager-4.18.1.ebuild 1622 BLAKE2B 240c71ad3db1747beba2963664bd159a59f5aeb479a5785464d8bbb023def9384bd821c52cd3f7e99c3672a8597c7d6c9b3a25b06b068b95b7d9e58e314e2dff SHA512 75314fb705d75893c34d1ade6bbb0fd32eac000aa04178d38e6f4e38768af30b33df1972940357325340afea22e8dfbda9a3b7868e3986fcc85ca5d98b965cad
+EBUILD xfce4-power-manager-4.18.1.ebuild 1620 BLAKE2B a8504c1bd2f57892d0137ce8ab02e7e85cef26dc861f3349c5ba77ec83ae82baed036bcb6130955f50fdab65b340701a5114311fa97d7aa1a5088e879ffa6e18 SHA512 d97810b2394e0b5d5df72fbf8eef8e9c9848cb6641cb5795e667d599039b35a5b72f920d733318dc25854783d784a9a274e4e128add7f5cbac3e224eb356798f
 MISC metadata.xml 361 BLAKE2B 0cd2ec9e6643d7379a8c37fc9ae3b3902396c94732182f4a3c7d50bef85e555c9d69b6c8ed13d127167c44e687d356b171f46d071acfa4c26b623835df9d94f6 SHA512 ca556c6a8e5df8b0e897fe64e04fdf23b23518b86db0e29568131d2d17329122f2aa012b2b2a7fb5811bd17a230c1d5a6065ce747532b4eb868cab4eb9d9dcd7
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild
index 64d8345ba8ca..7f3644cc57d8 100644
--- a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild
+++ b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="networkmanager +panel-plugin policykit"
 
 DEPEND="
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index e4adb164ca23..dc0f263b1164 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-session-4.18.0.tar.bz2 853627 BLAKE2B e2a4d2dfcdab677b738d2fc3857bb7db07a0918af5bd4977e0f04210d52d4fc94551187b0ff2e3b5289823aeba0e12dc00344043da0fed2b3b2207afda423731 SHA512 00fcae02004675a26e6d73998403cf0e3a36dfd3596315ee98567d302a10c344cc1b64dac782e02416f11f6db3c730792e8de7d2d0ea1a6e0f2b2b7dbee74f4c
 DIST xfce4-session-4.18.1.tar.bz2 872771 BLAKE2B e9c0b972e1dc2b324d15c17dd317f151d7d4d169533752222f8347be36c1d070f888993be8ef8f590fda5632f66c5a6c973ed91dd95afe06418656c8ec129d54 SHA512 6e6a55138380b6e7ce98508f4d3a52a596882b2f244a1ebd0d1a4b7dd1814c93e6e27453b500cb9178889790f067e28c7c4479b39963511d8e579831a44ef973
 EBUILD xfce4-session-4.18.0.ebuild 1511 BLAKE2B 60283009f9d1e6ae909433277c64771c426d46e6c1c6c94143a2d3f783e5a9d5366855888ef55faf9c31b7ab7f84e9c091b43e35efa754ef5ca8771a8c530a11 SHA512 659b67853f4919f2de3c97f3dbaa760901ca1ce7aad86e915fdeb2de4e03c5e2e4a46853c6d01ec991d87c76fe98a6b6b735aa569c9e684f7548b07910278434
-EBUILD xfce4-session-4.18.1.ebuild 1517 BLAKE2B ce0c77fcb148fc8c6768356840ccf61543aea92f4d8de746c983562255abbdb901ec3ac72d5737f4c0e9e938a338f5327c8c71840cfbabd4efd4e6ec463d1625 SHA512 9dea443db1c4f04845fbb527c3895e40e9a1f20c7128c752ed4f78672c40437062496d5e55031ca205ae983d196b3e7d24948bfaa9acf31d8d619bbbc1a42be4
+EBUILD xfce4-session-4.18.1.ebuild 1515 BLAKE2B bb152f448c5c289bda8d2d33e0ccbb17ba29653f1fdc441374ca1add1163d9b1d75946e5a7902482c4c5016692ced0de554278f79f02e94d74e4bca5f4da585d SHA512 aae3e333b695bd8642c45902083034f80bdf6032324a1e10d26e254e58f0be225f6273c5a0ba8c1a37e8d780fc0f989b00cb97a3f0c667bad98bf5d8134aa151
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-session/xfce4-session-4.18.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.18.1.ebuild
index d46f926906e5..ae01eb28e109 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.18.1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="nls policykit +xscreensaver"
 
 DEPEND="
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 0858fd57868d..856a76cf205a 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-settings-4.18.1.tar.bz2 1513041 BLAKE2B 83b47dbe138bd809391833a4525d01b2171dd77ad5826e90f95a181deb39350683b864242ed8708caaaefe19aac748e96ac270fa71ef25a96cdabc5311c2e639 SHA512 868d9d041c7aee621543ea54798f9758dc47719a7684d01ebb55e0193c30a0ac544df6a4961846e4b8c6d9297737be767d6f68446c4ab85870d8c0741cd07515
 DIST xfce4-settings-4.18.2.tar.bz2 1544572 BLAKE2B 8dee6855c98426aace796c7c6fe55770ca2c4c8e0c5129fd70274a0fe6589dd797eb078d79f7fd490c39cd4e1ec1dd90439c4cc030e7594aeb27c84e6e541fa2 SHA512 3371db3952f1863763b613952585873a0b8e1bd8507a64c056a918f3d16c3313e1266cb65dc341d3ce89ab281ee5a5d2cd183b6bb4078609b843524a125769b4
-EBUILD xfce4-settings-4.18.1.ebuild 1814 BLAKE2B b7a30fea90f89d256f8511926102bd1cb91ca17a9d79fe061ec0314b41cc8e99adbb93eb0e8f67e90bf03de954fcb19471983e1dfc95d45a3e7b16607519ec93 SHA512 785ba75fc52c310aca81a1dfcbf6abb87867b8e4643ce6976b75bfd41f3d36b51bea77d64a0d30ad567c2ade075efba5e6ab12736c00b8d9e1adcebb02529ce7
-EBUILD xfce4-settings-4.18.2.ebuild 1820 BLAKE2B 761df5405092625aba448eb7bb45d90c73ed61b174559c55efdfd4a561f9db2429fc963e52f9613bb1671f5d446655b66d70949a82932d065c58dc43c48a9bdd SHA512 dfd3ae579e17be8490fc1ac6c8d6fcbf110e012525b87bf30ab31ea1e69ea5ad9b38b3312523a7bd213dd6a5864ee90a136b9522d27e10f6c9b81d5894c479fe
+EBUILD xfce4-settings-4.18.2.ebuild 1814 BLAKE2B b7a30fea90f89d256f8511926102bd1cb91ca17a9d79fe061ec0314b41cc8e99adbb93eb0e8f67e90bf03de954fcb19471983e1dfc95d45a3e7b16607519ec93 SHA512 785ba75fc52c310aca81a1dfcbf6abb87867b8e4643ce6976b75bfd41f3d36b51bea77d64a0d30ad567c2ade075efba5e6ab12736c00b8d9e1adcebb02529ce7
 MISC metadata.xml 480 BLAKE2B 4aabe2bbd7da19f62794843c890648503139a81904d84f6b97f9af9634a43ad583eede1adec9704969663455d033838db3a9a825c90d6f341cea411ed89514f2 SHA512 7e1e28f50387533611b4cee185e5e91b1dcc180ebb5bf7bcbd5fa58bc8ef666ce1bba57961de19016ceaa75a6b60b70ec55cff9a2d22bdf0d4f2b9e04abf2bb7
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
deleted file mode 100644
index 208e1b52bfa7..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-settings/start
-	https://gitlab.xfce.org/xfce/xfce4-settings/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.66.0
-	media-libs/fontconfig
-	>=x11-libs/gtk+-3.24.0:3
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2:=
-	>=xfce-base/exo-4.15.1:=
-	>=xfce-base/libxfce4ui-4.17.0:=
-	>=xfce-base/libxfce4util-4.17.2:=
-	>=xfce-base/xfconf-4.13:=
-	colord? ( x11-misc/colord:= )
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	xklavier? ( >=x11-libs/libxklavier-5 )
-	!<xfce-base/exo-4.15.1
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable upower upower-glib)
-		$(use_enable input_devices_libinput xorg-libinput)
-		$(use_enable libnotify)
-		$(use_enable colord)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.18.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.18.2.ebuild
index 5ac63306b8df..208e1b52bfa7 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.18.2.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.18.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index c5048692f891..10ca2b3ab8a2 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/thunar-media-tags-plugin/Manifest b/xfce-extra/thunar-media-tags-plugin/Manifest
index d9d161a3674c..d8b45ad0e8d9 100644
--- a/xfce-extra/thunar-media-tags-plugin/Manifest
+++ b/xfce-extra/thunar-media-tags-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST thunar-media-tags-plugin-0.3.0.tar.bz2 378993 BLAKE2B 9ddb44862808eab8e836cd85ef9afd6b04a96d1b1b98a80bddba85c1544e91a563b3d40ede04035de50b032c01623d574d818cf19ba60483432a78a61e772c21 SHA512 f7c13acb1d9936676e22fdb2d6c1def5ad651ab104110559817fc51dfad845823de4ba724054a7e99a4af980e62e05db750097c32018effa29cb5f56676d9eaa
 DIST thunar-media-tags-plugin-0.4.0.tar.bz2 398971 BLAKE2B 83402dc50a68eb5155351c45ab81f58c3dc95b9dd0d5495f793114532c17afbc2cd4b144a8ca85be54bb8cdce8352b9257fe7e9a5410ba62d7c9ee44da8df491 SHA512 1856bfdaf6489e974949e30231f835cf3d51ec693e36cec32e1735df630a5e1df609b63dc770ee85abf6925470159282e563843c6f0c948052eeafd4abf8062e
-EBUILD thunar-media-tags-plugin-0.3.0.ebuild 657 BLAKE2B 50a4f8b5315acb0ba822ab759604e60f30ecba73d0a5f3e6319f82ef7f9bca439de4c147e78c3dcfdf261ec9e60f248977ab7d7b644c93baf90b1ad305a7c86c SHA512 df753fecaa1f1f3192a6ffabd5689f145b69fa5219000dbb1887d5249fe3c5ff919c5142d622385a260d754c9a06d20c49580c7407764b1d38b6fb368959ef38
-EBUILD thunar-media-tags-plugin-0.4.0.ebuild 786 BLAKE2B 4837e8f375eec3e70c55fa6556c5151820448f27965cb6789a533d00492703acd733c40e75e14922719eb21b7d2625f0207d68d891cf635d1693fa48ead61dcd SHA512 82d8eaa95b7b7bca09f7e8ca2ad5d210e2a59155c33210b486d7d2c697a88c15bbf9f202c0f30485cc31487419ac751163365cba5d0682201e8f98743d0d02cb
+EBUILD thunar-media-tags-plugin-0.4.0.ebuild 784 BLAKE2B be75f9ebab9ca8f0d937a992411e7990bb0f154b518607190b6b62b0276bf6293e95fab27dfadabb95978fdbf076ed4718b0fd1bdcb163f99567808a8320f9d4 SHA512 cf4699317ddd9079d3e4eab93a70388dfb02452ffeff53d608ee95d355a84bf2953362084e3a794c3bd7a85d84dbc701db9d97a1c31141fb698e5a033ec14ace
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.ebuild b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.ebuild
deleted file mode 100644
index 5862c3a07070..000000000000
--- a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Adds special features for media files to the Thunar File Manager"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin"
-SRC_URI="https://archive.xfce.org/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE=""
-
-RDEPEND=">=media-libs/taglib-1.6
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/thunar-1.7:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.4.0.ebuild b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.4.0.ebuild
index 2eaef075ee59..e421bfff6f88 100644
--- a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.4.0.ebuild
+++ b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	>=media-libs/taglib-1.6
diff --git a/xfce-extra/xfce4-datetime-plugin/Manifest b/xfce-extra/xfce4-datetime-plugin/Manifest
index 92de02664bd0..ea976de6f310 100644
--- a/xfce-extra/xfce4-datetime-plugin/Manifest
+++ b/xfce-extra/xfce4-datetime-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-datetime-plugin-0.8.2.tar.bz2 328440 BLAKE2B b3314b5250edd63749fa7f4e54ae9b2c2ad1d05d56e31556950560164c0e2042f4ef2ca842c1f712bb6184a4db50cacadf766734ea16b7aac88aaecbf96c95a6 SHA512 3457b503c6fc72b2a1ffb7a26bf71776362087fcb3a33c6050d169843591855420c60399869131013653a6acac5b18f5926fc51690b49ebad01c4d078b2bca97
 DIST xfce4-datetime-plugin-0.8.3.tar.bz2 329081 BLAKE2B d863e60cf6cdd79fdb0512bf2dd62505070e3922628d8692124969ac2c2bea1afe2016eda4954afa07753944b8686ab63f8fdac87f2b7cc759105f69989b6095 SHA512 8c85078354e6cff8b60871cc6add723edd3f816aec3cd1e9e3f16a58e45443d54b4dc8289405e4641cd84deb93754f2425fc2c4b52b3242d9ca299e03e82d0ff
-EBUILD xfce4-datetime-plugin-0.8.2.ebuild 779 BLAKE2B 69f03720484048eaaafd871e4eddd09ce59d2b0fbc3ea91280e2c9fe402e1b7509535e7bd294bc9f4933d39a99f1903f4f9f00a95f65c2bdafe72e79e3d6eb08 SHA512 666ea34b126a30a18d609b47e74397fe87eb955b284ecdb1d84b3c416e11d2e55c1958dcae4be72b5b64be757c7b1c208aade4b581fcc52c363ea9459ea0bc2d
-EBUILD xfce4-datetime-plugin-0.8.3.ebuild 784 BLAKE2B 382adb544c5c678288b71d1a82a5523d591388c5b281d0fa37dfa2c8aa9a3acdfc59e42989bd5bc661ee4cc29c838a1bdf7c9c8654c0d61f82cde4b50f833d12 SHA512 1507192f3ef17bcc89ec87736a596d1d1abcfa3626b033efaa919358fe2afb4bf3e1dd3a7c6db11ba98d950bad42218731b7e972a1897b596d7ea2341ec1224c
+EBUILD xfce4-datetime-plugin-0.8.3.ebuild 779 BLAKE2B a8f7297889dd76204479a311a3bacdd9acf67442ee937b2adcae69f6feed3cbdc676faed9fe298d30afd182aa57a6d441e917ebdcd79bb7cc8ceab437b24d020 SHA512 a172d9c815bdad87e57f861db3540418835f102070e76451e2690d3bb0514afd805b8dbae5b4e0f6a948a8124482e05e76fe2605c7b329eb6d115e15844554ee
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.2.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.2.ebuild
deleted file mode 100644
index 4db6bc4e903c..000000000000
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A panel plug-in with date, time and embedded calendar"
-HOMEPAGE="
-	https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin
-	https://gitlab.xfce.org/panel-plugins/xfce4-datetime-plugin/
-"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.3.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.3.ebuild
index d107cac38a53..524691d48e92 100644
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.3.ebuild
+++ b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index 2d6cab23ea72..89437185ce4e 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -5,5 +5,5 @@ DIST xfce4-notifyd-0.8.2.tar.bz2 684013 BLAKE2B ffb5e6ae171db83abeeebd375cbabb73
 EBUILD xfce4-notifyd-0.6.5.ebuild 935 BLAKE2B 121a2d7bd22fe0a23e9dff60d556efdc6fe265b1beccfcaf081d1fd64b14e15491831950b858472852ae48e28720562eca259e4b486b7b865c429c8715b40a31 SHA512 2995e2814cc3dbb557fd6ec2826306d6040bf886edbae73b8e4b461218f160206128ff6b0e171bbc89e547e4ca9db001baf3432200cfa2b3d754abba7378ee5d
 EBUILD xfce4-notifyd-0.8.0.ebuild 1266 BLAKE2B 3f12d05054f2c5f84b5669abcf62297acc203ebf69464600504832924dff83af70bf436087ed6393392eb722b7f37af0f064003158d61252bcf7b5c9153a2f4f SHA512 1a0a711e473e5accf6c964ee4a821d8377de7c107dc447a4b2a137042f4ff07d7163abf5e11184927175d36786162394e63d1fa645729a3450cac321ec6e73f5
 EBUILD xfce4-notifyd-0.8.1.ebuild 1266 BLAKE2B 3f12d05054f2c5f84b5669abcf62297acc203ebf69464600504832924dff83af70bf436087ed6393392eb722b7f37af0f064003158d61252bcf7b5c9153a2f4f SHA512 1a0a711e473e5accf6c964ee4a821d8377de7c107dc447a4b2a137042f4ff07d7163abf5e11184927175d36786162394e63d1fa645729a3450cac321ec6e73f5
-EBUILD xfce4-notifyd-0.8.2.ebuild 1289 BLAKE2B 012805e4c5849f11a2c51fb12ef758a61de0c3c923498261f4cee260b80fa0fcbbce6532e07cba7bd8168231b894da2d27d3f58e3f4ff9225c3257c7100ed691 SHA512 d8047dfaecb13f01af4c8871c5a9ad5c4f691d1db1b96690ca40ee721cbb77db67b0dc79b316137591305e43b94aab946f1710ce35f3eed0dfb8b582adfbd9ea
+EBUILD xfce4-notifyd-0.8.2.ebuild 1287 BLAKE2B 5b25f2b8038e9077f5cab00724ff121c34a1eb5af83caf93f20daf8d9dd12326934a4849a4bdaa0fba0f4d0b768e748a56904fc12fb9158fae589317777cee19 SHA512 ee3fee968da9963f2d43fff96d78f71ab2dc571cb7a229e83d0cb430b25a9be80e4e34a453d17780648a1b58007381e8d53d71574faca4a7c4cedb188ccfc7e1
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.8.2.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.8.2.ebuild
index c81204b5a186..951632be20c4 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.8.2.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="sound wayland X"
 
 DEPEND="
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 039b649f83f4..c4bad83ac744 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-whiskermenu-plugin-2.7.1.tar.bz2 183687 BLAKE2B 609a802fa4a13e860f9f2e374acaa520bc443f881532015b296236a034797784a14989e3f8f54cfcba1f3e36d25844f8308e5ece14e01616f390f409bd6514b1 SHA512 40a1124ad8bcb51a21cab20cde8079fdce31d57ade3da787235554391e5eb9ec747c646f46f84f9ecadacf124446bf80a7aec8138415b68ed064e02371aa7c0a
 DIST xfce4-whiskermenu-plugin-2.7.2.tar.bz2 180151 BLAKE2B a5df19d562c6f0716925825b2737c70a1892dd1c6e83394cc386814bcf203e7704b6b24e708bdf0a55bcda3d8c7f70a540522c73cf45c64ea598552108cecb4f SHA512 970734e91ae9e1681d5287e7c93ab7abd143b125f0cf7f0ed77e0552b94c9152ef4f1c5aa970a6d3f1a803ede1e5c5dc8d2c0146f8ab51ecfe4e6934716a190c
-EBUILD xfce4-whiskermenu-plugin-2.7.1.ebuild 998 BLAKE2B 7b20cf8d8706f14b084bd83dae47f6d30c12d6bd98b9969d89d3d7d601f73000d80a9638e8da8e160e6869e1fcc28a7e355abb541576f85aac723f3b57cbfcfb SHA512 ba1ca89c5c8e4df1de6deb2dc5a6b1eb19c8a48b68c1331218dacc408de371ee31073f430446efe4bcd08082fa2bc1ac88efb18a4476aa841104deb4b7d3bcb9
-EBUILD xfce4-whiskermenu-plugin-2.7.2.ebuild 1000 BLAKE2B 60f89d69825bd3716bca7e79a2f13ffeb4f5290b5f45663b78cf1e67990f4e38e5c9b248e6e166182bb3c5d59ca535b7ee74b117c130acdb4ab65ec9d388ea41 SHA512 f40db4c1325fbe26dbf46aa2e2f127a529b9ce3a5c3367f81f2c594c46d600c4f6d21f4cf6d0562207ef0276d7a2445dfc808577497a4026d7589d0bd557a8b0
+EBUILD xfce4-whiskermenu-plugin-2.7.2.ebuild 998 BLAKE2B 6bea5806b961eaeb41aa3e0fdb4b1b128c274ec503cc0b9796e16263c037aec376541df2782f492d9c3620e0a37e385cd246c99899a7325995270bf4304893a6 SHA512 7e18432f2f1ce061c8dca7a38bb22d8550d3b1c14dfd19ab5ce2d7fbdcff5a5519cbb9ded4ccedb83b808dcea66afec1e4574e5c95a0a6ba987ae2feac0894be
 MISC metadata.xml 2114 BLAKE2B 301868122902e577bed6e790601a192b839d3345d601e87403d5651aa99a260b7c80d9bb16a6f273a3a06531f091b3a2416eeb4cb0453692d00c17cf5478df24 SHA512 f5e4445fca8f8ae4cb1aa681108256584729ef6073e531f23729bb7880d839c3d29995480e21eabcd453f1f3368fb41d078b5091bb691d0879215ad6e3e1eb3a
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.1.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.1.ebuild
deleted file mode 100644
index 93f2b6b0ebeb..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.1.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
-inherit cmake xdg-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin/"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl
-	x11-libs/gtk+:3
-	xfce-base/exo:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# upstream does fancy stuff in other build types
-CMAKE_BUILD_TYPE=Debug
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-		-DENABLE_LINK_TIME_OPTIMIZATION=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.2.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.2.ebuild
index e781784c425e..0b68d5606c70 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.2.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2023-03-17 18:28:08 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-03-17 18:28:08 +0000
commit	1f254b1ee917690b4f8f7738fdcfc295ee304ff7 (patch)
tree	136ad1b72b899873af1ab7e8fcc6ec343484f41f
parent	bcf596975a1c2450e077c80c84017c54198f216c (diff)