gentoo auto-resync : 28:04:2023 - 23:13:34

author: V3n3RiX <venerix@koprulu.sector> 2023-04-28 23:13:34 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-04-28 23:13:34 +0100
commit: b8395ecde09583851e86d0512adec19f7308d791 (patch)
tree: 80f0b26997037858eca514eecb197b37300ba4bb
parent: 670fe3b64a21a723fda1e52fe61cad2327f81f67 (diff)
206 files changed, 1197 insertions, 2185 deletions
diff --git a/Manifest b/Manifest
index 5b26c5085f20..15e510d6059e 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29472 BLAKE2B c48b5d3aa921e38ae2cab916b955e96cee8c1f27f250e1732ecfd5709882c965a8230d1f29351c851d0bdb2b94fb9c5ead0756aef2ba21febd2779663f3a3cf7 SHA512 83d3ac7ced61c9c797dbe340b06b8732f604f58c31f104b1d7673e126feaf11becaa7b0a80ed394c5ed3ffdb28d760d3be08278aae864b9f47aa9a52d14f1602
-TIMESTAMP 2023-04-28T15:39:52Z
+MANIFEST Manifest.files.gz 29488 BLAKE2B fd415e9285fb92d69d873d7ad3bc2a51fb521b1a3e427bef245bf21cc1581f0a1ab918098834d1525ac15690d9b3325bdebbb1e368b8efd5dd6d7d97ee0beec0 SHA512 d47ca5e01d9d86ac25f2156c41a4b0860a346f9b569d20d1d9c47236982a10c8c7d2be766d0dbe0f02740c8cc70a8752858e894329fc7f891870094bf50e3014
+TIMESTAMP 2023-04-28T21:39:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRL6MhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRMPSdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDIfw//faGt/gpFlRqWk1WcgMH6eYhjhXyW8cDcvUt7Kn3h5fBN6cc999qCRbLF
-MA5wB7AYz0Ii1Qu0unBizM3oNgu4sOkTMoknydmNNztgWySx7F9ZNEhyS7jhZ6Al
-k/kHhn7WVhDmZ+jIhkB9aMV6OZ8d2cldscIFzwh68AkE/shSQh9fwNJ0xcjHIIGn
-vTnZs82J9qk6EYb6/Rm/u19HhYWseTM0c7xs/ZeuN8+SmJu7UZMFQ+pramRxYzpu
-C/pz1BkaSbvPfHmkuBQYayHM5W8VKNoc0NqQq9S3LW8UJSQVPlddgjNbXw8Cnhcm
-j3v42+iDXF2aYs7jKZKm9bRx1mDI8LGXvOblR6KHsoOE1whCnBlrywfYZoBWqpVh
-Xvi8jnpiX+Ehdo3nbGWV4VD60SbTuNBBtuUkvxO9fCEWKNF0SoZa+vJKZdxVpsnL
-vVGW9zDvTB7PcI7fuRQcFhQ7gq+3DOoS8oaC6y8dT3xUB2Ns1s1w/RLiUHwvvsHz
-dFqrk+7CeQzbG940gW4+7I9BB008TXBVe/9jRf8JLVbnnK3lSc957NTN5vGXDoPw
-kiFyppAJhVACJapbhG5xCbfLxX9S602zJ1g3nq0GdBcP28crXrAI5KZZQHHuJszI
-vMP5h1WC2+FJs6Blk100CkvdJb/6o0NufnIn6E4MzR/U0SDX0n0=
-=s1TP
+klCg8w/7BcXcndUHpVZiklBQlThxHEuaUbNxgzbXjCbTB06O+rsN47JSUvL3APk9
+aBLTo8NZF9q9ZXrqOhWcqBUPwjCH/ylKLS1lKu6Xn5h1Mzv7rqXNh2P/KDGC0Akf
+oWyYrElxnLMN7G74eUBEW8xaZV0jAYqSwAlBtuzX8qZgLFL4zjQeLFCq5MPI/1w9
+qPXYYhmtAd7AOs4qBSm5w3HhwZb29v3LiWU4rkC6lHxASM1B3lrjUZyYigU3V0aZ
+/f5tDt5rmFWc4KCtHA29viJ6ky1j6wbZjyI+PLZnmm94lDHIPw7qehZyea04iICa
+8u70KJxkPh0B/ytbIPbUyzANBnGwoJL+PZQqIdcwOc6OGtXIwkFUaTad6Ukv+bdP
+fc+rXWWuyx/h+a7TJbxuGHpWPtNc9JnHfBm6kU3gtSJ+xyJUpvj7A62uTmhMWdQK
+Y48Y7ILcGbr+e+8I6t1dnHyIAC7TqRKZiQiayqakWUaxMNl9Ep2x6O6aWJAU78ii
+GaBscKzOV/9mfB01DcwNQnOdOJa2WXdvtP0Ecx2r2x9KFws4or3kEEaJH7LeRM7X
+nsiuZOKAXLrudRbd90EprDgdRef3/+//uqZ6v/IDcIEfE4sCOjZfds9cop/ZxpT2
+XODC1Z3tVKUEdUN7X9Kw7QRUDpGmJB+xqngY/Ks+lrh3Sh4N2j8=
+=gtmx
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 145493260655..d8f158dfdecd 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c17523ecd22c..25d75cc9d700 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 a954df37900d..44743efdc7f5 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -1,13 +1,9 @@
 AUX resolvelib.patch 5731 BLAKE2B fdc0660ea786e02475e7e9735de6493cd6b96048c238ee050d1751a46cce12048112e495e1de48e1d1bb41d5d4415b16dfe294621bd0f6bbb0786c3df52dd35b SHA512 baf5f8c42c85628dffda987dc81b98f56f1a60857f4cc9e6f1b9938f4978d1ba4d84dc7904685dbe02e19a4b91a7a2f979772bbdd42268e6754bcd5208e40d37
-DIST ansible-core-2.13.8.tar.gz 13985893 BLAKE2B c0fd9ebde2dacd590588a654df29ed56e681ee67f3df41f1d1e91351259c22a0b01f0eb108763596198133e4d980c2130317f79d4f8f25ea1e36dac9325a8b40 SHA512 a3abeaca7076a590892b31735c901447654b5f1db59ca3095ad1d98c8de11b982e1375a22f1814712545fe84a870f57132d87c2ca47fa6a779bd53cd99d17ba4
 DIST ansible-core-2.13.9.tar.gz 14025835 BLAKE2B 831f04f1d4872d2e7a9801e69e450ed48c65f95121dc56f124c932169e44c12da672dd4ba9320a4e40270afd044d38c0774e79980977322260f110986d06a65e SHA512 74514d98fb3f7f24fb0b4e95ee20c76f26234d1f5067ca2801e9ac92baabed0f2f2c89bf577510be7403041405951271e7749279c9fa04fab57018cbdf2c52c7
-DIST ansible-core-2.14.3.tar.gz 11516886 BLAKE2B 95c209842c1ccd090467e529f8c84def76cb3df69863b02c01f61a1ac6d4fa911134cc336e51e087215939efa91883ad51d4c01d2b3f4c124b82c540ab0e3be0 SHA512 95278d9c55d3eef2f66db1ee62648b5493e138f19513c32780684c55631c1ec49f94988a8d0f5eede44dbcceca7b4dd34aca10fa67d17dbe90ef8cf37051581d
 DIST ansible-core-2.14.4.tar.gz 11589961 BLAKE2B ae096debaf676dbd46cb047f0f87af5d09b4265368500964bbd0cf3ac8e58969bee489d66486fb570a697df5b22065fae206f1df361eb911a7fe025628655371 SHA512 86164dfded15232174e4f11140a71b91ef5b0d93b40a2df9588930b4b955f20feb419258c2bbf9d6735d298ec626c88c5e9b1c933a51e3273a28b85fac7a3762
 DIST ansible-core-2.14.5.tar.gz 11620295 BLAKE2B d006f773e1c2b28582143a4f08f699e5744fba492130388fa5463053cdf8f0cc7056296daa213c72884ea0c0ba454a3e04ef118c184faba8c8d3c281ae65345a SHA512 130a0de925c7229dee350ddbf4382d87802d86aab4817ed595105db8ed5071153847dac0478f20a994670e59e53a07b77d0bf35855d309ebc222fbb61233b7db
-EBUILD ansible-core-2.13.8.ebuild 1325 BLAKE2B ca6bdb1f2b9eb14c94a4e443f02751f41e1ddf9eaec7e46ed91ebfb2fc9a77ed3d4d9bfef2bc9fd92e9ec6fe707a4854ddb0fdfd457d8859a5dd48da4783313e SHA512 380e6c95b884d493f0de5a6a721a2fbe02bc5ac99b9de8e8a2b7be901c9510b5d7f9f876352a2ff0fe553da03d50d5e55275135a899cc3f7a8e88e1bd8db714c
-EBUILD ansible-core-2.13.9.ebuild 1328 BLAKE2B 80846b2634fa068a5194947e74fba62825738df1de99e890b1923ede0fc33594e3f6d4fadcdddcfb44e73b27671f17698c9062f8cefe008d01603d14cb1e5038 SHA512 bc4a5ce71b0bc318652216ff7a147ffcb78cf0221de26fadc5d1d4ad9bf617252485f0f0e61903d508cf4ee025b647f6003b38461ff9a5845cd9477dc8fb6bb3
-EBUILD ansible-core-2.14.3.ebuild 1306 BLAKE2B 6305f4d4d83b581a94f7bb9e8501e541327c489215eeb2db26dd99086d25b8109a4cba21f982c67f04e978b7fd39d46a0ddb922ec503e60d6ff967ee1fcb9a18 SHA512 96b4ed14b611917f26c5eef7a618c9b6aeb3d84eda44f3292bdc448d50259a4c8618137ab655f326f49824695e0fb8e057109e68b5129c89e1d05df75e868958
-EBUILD ansible-core-2.14.4-r1.ebuild 1354 BLAKE2B b338058c316d4c5ba00e2af886f80b0d30e2d35b21e7c761a9ae4c07a0a538f04980c19de72eb19f8a3267482c3c6a50b8a3bdaaca42c101e84cae71439f53d7 SHA512 fb2b58338c253cde83c375882cc648a8dc7930408f3e235b146144b067ce754f2bbfcb8e1de8429e13d2eb693fa68f7bac89cbe1861c10424d26057ebd020936
+EBUILD ansible-core-2.13.9.ebuild 1325 BLAKE2B ca6bdb1f2b9eb14c94a4e443f02751f41e1ddf9eaec7e46ed91ebfb2fc9a77ed3d4d9bfef2bc9fd92e9ec6fe707a4854ddb0fdfd457d8859a5dd48da4783313e SHA512 380e6c95b884d493f0de5a6a721a2fbe02bc5ac99b9de8e8a2b7be901c9510b5d7f9f876352a2ff0fe553da03d50d5e55275135a899cc3f7a8e88e1bd8db714c
+EBUILD ansible-core-2.14.4-r1.ebuild 1351 BLAKE2B b00902f00b8f1371777e41651460ecd2925d20a165ee8e491ff7e4d7cd902d380eed501556bc8c393e2236f79818eeffff05f8e2f093408ca61cee70d0ee8642 SHA512 94e9821734f241f745301bea4676c7d7aee48628d61b910cd694d6d541a660fe226bf9e5b50129b5263221ef9986898f656831a63531ada6916ba63d4b620724
 EBUILD ansible-core-2.14.5.ebuild 1354 BLAKE2B b338058c316d4c5ba00e2af886f80b0d30e2d35b21e7c761a9ae4c07a0a538f04980c19de72eb19f8a3267482c3c6a50b8a3bdaaca42c101e84cae71439f53d7 SHA512 fb2b58338c253cde83c375882cc648a8dc7930408f3e235b146144b067ce754f2bbfcb8e1de8429e13d2eb693fa68f7bac89cbe1861c10424d26057ebd020936
 EBUILD ansible-core-9999.ebuild 1309 BLAKE2B 5288758a95f5be33854ed6093801b954adbd067213b825eefb2ac56945f15cef99aae4d82e87de8af26b48068b0a98f424a12861efff111c2007e2f1f1d61420 SHA512 c9c81036d86440c692ccf304c229caa8929d1e34519831d62b627141192d33cf832462b3ef2fbe65ac8351f4b56cd3b3f898e0c829b45b5440a0753a88f0fc1e
 MISC metadata.xml 1042 BLAKE2B bf5f9a6d7f2b7a0465332ce47a343566749ac3e6b8c29d37c21140c69e56a3c58ba2bc6335b6839da43993dc427a12350506dc55b0f727856f16b173c0df90a4 SHA512 4adc7776bc6f02d91f2229ea96566e94b1e8155f75bac27d7391f87d6fc3100da425235f2c02dccd1ce7534abc9c30be0ab5a15ec9dc4278463f10dcf95e8b4d
diff --git a/app-admin/ansible-core/ansible-core-2.13.8.ebuild b/app-admin/ansible-core/ansible-core-2.13.8.ebuild
deleted file mode 100644
index ee8d323e90b5..000000000000
--- a/app-admin/ansible-core/ansible-core-2.13.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-BDEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		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
-}
diff --git a/app-admin/ansible-core/ansible-core-2.13.9.ebuild b/app-admin/ansible-core/ansible-core-2.13.9.ebuild
index 84f6bffd432f..ee8d323e90b5 100644
--- a/app-admin/ansible-core/ansible-core-2.13.9.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-core/ansible-core-2.14.3.ebuild b/app-admin/ansible-core/ansible-core-2.14.3.ebuild
deleted file mode 100644
index 3c7933de840a..000000000000
--- a/app-admin/ansible-core/ansible-core-2.14.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	inherit pypi
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-BDEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		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
-}
diff --git a/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild b/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
index 66c67a2e2ac7..c9e4dbcd003a 100644
--- a/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index b18300ef7dd5..cf5b9b978356 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,7 +1,5 @@
 DIST ansible-6.7.0.tar.gz 36371372 BLAKE2B 75cb14f158c36ded8313a1c5b798838afdf3a38ffc8e29a87c8e1e3e74c9aeca827432397ad83ed23a1d3aeaaef91822cc3c23aa226a307d93f84f54b25d71bb SHA512 676baf03626d5bf36aea7117d39ef71ba7878ab6bccdec1ee199bd699d559a5f3f6a0d9032ef120204093677b7fbbe1b575529d3aa692acd1a4447f9c2715f3a
-DIST ansible-7.3.0.tar.gz 37218246 BLAKE2B 04a1a4d00c8f33fa81b907d71f76988ea58e66bb88817475ed4f53fd0fef61468e9e2623ff9224e37f7ea06301aad34ebc39f68e51bdfe049e110d683e6b0171 SHA512 078bda71b6de438c083068902da1543b97f160265a6607fdbf9a386361b0932ba673cf46192c5a3521bc52724489ea9fc0900b0f742756ff4dbf5d2b7d4471bc
 DIST ansible-7.4.0.tar.gz 37352820 BLAKE2B 33d3affa052e509348c981920597ab13f3181dee1ab46eda764e0a68df2edeefbcb62cec57e62da559bfe2b5e7efdb95eba1b602efe198bfad8dd0301e66c7df SHA512 c77aebb54676b669305905c969fa5afac9e1262bfefa358de7fee0fb3ef89d0306c599acb2225cdb4209c53df16c307d438cc628299aec494c70cba166eb3cbb
 EBUILD ansible-6.7.0.ebuild 702 BLAKE2B dc001693f809edd51a506b788ee1f3755d7cef610a8755c50d47f56ab9733a4ac65ccf3239d79d3a79cf4ff80e0f8ecef4e99c8e5528f6f4ad155768a0e0d303 SHA512 d0c71d92fdfdc1f588d045fab3a19971d994071bbdcba6038d72b3225833180a16ff7477367cee73011169a91f50788879ddd5dd0342a3a34e40fc51feeb74b5
-EBUILD ansible-7.3.0.ebuild 655 BLAKE2B 737b7e75834d55ee6bbbdc00797896cfed122cfba478bf076156befa70e873899a3b4313408030aaa3214175e7a45bf3c86c21b4e84c2de5940c42cb5e68780d SHA512 4765ba667b64e4eb5659423a8ccc1eb8e52bd6c0f4e287b4aa4f79877d11ef88b95bca3518413f93cea3b785c27f739754af64781f783fa7e46cb2d44c1d7b57
-EBUILD ansible-7.4.0.ebuild 658 BLAKE2B ffe6100a7745a7e1fc7f35564eda5985b002948292a58e199d608223dc7ca37879b02a3e71a40c7f005e8e33c153489ede0643d9a014205eef23467625b9d9c4 SHA512 8e5e4242bcdaf4169e87d19e82e91b80938134544309f67fad49148798ab20922eb17ccdef4752ef840674bd04d74123c7c15a105816181928247f1dce761780
+EBUILD ansible-7.4.0.ebuild 655 BLAKE2B 737b7e75834d55ee6bbbdc00797896cfed122cfba478bf076156befa70e873899a3b4313408030aaa3214175e7a45bf3c86c21b4e84c2de5940c42cb5e68780d SHA512 4765ba667b64e4eb5659423a8ccc1eb8e52bd6c0f4e287b4aa4f79877d11ef88b95bca3518413f93cea3b785c27f739754af64781f783fa7e46cb2d44c1d7b57
 MISC metadata.xml 731 BLAKE2B 26c756a1f3d67f68ba824b56b8a7a48f13e6586c761da02d61852c7669c419ecab686ed1bb59ac7e229038413fdf9c0521b11d005e8250b63380c1b5282586d2 SHA512 e6d8bf5b9748c6aaccae0fdeb3f187be80d5a956dbc57578f6fa344a667624a0a4ffbaba689d2f7bc812dd91fb3b959b3293260729ce7c995a20fe47b2cdf097
diff --git a/app-admin/ansible/ansible-7.3.0.ebuild b/app-admin/ansible/ansible-7.3.0.ebuild
deleted file mode 100644
index 0cefb7045e40..000000000000
--- a/app-admin/ansible/ansible-7.3.0.ebuild
+++ /dev/null
@@ -1,28 +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 distutils-r1 pypi
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-core-2.14.0
-	<app-admin/ansible-core-2.15"
-
-python_compile() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-python_install() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_install
-}
diff --git a/app-admin/ansible/ansible-7.4.0.ebuild b/app-admin/ansible/ansible-7.4.0.ebuild
index b74fccd0afab..0cefb7045e40 100644
--- a/app-admin/ansible/ansible-7.4.0.ebuild
+++ b/app-admin/ansible/ansible-7.4.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.ansible.com/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"
 
 RDEPEND=">=app-admin/ansible-core-2.14.0
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index 89a5d4e23325..4b36bdc84d8f 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,4 +1,3 @@
-AUX lnav-0.11.0-conditional-ssh-keygen.patch 1109 BLAKE2B 9abe69b110a0119f9900cb6776baada9f1c708589372437e3f3d2a0f298a91f502a152b2754c06a3b7c7c8fe0e3dbdaa1272cf08992bc53547f892112ceeb3f8 SHA512 f702dc9f1ac1c650dc1bd562e48df9d43dedf30e962cc77032ecbab4d1ccd76d651eb58a3c09feba43ad99d7fce75359c260eb002cc3ec080d8a3b1ad774d5f8
 AUX lnav-0.11.0-disable-tests.patch 1784 BLAKE2B e4c0184793b19eff53dea12a81f0e8c7fab6fee44a77304f268365cdec0fa13fb916b35e25fb032a992147338a8028ffb799d9cd14db147f2396f5d54c74173c SHA512 e4c3ddee7c0747196a4ec5cdd409f1c088e06938762677d05757113ff8c8a1834a8ee2d132befef4fa84f4e34633d1d9a64d39f06e423f2a262e79ac121ea202
 AUX lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch 668 BLAKE2B 1c02dd2bb64bd42b8c3483732b0a2e282c82ad08fe02e704be6393d36783d56c429c99fbd03d938e747b790a75f80d4ca795a5e489054c6bb8c3494c8de062ba SHA512 30a8e13e22a5282cacc3d47e1f2c88c54361b93953bacfd4fc3f481b5e9ed1fa21fe75943c0573bdcd92bed73f96097d494dec9093d9b312c066ad7b813b0ba5
 DIST lnav-0.11.1.tar.gz 10268167 BLAKE2B d490c6798685e80021437e1771742dee59c3b5109a43591581f4ddc15528c5b616ab915418fa78b7cf13a82bce582baf0516b5b2339f5fa32054359c21908852 SHA512 6c7d2b603ee04bb2cee16bf28b0161ebe7bf3ec838bed765f9852f79ee1ff8a56691dcaa66998e0ef58f16f16274bf93c7f2eb8f2e58264faf284bcfd25818ef
diff --git a/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch b/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch
deleted file mode 100644
index a0396182b8af..000000000000
--- a/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b16833392b74826f8cd437675fc29e4a0b88efcd Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Sun, 4 Sep 2022 00:03:33 -0400
-Subject: [PATCH] Only build ssh keys when needed
-
-I believe the test/remote folder only needs to be setup for
-test/test_remote.sh. Prior to this commit, it was being built during
-make, rather than just during make check. This commit adjusts things so
-that the test/remote folder is only generated during make check, and
-only when test/test_remote.sh is being executed.
-
-Fixes #1040
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- test/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index fd09a656..457f3cb0 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -478,7 +478,7 @@ DISTCLEANFILES = \
- 	empty \
- 	scripts-empty
- 
--all-local: remote/ssh_host_dsa_key remote/ssh_host_rsa_key remote/id_rsa
-+test_remote.sh.log: remote/ssh_host_dsa_key remote/ssh_host_rsa_key remote/id_rsa
- 
- distclean-local:
- 	$(RM_V)rm -rf remote remote-tmp not:a:remote:dir
--- 
-2.37.2
-
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index bdb87313a830..ca4239f3276b 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,5 +6,5 @@ DIST puppet-7.24.0.tar.gz 2823083 BLAKE2B f4a3862153a01b1d5ce1cc9d72a2446d91346c
 DIST puppet-8.0.0.tar.gz 2874596 BLAKE2B 64a609c0375c942520f17bd6281225568b9803cd7af3e9f4da8311eb4f2680184174b0b5c992b243ba9680912b77038934bb3506ae28a964c64b0f1f8feca62e SHA512 78ba9d603831874fbecca7ce3e2802ed54188a71ad7d6f7a24fa3390330e41a7b43b074c6c51e32cfdf10ff92f6b087f8fbe9220ea65efb917f517776451ef56
 EBUILD puppet-7.23.0-r1.ebuild 3667 BLAKE2B 596aba703f8e8154cde0c6dd8d11cde9118aac72546a3579bfbe43e69748b80e89ffed85baf5e0be36f5cb3e969837fe731523827581a60535df6f43ba9a5691 SHA512 9db45b40a7c9b7367583181a28dc5901c845fe814298a48fe1fe2ea9b3d7eec9c55ab3076f934902f1c8885deffc89eac90e8fa13d6a4fdf16e313f031d3cc6f
 EBUILD puppet-7.24.0.ebuild 3669 BLAKE2B 1d9bda9449626c6b1e23f33f2564557631cdd9236253e6b089544c29b89bb35691ca78dcc614f5bb80acbc5ba7f87280541eadb4112fe6b3c413db63abbf808d SHA512 52ed50c70e4e7580cd7d2df5430b07a0673841f53697fc60782855bf7dbaee53891fbfaa8995608e9447b8b2dd267977f5ccc27802e78e2638e622e670cb03c1
-EBUILD puppet-8.0.0.ebuild 3487 BLAKE2B de2093b1da3465e92cccde2faeeb3cc59618347d2cfe3fedf8b42668b9edca3c3c1f6898508928b2cc3c60d7b588687cba1ce8d9db6939e78b43f56d5fb14794 SHA512 f5e66a85e49e162508ea910e82f2e8fc93e381c83e46cda5f11a86fe01e523e0ae900345d676f7c4459dd8ca1b6be6303c63b6fe87329d0dc606476e83418435
+EBUILD puppet-8.0.0-r1.ebuild 3508 BLAKE2B c883b56902bbdb5580ca595c4496f3b4f8353da5099fb93a545d4b7617429c4bd6afd21db417a6582a4578a56c5a6c81cc1e70b2cd82754e8450c8d1f4a4723f SHA512 6725289f96f4f98278f41cbe4340cbd0a77a963c3309b1074c6927bef15b08f443457fbbe501f6b004abfa46403304c6d3ec2ef17fb333be25d129119c4646ac
 MISC metadata.xml 1496 BLAKE2B cc2549141aaf5623f65be274fa8195fe6ee2826620050284ab0a7f60ba04832ecf8fe0e0890c470c98095946d1e4e7a0ef1fabd4d400c47d086fe173769f3d8c SHA512 1217b23c939409ae6cd15286b3304388893970276c80bf11284769946856ba1db20ea537fee5b7b2183305a24c88c926804e21f246f508e40cde41f45f1490bf
diff --git a/app-admin/puppet/puppet-8.0.0.ebuild b/app-admin/puppet/puppet-8.0.0-r1.ebuild
index 9a3ead6bacc9..724598bff245 100644
--- a/app-admin/puppet/puppet-8.0.0.ebuild
+++ b/app-admin/puppet/puppet-8.0.0-r1.ebuild
@@ -28,6 +28,7 @@ ruby_add_rdepend "
 	dev-ruby/json:=
 	dev-ruby/semantic_puppet
 	>=dev-ruby/facter-3.0.0
+	dev-ruby/deep_merge
 	<dev-ruby/concurrent-ruby-1.2
 	augeas? ( dev-ruby/ruby-augeas )
 	diff? ( dev-ruby/diff-lcs )
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 1a0649c3d30e..ed0b9957ef74 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index 971b8f97d219..8e9cc7292fb3 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,4 +1,3 @@
-AUX kicad-doc-7.0.0-eeschema_advanced.patch 597 BLAKE2B aa62c9ca99ea9202931797f0eb9e074ff86576efb355efac865e0e2f4edb096f9fe06f47cf173dada98ad87e91cfde9530a82263c319df246d92dcf0af661708 SHA512 73fabf9289a0276ba754d3769e70cd10975ee3b9a96c2ea802401dd11cf3c3e6f42a9c1fdb034fac7fc664c2f28a694f8713cef629dabb0885a147cf87ec46de
 DIST kicad-doc-6.0.11.tar.bz2 79253772 BLAKE2B 904c01cd00b1669620018194e98303c00ba2ba32b44fed2f36966edf40487c26b6a7ed827a0c35908eb74ea04054a0c7cc39d371e5c6013bee484bf2b67f6177 SHA512 1c942a53dfcf071e83d5b7674df446b55818961da69586fe772467e4cf7ea64a13de01af20ec087c8a73f9d101a5a48680d840415e1a278e2ef5b22952980180
 DIST kicad-doc-6.0.9.tar.gz 81321926 BLAKE2B 0885d0210afcc83c2ccaad3a0caac912e8f756e69c4569e543a81440e14b6e3ead68ccc427f4dcd9026ebf86a8e3c45487955479bf8c43ce9bb6680de9da777c SHA512 be8ae3bbebce334d7d7ab0e24bf3712aaa83b078f1a4495b755cdd9a5ff8e55951dbd82c5ac17c5aeba66008a9e6ef1b9f104f51ad340cb7cb88abdd86e5853d
 DIST kicad-doc-7.0.1.tar.bz2 104103280 BLAKE2B dbdcd82e65c9d3a2bff629f8fa4e3cc34c2adbfa3fe9a808e3802addc3d75f3875ad52c4f5e79cb2bfb7563a6288d0c2eb6f119adf4f7fd2f31360cea82d1ea7 SHA512 5274ef673db9e415d5b82522681acdd4ee2b2f615bb52abdd11ebd17b72f36852ee297fdb98f9cf1dee12671a23adc24a6a8a03be720b579bbee7a9ead167e41
diff --git a/app-doc/kicad-doc/files/kicad-doc-7.0.0-eeschema_advanced.patch b/app-doc/kicad-doc/files/kicad-doc-7.0.0-eeschema_advanced.patch
deleted file mode 100644
index d862bfceccdf..000000000000
--- a/app-doc/kicad-doc/files/kicad-doc-7.0.0-eeschema_advanced.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/eeschema/eeschema_advanced.adoc b/src/eeschema/eeschema_advanced.adoc
-index d51209da642753d6cbbf862195d61b3c5317b9a3..be417983c5065164a6500e49b5b0e380c3fd9412 100644
---- a/src/eeschema/eeschema_advanced.adoc
-+++ b/src/eeschema/eeschema_advanced.adoc
-@@ -280,7 +280,7 @@ information for KiCad to connect to your database and retrieve data from tables.
- below into a new file and save it with a `kicad_dbl` extension.  You can then add this file to your
- global symbol library table using the Configure Symbol Libraries dialog.
- 
--[code,json]
-+[source,json]
- ----
- {
-     "meta": {
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index b4616fdb96ad..c6ef1efee39b 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/bind-chord/Manifest b/app-emacs/bind-chord/Manifest
index fd5588dba755..bd3644584f66 100644
--- a/app-emacs/bind-chord/Manifest
+++ b/app-emacs/bind-chord/Manifest
@@ -1,6 +1,4 @@
 AUX 50bind-chord-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST use-package-2.4.1.tar.gz 124368 BLAKE2B 5eaa6f500234d86651e155fa5360362c5e2696a8b258d5785a02b94f4ccacc6a9815e0b53f663684cef1cc9aa6c6812a5f59e04de3a3d7c5ac36e9dfb6ea09ea SHA512 7248243dbddd939eb1ef9e76f9410265ed1cc48398745f593b57122261a6bb3bf4ab40392b6f29476ca33922f7087a52596a87968cf4914e5ed82db6c513bbbf
 DIST use-package-2.4.4.tar.gz 80065 BLAKE2B ee38736f011f1ea7522d24451bfa9dee4a17690cf7f3a885936a75bff1bb26950207b3111632826df54481b081ab1a109800f8857fceace622821dfef1324133 SHA512 09bca5a9a48fdbdf204a4b92f1f301a6bc63f57192868671d833d829f0eba0a4b95e706584158407bc8c9ee4549e699f6b43a333a4de15c6b0aabc74db2acc0e
-EBUILD bind-chord-2.4.1-r1.ebuild 679 BLAKE2B b91d83c550532da2aee9a1513d6411728cead14829fe82793906e2671d6d8e7f36ca2732bd281c633cd1a26c8fe8904949c1713a9fa43f645995555c2fc8a0a8 SHA512 d8226beddefa89568d15a27b866a95c91dbc0c50d8456d719b412607de4145f7fd8e68309325e6ef6b049dac5f439f29649201a50cdb2c9541ed9278869c088a
 EBUILD bind-chord-2.4.4.ebuild 706 BLAKE2B d831cb3085b1c49c99030daeaa63d19cd31e2cac4f026e76f8d67d7e18a9437f9000301f2e8473b6742f2a2b5b0aa314bf9d7c5f5ff2c1e98f0a304f418e0b61 SHA512 f7d9c477f0d4c0b52900b36ba0b3e26a7c5e33f46c9bc9ff0ba08091332d90c48fdc8feb242786b759baa71650178ea698858e4ed03349180bd30b1c5354a4a5
 MISC metadata.xml 429 BLAKE2B 287e6cbe3a1ece1241e6fe22235bdcd346bac4ff92e49ec9b9de52271fdf40d05f7f0646878b3fb6dcf447c79350e91bf62a5aefa0dca351638f7a7914b52446 SHA512 5db5dd382365f331fb8945b0ee319e34aa037f0b23239d9df26433f866e4276558dc1cf450e807f3fcc1f4cbe358e84751cc37a3a5cd85d08b083014a761a838
diff --git a/app-emacs/bind-chord/bind-chord-2.4.1-r1.ebuild b/app-emacs/bind-chord/bind-chord-2.4.1-r1.ebuild
deleted file mode 100644
index f37f89180fc6..000000000000
--- a/app-emacs/bind-chord/bind-chord-2.4.1-r1.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
-
-inherit elisp
-
-DESCRIPTION="Key-chord binding helper for use-package-chords"
-HOMEPAGE="https://github.com/jwiegley/use-package/"
-SRC_URI="https://github.com/jwiegley/use-package/archive/${PV}.tar.gz
-			-> use-package-${PV}.tar.gz"
-S="${WORKDIR}"/use-package-${PV}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-emacs/bind-key
-	app-emacs/key-chord
-"
-BDEPEND="${RDEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-compile ${PN}.el
-}
-
-src_install() {
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	elisp-install ${PN} ${PN}.el{,c}
-}
diff --git a/app-emacs/bind-key/Manifest b/app-emacs/bind-key/Manifest
index 1b8c86eaf3de..75fdadd2dc99 100644
--- a/app-emacs/bind-key/Manifest
+++ b/app-emacs/bind-key/Manifest
@@ -1,6 +1,4 @@
 AUX 50bind-key-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST use-package-2.4.1.tar.gz 124368 BLAKE2B 5eaa6f500234d86651e155fa5360362c5e2696a8b258d5785a02b94f4ccacc6a9815e0b53f663684cef1cc9aa6c6812a5f59e04de3a3d7c5ac36e9dfb6ea09ea SHA512 7248243dbddd939eb1ef9e76f9410265ed1cc48398745f593b57122261a6bb3bf4ab40392b6f29476ca33922f7087a52596a87968cf4914e5ed82db6c513bbbf
 DIST use-package-2.4.4.tar.gz 80065 BLAKE2B ee38736f011f1ea7522d24451bfa9dee4a17690cf7f3a885936a75bff1bb26950207b3111632826df54481b081ab1a109800f8857fceace622821dfef1324133 SHA512 09bca5a9a48fdbdf204a4b92f1f301a6bc63f57192868671d833d829f0eba0a4b95e706584158407bc8c9ee4549e699f6b43a333a4de15c6b0aabc74db2acc0e
-EBUILD bind-key-2.4.1-r1.ebuild 598 BLAKE2B d4fb102ba8f82883582414e7c089671166e78ce84c187a6ebdbe91a9b86d2bcab3495bd24a9edbae33d5a5bf0a3961597a25043f3c23b8482aa771ca94a0a299 SHA512 63b3d61049864a0f13fc3554f08dbc0f164fa7964695cd15c9ab2aac8997acf95dc86f51543161913945593fc2449c00dc675e61c7a55ac9c959a80436db4ac0
 EBUILD bind-key-2.4.4.ebuild 625 BLAKE2B 849914ee3c7fa78efdc8d5565fbce0fd89e77bb54d411be2d234ae63a2cd3b67bb7f544746bcbb5f64780368d67165044fc2cf0ce7016cbae34d9bec81f296a9 SHA512 7354b526828fd5334aa3b202f90704a6a046c961e11e3e594141fd59c61700ef467ba901d1c414bd1f5c31a664bfb0ccc4b0f4097187f4c916ccc9d2f69c3203
 MISC metadata.xml 429 BLAKE2B 287e6cbe3a1ece1241e6fe22235bdcd346bac4ff92e49ec9b9de52271fdf40d05f7f0646878b3fb6dcf447c79350e91bf62a5aefa0dca351638f7a7914b52446 SHA512 5db5dd382365f331fb8945b0ee319e34aa037f0b23239d9df26433f866e4276558dc1cf450e807f3fcc1f4cbe358e84751cc37a3a5cd85d08b083014a761a838
diff --git a/app-emacs/bind-key/bind-key-2.4.1-r1.ebuild b/app-emacs/bind-key/bind-key-2.4.1-r1.ebuild
deleted file mode 100644
index 9a2527d8396d..000000000000
--- a/app-emacs/bind-key/bind-key-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Simple way to manage personal keybindings"
-HOMEPAGE="https://github.com/jwiegley/use-package/"
-SRC_URI="https://github.com/jwiegley/use-package/archive/${PV}.tar.gz
-			-> use-package-${PV}.tar.gz"
-S="${WORKDIR}"/use-package-${PV}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-compile ${PN}.el
-}
-
-src_install() {
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	elisp-install ${PN} ${PN}.el{,c}
-}
diff --git a/app-emacs/company-ebuild/Manifest b/app-emacs/company-ebuild/Manifest
index 88a568f8c61c..f84d5a0d411b 100644
--- a/app-emacs/company-ebuild/Manifest
+++ b/app-emacs/company-ebuild/Manifest
@@ -1,7 +1,5 @@
 AUX 50company-ebuild-gentoo.el 210 BLAKE2B 669e2366c1c28ad32136578f1f996bfbcd94f654e9b683958f7efb0f542b07f5f580b293b706ab996df07a7e5d86fce2ea0ec4b69b734ac1065508c21d44fd6d SHA512 73814267000a349bbad229d1b172ba61a07733473fd53f0b5a88b6488edf85e95ecad7fb5e145ed423c9c55fa0ed65abec16d99dd5d8cd140407aeb2874508b9
-DIST company-ebuild-0.1.2.tar.gz 11697 BLAKE2B e376626d13aa32a4df09ecdae2245b9c961a6e2cd615febfaaa626ac48ccd420b462a6195d9f769d64c37629c34929ba87e3ea6543e2344b62b217a51695870a SHA512 2a67c6ea6e53f78a6c41b2251b928cf7e97bb3f71c7c03057c540c699bd275898bdf8840d723cf5d8846dbbe82cc531f1cc2707181825fe05c4433ea80039011
 DIST company-ebuild-0.1.3.tar.gz 11699 BLAKE2B d098bbf925c308335ad498eb968c6dcdbe8a981ee32c85cea22c38628a360455f109fa884188cdb8e1a096b3e97fa1e95de044653cc9adeec3962bcdff550c69 SHA512 dc0328aa5da9e7472f35f01826dfe934831362141709885f799e3a0c1141702b63f08569508f5af502aab3d790105fc89cd16e0c863877348eeba4156f64bbcd
-EBUILD company-ebuild-0.1.2.ebuild 620 BLAKE2B 64e83b0b2e25af0e08ef22061e44d319009496b2bba42f4eaf242c42fac2cc7d07e50c2f655cf1c1eb93eb8e5916176f8db44c6750c603a920f7810a1b474fbb SHA512 e6b9c7f13539e47260e23a35e05cb1e49337d075a21404f33fa3264992fd062adab4abe7d0b0a9b7fb181dd33a26feed69c6d906002516245ea71ab9da44b93d
 EBUILD company-ebuild-0.1.3.ebuild 651 BLAKE2B 9e083634468346d3925dac8c951d9a0d5e3b159c56bf8ca3995583b70e5c86cd568dc5c907c61b007eb712b6916cf2699e50c8f209ce9088a13f13fb838db7d5 SHA512 0c53caa953c350a8397aa2249ac280cf1ae61b279ed1a44121becb3a03d60024d2f9187fb11d095a688335dbc290541b730da84d1667760a8ccc2b44d178314f
 EBUILD company-ebuild-9999.ebuild 622 BLAKE2B 57f0ca4543f5e68c41ac86413a0bc68a81afc251235faf727407129535a615b28133b213a40037ec30967192001b8367a658175aebe66f8cb9e2727697ff354a SHA512 95154f84abe16382fe014ae6146125de349f822b4081edcb6ec95350481501bafa58c7f36bbfc36c4664a21161bf59168861d4e42cc30323d72e5334efda347e
 MISC metadata.xml 451 BLAKE2B 85cf2b33444f33f2dee8a0ccdfff3f83de7ab15d3233e0264dbceddb68382cdd551a6dcc691d71f52fbf8a3e7d1a1d041bab9b3dae0c91e81f7d7c3de8f3e2bc SHA512 4886219382c419a94a07041a0e4d0ed6622c45a0371cd0c70a912d391ee29db1a6e730c1134b8493e5edb299646f35df8eb799cfa311f3927256dba2cb345b55
diff --git a/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild b/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild
deleted file mode 100644
index e231f5b49027..000000000000
--- a/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=26.2
-
-inherit elisp
-
-DESCRIPTION="Company backend for editing Ebuild files"
-HOMEPAGE="https://gitweb.gentoo.org/proj/company-ebuild.git"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~x64-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-SITEFILE="50${PN}-gentoo.el"
-
-RDEPEND="
-	app-emacs/company-mode
-	app-emacs/ebuild-mode
-"
-BDEPEND="${RDEPEND}"
diff --git a/app-emacs/emacs-ebuild-snippets/Manifest b/app-emacs/emacs-ebuild-snippets/Manifest
index 220d5f821b55..d5162db943de 100644
--- a/app-emacs/emacs-ebuild-snippets/Manifest
+++ b/app-emacs/emacs-ebuild-snippets/Manifest
@@ -1,6 +1,4 @@
-DIST emacs-ebuild-snippets-2.0.2.tar.bz2 11606 BLAKE2B 5316355ec5fb7bae942ec27e8c7400f5f4570f9bdfc0588c2a92f908146da1475b87351f0654f58f99b41d752b357e255997d4fd3d89b3676790faea5acee3be SHA512 2cff09b32beec77fc6dc2033bdc2bafa31f89450b98865b5000ac95455436d3b840299652c7258b133038d41e4ac6f477f2b6637a5803484f3ec4dce86600944
 DIST emacs-ebuild-snippets-2.0.4.tar.bz2 12041 BLAKE2B 98c4134080686f12bfae92b7bfe912ead0c7f407755682c18a33b191a9329be848a5e77eb0bb50f54e935a8460e1c0fac1574187b605a8a647c199ba8946e50a SHA512 ce78bc2bcad3f7d8684258d344aa3f95b1c57331e169ea04af19f2756eca019e30b6ba7037f5f59b57a20c1fa2a2203be30bbbca4005e425129a3744843b55eb
-EBUILD emacs-ebuild-snippets-2.0.2.ebuild 813 BLAKE2B 503a475ebcbde3ce923ec898f046bb82312299b4bf248197edfff77b655324cd326628e59f61ff0b9f0d915e514087f2c4e16f8ad18a28914fa86f3f2813a141 SHA512 980fca963c84ba28d32b0a230c10d34d995897d61c19305c9229e584b1c7eb6a0a450c81cdfc6c9d7c4f8e5714ea0c3d9456c2645f23cfdd5bd05ae10cec4707
 EBUILD emacs-ebuild-snippets-2.0.4.ebuild 844 BLAKE2B a6ae6dbb258473facb5d116cc1d1deaf9854100e52cfd23958dd283759d52b0c538cc9656a1a7c7d656a43d73ef8891057afc9367e655442ae0a727c229a11d2 SHA512 d7fcb50e3f81767916985aa607bf1b1b1defb6896298806a64325cdfe4feb82c2db895eadaf367758224f46ea51b14465132591a82ef0f262245aff713ae9fbd
 EBUILD emacs-ebuild-snippets-9999.ebuild 817 BLAKE2B aae3217ab89526cbd5a3bc0790a484251a327f990a4a21ac0ce50d927ac6c6e93fbf99678e1e596869f319f19d6c7eef5df8e3d9140abaa106f85063de34aa9f SHA512 688e1165cce7c4a82ab81087bc7b1145048c8667a645ffa05ac81a520de77a2af2e5b8e9b6a5342fd5a66d0b8bb3b33812aaa42014513474c09f213d9cf45e5a
 MISC metadata.xml 390 BLAKE2B 803c6f9ddd01b6f0b24761b7f8d4cd73df64bf4a630712bc4db41ea5e7681dbf329306623e804d3ae70ba426d19437d18cc0e37841c3d45ed53346cd5c5cc9ad SHA512 76346de5dd4da5532996d488e569c2ff506756bcaf1f3fd602d6ae759033f4205a5b8aa40ad735545deb7a906322d81021acbb55860c543d0e39b91ccb349a90
diff --git a/app-emacs/emacs-ebuild-snippets/emacs-ebuild-snippets-2.0.2.ebuild b/app-emacs/emacs-ebuild-snippets/emacs-ebuild-snippets-2.0.2.ebuild
deleted file mode 100644
index 2c04e6b056a3..000000000000
--- a/app-emacs/emacs-ebuild-snippets/emacs-ebuild-snippets-2.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Yasnippets for editing ebuilds and eclasses"
-HOMEPAGE="https://gitweb.gentoo.org/proj/emacs-ebuild-snippets.git"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
-else
-	SRC_URI="https://gitlab.com/xgqt/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-RDEPEND="
-	app-emacs/ebuild-mode
-	app-emacs/yasnippet
-"
-BDEPEND="${RDEPEND}"
-
-src_prepare() {
-	sh ./scripts/changeme.sh "${EPREFIX}${SITEETC}/${PN}" || die
-
-	default
-}
-
-src_install() {
-	elisp-install ${PN} *.el{,c}
-	elisp-site-file-install "${S}"/gentoo/50${PN}-gentoo.el
-
-	insinto "${SITEETC}/${PN}"
-	doins -r snippets
-}
diff --git a/app-emacs/use-package/Manifest b/app-emacs/use-package/Manifest
index 10f5912fc482..6cd51509e9d5 100644
--- a/app-emacs/use-package/Manifest
+++ b/app-emacs/use-package/Manifest
@@ -1,7 +1,5 @@
 AUX 50use-package-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 AUX use-package-require-diminish.patch 420 BLAKE2B 578e7d2da6e4840ebea2161f9c5c7a765f3c0bbf0dd6fa67b3f151f0bb3181d5472dd28276ee7f54fd8bb08ee4ed586c765156a3820c708b2f5e5adbb4877ad1 SHA512 81bdfdd9430088591c522096f0bb85f2a8ca0a9ed2e68f578ac8dbcefe07c0c4ff06c02b6703daa0f2c940f57b7bada0d71bfda43128d2fae1b1b46e2e9277e7
-DIST use-package-2.4.4.tar.gz 80065 BLAKE2B ee38736f011f1ea7522d24451bfa9dee4a17690cf7f3a885936a75bff1bb26950207b3111632826df54481b081ab1a109800f8857fceace622821dfef1324133 SHA512 09bca5a9a48fdbdf204a4b92f1f301a6bc63f57192868671d833d829f0eba0a4b95e706584158407bc8c9ee4549e699f6b43a333a4de15c6b0aabc74db2acc0e
 DIST use-package-2.4.5.tar.xz 61288 BLAKE2B e494791eb2ddee436d6ea1488e632fcad71ba1ace7b2a430c706d5db3e4aad1e25e306e6214e04bafdec79f02c8ae29092207696fffa9d9b2450eb931c6986ed SHA512 01321a4d989dc51ad46bf228c75ea1e666deaf4c34106205bb0e630beb1e71bc7d9cfe1888bc7683d030532191edf94d542045bdae4d2ba8337d354d43440b3c
-EBUILD use-package-2.4.4.ebuild 959 BLAKE2B fc82564f3f78873f02136889b5bcb541c43f246d3004d886766a907769742227df7ff361b49dda047805be9b42cf4dff0a8ec4a0453a49a19b51a440e0fb16ac SHA512 7d63aae7f81710b6f95b717a41a469f0a85c945e2a8c570fd8043db0989eb915dc63f1ee7da4ad0f19c31e4c50ec7f109d9cc5d1a1ac9285b42e9994b06171f3
 EBUILD use-package-2.4.5.ebuild 838 BLAKE2B 8d007de75874d09494815560a96da7d749ee9e35d51accf3e5252a201428f7f0ba03a3b257422be72df0bb97c4dc9ba44bf55585da9df5f210a51300d4dbd3a4 SHA512 262d234d7aa1ea0f4c715a0cf5059a2448279baa393a0a820a8dc25bccc87e22113b560b57279a7523f038ea8fff18d1454734cc832a987066df2b009c99c61b
 MISC metadata.xml 429 BLAKE2B 287e6cbe3a1ece1241e6fe22235bdcd346bac4ff92e49ec9b9de52271fdf40d05f7f0646878b3fb6dcf447c79350e91bf62a5aefa0dca351638f7a7914b52446 SHA512 5db5dd382365f331fb8945b0ee319e34aa037f0b23239d9df26433f866e4276558dc1cf450e807f3fcc1f4cbe358e84751cc37a3a5cd85d08b083014a761a838
diff --git a/app-emacs/use-package/use-package-2.4.4.ebuild b/app-emacs/use-package/use-package-2.4.4.ebuild
deleted file mode 100644
index 868aa6d26fdf..000000000000
--- a/app-emacs/use-package/use-package-2.4.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NOTICE: This package provides all "use-package" Emacs Lisp libraries except
-# "bind-chord" and "bind-key" which are split into their own packages.
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Declaration macro for simplifying your Emacs configuration"
-HOMEPAGE="https://github.com/jwiegley/use-package/"
-SRC_URI="https://github.com/jwiegley/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-emacs/bind-chord
-	app-emacs/bind-key
-	app-emacs/diminish
-	app-emacs/system-packages
-"
-BDEPEND="${RDEPEND}"
-
-DOCS=( NEWS.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-require-diminish.patch )
-
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo.el"
-
-src_test() {
-	emake BATCH="${EMACS} ${EMACSFLAGS} -L . -l diminish" test
-}
-
-src_install() {
-	rm bind-{chord,key}.el{,c} ${PN}-tests.el || die
-
-	elisp_src_install
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index ef131b70c8ba..effa819834c1 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index a02280bf4d79..ab6eea318560 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -7,11 +7,13 @@ DIST wine-8.0.1.tar.xz 29057128 BLAKE2B f1e04ddc7531704b4229d1bdb6e742ff20886dff
 DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02 SHA512 53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.5.tar.xz 29064032 BLAKE2B 35fa6d7ec88ff67d9acf13466b3618eb45d664bed0a9ee581e46cb6e7692395837c8c8e86dead1dbcad582ef29c674a0df4b7180addee837b466eba7fdcd350a SHA512 f6aaab8a32eb7bce7f48d21d99417c9e6e8fe41b3d36320762775ef954db7ddd4fcff01d56475f35038d814557834a41a9e3ae85e5cae8a1b820c5044b42a327
 DIST wine-8.6.tar.xz 29118124 BLAKE2B e4659785722f0c1adb9ce4a156fbafc8484977a5fe2f4a6e1d5eaf8f1f14c6787f080b9d389cdd8716eb7fd00ee2879fab2042af5dcb970530d2e19628442c73 SHA512 602680675f5e062121767769106199179c52a6dd93e97b9b8b4d8365134c72f7745e37d4e3edf6c89c553fb1bfe55b914e77177508fb4f032410d423359abba7
+DIST wine-8.7.tar.xz 29158096 BLAKE2B 73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c SHA512 0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
 EBUILD wine-vanilla-7.0.1.ebuild 10516 BLAKE2B a6ae70e54cf3267bb6eff8a47d7c549ba9e8843b2ec0e24eee8e68ca3a3c1e1ebf570e23a8ff5fd6c520c8ceea635f2b8a08d9960fc030318220b644b02a30fc SHA512 64d3a95a34baeb68d021fd1de2faf796fde0e38ab9f56e98885961a80e9e8e26a4fdf755be28a18d1bbbe058a56825f8dfee1d4fc6b2ff67f06080dd5b982d07
 EBUILD wine-vanilla-7.0.2.ebuild 10517 BLAKE2B 6976d611eb52e0f20a2094685ee2d9b9db34ef17d424d43d59acf5fb864ee15ca60b964f12e16841238c3232a74debc134602dff6e08c81ee0dda82ee92bceaa SHA512 ea0dcbb249ff0f9fd7cff93af24ca5fe1cb6afbc11cbe28a6e8c2561c3721a4e555a0ea81dd816ae8597fbba7ae0f4b0f79a1b9c9f72800635dce1936b789e94
 EBUILD wine-vanilla-8.0.1.ebuild 10536 BLAKE2B 570e44c1e402460e42d2bf2bfe5f9e68c51ea3a3fca45c0032b0a07977a64480364e7d3f2a192a98eb8e5d8c7059b55b6a99fe88f63290964ed4001c4f68ccaa SHA512 defe5841154d8f3819dc52180a1c81812a1b1f8c842f5a14ec30877c453b5296d92d1c586823ab3232562ae3a52fe254866c1e3197d395cc6b76d731accc8a63
 EBUILD wine-vanilla-8.0.ebuild 10534 BLAKE2B 01742704db68023493742748281f19933ef206236ccc2b1bb16dd276ad6910362509a2f3c89c1c0803fa13bad0bf294356c6abe81207e750de1f1dc04ecc5bab SHA512 313ca0bfc18b4ec6bc300d7998a64ddc720e9b4463f8f240f539f9e814ee1fe8fea0b32ac35c510f06f328824441b05f347f8ea6d71caabd57641988e778369f
 EBUILD wine-vanilla-8.5.ebuild 10716 BLAKE2B 1538ea47e8e0f3ad6a7cb11be52b8e60519ece845080ed97afb678f14b66e8320dd68b89119bf8db46b8ec45957c31d5f49617493a5c71b4a5cb7f5c6dea8f95 SHA512 2074327e2084b6b9ffe0296783e5a5898d0cdeceb7051a4f5b06b6892da2aec3312130faaa3537a5e8f2062be1ab9ea2265250a469304852e12392c32f8a54e3
 EBUILD wine-vanilla-8.6.ebuild 10716 BLAKE2B dd0f65bdb5fd09dd8472ad6a0e12f16be1387d3a13073c49fa710338bd35dd609eca0f7cc8843463f950c1033b93117e5efc93bfc3b8a660ce4f1231d86cda22 SHA512 88876b330fce27446260dcf3b2929c998ced065897a9d03f614f3efcd415142a1a0ea5a07b0e9dbf933aa73c0d66c6d860ff97670285c05033b473ed709c27a0
+EBUILD wine-vanilla-8.7.ebuild 10755 BLAKE2B 7d231ec760614c7639bf8fa8af1886de56331e719e2fec5a1babd169f7d74b8afcf89c35e5ff6d19d3448832dcfa46f8d93117988973a448a609458d0a9b027a SHA512 f2de3b8584cc8fa1935bef044b6e97da2f6d977647997ef33d58831a856bc6260d2668f98d6f29d0e508a38902c37d909e3f1c43482018e4edd3c91264e15632
 EBUILD wine-vanilla-9999.ebuild 10755 BLAKE2B 7d231ec760614c7639bf8fa8af1886de56331e719e2fec5a1babd169f7d74b8afcf89c35e5ff6d19d3448832dcfa46f8d93117988973a448a609458d0a9b027a SHA512 f2de3b8584cc8fa1935bef044b6e97da2f6d977647997ef33d58831a856bc6260d2668f98d6f29d0e508a38902c37d909e3f1c43482018e4edd3c91264e15632
 MISC metadata.xml 2376 BLAKE2B c37d5b769ce6ea0fd6ac0cde1084a332e34c13d31633d5c60970f89a932f621c0332b97b0667bbc42098a01c979919ac9d8d30487f2ad6691259270641b85485 SHA512 2968f0df88d5d95c0c649ae15cbc9088061c915046b2014448dad782a4abfa8cb173b6ec8ac15575329e5ce882342dfd1f5076a0ea8a2e89800fdc9628dc05f9
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild
new file mode 100644
index 000000000000..1a71740166ff
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.7.ebuild
@@ -0,0 +1,335 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=7.4.0
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
+	S="${WORKDIR}/wine-${PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
+	osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard
+	+ssl +truetype udev udisks +unwind usb v4l +vulkan wayland
+	+xcomposite xinerama"
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? ( games-emulation/dosbox )
+	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+	) )
+	nls? ( sys-devel/gettext )
+	wayland? ( dev-util/wayland-scanner )"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900338)
+	res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with smartcard pcsclite)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with wayland)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
+	)
+
+	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
+	filter-lto # build failure
+	use mingw || filter-flags -fno-plt # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
+	# build using upstream's way (--with-wine64)
+	# order matters: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		pe_arch=i386
+		if (( bits == 64 )); then
+			pe_arch=x86_64
+			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+		if use mingw; then
+			# CROSSCC is no longer recognized by Wine, but still use for now
+			# (future handling for CROSS* variables is subject to changes)
+			conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
+
+			# use *FLAGS for mingw, but strip unsupported
+			: "${CROSSCFLAGS:=$(
+				# >=wine-7.21 configure.ac no longer adds -fno-strict by mistake
+				append-cflags '-fno-strict-aliasing'
+				filter-flags '-fstack-clash-protection' #758914
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+			: "${CROSSLDFLAGS:=$(
+				filter-flags '-fuse-ld=*'
+				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+			export CROSS{C,LD}FLAGS
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
+	if use abi_x86_64 && use !abi_x86_32; then
+		dosym wine64 ${WINE_PREFIX}/bin/wine
+		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+		local man
+		for man in ../build64/loader/wine.*man; do
+			: "${man##*/wine}"
+			: "${_%.*}"
+			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+			newins ${man} wine.1
+		done
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	# don't let portage try to strip PE files with the wrong
+	# strip executable and instead handle it here (saves ~120MB)
+	if use mingw; then
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+		use debug ||
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
+	fi
+
+	dodoc ANNOUNCE AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 5be58604d339..c0ad6c735a38 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/esekeyd/Manifest b/app-misc/esekeyd/Manifest
index 21db6e8ece03..e2793492b627 100644
--- a/app-misc/esekeyd/Manifest
+++ b/app-misc/esekeyd/Manifest
@@ -1,3 +1,5 @@
+DIST esekeyd-1.2.7.gh.tar.gz 10623 BLAKE2B 599813e046ddbd69c218dc823c760c3598d3f1ef0411e953f7c64adc00846b63912fc143baeca8acd9d4631e99e7fac79246309af06dce6bd852c3124604908e SHA512 cc6d227ee5138b4bbc6affcf5214c7233d9245532d69233afe2322121b04428e0708c923bea8db358fe5e0bd4a6b9d6f67f3dbd8fafd0accdff8508600929b0d
 DIST esekeyd-1.2.7.tar.gz 104502 BLAKE2B d8060837e533c5c3fda11dc3a2d67f3010b820035d1f1a794c296a132f3dde3c17fe132257b996532ae6caa57fe2150c370aa71d03c2e48b9a88568498144769 SHA512 dc15623e0ffdd4cc7f3834b2becabf54ce61ea5190fd44734b2aa426db3d936cb5e3caada82357d6ed41db6eba41e9f792e453e2bb93c0fe62d87ac29651c89a
+EBUILD esekeyd-1.2.7-r1.ebuild 540 BLAKE2B 23e7f3f6d369ffbd5b207a36b9ed2c5cc149cf06f98715d051fb7429930e8c26e9bb03b18cbe9c4eada742d6491102da381043a3d00b8a7c75dc07afeb3ad535 SHA512 c3ab7f603ae70fc3f371b64392cc4c3cfb378390570ae8fd950ab9c5cfcfd26880d5c90c4e19dc0eef2a98f68bbc73033da8437b0e71346e8db7ce5bfa6e6710
 EBUILD esekeyd-1.2.7.ebuild 411 BLAKE2B ac15d61336c88eb707c33c9306eee0f322aca8e3831e64605b0b9d78a68416268ff49c67c76b699108eca1c6eb718fcf8b696676abd15966844d8810734d82e6 SHA512 6cf397221052837399690bb08356671f700dd046c5b4bc23ffa96d61f59c9557474776e30f046d826e0c2dd528bf9805435f56e8d72c2a1b106f8e8873b49af8
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 250 BLAKE2B e9fe0d85755c59844a0c5b9c778fc133497a5668092981bdc769d0a633339cadfabb83c7e1e9caa0318126738e06a26d62f58b3c791654a2d74b350c77b3dcd1 SHA512 1cc83afebea3005de88f5a36fdbf7aab599ed985b0e1b267dbb61d48433f945519a7d48565d855248ff5bc273a6f60d30067c6dbce1082f7d9fa15ece40e17a9
diff --git a/app-misc/esekeyd/esekeyd-1.2.7-r1.ebuild b/app-misc/esekeyd/esekeyd-1.2.7-r1.ebuild
new file mode 100644
index 000000000000..0405ac1bc018
--- /dev/null
+++ b/app-misc/esekeyd/esekeyd-1.2.7-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Multimedia key daemon that uses the Linux event interface"
+HOMEPAGE="https://github.com/burghardt/esekeyd"
+SRC_URI="https://github.com/burghardt/esekeyd/archive/refs/tags/${P}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+DOCS=( AUTHORS ChangeLog examples/example.conf NEWS README TODO )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-misc/esekeyd/metadata.xml b/app-misc/esekeyd/metadata.xml
index 115e9d64a669..41f8531e5d0d 100644
--- a/app-misc/esekeyd/metadata.xml
+++ b/app-misc/esekeyd/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">burghardt/esekeyd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f26ba5ec4454..a8e51e1be7ec 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index ec7dcd207d85..37e06186ee0a 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,3 +1,5 @@
 DIST iso-codes-v4.13.0.tar.gz 14990054 BLAKE2B e9e9a166675c09ecfe62da92608e91d4d6aeb53306e6162ea432bba418d074ef54cf510071aae6407bdc1fe59c295e52e2c7862e0d5b8962f467834c117f4912 SHA512 fd180b8462eb1ee2fd49bc144fd8b1b866067512a5deec3f580689641c596f623a11f0384e8c05cb48de520e1ce7c0270a649ef37542ba51f93e244b45bc5bba
+DIST iso-codes-v4.15.0.tar.gz 15046318 BLAKE2B fc4a9dd6a80fbd7658e0ba30f483a57f7d487f5eb7cc73ac2504d24397f1a8519acf8bf2431b18f969cbe4dd8e386cedd82c9284d405c57c6682af7639b4aacb SHA512 1700c5c24a5a8c278df67539d7d99cae832a72e2fc604394b15af17cad78e36a9280e0a91ecaeade9e14b9f6431967ef2d2e662e73d200773e63455b0e1c5187
 EBUILD iso-codes-4.13.0.ebuild 2650 BLAKE2B 488a6d6160722ee9b5e597bbf314ee420874b3fca46e7745f93383268da95c4680bcdb2024ce18e1f7380f103a5435f7431c75619c9d018180fdb97189a05bbe SHA512 ba0a30ce7ae5cbcb12b11ca0a1671c1f065c4d871db44c420716a20167f2cdb3fd4933b9405b9839177a456d28a56118bb29e16023b28b8e7bd4ca7ae74492a6
+EBUILD iso-codes-4.15.0.ebuild 2663 BLAKE2B 77ba9bd9376bd1196826996264fa373adb5cb3350201b83d9832209e5c66d0397213b927bbe25c8470000c84a5476347cd93c865bc1fb25c14cae13bb1b71028 SHA512 13de5ecac0ec6ade047640c8c4965ea6b019d49ea8ac81ef33fda2ba14f92ee956a1b5c8a8ac68469a61b8768cbf8d12d116b70018c4d6c989a2d7909ac1a232
 MISC metadata.xml 481 BLAKE2B e19ee7de8b2de3aa09f97bb7eb4247ba2979614d768c0dd92a8cc131269e46a560baa1c0ea8fcceb49073efb1b890cd54d939c16ac7412413983a19083f05337 SHA512 f1e20f870fabd59d97ca612c3db3443a6a1544de3b03f12fe0c9c44a1740b06bf38c394b489738e60b22fa0797379d24c0ec8371efa067873910ba39fe30f194
diff --git a/app-text/iso-codes/iso-codes-4.15.0.ebuild b/app-text/iso-codes/iso-codes-4.15.0.ebuild
new file mode 100644
index 000000000000..a407ad00b04d
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.15.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pa_PK pap pi pl ps pt pt_BR ro ro_MD ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu"
+
+inherit python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+DOCS=( CHANGELOG.md README.md )
+
+# plocale_find_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+	local std loc all_locales=()
+
+	ebegin "Looking for new locales"
+	for std in "${all_stds[@]}"; do
+		pushd "${std}" >/dev/null || die
+		for loc in *.po; do
+			all_locales+=( "${loc%.po}" )
+		done
+		popd >/dev/null
+	done
+
+	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+	if [[ ${PLOCALES} != "${all_locales}" ]]; then
+		eend 1
+		eerror "There are changes in locales! This ebuild should be updated to:"
+		eerror "PLOCALES=\"${all_locales}\""
+		die "Update PLOCALES in the ebuild"
+	else
+		eend 0
+	fi
+}
+
+src_prepare() {
+	default
+
+	local std loc mylinguas
+	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+	check_existing_locales
+
+	# Modify the Makefiles so they only install requested locales.
+	for std in "${all_stds[@]}"; do
+		einfo "Preparing ${std} ..."
+		pushd "${std}" >/dev/null || die
+		mylinguas=()
+		for loc in *.po; do
+			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+				mylinguas+=( "${loc}" )
+			fi
+		done
+
+		sed \
+			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+		popd >/dev/null
+	done
+}
diff --git a/app-text/uudeview/Manifest b/app-text/uudeview/Manifest
index d112cea405fc..c5f454e557f3 100644
--- a/app-text/uudeview/Manifest
+++ b/app-text/uudeview/Manifest
@@ -3,6 +3,7 @@ AUX uudeview-0.5.20-CVE-2008-2266.patch 4595 BLAKE2B dd2ba71e43941812472729575f1
 AUX uudeview-0.5.20-bugfixes.patch 3575 BLAKE2B 8778f0f08fa8d8c5faabf2721c195505a53369f30d93c494080025e491121a75135f321fe5c0c117e5bfd538a7cb2d82fc64cb5584822dc9f353cd31b168bdf0 SHA512 c5e4126e9457cb94d6f014ba20e2497969a50b84d917bd31529a2a75ae5b1e9990ec946e8f8de7a83ced71e32aea7d62210416d94b765dc860902825ca6b34a3
 AUX uudeview-0.5.20-fix-append_signature.patch 893 BLAKE2B deccd364dffe6be50b5985c603a55407fa0ae358fcaa31133607d276d04770eb5e43ed175d8d169f3afabd9dc7a27c55a0273dc946f0e85be48f66922ec1ce91 SHA512 6c84e1276b1bb1f411bb9b1561d32f49312c6969721c4016761d3a2cef388d46b6288e5e5000d2f54a5529ba1bf16d5427ef73f531be5d53d8abcc2300792482
 AUX uudeview-0.5.20-fix-function-definitions-clang16.patch 3242 BLAKE2B 250af757d13ca87cf547e7761a03649c69f8d53e9a0f8d336370e9b5c6ae1af2ac085c868cdbcd8f926c6c68101af52a378ac061c7223593ffb9781c47c7b882 SHA512 5a87898683f1a0e8bb70855533d63578b74e975c6794e19b253439eb540c9dfb1918cd67253b0269116799118e22d0e14c8377728cc6f75bfc465dda27fdf67d
+AUX uudeview-0.5.20-fix-implicit.diff 331 BLAKE2B 5eae1b9442e9dc834af7567d9e669481bf59a272401200a19447b252c4f655bb3bfbf084ea4b13d94313003f393418a8e117c413f084e23305547b8cce920a38 SHA512 ef8882b66e436342af5a9b8941d29e616d09af02cfb6fd9d898a55c7a7d7fbc17b9a42f17fbea342b058849e35bb2c9c0ed73f4a7af92244c79c34f0422156c0
 AUX uudeview-0.5.20-format-string-warning-inews.patch 384 BLAKE2B ff953f6401428c9055f21db08a813d64a275a42fd1ca4065f333826f22bd75b7310f1cc462f52f804acb42386ca91fe1dac22d4e5df8f10d9dfd787da787dfa8 SHA512 082c2892f4f6c6a16e44ab4754e71168346e32f3ee103177de0a7361f36b8ea4f0f612284ea47241beae63ab85c6734990c774e8576ad7cba678929826fde1d5
 AUX uudeview-0.5.20-makefile.patch 822 BLAKE2B b7729d04f9b881924205efce8dbb398b12e04ed95aa585f2e19fc79340e36772d8c8eb2c9fa23d2d69fedd44c743d85234578edd406b910f6f6ec70457f220a2 SHA512 69efb3af67aa9a47a4d4155b1c346bda5bcfcec26000e82b170d854dbc29e72ce6a8b21f171a72761f8ea2cc2c6fb65e74700a6134c9cbe107b596b45762a34c
 AUX uudeview-0.5.20-man.patch 3246 BLAKE2B 390d89a13080798b1ef0f902d92c82df59c10c6bb5b34eb8655ceadade0e31b0e81c100fc3e8908edf6c482c51c2560b90aaff8156b7ca805908036aa8342b77 SHA512 a940d6663563e7a91b35f5350e05b6cb7939f06d7db8767a8a5483dc82477c796a351cc03be9de49bd55513ca0b2e3203cd82c4b834caa54da9c8aae5750136b
@@ -11,4 +12,5 @@ AUX uudeview-0.5.20-string_format_issue.patch 907 BLAKE2B a99e9341219e8581cf32ef
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
 EBUILD uudeview-0.5.20-r2.ebuild 915 BLAKE2B cb90d99429ff87ae32bb43766ff681eefc2901f577e98deb0151aa7f1d4d72dbd8a76a57083e27acca98f30c7cb8eec64fdc15adc8e7f9c920662c2af459cd00 SHA512 4b159d03eb9ea9621d1a6bdc4e9cb72dfb1412da77d6bb00278af707bc12689f67145fa408c89139c4139bec1e38d19e05312d90699dd4702b5d0cd84f393292
 EBUILD uudeview-0.5.20-r3.ebuild 1078 BLAKE2B 659eed5c73bdea7feb6eb3cd24ddbdba6c612615b3e5973cebef3ff9637b3ce73b33fc6b4d7cfca1e2c12c185e4468a002c92ec30e5cb267d29af7137e923f7b SHA512 cb019c466c990bcad9fd49f796b71cef40ae390da0c59d7feb14614e657b0a36b40e05c19438042c06b4aaee0937112296f8f2e8e178138d9828d756596212c7
+EBUILD uudeview-0.5.20-r4.ebuild 1116 BLAKE2B a81d5bc856a4867fa7e3acef522801328e7abc54e9e09543ddac833d52dfc2d7b392a889e80f247362dce7349c8eeeabaf8201e981f47ee3e54886991ddbf591 SHA512 1e30fedacdff6160b2bbeb52303a5df724094b9dd5ddd2174b0b826c02863b01c5eb8026e4585be942602e242dbcf78bb239105891eeb237a2ae3e188a72a40d
 MISC metadata.xml 217 BLAKE2B 4c798b28d6d7cb91ce9efa46084d222e24f1f62814b89dc32e8ee4c2d2e761392fa46cb368de68fdaf0c020acc5603a124b3a96edaa8e6ee333ba3f71ea59ad5 SHA512 83aaf1cf450d1a0769b0d5bc9533bb17e683dd88d04d3318da131cd1c8c66492451b9518f9f2b08d144ac0a2ba4113ed09ffaff1b7c4779f6c35bd7bdcabb874
diff --git a/app-text/uudeview/files/uudeview-0.5.20-fix-implicit.diff b/app-text/uudeview/files/uudeview-0.5.20-fix-implicit.diff
new file mode 100644
index 000000000000..30b900d4509b
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-fix-implicit.diff
@@ -0,0 +1,12 @@
+diff --git a/configure.in b/configure.in
+index 4ea5965..49100ff 100644
+--- a/configure.in
++++ b/configure.in
+@@ -518,6 +518,7 @@ AC_CHECK_FUNC([mkstemp],,[AC_MSG_ERROR([needs mkstemp])])
+ #
+ AC_MSG_CHECKING([for strerror])
+ AC_TRY_LINK([
++#include <string.h>
+ char *blubb() { return (char *) strerror (42); }
+ ],[
+ (void) blubb();
diff --git a/app-text/uudeview/uudeview-0.5.20-r4.ebuild b/app-text/uudeview/uudeview-0.5.20-r4.ebuild
new file mode 100644
index 000000000000..7ec9c8a0f37f
--- /dev/null
+++ b/app-text/uudeview/uudeview-0.5.20-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="uu, xx, base64, binhex decoder"
+HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
+SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bugfixes.patch
+	"${FILESDIR}"/${P}-CVE-2004-2265.patch
+	"${FILESDIR}"/${P}-CVE-2008-2266.patch
+	"${FILESDIR}"/${P}-man.patch
+	"${FILESDIR}"/${P}-rename.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-fix-append_signature.patch
+	"${FILESDIR}"/${P}-string_format_issue.patch
+	"${FILESDIR}"/${P}-format-string-warning-inews.patch
+	"${FILESDIR}"/${P}-fix-function-definitions-clang16.patch
+	"${FILESDIR}"/${P}-fix-implicit.diff
+)
+
+DOCS=( HISTORY INSTALL README )
+
+src_prepare() {
+	sed -i "s:^\tar r:\t$(tc-getAR) r:" uulib/Makefile.in || die
+
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-tcl \
+		--disable-tk
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index cc8c2180dfea..607defc35181 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 844b23dee144..8cecef935120 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,5 +1,3 @@
-DIST black-23.1.0.gh.tar.gz 1196151 BLAKE2B 3c81bf5e52bb08928b568a20c9b3d769c5ebdd120bdfd4565c89fbffd978cd4a93dd70eacd041a4560723987278d16acfcae49245007bdc59178264757fba74d SHA512 f86d1bcf59c3fa0bb1bc3e71511c5df435ea437fd1cb30c466b8babc9522fb96bba6261da1431db75e6d578a85d061d31bd6ddbe50327fb4a3987eb03b03c330
 DIST black-23.3.0.tar.gz 582156 BLAKE2B 01ed5443e1bb251d46618a5b61bbfcc2dc0b41c0bef7d4315fb704a2ac0fd51eb4fe268838b8be6195630f21e6f7b3a5bfca124a7bd60dbef95a02714924327b SHA512 1ea8749ee25aae34a40c5d1b779c6076971488dea1a85ebfcbe4c2a8bb5abb5e3918a735a4e3f9b4ae2690eda0f48fac014ade055721b54d879fdd2d3450b72b
-EBUILD black-23.1.0.ebuild 1506 BLAKE2B 6f023d2ff0058c63a1dc566c94666a719110795b6ec45efa99476fc5457caa7de0922c3797ab1f0f4af30225d8cecf6d9e6822babf1bd351824fdd836228ebdf SHA512 3a8115a3f3ca8c08086ef4e471d19849b792a20bca97b381eb6e0faf8a0d96cb7bfd30218bccb020e4947701ed2ffd37a3d289fea05e1e48007d9bef1b2cec1a
-EBUILD black-23.3.0.ebuild 1387 BLAKE2B c4b41dcf6c90014d468bd3b749c94999287b8d8ed904924963f65fa7663714db5c1930b31b502a036837824388424b3a960deddbe96edd33db619fe70319f0ee SHA512 107e096084fff0b8bd6497765cb087465dc2725e8692401e186b8bef229119c14aaddea9feea21ed3ab4f5ebfc294c7156d60943c0e339672f25d19464cb0f2c
+EBUILD black-23.3.0.ebuild 1381 BLAKE2B 5d4354628ec5ea27a179e250b0f0fad68e51fecee6fab3526903a0b2c6127c935e3bf6a41827ecf2f50dd6c3bb6afa9e19aba6b0c7f1ffb7d7d911baad440656 SHA512 ed3b0b617e749ca87f51f280211e35a93ec7077bb64d798be0d0f59fccb3d3299b52fad58193ef2839db5daa098b91776f8e81560122bb37156bf67385a3bb8d
 MISC metadata.xml 446 BLAKE2B 7d9bdbc4fdd62c1b4278a824a75dede64ccd3a4d865722a99edbd4e316342879eefa7b249c453668a5d33009e134e2feb4d1ac01976146c3e988f3724749d4a4 SHA512 0a3a912fc1d439a92452e48c9749705cd2307e645bb1274d22265656f6101574edda79cf04c03ae512818e7077e404f79fb1f70fd68d9c7cd3be3417f991700d
diff --git a/dev-python/black/black-23.1.0.ebuild b/dev-python/black/black-23.1.0.ebuild
deleted file mode 100644
index 8ab986331f85..000000000000
--- a/dev-python/black/black-23.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2020-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} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="
-	https://black.readthedocs.io/en/stable/
-	https://github.com/psf/black/
-	https://pypi.org/project/black/
-"
-SRC_URI="
-	https://github.com/psf/black/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.{8..10})
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.10.0.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" \
-		"dev-python/aiohttp dev-python/aiohttp-cors"
-}
diff --git a/dev-python/black/black-23.3.0.ebuild b/dev-python/black/black-23.3.0.ebuild
index 6b49dd53af6b..9bfc7eb5cb19 100644
--- a/dev-python/black/black-23.3.0.ebuild
+++ b/dev-python/black/black-23.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index a7a435762454..b8870d34058d 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,11 +1,3 @@
-DIST jaraco.collections-3.11.0.tar.gz 17639 BLAKE2B 6eb81b7a1cbc294626f26e4e8c22c77f8ab9f1594f646c00bfa3cb482e13f04e22652ff5b37e6615b513dbe7cb8bf7cd34287f2531f651a4ffaac3b93fd266a2 SHA512 764e3b167ae9f25d8604d71e38dc869b018b912923695dc7de35cb5066eb93f2d769b033a80011d2b1414916263f2bd220610a35aa2baab67a748a00d9691542
-DIST jaraco.collections-3.8.0.tar.gz 17021 BLAKE2B d1439d2ac8e1c62a87f85775d58a1ea30abfb9eeae2d04c00eaaca9452cd3d46c668841073ee41913a52afa519ecbbddba321ec06584c8cab29dd736f4337219 SHA512 3d20c07d616e82c8c2699f2a5e7a0c42e8a4e5314535d4521a2e3457db510cd24019b23128682ac60c34b47fc4b5232ba0fd2e463c199aef6f6eb6d6ee4347ac
-DIST jaraco.collections-3.9.0.tar.gz 17407 BLAKE2B d5d266675a7a6ab69c1ac23c911fee639d05ef25c0d5f942695b02f8f45b4e6399628e13743beb570f61b1b2e400e28a34080599125e4ab8c59fa9d9c81172f1 SHA512 cac756866dffee2a7b41d4cc3a957e56bd7353454c0a819e94d7b5102bde624a759e84e74eccd6df475b1753f8730f72ac4dd2fc464085a387c879a0e2ac1891
-DIST jaraco.collections-4.0.0.tar.gz 17373 BLAKE2B 5903fed40affe3df25a7d339074355fadc0f86ce9340358530a0d269e288da05c3ada1bec662be86b0fd8e364344ca09d0ab69fcecf7a09e9a2dd78616d8c378 SHA512 0f30714d87ef85705dc3330aa1d4912e73f55718257d1c0f0ad0569b840d420d0838111eae50400df50ae2ce11c0b903943951a7cd1391acdb331afb5f76198e
 DIST jaraco.collections-4.1.0.tar.gz 17806 BLAKE2B 7558a50407db2113718701c52196f2ae2e0400a1f91104edb280e73ed5f8d74f9976c4309649684022ff83e8d5f55ceb0a9dbd44ca97e08fd508eb516e8ad4af SHA512 15ec220503304cedaa2c03a94cea79b172500685cc640902f774d178994cca1acda9cdc2a9b8f0ffec54cc98b0b75d2cd70512a12a453ea15ae19af4c691a3f8
-EBUILD jaraco-collections-3.11.0.ebuild 742 BLAKE2B 0461329753fd7531a0efaeca5507b45d5dbc27bca238ccb53160ae520cccba5ba7edc4988f067fd8cee9be7976dc97b1794dd896aa5f8ccbfe0e182d9778007c SHA512 7edd27fa21d330f695e24708587912286071c88f5e136656b291b323aa94377342cfae95e6ff214dd0644e47c3cbb0fa7946213eab7f81c0193f114b7d2c07b6
-EBUILD jaraco-collections-3.8.0.ebuild 736 BLAKE2B fc2f1acd286b09c44671a22e9bc729fc60c7923dc1fcfd4c7da6a4d384bf09a1f2c2e7fe6d221ac81f069c10d1e17c4be3461dbaa3385cdbab1043d459265bf6 SHA512 2a48ae9a9a8141f88cdfcd7f0f7d1ad5f999c4a9476817cdbb4fb5e1a01f6bf5c3180b47246908937f42a3010ce342310678cc98403e61f787bf632198f2d9bc
-EBUILD jaraco-collections-3.9.0.ebuild 742 BLAKE2B 0461329753fd7531a0efaeca5507b45d5dbc27bca238ccb53160ae520cccba5ba7edc4988f067fd8cee9be7976dc97b1794dd896aa5f8ccbfe0e182d9778007c SHA512 7edd27fa21d330f695e24708587912286071c88f5e136656b291b323aa94377342cfae95e6ff214dd0644e47c3cbb0fa7946213eab7f81c0193f114b7d2c07b6
-EBUILD jaraco-collections-4.0.0.ebuild 697 BLAKE2B 14a05ceb115e138d1c608bf8ed60b49473abccff74df58a511d7a5e73ee7a07cf76c3d92003a41d0b1c96870e9dd22d6eac8800ff10cf09b920cb491f44131f1 SHA512 ce4c925ab273474091959b1d15e06767a2948a2b6aee5bbe833726c6e1f5645ab75de6ecd24e19c2df5ece60359fa6af03c03ceca3b11c34c561608d21beeb0c
 EBUILD jaraco-collections-4.1.0.ebuild 691 BLAKE2B eebc1c89d5a050628d960b10fe93a5456bb3f6d39ae4b1d436c7d16f4d6487331ecd2dea930698e6457129b25683caec98f224435de955904af2cab1c83643b8 SHA512 f5baa58d93011d0238eda0bf31a57e1511c1f18d73af86e7d9f378b3868c83d468da30ee12f3dee43c1998501cbbb4a223d84ce381ba2291eac8e716fc8dc311
 MISC metadata.xml 578 BLAKE2B c6ad7ecaee92099645bcbd75ed9eff9da2a83268e8a7f828b2dbaf5414228f26b40f09fa37fd156d128742b111cfcacb3e177970b217d4de890ca7262275b26f SHA512 b2602fb629500021bd8fad159ddfcdc76a11f15fe2a51d0d25d5d687ae09170f6cc8438c252e8cb2792ca43bec7be65e249a799582f17c882639e30a9222a0ec
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.11.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.11.0.ebuild
deleted file mode 100644
index 9ece9dcf694e..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-3.11.0.ebuild
+++ /dev/null
@@ -1,31 +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
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.collections/
-	https://pypi.org/project/jaraco.collections/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild
deleted file mode 100644
index 0b4c0c276627..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild
+++ /dev/null
@@ -1,31 +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
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.collections/
-	https://pypi.org/project/jaraco.collections/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.9.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.9.0.ebuild
deleted file mode 100644
index 9ece9dcf694e..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-3.9.0.ebuild
+++ /dev/null
@@ -1,31 +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
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.collections/
-	https://pypi.org/project/jaraco.collections/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/jaraco-collections-4.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-4.0.0.ebuild
deleted file mode 100644
index 90e5e642b752..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-4.0.0.ebuild
+++ /dev/null
@@ -1,30 +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
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.collections/
-	https://pypi.org/project/jaraco.collections/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index 0c2372f176af..2399ff90ad22 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,6 +1,4 @@
 AUX jupyter-server-2.0.1-skip-npm.patch 698 BLAKE2B f037094e4ba041f112e6b2b08693186c9414fee1dbb9a25be94bc7ec75be09888c2b147329ef9c4b2bdcefd54c44cbadfb658983f97537e5b277eb0fc9ae4cc4 SHA512 d20cfdc71c1c58a7c3126db80d30d34ec8f188f6b5da82accd9e02c91cb14ce750123be443d0c85b18357ae1d22117912c4605e0ee74d9dbf226c739faa17297
-DIST jupyter_server-2.4.0.tar.gz 693740 BLAKE2B c50a06f1ebe1479c126c2a10ac7f58f012f97f8d565f1705b5d8080ff854a387a6bbcba65785652988a1adc3575009ea0b68e48b7cda8bbd89b5208e1a6d0612 SHA512 c5ceb6caa37c6d8bb5b3026f450bdfc92c37cb5a350541fa35764eeb33007918b2aa55b41108703477efe68f7d5e4f4ba3fea51cd203f3f3c0b74ba3bed6e1c5
 DIST jupyter_server-2.5.0.tar.gz 694029 BLAKE2B bea1082709653617c812124378e1e2a639e90b1e0d7fedacd98628c415adad2daa5343b57a19a776c41820e6665c8591c8d2a652f8c791b605bc3a4b65400ef3 SHA512 7145f60a73bf3d9aceff37aaf56b3b3a54c94fd9f13f06659387909cb1727759a082d11e983df4e687cc508461d5afb6e552f3ac09e30bebb1eb5e863992ad14
-EBUILD jupyter-server-2.4.0.ebuild 2174 BLAKE2B 0484e37ad5a7cc22015c3c541d0227103cfd5d71cc4a8cd4478edb92e3689a63079b034d7fc5aad693b0f4b0765111340c2deb2a4a96788881a466e974aa86c2 SHA512 2288447da7696c858c462005690c1631a8979d56663f5d87c52736574a01487765f6630ce8c18df2378d5e8d210f110a8f919d4fd10413c756d6edd0308bb1a6
 EBUILD jupyter-server-2.5.0.ebuild 2174 BLAKE2B 0484e37ad5a7cc22015c3c541d0227103cfd5d71cc4a8cd4478edb92e3689a63079b034d7fc5aad693b0f4b0765111340c2deb2a4a96788881a466e974aa86c2 SHA512 2288447da7696c858c462005690c1631a8979d56663f5d87c52736574a01487765f6630ce8c18df2378d5e8d210f110a8f919d4fd10413c756d6edd0308bb1a6
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
deleted file mode 100644
index 30abc93f4dc3..000000000000
--- a/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
+++ /dev/null
@@ -1,75 +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} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_server/
-	https://pypi.org/project/jupyter-server/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_events-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	tests/test_terminal.py
-	# Fails because above is ignored
-	tests/auth/test_authorizer.py
-	# Fails with additional extensions installed
-	tests/extension/test_app.py::test_stop_extension
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.1-skip-npm.patch"
-)
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest \
-		-p pytest_tornasync.plugin \
-		-p jupyter_server.pytest_plugin \
-		-p pytest_console_scripts \
-		-p pytest_timeout
-}
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 01a48ce54535..d96c90ff85cd 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -3,5 +3,5 @@ DIST pikepdf-7.1.2.tar.gz 2911232 BLAKE2B 14b6b90617b7bd30f6a595337751f586cbe7d9
 DIST pikepdf-7.2.0.tar.gz 2913496 BLAKE2B 6992b9e64e7bd718fb09c5cd3eb77937c802bb07b24b72bb0825ec721137ee1211f9f7bbc3d8141b60e0ece1f71e6d9d36b50153377b3475f30d7aac3c8f2181 SHA512 96759f36e3f019d6cba775541e7338e774d61cb71c464e42625b1b6c98b8babf5fc9d9324dc6375257897a130d7fe5facdd7a1ddaec6662c8b088854e01fc97e
 EBUILD pikepdf-7.1.1.ebuild 1493 BLAKE2B f1a371305b4810bf3c79e31e0dfa68362603b2efda661d421f0d77e9d836d4f463ec38418c48eebc2a3f328be7ab980ec9cc3c43c486d56bf3c827147e0025c7 SHA512 9fe46a28026fad07a99c1050254fe302a62f32524ec2670b47c13bcafed00eb154868650dd6e3c315d8c03abb35f176d8e36ab804e66d6bdba52e5a284de60bd
 EBUILD pikepdf-7.1.2.ebuild 1501 BLAKE2B 50c70b2f9074d703c4cec6f323ead242f1e9aedb76c83092506659076f61484f51eefca8aeece8f26ef5d3de30a6c12606f280ab54e6d3995c0b1e83468a1968 SHA512 474d6758dab21a2a83e055402b6b941addd7fb63e9f1510237cb0f2021cbc6f7f7116aff5ccefc05c241d866cbd750c763b8285000fae20bfbba070dc212f285
-EBUILD pikepdf-7.2.0.ebuild 1500 BLAKE2B 3ece5ce538ae10a17accfc178b4d2e7419f68d3966a3321ff3285b20567a4d573493575f94039fd7a5fd1d47252d4907de817cc704168f71c3faa30967489454 SHA512 ca1b6e55bd93558c9159144040abc7d91c3395270cf7f6d3056904a96282f18747aceefe179e0f3401e75f64e4cc7e3e631b6ce853243d2122255039f53cc389
+EBUILD pikepdf-7.2.0.ebuild 1497 BLAKE2B 3accc2f80f72512db2f4bb95ae9a6c98d1df6fc680e9c61edbc6733307bcda741c166a0a8f5cc667bcbde4284bc8deaa79a7156400599854041ca4bdc626fc7e SHA512 67aa6060057d33315045f7a41a2944a68ec07e83559c0646e2884aef32e2478dfff663290c5b65e2ed0ebaf204fc47d612cb93d82cf43a05dac8de1b06dd5fb0
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-7.2.0.ebuild b/dev-python/pikepdf/pikepdf-7.2.0.ebuild
index 7b728aa528fb..2590324c57e2 100644
--- a/dev-python/pikepdf/pikepdf-7.2.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-7.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MPL-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"
 
 DEPEND="
 	>=app-text/qpdf-11.1.1:0=
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index ed3547348660..577d3004c518 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,5 +1,3 @@
-DIST pydantic-1.10.6.gh.tar.gz 902014 BLAKE2B ba3a3896cdcd2eecc7bd4e6ad979846de377c94d939519889752b36827eba7b3d245943ba192dd80925c2aa09ef02243aaae5e990a6f7b1ab9a8d0b5ba9830c4 SHA512 094fda0158faeb6021632f7ce3ea2570c19ddb288260d4e0f5a4361ab2684a68b0e6212264b37a4a75166746570098d1c4aa0311797d2cf1a22cef2c1e1f0137
 DIST pydantic-1.10.7.gh.tar.gz 903379 BLAKE2B b2dd75a640ca54024a2bf141117a1d738a30a4630bed8f4d0169fc5a6a55ded719727d88c7e78b9a2acc3aec68482e9be8c8bf4776fef668fe4acc3e1fd775df SHA512 948a7935b374719773df50243aed708b3c6789243b9aa0ba239cf1502ddd0e0cec4d701e108f1cc78090c088f3cb1c78b840c39f5e7ad0e61739776f552f284d
-EBUILD pydantic-1.10.6.ebuild 2147 BLAKE2B 78b1fbaca4b8246e9d977d850cd7d3e5b681cf07968bc9ef24e33d805a371281a132abdfb3b05f578f7b7aaca6dcc4ece9a7cb57ed84bfe96cc01c40f53c08ff SHA512 1115519399cbacd60716ec69b814e8e20a698c172485614f2a372e165d5f0bde56672ddec689510a1d47a955faa50f75df73b4268b826ea1d5cf6bf67876893e
-EBUILD pydantic-1.10.7.ebuild 2152 BLAKE2B c7dcb638f1a96d096518d0914dfcee29878328f12248242734614c8c1f2309a427cd74ba156c9b436ba362909087d009c2f1890c3cd1eee7a8c7c4f8dc6dbe61 SHA512 5ee0c287681d665055f72e92dc71ac7d2500ae309368c8a9b896d435526377ad7f5f947f07f4c822c7815958aa277dac3b32bb68fd75d0964a8586d5bf113278
+EBUILD pydantic-1.10.7.ebuild 2147 BLAKE2B 78b1fbaca4b8246e9d977d850cd7d3e5b681cf07968bc9ef24e33d805a371281a132abdfb3b05f578f7b7aaca6dcc4ece9a7cb57ed84bfe96cc01c40f53c08ff SHA512 1115519399cbacd60716ec69b814e8e20a698c172485614f2a372e165d5f0bde56672ddec689510a1d47a955faa50f75df73b4268b826ea1d5cf6bf67876893e
 MISC metadata.xml 561 BLAKE2B 9cb2851ece8c8bd005a45008efe6d14d990f82832700f641418c15921f368de9bf2b20f9713362f5308a871a10c60a54ddce4e095a4a60209c89bde964c71ef7 SHA512 2f26f32c0d937153966ffbc3b9bb67252043dabfd9ca96b2ba854b111300a0c8bc89a664e439cda3bcc39597c3a29d28b3aa84172ece0f1d818b49cda746ee33
diff --git a/dev-python/pydantic/pydantic-1.10.6.ebuild b/dev-python/pydantic/pydantic-1.10.6.ebuild
deleted file mode 100644
index f7eed6cd5d91..000000000000
--- a/dev-python/pydantic/pydantic-1.10.6.ebuild
+++ /dev/null
@@ -1,82 +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
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-SRC_URI="
-	https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.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 ~arm64-macos ~x64-macos"
-IUSE="+native-extensions"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		>=dev-python/python-email-validator-1.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		# do not build extensions on PyPy to workaround
-		# https://github.com/cython/cython/issues/4763
-		local -x SKIP_CYTHON=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock
-
-	local EPYTEST_DESELECT=(
-		# flaky test, known upstream
-		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
-		# mypy linting causes regressions with new mypy versions
-		tests/mypy
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_private_attributes.py::test_private_attribute
-				tests/test_private_attributes.py::test_private_attribute_annotation
-				tests/test_private_attributes.py::test_private_attribute_factory
-				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
-				tests/test_private_attributes.py::test_underscore_attrs_are_private
-			)
-			;;
-	esac
-	rm -rf pydantic || die
-	epytest
-}
diff --git a/dev-python/pydantic/pydantic-1.10.7.ebuild b/dev-python/pydantic/pydantic-1.10.7.ebuild
index 39399f63f05b..f7eed6cd5d91 100644
--- a/dev-python/pydantic/pydantic-1.10.7.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.7.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index faeef2e1eca0..44f55fa53a78 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -1,5 +1,5 @@
 DIST pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz 2678274 BLAKE2B 537e63a7e4755f6fea20f4ceec065272b83879958a0a794780b8976877aa083a2a9bc1b8b4a4592accaeb59dbeeac480d75965291ddbff324aea5c90d7dbcfc0 SHA512 b58a57d70efdfcea066735e3681047bec4fc89a9b75e423f5f889cd29f89a25bd0b96fcbca17578958b677e44858aafc9c6b17aad54dae640640bb7eb54cddbd
 DIST pygame_sdl2-2.1.0-for-renpy-8.0.3.tar.gz 4053740 BLAKE2B 607e9c587734a5d53f25ff7537b308eade273f97065e81166bbace9ca255adfda0bef23f05d9fcb370c96d7eeb6175a6b649b0b07727b027ed2b43506dc876c6 SHA512 135779d4de6e2bc8ade069c11d521dd0dc2bebae6dc63a374d478785fe7534626e9dc3c7f8f50c3291f4a60b26eb474c14e3971f0b9487215125bbcd5af6782c
 EBUILD pygame_sdl2-7.3.5-r2.ebuild 945 BLAKE2B 09c4e31e5bc3a426332f9d5237822446311e3c8b443a59acdea4d16451f2d04e17b18583c76022e2223d7ed891c416fc608b0666168087e8999a4b32fb2e06ad SHA512 425013156cbf80c1d69e1ab3552e5273b20329f0dbec178350f8bd426143d44f0086b5f68e0196f1bc09106ab05e0637373053d2148bcf5cdd649def40d879c1
-EBUILD pygame_sdl2-8.0.3.ebuild 1077 BLAKE2B 123fc5fc1f5e2e410901ca6a1c2e1016a59b2dd85d79d7e55945ef5439db582965090f3795f8c85bb24b864413f8fb0740e093353527d64c71eb1a36dc12fd03 SHA512 7e9eae57b135e5d76dc7c46fe854bec382e71423b7bb0e0774eeda77320705088bc210a650c511f6c054e1a5ec510305c40fe8aa6ed34aaf5d8e075bbf6139ce
+EBUILD pygame_sdl2-8.0.3.ebuild 1075 BLAKE2B aaf80576a3961ebce2bf88e11c6da88a0a038907ab83cf864e423f5e144773955e54305dc03f782cb468ba40e5997e8fef7a66e7a48c3f0429f3211c8f73e91f SHA512 097e17a595e4f30a0f7ac2ec7502f3e41d47ac79c1d477bceb8dc0319c30b76fc1a0dd5f9d0061d8e4952edc485f2c87a2da8ee7b00f1022e5f87afe2fadeea3
 MISC metadata.xml 382 BLAKE2B 0456a0211bf9f5497ae588dcb47ed34d99f08b7600d135a4591e10c8ce8a7349c816c53ea4e800070afd065821aabf22a70e7482402947f2d1801c3250d62d12 SHA512 dd3d1bfe08a30dedf0da22a02e2a3f3e8d38ebd59b2c122b26486b6891ac7459a06368fc55bbce6b243880367110b1b908bd796a17feededf3b1d8b4c9363278
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-8.0.3.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-8.0.3.ebuild
index d1b95dfb311c..3adc4a5202d0 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-8.0.3.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-8.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 7f7ad6034e79..6b3c2104aa31 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,5 +1,3 @@
-DIST pygobject-3.42.2.tar.xz 558724 BLAKE2B 3e98cf52e818eff42beb8b6120ee8eb4cbe3a6f49670d355e1081b71d411bc93fc701cc37108a321cfcc19698c39b8b61cce5a9369d871da58fd2a2c0455fb96 SHA512 eb604f839e0702e8aeff0f19665e44c05c56cae02ce892e9ab8a95ddb0d5d0216182d0c9a0059fc8e05990c0d5707f2f7456d8924bbfb95ce1d9a42908ac0119
 DIST pygobject-3.44.1.tar.xz 559432 BLAKE2B 7edfe91ac1b7301befaf8ef17078b517666467f446bfbe25850336cd365d314153d444d29ecf028ce44a12cef1c94f139d110ac6784c8a2c6077730d4836f6cc SHA512 5f2ff4a068e7e24dcc32f8c43ba58660c85a0fabdd9ff0bac4ddf1ca82bd0fc962ce5cb3ab25b991c212d45e5e89dac67c3259c5423a7d7fd70b2ac1f56e5327
-EBUILD pygobject-3.42.2.ebuild 1788 BLAKE2B 7c3768d2e9a33ce057ade2173327005873f25fe48f0830fa2457aed37455f3a7737490ad98e2ccdd8140befbf6449a09eda64025957e69be07a609738f43d5b7 SHA512 599982b5606a2c4f23739f4b884fbb05cb0a5bb0cbe7282bbd35cc9716a54bf33ceca1636c1b5d119abfba7b2910ae1c25b140a2717b8198df27ea10e5cb6371
-EBUILD pygobject-3.44.1.ebuild 1789 BLAKE2B c9279331960d9a2b82e83157fad17ed85a55fb93cc5ff48627ffccc55c5d5deb9f4c25919abdb73050e794cc40f4ff196c5298d34516c15c72dbd915c8f2bad8 SHA512 5d64b90c6305c446c0f2c537324569df286ca7ccb1608f0efb34b2a5832f2f3ddbf8b14dfe5f8ae6e3373eb8be2e00951fcd8b1a172cd4e9139bcb5fe02826a2
+EBUILD pygobject-3.44.1.ebuild 1788 BLAKE2B 7c3768d2e9a33ce057ade2173327005873f25fe48f0830fa2457aed37455f3a7737490ad98e2ccdd8140befbf6449a09eda64025957e69be07a609738f43d5b7 SHA512 599982b5606a2c4f23739f4b884fbb05cb0a5bb0cbe7282bbd35cc9716a54bf33ceca1636c1b5d119abfba7b2910ae1c25b140a2717b8198df27ea10e5cb6371
 MISC metadata.xml 1398 BLAKE2B 0f89629267eea1f03252ac53ebf6478977301f5edf58024152b7e25cac1bb238241d419241dac72181bc82d0bda4dc281fe490a72967b730df7087300562127c SHA512 49ec255944b9530fe59ba325925713512ca84d71149b988c034d092d4a433c6f7a23822d685180c343a40055bb5c879980996d34a30cae8fddc617707bc1a417
diff --git a/dev-python/pygobject/pygobject-3.42.2.ebuild b/dev-python/pygobject/pygobject-3.42.2.ebuild
deleted file mode 100644
index aa8df02fbf99..000000000000
--- a/dev-python/pygobject/pygobject-3.42.2.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
-
-DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit gnome.org meson virtualx xdg distutils-r1
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-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 ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/gobject-introspection-1.56:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		>=app-accessibility/at-spi2-core-2.46.0[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-python_configure() {
-	local emesonargs=(
-		$(meson_feature cairo pycairo)
-		$(meson_use test tests)
-		-Dpython="${EPYTHON}"
-	)
-	meson_src_configure
-}
-
-python_compile() {
-	meson_src_compile
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-	meson_src_test --timeout-multiplier 3 || die "test failed for ${EPYTHON}"
-}
-
-python_install() {
-	meson_src_install
-	python_optimize
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-3.44.1.ebuild b/dev-python/pygobject/pygobject-3.44.1.ebuild
index 4f611f1c0a57..aa8df02fbf99 100644
--- a/dev-python/pygobject/pygobject-3.44.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.44.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index 2a77dfbb61e4..5a446832823d 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,15 +1,10 @@
-DIST pypdf-3.6.0.gh.tar.gz 7174931 BLAKE2B 2d9260ecccc03e6039d288d1fb16f8d1deffcd8daf83e4bb25ff7f2c49b3c6c979ebca2f04458964999d29fb5979b21a0087b02ac66c0bf387cce2be50a308be SHA512 43286f7c9c68048d763a87b02eb932ba597a7aa778153e8abd96d7d496da0d910199dab1e985d21c625daae225dde69936fff56accd52102353e6a03e30db4c7
-DIST pypdf-3.7.0.gh.tar.gz 7505675 BLAKE2B 68491e9d144717a5f92a00c01ae0cbdd1713c94f65ad44bb9ad1de556a80caac674c164d7c7a2d9738f68afdfb36ad3cde7791016856d0e8ddc1ff2c2d7335b3 SHA512 4d1d7d47ca20970174bf938af19813f5e2738ea6658fe3023b64e93575e3e73eef84327def6eb8868f4bbba01030a24252032a16cd89c6b79e3390b9ee9ecbb8
 DIST pypdf-3.7.1.gh.tar.gz 7508532 BLAKE2B 917eb7a825781f966d6b268cf3471935b9d245de5465acd428f87cc387a01bf1739d1cddb504498e4e7505a098508a1e12d686ad21ef73960f11bcddd4acca57 SHA512 5834a5738860c341e231a0ba79d9ffbc14d1f683bc781793d962fb8303aac5e6ec825492cd2e470d47fdd166576c5c4be64bbb7a03f7f79b160d456667ce8f15
 DIST pypdf-3.8.0.gh.tar.gz 7509837 BLAKE2B 2acf12b5c43799252641f2c7d0ebd24c1f1eb02b655b0c458eef1049b660452967ff613e17b2eb70330d67677860b58b0f8f99d3af2c2794c4aacb30646b3244 SHA512 a4f33c8f940303958221a48ffbf088c363d7cf9360d5c9d27829b5703735216c32af63262313a25598c3479c4584999a23ac6bf77daa701042ef65314194dab3
 DIST pypdf-3.8.1.gh.tar.gz 7516880 BLAKE2B 87d8cd66c7efcf9624205da904290fe82f51eeb9b521903ec564467755cc9a824ab0660a41d0cbd4a1ada2e20b4b35e16ce3a73a9933aea9fc5e0f315e613709 SHA512 8b78ccc210b8f34b9556cf69cac8f2af207de9a42840a0b4c822c0ab2c0b2d468c5c20a14704d3f54c6b57bcc451c3f0b7ff54b8149616b539cb07be57482e58
 DIST pypdf-sample-files-0c3b1d3879c5cd7d913b3d931fa33b37529d7346.gh.tar.gz 9028862 BLAKE2B 7c72b76724e7b0fb4069c3151c13342d66cc451f398f6826b09dfb5b57e2d2b625118de1f431b5759466c4e6afb5d0c8682c4c28ec2f3b700a6cc39787ec6ecd SHA512 342562a711673030eb729135f27c241f5f37305b0d6f30f555667881e921089b801a3376330d840b16d4a3683d0b6f07824d05e4d208d32a3771ca83a0b7f22d
 DIST pypdf-sample-files-69b31cff6b183a42f9081709ef9bee4047976f56.gh.tar.gz 9044391 BLAKE2B 9a9bcfbacabf3c80073a440f54736728cba4ea92d1a817ce98bcaf9375340d95e453f45207f53ac878ef5c13bc4ca7d0d4488b79f205f396e960ed042680ca01 SHA512 32b4572d60a0aadba02485f11c84712c1f5f0a75f7acd6fb27f1df00cb2a8ae338a1001e6519f66c248efbd129aba1a2ad568e930ce90bd542c8dc58f383386a
 DIST pypdf-sample-files-d3d250321b01ca1194e16a814d24508897862fe8.gh.tar.gz 9030851 BLAKE2B 63e5778763315aff0753e5a0f06cd55432a494efea921c73e765567aee63223af3f3d81436e22d089008bc38c917e10eb5da7988abd458fd3f3488e8faeed70e SHA512 a8e77982ad78aeb58db7a5a722c9e072d7c55bca7290f448ba388b70256137fc6b9919c8079d8b548407c88b8befe7caeeb65217eb52b6d9bbadfaf652d89e0a
-DIST pypdf-sample-files-fb7a080b35b3553bd10221282beeda7847959e83.gh.tar.gz 9027029 BLAKE2B 8f8797263b86f08efd9708d5812000efd08708abf66a0e95f50f5a147102e555dd7f8c465ae73cae842d86efdb52cabba5f8962626f56cb1b98409bfa108e150 SHA512 3a9cdab964a14cf6b14d80d917441a4e5effe2b7647163b666781ecabd189624dbbe5039111f6b1d753ff73e013665a1b86d87ca7806580fda58ec5810f88e94
-EBUILD pypdf-3.6.0.ebuild 1244 BLAKE2B 1bf96d9a0a542242320be90159c51304c5e270f02bb3f33e89feccad38c32013aa37c6165902f503a133f59ca32bfab5150362c998c591fc8be62f2d59717b5d SHA512 c95e5d99fb0a2e565fc0e2b311d50d0573c3f234918444e3618335f35ca0cefd0f8bb68baf6748a17ff7f890660c5401f39ccaaf2a96ff387291cd0143f271c4
-EBUILD pypdf-3.7.0.ebuild 1246 BLAKE2B da8bd7f5e9007468d3fc3e723c20964d9be8b4de54df656eaed47a6ba4ea196e5f131f5c04b564eb1dac28696b361c317e267140857cf5c97cda5ef65c6bd03d SHA512 09c4749006ad9e14378e399266fb9a7d3d6aa285110cc2aa24f1a168217df17c21b7e74acd7f7eb372c3753a763333d6ac21484a609d5dafc32fdfd67e807caf
-EBUILD pypdf-3.7.1.ebuild 1245 BLAKE2B 4f7bdf4e737c6f87831a9460a5809429d766c5a8c710441a056d130693c01842832c7569370cce432bb482803988782aa30689b943fdbbfc60d9e28c8ac10fc9 SHA512 5e0f489d79d594c6826d3c00b23045442fd1d037c891d8fc7df8713c572966c13b62cda3732de5e84c6cd0fe9fb47077308e2285521e461091444aa9af64c83c
+EBUILD pypdf-3.7.1.ebuild 1244 BLAKE2B 8c2819e81ae84367249159d59d5e84b195cfe6b56231ed951013587ab590955eba32c9cd617102b4512c563aa2aff98ad5079a882f0732a7f90aa5db94273cea SHA512 37da32e5960bd2dddbd48f57a16a61aef53d2203249150a3cc16346eac5da407cb8b5ef5427e21863f18ceb820d9cac707d92e5984232e1594706c5676b4e61a
 EBUILD pypdf-3.8.0.ebuild 1246 BLAKE2B e4b19bf9823f78ddfb327f833029544b4a7caca2d2e57f345d7f3505d69069849c26f0de4d746bd2f66bbacfd435df513459d56a75e138d246d30c833d5814c2 SHA512 5250526439080843fafd200cc17539517c93912ec572d715bc5814bb228ef54710886d9b9755a297199008954ff6c8cb3b79752bd9a9dda344bc46930965da6c
 EBUILD pypdf-3.8.1.ebuild 1246 BLAKE2B eae2042e379ef70d2f89be49be667604f37acd66778b01c9bc616bbafd82ed9b72077b0fee0f90f85df386a7c78d228932e85e7fbec5c3698407e25f53c11bcb SHA512 c7388c89acae984f7e44161686b7ba9e220ecd30d8ccca70b727ca9f056e8bc7cf51e2e2b46060cad045fbb5781223e980473a49221768eeb8e011f7ce9277ec
 MISC metadata.xml 373 BLAKE2B a829b7048eb3a95caeb1be83b6172603df6a031d40995294f2687bf3c3cb70e66fafb9ba8339d9979fc85f5936b9552963a8fcd072a20661fa78f3aa3c4b89c0 SHA512 775ac2de487f11fba1ea8d283b42b9ef56e42cd95ea11f50a06b099420e69c0567f65c506b14891ac641da90ea05ca70da4f8a3e4a028cf41bdbc823021dccfe
diff --git a/dev-python/pypdf/pypdf-3.6.0.ebuild b/dev-python/pypdf/pypdf-3.6.0.ebuild
deleted file mode 100644
index 3affab3f0d02..000000000000
--- a/dev-python/pypdf/pypdf-3.6.0.ebuild
+++ /dev/null
@@ -1,60 +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} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=fb7a080b35b3553bd10221282beeda7847959e83
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-S=${WORKDIR}/pypdf-${PV}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-3.7.0.ebuild b/dev-python/pypdf/pypdf-3.7.0.ebuild
deleted file mode 100644
index 246ddfc145ee..000000000000
--- a/dev-python/pypdf/pypdf-3.7.0.ebuild
+++ /dev/null
@@ -1,60 +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} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=fb7a080b35b3553bd10221282beeda7847959e83
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-S=${WORKDIR}/pypdf-${PV}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-3.7.1.ebuild b/dev-python/pypdf/pypdf-3.7.1.ebuild
index 5eeb924a862c..14d14b921bd8 100644
--- a/dev-python/pypdf/pypdf-3.7.1.ebuild
+++ b/dev-python/pypdf/pypdf-3.7.1.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/pypdf-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
index 1f8850a40dee..099400da4c69 100644
--- a/dev-python/qtsass/Manifest
+++ b/dev-python/qtsass/Manifest
@@ -1,5 +1,5 @@
 DIST qtsass-0.3.2.gh.tar.gz 28601 BLAKE2B a02a21fb80d977cff09d3af74f50b68f341163997b68bb0eddf8aa5011b523992ef33f8d7afb8ee8361261c9ae7c45c5a141cfc957fdd3e10dc07ceafac06101 SHA512 2939ac9b2536148541abda4f3ea2750e814054c70a96614880453bf1443643e463fda9d2d308b3051461f88b4cf53046fc2ea057b62a2190b70a4b3f6daf033b
 DIST qtsass-0.4.0.gh.tar.gz 29466 BLAKE2B 954016c3a7a1ced59a28a50284f284f6138caf6c97cabb2854c56a3c499741060d4de7717ec39733fc41dc221d11f16118380dfc252ee1f169466bacc7ba6ad9 SHA512 58b5b70c5f1c102817d6024acb0d72f496f55217950e5a52422965215b8dc8debf4c7c6d4724efb5609b75b675d81e99dccc9211c0804c75063d33127f25353e
 EBUILD qtsass-0.3.2.ebuild 575 BLAKE2B a979e4b587c4f9f1e7bdafc8297bab508ef5126ec4e381a790511fb077144b8df275ab0801facefb3b2cea34dd36b1e4c1400c69d72cc7ac2356524756f1c728 SHA512 b7e47ace1e7a2d5899489b841d317af53bafb3ca4b5a1e1adba5cdb02a5438bb9b32a93bec3ac11890850a1e5f3a1d6c24330189f4e7ca33431f7dd0ff6a7422
-EBUILD qtsass-0.4.0.ebuild 631 BLAKE2B 5bbd3e67707c9f143fd1e57073c231983061ad2f38049f39384d4b02ad963c22421e6cda7b69f3f8e065428003371d13f511c7dd41fff2d7c52da457ad9517cf SHA512 547669c8fa95b1ef0d8159f4a549a417fa0917d02c9146345572d405bf2de56beebf9bf9f525afad5d0cb42709de3552039e2c1f3ff939d14acf8d495e0ba410
+EBUILD qtsass-0.4.0.ebuild 629 BLAKE2B 564557d4dc7d106baac656f43b514975511204d7a56f764b151603b4a2077b65d84e3ed93d20f47b2a4474708943688198b18d9e94b3531d4d5b97e96f225862 SHA512 6a9c7c25e3a0cc002be52f379f05cb8af48b3364914b3853f86d305a5628ff4e8197f60fdb1a97404baac4421f188e9eeb736bd7a96c388b9c0944472889f146
 MISC metadata.xml 409 BLAKE2B f0526e577a0df1dd2cf9efb8a3f69ec7a861ce81c6ab7e48476f6c8baf3a788f9a294d9431f1d6bd615ae7c43836e4f00ede581e6259d80f23bed9a465a1bede SHA512 8183a06884c16c3275b7954b184e151563f0957889a9ccfa632fa5f1fbfd2467f14b7c19e9bc347242920c75a9ced61db66781ae9d6521d3c457074eca25e1da
diff --git a/dev-python/qtsass/qtsass-0.4.0.ebuild b/dev-python/qtsass/qtsass-0.4.0.ebuild
index 1a66bd84d25e..6a48bafa1f06 100644
--- a/dev-python/qtsass/qtsass-0.4.0.ebuild
+++ b/dev-python/qtsass/qtsass-0.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/libsass-0.22.0[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index ad8930ef6648..0969b981df07 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,9 +1,5 @@
 AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
-DIST regex-2022.10.31.tar.gz 391554 BLAKE2B 060822767ab28e26d000faa198f4226ba1e4600141a7b3e0f656df8d004b5007a0a7934057e608d524f6a21421573fbeb8a1be208ce69ba2d912a55d19fb3f22 SHA512 d461cddea75f2a8ceb749d7e1a54f3543fe4cb3418976ded26101cb53c333f0e2eabaa824239c89c50c94c6736409566215cb7b6c6c3a0544678d10b6af76cc5
-DIST regex-2023.3.22.tar.gz 391917 BLAKE2B 62a7c992f0bdd0342a0dd37d6e28b2511dba0ea790f9684548dbd128a95c580820b3335f537cd8fc27b968e25cfcb4333aaf984caf0b3135aca15d96ae37372b SHA512 aefb665f62b2f483af2c0683f1f793a8e4a7c952062eab3c95a0e2e80aa86fe51f94fe6fa439d7cfb795d8ae90059b28dc265e81704481bde03a52d004a7dcca
 DIST regex-2023.3.23.tar.gz 391964 BLAKE2B 87271765ce6b3c8a96a79e86a2b2e907a9a97e55c78c38d117b05df2fb5626af3ba90ecb55ccde6cb745eba00da2528bb0b6d21dc759c3040c37f6a0cc647476 SHA512 276e16a60d77f0099d9e9a5241f60a823d8ca3056672d74aba21d38daf11ec18b317009e84135f63470a71c877c6abdfe25da0e69c5ea5ad47c97737099a5167
-EBUILD regex-2022.10.31.ebuild 842 BLAKE2B e389dcbc58021e66508c95bdef0cc7af22f02632216e811e3d98da03584da6997be17d612092e8b0dc5dd3fcabccd06e104fc18ef21a4c15b688c998a1dc431a SHA512 6afd1ec80a090735e92f2fb1b2f485aacfc6432050412e7caf99d28229ba353c61a369ebee3f623fba1569ecbe6c3f689462d048cbdc009d8271da6fc906923c
-EBUILD regex-2023.3.22.ebuild 850 BLAKE2B 8b9c7b887a380675adee05a43119f3c5cded544597ea204bbea121605f3a3c76c7d5ea1ff03b775fbe841b7dfa6d07016f3063694878d72114177d84e85be1fb SHA512 906c6b14f000c8bc28bb7d316dc2e64c467f0bd8bc33c1e8a56108eb39a719995b59862dc6f27ac1aaf59d6f9555bd591fae125bd9403753c4caea9ddf379699
-EBUILD regex-2023.3.23.ebuild 846 BLAKE2B f4bdc9e962fd58d72673488ba80bf69b49cef84a314b16a89f59a7e8d27a5840b85252cb0511d5c782d210a2b7f775ed5071824651e15b9d01f77de9f23b9247 SHA512 eebe4540955302f6e076a3385398e743d0bc295042f4e4f3ac6f5510230725ec7f75c8ce23004683a266a228671221e6770faba2887d306529cb1e30c9e7a666
+EBUILD regex-2023.3.23.ebuild 842 BLAKE2B e389dcbc58021e66508c95bdef0cc7af22f02632216e811e3d98da03584da6997be17d612092e8b0dc5dd3fcabccd06e104fc18ef21a4c15b688c998a1dc431a SHA512 6afd1ec80a090735e92f2fb1b2f485aacfc6432050412e7caf99d28229ba353c61a369ebee3f623fba1569ecbe6c3f689462d048cbdc009d8271da6fc906923c
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2022.10.31.ebuild b/dev-python/regex/regex-2022.10.31.ebuild
deleted file mode 100644
index ad58e05e008b..000000000000
--- a/dev-python/regex/regex-2022.10.31.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=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://bitbucket.org/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2023.3.22.ebuild b/dev-python/regex/regex-2023.3.22.ebuild
deleted file mode 100644
index 62efc90d2934..000000000000
--- a/dev-python/regex/regex-2023.3.22.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=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://bitbucket.org/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2023.3.23.ebuild b/dev-python/regex/regex-2023.3.23.ebuild
index 4b00aadb8ae3..ad58e05e008b 100644
--- a/dev-python/regex/regex-2023.3.23.ebuild
+++ b/dev-python/regex/regex-2023.3.23.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 9223f02026b2..641d3728ad11 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,8 +1,6 @@
 AUX reportlab-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch 1502 BLAKE2B 79fba12b6219d0a9e3d25140359bd9589af0f501345797d74ed07d6efd0fe239b4ef2a357bb65d16c0544224022323418a4d3f57358433d776a4f2d41b7bbbb1 SHA512 696454cd280fe603ae014b829577cc3fd1b968478cf327528229cdf66dc0069fa2748cbc7b8519b26b170e9f01784523da2862dcc8623d24a8b7695fa3f4d42a
 AUX reportlab-3.6.9-paths.patch 996 BLAKE2B a003ce69d7aff12e04fac914d44a0af58555da9858d96f23be26455836ee1105d76136cdfbe52b888f9779f1b8463fda9a04587b3ef045c8354d840f3f92caac SHA512 f71ebfdb07c87a7bd39a5578355a2a800654204e38f722106dcfbe848332eb1ef6ce8b6ffebe08fd0a07214c0fcfade69e0eee1f47b1055c877efc64e70e0bfc
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-3.6.12.tar.gz 4519536 BLAKE2B 106e0ede2b3c039152ae5a39e0aa5b3bf0239789ba08630f751260b75305973bff13730e3f7419340514a4f0174223dddf522cd9408b8dd04fbe39b84979b152 SHA512 99e6ab1cf27cc9e661b3bfd8c71290d94189db6de5e71b2429cccd48bfee5659d5fb46dfc5709e6616877b48bc17241c74282e0d2ecddda2ead16df4c1b6818f
 DIST reportlab-3.6.13.tar.gz 4035524 BLAKE2B 638b670b76b4cfb88c0a66db484f5b4d042fd935798316d02303932503e353a6035419d7ef1c4dccd8ef94b3cc2e13a576fd3cb5461fca17122a800f1140945a SHA512 059c3acf2c995ebdd3ffe005bd98640bc9c063c2fb9b3115351b9c1a4f7cfdabf4ffe61123342de2e84773005d46cf6d44410042206222df0700259e31ec7aae
-EBUILD reportlab-3.6.12.ebuild 1278 BLAKE2B 40ad71cb4fbc09fd06a13f7404be0b9bc3f6a207c2a1ddea0a7a0091f962b0ccd2c7bac52c134bfd2697a669834711f6841b19719cf992c551416a82fbd4b268 SHA512 78f949c2b6412f75a1b1d68547f00ade92205da6b54b68fa12aa5a90bf6cfb85139ace7c2434a403d5e0a9c53f2083a84cd5f6c590efd0daecaa5ae7a905e709
-EBUILD reportlab-3.6.13.ebuild 1279 BLAKE2B ddba8d40c4d5a9bd1ffff08c7f224cf4726a58de81dea82547685241ddaf22b07bc63793655ee9805fa07162aa3784311df586332a45dc87a0fb9d190912d12b SHA512 ce130a6f751ccb3dc5aaf850025df44c87b8cd68b97b98059147e127a0388de0d35dd1a10a289a34e488423aa9397b775fc4012743e2115dc57efb38c8b39407
+EBUILD reportlab-3.6.13.ebuild 1278 BLAKE2B 40ad71cb4fbc09fd06a13f7404be0b9bc3f6a207c2a1ddea0a7a0091f962b0ccd2c7bac52c134bfd2697a669834711f6841b19719cf992c551416a82fbd4b268 SHA512 78f949c2b6412f75a1b1d68547f00ade92205da6b54b68fa12aa5a90bf6cfb85139ace7c2434a403d5e0a9c53f2083a84cd5f6c590efd0daecaa5ae7a905e709
 MISC metadata.xml 1974 BLAKE2B bfccbbc451ae8cc0a7eae60e9b6134e01a8eb9be40506c51b2b8fc23845daaf4bf6e0c97d854b5e58f1ede8ee32a97280f526949e772e06288f0a237bd32baf6 SHA512 0c46c2bb1021b7b098446fb4005b524104f3a28e0a8a497c0f60e3f89668e9198eb57be2d2b01aef36896a519244ba32ebd1a63f3840161390fc901dac6d9daf
diff --git a/dev-python/reportlab/reportlab-3.6.12.ebuild b/dev-python/reportlab/reportlab-3.6.12.ebuild
deleted file mode 100644
index 88abb16d03fb..000000000000
--- a/dev-python/reportlab/reportlab-3.6.12.ebuild
+++ /dev/null
@@ -1,62 +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 pypi
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/
-"
-SRC_URI+="
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-"
-BDEPEND="
-	app-arch/unzip
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.9-paths.patch
-	"${FILESDIR}"/${PN}-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch
-)
-
-distutils_enable_sphinx docs/source
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-src_configure() {
-	cat > local-setup.cfg <<-EOF || die
-		[OPTIONS]
-		no-download-t1-files = 1
-		use-system-libart = 1
-	EOF
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-3.6.13.ebuild b/dev-python/reportlab/reportlab-3.6.13.ebuild
index 06539093dceb..88abb16d03fb 100644
--- a/dev-python/reportlab/reportlab-3.6.13.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.13.ebuild
@@ -19,7 +19,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 3cacea548b6f..439f369ea7eb 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,5 +1,3 @@
-DIST requests-cache-1.0.0.gh.tar.gz 2914633 BLAKE2B 5402d3b6bc99bb0b72a484854b83450d8f57fd0aff39661d6f2452c69cc0ca9b140fd2ac7b02110e47bcc0bf2497c58912330d7472b9f1701b8d4e2a54f7cef7 SHA512 92d6e1b9afb158f824a4b20d83c7b30a5988476b741213b0663df6095df1753da2dcd6516372ba383864e19d346850a356e9370b2ae27554effcc3f0b6a078c8
 DIST requests-cache-1.0.1.gh.tar.gz 2914175 BLAKE2B b1c3c544a761e127204172381a66b0175f09e49040a7d0f04760cf03b253846ac7e831b7c15d4b128e47e5bc132ea3493eba2784ac442be4dc0eab262e2251b0 SHA512 ec5788e31f60fd95e575d01af1163f981757972db6557d7a62da2ca0719e84262cf66cdd9b40c73cca540b92d6b7f6beba1aa42bedba528734c61edf5013ec3d
-EBUILD requests-cache-1.0.0.ebuild 1859 BLAKE2B 7a7db167f03ffc172ef756bf8d5bf80ed18294793a9658b930f92ea5ac2cd542906e4b4f9c6e6ef747e174ddbec30497c6373a864670aa1e0b47f9443c82b6a3 SHA512 7944c319a8e2fc4c2eb8067a18f1f6664ea5a78fea4c76c19ecb521d11cd17dce0d05e753d19ee295c91d6a1f0fe40fb009d5ea76bee4fa2eb21974eb79ce141
-EBUILD requests-cache-1.0.1.ebuild 1861 BLAKE2B 1fd6dae285c7642291dfa79dd454d6ecbd116016d85f8d361d11557a44d6d86ea5eb167b0d9f8813cbde52a9205c0d7be2eb8806ad98e991ebdc243c8befba98 SHA512 8302b26c67216d75c5358a6d2e8761edb6e1b1f8e80700e1e8c34dc754723928cd5d103cf4d545691f1575c51eb425b06d10dade4adb3ff767fb2e7808841f05
+EBUILD requests-cache-1.0.1.ebuild 1859 BLAKE2B 7a7db167f03ffc172ef756bf8d5bf80ed18294793a9658b930f92ea5ac2cd542906e4b4f9c6e6ef747e174ddbec30497c6373a864670aa1e0b47f9443c82b6a3 SHA512 7944c319a8e2fc4c2eb8067a18f1f6664ea5a78fea4c76c19ecb521d11cd17dce0d05e753d19ee295c91d6a1f0fe40fb009d5ea76bee4fa2eb21974eb79ce141
 MISC metadata.xml 541 BLAKE2B a8fd81921a36e2fe5bdec38cc1039b9e91971c992a59cbe2dc4826977f753bd6cd2533f65b5f1a076308a898972fe70e85a2c8cf480259e9801f51b10c4de8a4 SHA512 64f29b67eaf3ce892a9f918abd7eaf8f020323e9e0d986b424cffc83e3ac1ba5cb14b534f0a0ec73a8e81694ca4e0e7f98ef02968ac5b43dab104b2b12e8e0f2
diff --git a/dev-python/requests-cache/requests-cache-1.0.0.ebuild b/dev-python/requests-cache/requests-cache-1.0.0.ebuild
deleted file mode 100644
index f5990c646567..000000000000
--- a/dev-python/requests-cache/requests-cache-1.0.0.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
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 optfeature
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/requests-cache/requests-cache/
-"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/requests-cache/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/cattrs-22.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/itsdangerous[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/rich-10.0[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-		>=dev-python/ujson-5.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local EPYTEST_DESELECT=(
-		# Requires Internet access
-		tests/integration/test_upgrade.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "redis backend" "dev-python/redis"
-	optfeature "MongoDB backend" "dev-python/pymongo"
-
-	optfeature "JSON serialization" "dev-python/ujson"
-	optfeature "YAML serialization" "dev-python/pyyaml"
-	optfeature "signing serialized data" "dev-python/itsdangerous"
-}
diff --git a/dev-python/requests-cache/requests-cache-1.0.1.ebuild b/dev-python/requests-cache/requests-cache-1.0.1.ebuild
index 8c8138380cbe..f5990c646567 100644
--- a/dev-python/requests-cache/requests-cache-1.0.1.ebuild
+++ b/dev-python/requests-cache/requests-cache-1.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 41e83ca653e1..2a7fff161c2c 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,9 +1,4 @@
-DIST selenium-4.5.0-py3-none-any.whl 995204 BLAKE2B 214050a4e410a4689255ec8472a1cb35a37596e73d46c48769aa8e184b6f84e281a20e7e5f812b8185edacfcbca6eed77507aa59ffcaeae384f962b4214928a0 SHA512 b22d80d750c85337a2b793799b5a63b11bed45d11b874c1a64c02f53b4adb57263e69bebc79203de3bdfa5b8708203959971723cf0aef7fb68bd1b2a9028e9d9
-DIST selenium-4.8.3.tar.gz 6332823 BLAKE2B cf874ab56182471055aa3d76d8828529f3c54f04eb9b7bd9342a87eade9c39875eecf00fce4f47019d5453bd65a0e5ace99170770394fc21bec1cf8d7998c579 SHA512 8bcaacb1f809e92ba9c1d14ccc0560979a29d27d61bfcd7d7fa08c3ee877c98699a0c5ffbb361ea37f0cc01a51b44b3d04ed4df025340bea7f842b4376d2715c
 DIST selenium-4.9.0.tar.gz 6336895 BLAKE2B 4a812324abd1903f14b03a73d21125eb83b753a553bcc4515aa4a3dc792bfb07bfacf34e35357f81c36675d9079bafe5f289a63c709df57358103a9141cef535 SHA512 3bfba3d862de73261e984e4dce3c2ff77b0f57074073b38648cbbe6908f2d20a5fadef8b23b6a292d780bfe3556291e26c2a7b1cc4b314cc959e78e0a2dcc6dc
-DIST selenium-selenium-4.8.3-python.gh.tar.gz 90236640 BLAKE2B 943497a5015da8a626f210568715c6839b566feb7a04cf28230c2eded44ca3d110d782d9f90730206c0a2135200d81a960d60974662ce63dc1cf2e3cc09a4f0e SHA512 d3182eec2229872860ba370e99b3093fe73a519e839bfdcd01b2c3cc74e28b51c272e7fe176c2123d2af21d6cda1fec99051362c4ee10469359d8a24a8bdc7e8
 DIST selenium-selenium-4.9.0.gh.tar.gz 90247221 BLAKE2B fe99ac519ef4ced5f61721d1e3bae70e938b4a481582623a33f4d5a2fd1978c42e216501eb25ac7496957c2ea37a3ad97aff7ab7adf440e1428a311410024aca SHA512 9e745eae4cf6ea95fe1268b79a80734f4b67b0948fa5bfb144d6b681cd4b353add5c1a1d16b3f35652b6fa4a5b135f8a5203de97fcb9af0c27060a45b6269225
-EBUILD selenium-4.5.0.ebuild 781 BLAKE2B 340cf76c9431b8e7598c4fbe415808814a9f7e7d0657d748bbf75ff764dfc7ca0e38f74e21ad60e529fe0ccf2928ea17081e21ef6d23d916c5a51ac8ba346d89 SHA512 ee70ecee71bcb2f36f227f69200dece1fcda518550c1ae74eae0e16f03e091fcc756968cb2cf74a6c038fe1dbde8222faee48bc4c09d2286651368687e70fa72
-EBUILD selenium-4.8.3.ebuild 1649 BLAKE2B 22dbd2a61522eca41b3a6cb53abc2940e20061b3195c5a2753074053ad08cf6d25ed9ae4d6a46d78f68547447768ac79b2a3f2b463c91353aefc19aa22609853 SHA512 29aceae985983379b254021a62f63abc765167d9d50781a743a2426ad4833b2643995d4ce999135acfdfa098c0b0e7c5e64456a1cc0d137396e160c9dd5188fa
-EBUILD selenium-4.9.0.ebuild 1638 BLAKE2B 9a14dfd501df49bed6a2c3f5ec01d5dc08fb749d0dbb36f88c158aba963131c6a095b35995c7bd2f85e2a88c16500680147a679aa322c7317dc18edc1dccbb60 SHA512 ce00a47c85356515fb6ff72980b6c64b954c39ec7241ac278e809063ecb6b2c3a0f82a9be621e021b2e293620dff4d96956f40b8f7714930e18e5b934de3f109
+EBUILD selenium-4.9.0.ebuild 1635 BLAKE2B 25060ec7f77dd8decc1ed42209e8b12073b5496a4a0a7a73adcf035bfd5f15377fc6891921f9dfda37b3bd308b7dcfa96c30ae69a2b20a629beb24944167a783 SHA512 65853cf7625e8ecb36f18770c2d24c21c956a2b3734c6421b2053a2a281a28b58e57a91a8a74d50bb49db0339a8b3ff422afcab15cf45f1ba5ce8ef34bed5fa3
 MISC metadata.xml 383 BLAKE2B d437d1631cefdba12fe2c3ce38ddff34bf9dd2bbc777d5d3425556bda76865711c991c9e3a735130a1d55cb7c6578b083ecb473c28706a2d45563b31bdbe6d1b SHA512 c087323da996b9ad4d0bf8f00306cf044d5daab194b60af029cb1ce06bf60c660fd5959b7914e6f1103143c3e4533d293a6d3bd0ec1c95163eba09d8a19c13a1
diff --git a/dev-python/selenium/selenium-4.5.0.ebuild b/dev-python/selenium/selenium-4.5.0.ebuild
deleted file mode 100644
index fcb1473fbd00..000000000000
--- a/dev-python/selenium/selenium-4.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# GitHub releases don't include generated files, and on PyPi we do have them
-# but only in a wheel format.
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="Python language binding for Selenium Remote Control"
-HOMEPAGE="https://www.seleniumhq.org"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${P::1}/${PN}/${P}-py3-none-any.whl
-"
-S=${WORKDIR}
-
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/${P}-py3-none-any.whl"
-}
diff --git a/dev-python/selenium/selenium-4.8.3.ebuild b/dev-python/selenium/selenium-4.8.3.ebuild
deleted file mode 100644
index d4ccf4ca28b3..000000000000
--- a/dev-python/selenium/selenium-4.8.3.ebuild
+++ /dev/null
@@ -1,63 +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 pypi
-
-# upstream sometimes tags it as ${P}, sometimes as ${P}-python, sigh
-TEST_TAG=${P}-python
-TEST_P=selenium-${TEST_TAG}
-
-DESCRIPTION="Python language binding for Selenium Remote Control"
-HOMEPAGE="
-	https://www.seleniumhq.org/
-	https://github.com/SeleniumHQ/selenium/tree/trunk/py/
-	https://pypi.org/project/selenium/
-"
-SRC_URI+="
-	test? (
-		https://github.com/SeleniumHQ/selenium/archive/${TEST_TAG}.tar.gz
-			-> ${TEST_P}.gh.tar.gz
-	)
-"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/certifi-2021.10.8[${PYTHON_USEDEP}]
-	<dev-python/trio-1[${PYTHON_USEDEP}]
-	>=dev-python/trio-0.17[${PYTHON_USEDEP}]
-	<dev-python/trio-websocket-1[${PYTHON_USEDEP}]
-	>=dev-python/trio-websocket-0.9[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: we may need extra setup or deps
-		test/selenium
-
-		# expects vanilla certifi
-		test/unit/selenium/webdriver/remote/remote_connection_tests.py::test_get_connection_manager_for_certs_and_timeout
-	)
-
-	cd "${WORKDIR}/${TEST_P}/py" || die
-	rm -rf selenium || die
-	# https://github.com/SeleniumHQ/selenium/blob/selenium-4.8.2-python/py/test/runner/run_pytest.py#L20-L24
-	# seriously?
-	epytest -o "python_files=*_tests.py test_*.py"
-}
diff --git a/dev-python/selenium/selenium-4.9.0.ebuild b/dev-python/selenium/selenium-4.9.0.ebuild
index f5989f241bd0..f01b214f769a 100644
--- a/dev-python/selenium/selenium-4.9.0.ebuild
+++ b/dev-python/selenium/selenium-4.9.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 	)
 "
 
-KEYWORDS="~amd64 ~arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 0244d761b7ee..cc5f1a14dc79 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,7 +1,3 @@
-DIST stripe-5.2.0.tar.gz 267950 BLAKE2B b7312e4c7e56803fdd64507602df3527efcc964aa7bb6deae59d00df75c72c47cf179382ce6b90ffab5089e7fce9b2e03de0748a091b36dd25d93d8cf6b1d119 SHA512 e928487b690a2c7bce9013ba988ff5a1d9b0ef4b0be56852385925fd5fa4a1b9e655e05b7fa2728d38ed7834eebe621b883851e6a6db625f388866f32c9f8a15
-DIST stripe-5.3.0.tar.gz 268634 BLAKE2B b6b6ac44f64b2b7f02729840409ed7f432abd6924838445deaa010a98056175bc47504cb110d27f93c1c1a590d759903f6af2189da43076fd3b1242c8f4f2503 SHA512 2ae99b315f0d1059551b86106cd3eb46dfb60dcc31f65f4e3cbda8817461b0071add2ab68eeb885b4faa080043708ac9e673d8a1248bf1c6461c62e1adcafc80
 DIST stripe-5.4.0.tar.gz 268711 BLAKE2B 2417174ceed571a7b8483992ac15ef9d19a037e5745118c2eec3094f8e848ec49b384f62bd4a136ed046b695bd753efc6064109c30a50aca539a1085b1e056fe SHA512 55351171184672ab55f38ed483078dbbb85216bf80d07726d1bb8848d24ff829a3d464d543182afafedfcaabdb516a5868bc4ac7d16f64f2dc2dc7c1ab2e152a
-EBUILD stripe-5.2.0.ebuild 1777 BLAKE2B 7d52e724895d47f77fa83ed1c81b77070c1453f9e7aa6464975dcf8384ef559567c618b4c056da8d701c33cdc15fe953623e2d1cae20147e8d0e3b8f01c9cc8d SHA512 9bc618c6f3bda2b506c49f87950981607eb5bba6eea89c6362c6b3da83a14da65d8c9d9aee741a97fa98d42314dbf2d3f1c268a94b0c45f850f3911ef023041c
-EBUILD stripe-5.3.0.ebuild 1779 BLAKE2B 86e73471b21fcdda355e14c9540ed07712b18cd40c298de791fa7392dfe96ed20803460f6f953c05c8d88618a26a1e24a476dc62b5a24ef0f2173cc75d10d96b SHA512 32f702eb44fd58d38cec9e79c6db3bfa19b23c44a6f750317e0860954fe7497fb8f12dbce33c4522cc24a93179adfe4e52738139c6471a37a641a70df6197e5f
 EBUILD stripe-5.4.0.ebuild 1854 BLAKE2B d8d234dc0e1f4ae602ff38a5c66c418e584afdeda8ae6d51be99810224509560d787a9f82e9a684b38c54f3b376c060a7656fbd8de92796c00dd747466ed609a SHA512 f8281dfb18e3791643a9733aad5eab4c07d8f631736b40194df7c14905c9bbae0659cacfbfc2f582faee36500d5a81b35bef9ac048962b288b8ccdadeceab867
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-5.2.0.ebuild b/dev-python/stripe/stripe-5.2.0.ebuild
deleted file mode 100644
index 3dcb231fe397..000000000000
--- a/dev-python/stripe/stripe-5.2.0.ebuild
+++ /dev/null
@@ -1,70 +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 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.151.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-5.3.0.ebuild b/dev-python/stripe/stripe-5.3.0.ebuild
deleted file mode 100644
index eb800215b7d5..000000000000
--- a/dev-python/stripe/stripe-5.3.0.ebuild
+++ /dev/null
@@ -1,70 +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 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.159.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/trio-websocket/Manifest b/dev-python/trio-websocket/Manifest
index 23c20d54bb17..67ddc9635656 100644
--- a/dev-python/trio-websocket/Manifest
+++ b/dev-python/trio-websocket/Manifest
@@ -1,3 +1,3 @@
 DIST trio-websocket-0.10.2.gh.tar.gz 45025 BLAKE2B cc80f7b8e06bb88bef69c6326dd899a27523ea70e0ea10c8b02a26498102638c569ffe21e2b4e355f9c635d60ae8ae34664d311bf5fe286456e43e0f9c2ba481 SHA512 ad8d4facb153b59597ca7dac14dabe60ac8ca4331aa72df8120e01ec726e1f392a8167d070f72534eb735b5dbf4afe46e385c0e3a2dd250afa2280c6a5a0c863
-EBUILD trio-websocket-0.10.2.ebuild 937 BLAKE2B f426233b99cf656a01eb5d83e6540202da570ec02eaee7ed1b0e3d3fa4ad36a0605c8dde26008b54c0dcd66942329fb50aa1ecd24b7f8406820cb658ed161de4 SHA512 0522fcfd3213f4c281ec0019100a2b719d00642da84cc1a126ed8b35d4d5c418c4fcc3d1ed32c58380cbc10ee188824dd7aa0ff33f6aa4cac803151c2d010912
+EBUILD trio-websocket-0.10.2.ebuild 934 BLAKE2B de954f549d169fded6a13cfb4fc79d8746d0e058778abdf01e4c0789dc5350a1b2f8a5e8f073c63474010370c3208aece7102322268ac4349babe7448edde2d1 SHA512 4f399d19a768a48314c730f43e4b6f66044c4f7d9ab7bb797c24f84a566f603b67f841e49fbfd084f347064a0c99e7496081560402db96ca41ba6f8ade6c85e1
 MISC metadata.xml 409 BLAKE2B 68c9d1ab2984909315d2ec3f91f2703cc0941911fb049c35614c2cdc935e55f0f2440f6624aab4838f0d7d07e3e5717d19c7138660e82f8a3cb237e610a974e1 SHA512 c9d5e6f956b40d03d0a062ded846c507e783c55404a76b75141004df7d43e6a8bf5810480b4286a6bdf2d48c30aad51261e48581abb8799c107b924cd8131170
diff --git a/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild b/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild
index 5fd0c0e8880c..d64a773f38c1 100644
--- a/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild
+++ b/dev-python/trio-websocket/trio-websocket-0.10.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/exceptiongroup[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 4c73e6f90ffe..027e499b0394 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -4,7 +4,7 @@ DIST xarray-2023.4.0.tar.gz 3689883 BLAKE2B 50c5a18eaf28fc3bc38bc322dc393ec3e6a6
 DIST xarray-2023.4.1.tar.gz 3690082 BLAKE2B 33b8c8b6694911e0fb670dc60b784e9473a632bbdc793ac85685c9891933e373e40378c7362d7d3f7d6cf584716f8759ad73701d469534b70323d8e20d27ef3b SHA512 5bffb6b09d1188da27f19b6ec652ffb5a16ebdf036cf53f2d7c5b1805e7beababea6505127a23170d8ae8ad9453f429598b17f468c84b72ad07383ea3951d935
 DIST xarray-2023.4.2.tar.gz 3692437 BLAKE2B d4fb5b184386bb7e9574ea3bdf484c3df82b9dca1fcd2380ac65b6a58da9f89da057d70efa9bd045b5cf6900c38f6aa4176fd2990cfe1369f987c452711307d6 SHA512 581b06a677b80c0f7e494a80ae52d75bd62bf613b13b7b7215458ceef727fb55a898c8da8cc6f8a6875ef6898007897eea8be55fb138f1dacad42965bbf1d956
 EBUILD xarray-2023.2.0.ebuild 1178 BLAKE2B bec6155037d99a0832d283af7d5ceff48a51aedebe5baab14f293008ea31903dc9029a82992e1be0399c9102106c6db776009e1f10a30c0a7304bba6cc96eaf6 SHA512 34cba8d8521f7b8506c6b84804365397974f97a71cb8ddfedbdd7f0dc4f11e7b5bfa1e8216a73ec8aa1c7bac7beded74088cd5db283dee76f67380c56b4f65ea
-EBUILD xarray-2023.3.0.ebuild 1222 BLAKE2B 11ae0cdd72648274d47812795be212ecd98c265cbd2a68e82af377b3d82c77f4188def85afe33da4b9989dc12f3da758322e95e1a275522e77c394227dbb7444 SHA512 6340918f15666ddc0f9ded9e19107efa4433b6069686772a231d638310d86c26f1ccb4c061bcad517fc05ef27be23222fadb5ea2b48eb46d09358bc7d8f99a34
+EBUILD xarray-2023.3.0.ebuild 1219 BLAKE2B 3e0ad7381050059aa3eeb05fa2b1c55d4b97e0f03ed074216b0de20691f65310bedcb6d52489ecbf9dc66e318080e01225164e853019b45b863013012327e9de SHA512 01607169790d51ddb41a0ec726d19828bf9130b6afa8cdb5f647e69d5d8c804ab10b1a8d31f9d8be822e7b58019f83790997447ff5bd48a149a885bfdf95cfbc
 EBUILD xarray-2023.4.0.ebuild 1737 BLAKE2B cc338022ae7e4b78a4bfe092810ea71f94e5ebd2d768be293be71e87561273e0ea86bb2f90495540989c604b23ba50ca9de6e6ef1bfb5d4ea34ac534ea45c630 SHA512 82477cffbfbe309882ac31e918de8bc87333a19b84fce86811f17a129e97a37e07907b54e67ec87abc849febb7c8ac844d9fbd4512444318ab4a7a95e9fe0a31
 EBUILD xarray-2023.4.1.ebuild 1823 BLAKE2B 4bf1e3d7abaad1fd66db35eb0e75596deb8587a52eb0503d023f9b3ef7f31bfcc895da241323849b0a97adfbe8a00b1f89b212ad30adc86d2d53c333bad6b8ba SHA512 b57d14a46f5efbe17d1806f69095d1cfe99c5eddd08beac80635b8ee0e2438ae6bda0af4c08baec26766a7755fba828c3c2c2a830ae6f24db745c65a797ef390
 EBUILD xarray-2023.4.2.ebuild 1823 BLAKE2B 4bf1e3d7abaad1fd66db35eb0e75596deb8587a52eb0503d023f9b3ef7f31bfcc895da241323849b0a97adfbe8a00b1f89b212ad30adc86d2d53c333bad6b8ba SHA512 b57d14a46f5efbe17d1806f69095d1cfe99c5eddd08beac80635b8ee0e2438ae6bda0af4c08baec26766a7755fba828c3c2c2a830ae6f24db745c65a797ef390
diff --git a/dev-python/xarray/xarray-2023.3.0.ebuild b/dev-python/xarray/xarray-2023.3.0.ebuild
index fc2365b9204d..5e7727cffd73 100644
--- a/dev-python/xarray/xarray-2023.3.0.ebuild
+++ b/dev-python/xarray/xarray-2023.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index d757ac0736bd..1d19b07eb2d5 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,7 +1,3 @@
-DIST zope.i18nmessageid-5.1.1.tar.gz 30589 BLAKE2B aa87ecc7b757c2f3ff877ea908df102477b5f888067a6bf98aab6467adaf7baa713c5b413f528cc0010b4082d03b48d069537dbf223713ed914982eb8f040433 SHA512 4762dc67d4b665ede25eaaeae1458257fef994207a887f128fb5c64685bcde08bc17e24890cf36a14febb57295813c9152f14aeea854493e4197702bb4e3d719
-DIST zope.i18nmessageid-6.0.0.tar.gz 27791 BLAKE2B 3589c46c0405f21e50df3eae1bc3aaabccd88d16cbc696634e31dffa866910965d050aef50534d9a04799d918830e78e8b977162409d7862e72e17eed4740c15 SHA512 415cf30bc571032719e39c4fdf12f3d8e877b975774a87fea22ff0577d83e4b1582c0af9744514b46253ffee04c4599c02803798cef2b514e8111c7eea17e34a
 DIST zope.i18nmessageid-6.0.1.tar.gz 27797 BLAKE2B bab5af18f9bec8a41b633bcd4081381dbda37b71eef32153e6889ca4b7760503f1ac2c8749b508213629505904e85166ea17d1898a5c50d5bcd55ae4a714c2a6 SHA512 8b50df352e7c53ce88c7adbc0eb1155b198ea0b200b411324819ffd59517a403f0be78746c76a7018e61e6272cdc1be1b623dcab1db28dafa3abf2a714623a4b
-EBUILD zope-i18nmessageid-5.1.1.ebuild 968 BLAKE2B f4b7bf4b4ae8d0a3752864e42e06bdf36a5d52ed3491296965328b097324c9950702d3b8de9e5ea8cd6fe360c9824282b800c11952102708aac85d0b80e7095a SHA512 ca440b35aeb346fb23fa757d2e85cb23ae6cc9901d4008ce0930a79eb23ad43f5949d84a5565a3e0743db07324f90e8a1a25c526ce60ba0e084c24a3d704cc87
-EBUILD zope-i18nmessageid-6.0.0.ebuild 971 BLAKE2B 576d0c19c8a0ca56b2ca359f64e0ba23c63ccdea6ef94293bff081f041feb3e5d1f82121e5b02418dd31a6acf84a2a069f4028528438fecf4e848da4ef399894 SHA512 d0a6ad3c0635cad8f13f61edb17fab7b3ed6e332a622aa40974b99e939b340ed6ba78993e0eb328e70524fd7778df82f14f8efaf14b97d8a7e41885c23427415
-EBUILD zope-i18nmessageid-6.0.1.ebuild 935 BLAKE2B 417bb27edc05ec51bcedafefe5122dc261ce9ef86c52ef79b32e0fb3affc015d6aab23acc964cafb8e4ebc9e8a45f0b9c99d0082a810a5b06e35760f51812a9f SHA512 236ea52ead1ee3ce2be56c3ca48da874fc10c3df923784c5029ce892880a7e08c5c217db446cbcdb19ce0be2526574d0e6e2609145bef773e718ed125aeb5624
+EBUILD zope-i18nmessageid-6.0.1.ebuild 933 BLAKE2B d3ef9788c6bf720afcced7c20dedddde44e5359abd30e832dfa1cab05fda64c0aac43887269913218383b9d50dfcdb1d965605c4912350242c7c2b4a65e72dbf SHA512 aef38fe48052fbce7bb20735acf5d79b7bf3899ca31d55dc570c0b23751f94c255cbd26351943e7d362e897d1edf7443ef0363d2ce471d5591f9b30d67568204
 MISC metadata.xml 488 BLAKE2B 2b413d726016bdcf199974f77972d7800a4d5f169463d9587f9d0563ee94f8f0cdafb9c384c387b7bf9c2f1814807a8ab32fae796275bc51d624133788df44c8 SHA512 3459883a636540739ecea197d7ebd1429dd6e8fb20d0df2337691e1742995edf50dd0fee6340695b6dc493d0d5fd7ea8d3f55277172cd7385df0b057f376fdbb
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.ebuild
deleted file mode 100644
index 0e68b5c7c893..000000000000
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.1.1.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
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Zope support for i18nmessageid (tagging source of i18n strings)"
-HOMEPAGE="
-	https://pypi.org/project/zope.i18nmessageid/
-	https://github.com/zopefoundation/zope.i18nmessageid/
-"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-zope
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -i -e "s:'setuptools',::" 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-python/zope-i18nmessageid/zope-i18nmessageid-6.0.0.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-6.0.0.ebuild
deleted file mode 100644
index d3e13bc75066..000000000000
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-6.0.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
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Zope support for i18nmessageid (tagging source of i18n strings)"
-HOMEPAGE="
-	https://pypi.org/project/zope.i18nmessageid/
-	https://github.com/zopefoundation/zope.i18nmessageid/
-"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-zope
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -i -e "s:'setuptools',::" 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-python/zope-i18nmessageid/zope-i18nmessageid-6.0.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-6.0.1.ebuild
index d420ecef7506..24fbde447597 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-6.0.1.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-6.0.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	!dev-python/namespace-zope
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index f1c68d585bca..6e00f9912d5a 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,7 +1,3 @@
-DIST zstd-1.5.4.0.tar.gz 620235 BLAKE2B 490415a1be76e4957f14e2e5137eca5a80290e4b492d551cd230826b500a36a8574d0c20eabd4d0bf6bf34d8c61f60f8e6aef5220bf3b0a2e5ba95eef1aa428f SHA512 f9a9301cb0f5f3f7fbf67dd44d9b748673894b89002f5666f394c093545a779370f79ab5a4fbe853be40d8701a5c9203a26da3ef6a243650f2c81a2c0d029b2d
-DIST zstd-1.5.4.1.tar.gz 619509 BLAKE2B fbeea9e6c03f9163c3dbdee7c0b88fc9f05f938295e570348a9b60fcbb6795a945af4eebcb92303ea7e143d9bca3380bc0dc5a43fc222107f29ae5ab5743e8be SHA512 eebce9b82c677232dc93083fa2baaa359386075899b358dffa48e5276c2e9548bc89446de69092b7367372c32094b209cc4da0482ca5852ed6bac21ad1aac29e
 DIST zstd-1.5.5.1.tar.gz 1106585 BLAKE2B 6c0d6108a3c5e5e3d013d6e10fadad8150311d2e17d304751dba4ac709e2c8005575ff73e2800392dfd9d7b6bcda9a8e8014d3cbe4a90d12bf12e7416776d744 SHA512 7dc2f3ffe0f94b56ba0cf8360ee510b292e9b8b1e92b8ba1ad1a9206b50f852a4e67e04d8e4900c0705820163d551644b38977e2864c648aae7dcc6b2a2c0a68
-EBUILD zstd-1.5.4.0.ebuild 566 BLAKE2B b18b055cb1df6c81a9fad5fa9431aa578dd14fbd4ea295750a3bd7a19e83857f495f74686551ffbc1fbec94af09f6b36888b5394bde1d66f20aaae4aabbe5ae0 SHA512 07997a563d33cc090c91b7382995747ef8ae6e91f92e8631be01f7bd6fe0b8092ebe9f0b39c0a4341b25aa4cdeeaf4db691976f41b5d822155731eeea55d3324
-EBUILD zstd-1.5.4.1.ebuild 568 BLAKE2B 2d204e8b0c709f1652d82d7e73e657d2fda69801f1e7562c71073bef11fbdee55b8a532a60abba67a21da5098a17e417eaa4d691f74e0eed31012e693e8e7aa2 SHA512 dee23d0b504e08acca9705701267cf9412720cba85e83aa2e6fb4481a5827d5bdf13e3e3695ff81f0efff759ab92d5d502842a51d6a0d4ceb5c9a0d9b3a78fe5
-EBUILD zstd-1.5.5.1.ebuild 568 BLAKE2B 2d204e8b0c709f1652d82d7e73e657d2fda69801f1e7562c71073bef11fbdee55b8a532a60abba67a21da5098a17e417eaa4d691f74e0eed31012e693e8e7aa2 SHA512 dee23d0b504e08acca9705701267cf9412720cba85e83aa2e6fb4481a5827d5bdf13e3e3695ff81f0efff759ab92d5d502842a51d6a0d4ceb5c9a0d9b3a78fe5
+EBUILD zstd-1.5.5.1.ebuild 566 BLAKE2B b18b055cb1df6c81a9fad5fa9431aa578dd14fbd4ea295750a3bd7a19e83857f495f74686551ffbc1fbec94af09f6b36888b5394bde1d66f20aaae4aabbe5ae0 SHA512 07997a563d33cc090c91b7382995747ef8ae6e91f92e8631be01f7bd6fe0b8092ebe9f0b39c0a4341b25aa4cdeeaf4db691976f41b5d822155731eeea55d3324
 MISC metadata.xml 472 BLAKE2B a4d69b294f26714e9f5211408f01222174c8dd9b0e990840c4603f70a7080fd41a6f3ec74987e40b330a19967f0b90447446b6d5fdb1179ec3be0406592f6b3e SHA512 0cb6b445a84c48dc909eca438bf3908bdc08309f27314692fc2a3fa5a21b3cd1af92e06a593fb2a2cb32c3f0f70db56b7177abcc1fa4348c664e779f0e277cda
diff --git a/dev-python/zstd/zstd-1.5.4.0.ebuild b/dev-python/zstd/zstd-1.5.4.0.ebuild
deleted file mode 100644
index 20017d80fc05..000000000000
--- a/dev-python/zstd/zstd-1.5.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-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 pypi
-
-DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library"
-HOMEPAGE="
-	https://github.com/sergey-dryabzhinsky/python-zstd/
-	https://pypi.org/project/zstd/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	export ZSTD_EXTERNAL=1
-}
diff --git a/dev-python/zstd/zstd-1.5.4.1.ebuild b/dev-python/zstd/zstd-1.5.4.1.ebuild
deleted file mode 100644
index 0c805254d3dc..000000000000
--- a/dev-python/zstd/zstd-1.5.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-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 pypi
-
-DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library"
-HOMEPAGE="
-	https://github.com/sergey-dryabzhinsky/python-zstd/
-	https://pypi.org/project/zstd/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	export ZSTD_EXTERNAL=1
-}
diff --git a/dev-python/zstd/zstd-1.5.5.1.ebuild b/dev-python/zstd/zstd-1.5.5.1.ebuild
index 0c805254d3dc..20017d80fc05 100644
--- a/dev-python/zstd/zstd-1.5.5.1.ebuild
+++ b/dev-python/zstd/zstd-1.5.5.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	app-arch/zstd:=
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index e865080b5f79..62e4075db883 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/latexmk/Manifest b/dev-tex/latexmk/Manifest
index 4284fdeb57e8..8e3861f5fc32 100644
--- a/dev-tex/latexmk/Manifest
+++ b/dev-tex/latexmk/Manifest
@@ -2,5 +2,5 @@ AUX completion.bash-2 1540 BLAKE2B 95b81acb67eb3eca85be33a303fbba2f6558e7683989b
 DIST latexmk-470b.zip 458908 BLAKE2B b82f09227412a05fcb662530b2c6691bac72640e5e1bc431de1710ca13b2c97f62f23fbf18a11eff21b222483367c7a4ba88cc197148d8f0b37edc53a96e1490 SHA512 2f984fd9c1785177fd58eb6bad44061bc7b397ed627599557704bae2cef1f53c186d161f99e4aaae5fa33fc66d56936dc9f5b6385f00d85bd634016bac0d555d
 DIST latexmk-480.zip 515014 BLAKE2B ec45e6590346c2ab0a226fff08143e5262fd442485c7199b3eea279901753b4d4d7c7d1030e44451a833bbfd74dcf04bae8fd6f63732ac4d5858f5dd96377687 SHA512 38652457a0ba311a7d4e3fdfeec53af27a1f370bf35e4f4214d97946eeece13b67ece22fe5b2c428c3d4d9145f593b683a1fc7993c11c601d8c4d87b592428da
 EBUILD latexmk-4.70b.ebuild 839 BLAKE2B dcf48a070d4c3ea7199e34614ebde373d449d58a97febd3e137642284a64fdbc799efd9636f24cf209699e1c273f5277565b87180e8ea24c6ceb6cd43c60f790 SHA512 669df5244d0baa8c954e87ca0a67aaac3e2148d5ff82cf10853212c1ce2f26d26baea3660c2e53bcd284bf438e854968132c0c256cddca27b98e9d298c5e4644
-EBUILD latexmk-4.80.ebuild 841 BLAKE2B fe307599e8d880b5ac11675f6595c8273b95b50f2dccb7701baf309864ded183980a52f0c62e39cf9fa0c426477ec9a7f6e1e2c6aa7cddb3432335f9b6d0a4a7 SHA512 ba24d1a18ad72d06d2564c11e54aba77c0906f4e1cdb264882fdfe2b5fdf2c1cc2c232a2283664d5de1e925eed3216d0a1ead6f42adbbc04f61eb989161964e6
+EBUILD latexmk-4.80.ebuild 839 BLAKE2B 8e160b5b317c6f05a7ac451b6b06f0b25d4baebb9f740dc610bad3176f97d10a5a9974426aa6bb438861ea2e129fa580c1c5011d6d063103c80376c3177fb72c SHA512 f9e5e2a4910c910204bdad8e0cf1e3e5ea5b6083c76d2b16ce41e1d59b5d354ddef0be23aef9c19934520d96cb041b96b542b9cab42adc1ce6ba901ecf195fc1
 MISC metadata.xml 250 BLAKE2B e2cadaf7d8fd791e45124cd765cb44d4e2347ecce2bc9dabdc682f6e6f198da73e34e273d326bbb8317c28c34a86e6139bde7e9cdc4ce7d6045443f8bdcec8a0 SHA512 3ca55284974baa2067e21fc58cd2f9f6a673d83f53dc53d3bafe26c1cff7b8aa13890545bcf92f9febc82afdd0b6b3afeb5c2d7fc4c31f7e0c46d1b0314564f4
diff --git a/dev-tex/latexmk/latexmk-4.80.ebuild b/dev-tex/latexmk/latexmk-4.80.ebuild
index 6e490c872364..4698a5507b83 100644
--- a/dev-tex/latexmk/latexmk-4.80.ebuild
+++ b/dev-tex/latexmk/latexmk-4.80.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://personal.psu.edu/~jcc8/software/${PN}/${P/./}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="virtual/latex-base
 	dev-lang/perl"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0b06e012cd43..de2fee3a248c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 196efec29338..4b58d6e6beb8 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-builder-43.6.tar.xz 10289396 BLAKE2B e9b8c98f5463906e0ec522307f0ec07c130045288db5b1295b56320ac36814019ee3350f73543c8a1655812dcd8b26da4cbe9d1b5bd3bda8cc7a943f308a91ee SHA512 e444843e1eae2a901048dc6f2ff7683c3693fcbceeb113ebd28e7a51d1ea9c3b7e317e28ceae9b659dc89cf3b75cabd526fff9483b81c623d809ca268a2c9a45
 DIST gnome-builder-44.1.tar.xz 9785408 BLAKE2B 43a41aa4856f3bbd84b6bab6686cd128d697d54e539d6b88e668a088eb256d11459d058046428564a706bf6e3766e3f61f9ff503151f16647f82bbbe400ab3fa SHA512 92653392fcd6c3a83f78c500037e8b8be05663cc8918e5521baacfbf5d251896358a284e7b37e4c49428c921b7f0cc2a96afa029cd00589b48f40b365e4decbc
+DIST gnome-builder-44.2.tar.xz 9788192 BLAKE2B 3e31997a840ea288db37d942aa5b5ff92dce6754a9fe5984e9e20334c7e0323835d279bee0744277cbe2f111076a932efa692d3e0e229230da3c0d782faa7442 SHA512 0e0bdf57b1467789b6fe221e484e2cce5e37dae0fe3c190db51ec0f150a0ced1eca574bebceefe4ca33d31b4f09f472a0853fce24b1ef3f5de82256fa01f6090
 EBUILD gnome-builder-43.6.ebuild 8733 BLAKE2B 4fcfccd449d726ffb335101546cc1d8610fa48f93247413ac5c87b3207e005c61194c9963a3ef6896819861b3712b3e920ee7e7e926f157da66be6a2c2ab3cde SHA512 b90fea7c51cd3cc40f1ef4a2c4bca0852d9fa662b977f404832856f9eaa3759ac510550f89d5afe19fc58263533d3f4bff842140c18717264caa331c66ea0c54
 EBUILD gnome-builder-44.1.ebuild 8982 BLAKE2B e21d41fbd298d8b62b4c124e9d0123899f0bd14540db06be7f436c5b4265f8a5656a038aec50e1cb77550465f75269f13f72170e7037596a2933959899a3a017 SHA512 64eef400246e57efe70bea3b23f0ea4e754ffa53f4473bce7606980a0dfb38639d96f36278254644892a9dd3ef4c506fa2b633df6bb7030fb837dd96b8770fab
+EBUILD gnome-builder-44.2.ebuild 8982 BLAKE2B e21d41fbd298d8b62b4c124e9d0123899f0bd14540db06be7f436c5b4265f8a5656a038aec50e1cb77550465f75269f13f72170e7037596a2933959899a3a017 SHA512 64eef400246e57efe70bea3b23f0ea4e754ffa53f4473bce7606980a0dfb38639d96f36278254644892a9dd3ef4c506fa2b633df6bb7030fb837dd96b8770fab
 MISC metadata.xml 1095 BLAKE2B e32e4a52f11c192e37b0593106b2938b3d8ded0cbb60859b7f30e9195667ef46b6ddb9b180e3aaa4459d6560027b3a85cb04b92930e191031966635d0bce4f42 SHA512 468bee5867936afa6d47cf4b7fcc36cb807fc2ad1d5a54e63013a1c862a157da35d051f12980331fece8f473ad5696c7a1c24e8bd53e2c41dd057250017b36b2
diff --git a/dev-util/gnome-builder/gnome-builder-44.2.ebuild b/dev-util/gnome-builder/gnome-builder-44.2.ebuild
new file mode 100644
index 000000000000..1961588e03a8
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-44.2.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	flatpak? ( git )
+"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/glib-2.75.0:2
+	>=gui-libs/gtk-4.8:4[introspection]
+	>=gui-libs/libadwaita-1.3.0:1
+	>=gui-libs/libpanel-1.1.2:1
+	>=gui-libs/gtksourceview-5.7.2:5[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.43.0:=
+	>=dev-libs/libdex-0.1.1:=
+	>=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]
+	dev-libs/libportal:=[gtk,introspection]
+	>=dev-libs/template-glib-3.36.1:=[introspection]
+	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]
+	>=dev-libs/libxml2-2.9.0
+	webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] )
+	>=app-text/cmark-0.29.0:0=
+	d-spy? ( >=dev-util/d-spy-1.4.0:1 )
+	app-text/editorconfig-core-c
+	flatpak? (
+		dev-util/ostree
+		>=net-libs/libsoup-3:3.0
+		>=sys-apps/flatpak-1.10.2
+	)
+	git? (
+		dev-libs/libgit2:=[ssh,threads]
+		>=dev-libs/libgit2-glib-1.1.0[ssh]
+	)
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	spell? (
+		app-text/enchant:2
+		dev-libs/icu:=
+	)
+	sysprof? (
+		>=dev-util/sysprof-capture-3.46.0:4
+		>=dev-util/sysprof-3.46.0:0/4
+	)
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
+	)
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.3
+	)
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus
+	)
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/python-lsp-server for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* virtual/rust for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package codespell and mention here
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust support via rust-analyzer; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dchannel=other
+
+		-Ddevelopment=false
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dwith_safe_path=''
+		-Dgnome_sdk_version=master
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+		-Dnetwork_tests=false
+		-Dctags_path=''
+		$(meson_feature webkit)
+
+		-Dplugin_autotools=true
+		-Dplugin_bash_language_server=true
+		-Dplugin_blueprint=true
+		-Dplugin_buildstream=true
+		-Dplugin_c_pack=true
+		-Dplugin_cargo=true
+		$(meson_use clang plugin_clang)
+		$(meson_use clang plugin_clangd)
+		$(meson_use clang plugin_clang_format)
+		-Dplugin_cmake=true
+		-Dplugin_codesearch=true
+		-Dplugin_codeshot=true
+		-Dplugin_codespell=true
+		-Dplugin_code_index=true
+		-Dplugin_copyright=true
+		-Dplugin_ctags=true
+		-Dplugin_deviced=false # libdeviced not packaged?
+		$(meson_use d-spy plugin_dspy)
+		-Dplugin_dub=true
+		-Dplugin_editorconfig=true
+		-Dplugin_eslint=true
+		-Dplugin_file_search=true
+		$(meson_use flatpak plugin_flatpak)
+		-Dplugin_gdb=true
+		-Dplugin_gdiagnose=true
+		-Dplugin_gettext=true
+		$(meson_use git plugin_git)
+		-Dplugin_glsl_language_server=true
+		-Dplugin_golang=true
+		-Dplugin_gopls=true
+		-Dplugin_gradle=true
+		-Dplugin_grep=true
+		-Dplugin_hadolint=true
+		-Dplugin_html_completion=true
+		$(meson_use webkit plugin_html_preview)
+		-Dplugin_intelephense=true
+		-Dplugin_jdtls=true
+		-Dplugin_jedi_language_server=false
+		-Dplugin_jhbuild=true
+		-Dplugin_lua_language_server=true
+		-Dplugin_make=true
+		-Dplugin_make_templates=true
+		$(meson_use webkit plugin_markdown_preview)
+		$(meson_use webkit plugin_markdown_indenter)
+		-Dplugin_maven=true
+		-Dplugin_meson=true
+		-Dplugin_meson_templates=true
+		-Dplugin_modelines=true
+		-Dplugin_mono=true
+		-Dplugin_newcomers=true
+		-Dplugin_notification=true
+		-Dplugin_npm=true
+		-Dplugin_phpize=true
+		-Dplugin_podman=true
+		-Dplugin_pygi=true
+		-Dplugin_python_lsp_server=true
+		-Dplugin_qemu=true
+		-Dplugin_quick_highlight=true
+		-Dplugin_retab=true
+		-Dplugin_rstcheck=true
+		-Dplugin_rubocop=true
+		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
+		-Dplugin_serve_d=true
+		-Dplugin_shellcheck=true
+		-Dplugin_shellcmd=true
+		-Dplugin_sourcekit_lsp=true
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use webkit plugin_sphinx_preview)
+		-Dplugin_stylelint=true
+		-Dplugin_swift=true
+		-Dplugin_swiftformat=true
+		-Dplugin_swiftlint=true
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_todo=true
+		-Dplugin_ts_language_server=true
+		-Dplugin_update_manager=true
+		-Dplugin_valac=true
+		-Dplugin_vala_indenter=true
+		-Dplugin_vala_language_server=true
+		-Dplugin_valgrind=true
+		-Dplugin_waf=true
+		-Dplugin_words=true
+		-Dplugin_xml_pack=true
+		-Dplugin_zls=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+
+	optfeature_header "Language support"
+	optfeature "Rust's Cargo build system" virtual/rust
+	optfeature "CMake" dev-util/cmake
+	optfeature "Java Maven build system" dev-java/maven-bin
+	optfeature "Meson Build system" dev-util/meson
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 719a4ff9e73b..787810a4af8a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/curtail/Manifest b/media-gfx/curtail/Manifest
index 3358987f5abc..e379d750f4eb 100644
--- a/media-gfx/curtail/Manifest
+++ b/media-gfx/curtail/Manifest
@@ -1,5 +1,7 @@
 DIST curtail-1.3.1.tar.gz 176042 BLAKE2B 0757c3c3eed24fea8f1493021d30df40fd8c78dad3bfd7f63cfaa83f36d36f69c47ba4e41a53a7a4299d436fb978ae3fc31afa07b5a1c9d82a6400a17c104966 SHA512 47d1b3939eaeaa3d27c497318bc80d0b7cb1c2674d66ed17c8cc5e6206b3efce7867ff01542b40ee6a4b4127160f2baed084b5b99cf518f2438dcf53af425f89
 DIST curtail-1.6.0.tar.gz 169234 BLAKE2B 7da8423cb0c4c169b07a770dcd75cabcf34a5b57bfa2aec814ae23eb60e9b3b0638040bb8223d90a1ab052f802dc3d0374f630fc184f2ac394a5c288aafe38f7 SHA512 9f2cc35d606a8c3629c43fde63e4b636021ea58aeaeb81f39f2a3129f7c05cfcb519f7ef6be53788cd9c975babff2f3917dab652b4e33fe7b768a603281f60c3
+DIST curtail-1.7.0.tar.gz 217253 BLAKE2B 3d32bf01fbada5ec6b52ccd15f3d941f1e2e017c482ebb02bbb8aec72144009284499f041ff10303742476d94569c4b3cd83297f37442bca19f005d15de78613 SHA512 360ec398bd6f56e9b6664e446f85eea49552d9d24cb59527599dd0f3c0265e7495c3052ec7b77c7373cbb23983b392641b003c0ad29d8fc63f7bf94ff971f7f4
 EBUILD curtail-1.3.1.ebuild 1172 BLAKE2B d10a5ff7d72071e47de68e86df67f19515e064c98e5d00d9992cfef6cd8537420ab7c99bcb2a0f2d2b8ee20261503c9d9e545c5bad5b0376a20f3549694c9a61 SHA512 08dd3fd769bcd1d6a96a1e42391112141fd6ccdb64241e61e35ef71af01a0aa9d123cdfa84eb48b77a0f9c60c7ac3932b87c0e703008e3262da3cb05ee69ce3a
 EBUILD curtail-1.6.0.ebuild 1280 BLAKE2B fb16f56ff93e0c8d8d44df0ab94e0c3b0becca85732e739fee4e0511328464358ee276e7009050316e4e947f22218120ad23b67142db3ae18d615c1360e1e374 SHA512 6c27744021f55db9cf090a147e3a6fc94ff8e76c58bc46db3ea7c209ea1fbdf7852c7628e8ecf2ffb08ede089268969491580307e253868c55a6d56884b9cd3e
+EBUILD curtail-1.7.0.ebuild 1308 BLAKE2B 3e7f7e8534de1d4522f3a082affcb08da6e396d5a8d2f0781d1402bd387917cffb464c6c02a333d34a81e3c047633e937136645eed3cf0d771995c0983cbe43b SHA512 168b21229276136459358d95feda1a02db3bd986cdf5788874cca7a7f1aa21dcee78978baf953134993a56094126ec7e3a0a1b92e9d6a6d730be93e2d1bae8dc
 MISC metadata.xml 817 BLAKE2B ea01ae4c58024699aae770d6e7f21a03adfc8da5f5f658a0b1708824bfda730a2fce4557de4fbccbc079c66a11ab08d6faef020bf897d47870f6581b5e0d68e6 SHA512 3d573feda8c750a08903203c1d2f2e1385e17242356c6f319e29944e530b2199a27e4e432a806dfe1f2c8c783dd67c4fe347d5160d4df99911f67623a3168eee
diff --git a/media-gfx/curtail/curtail-1.7.0.ebuild b/media-gfx/curtail/curtail-1.7.0.ebuild
new file mode 100644
index 000000000000..f85559ce168f
--- /dev/null
+++ b/media-gfx/curtail/curtail-1.7.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Image compressor, supporting PNG, JPEG and WebP"
+HOMEPAGE="https://github.com/Huluti/Curtail/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Huluti/${PN^}.git"
+else
+	SRC_URI="https://github.com/Huluti/${PN^}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}"/${P^}
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"  # Just desktop / schema / appstream file validation (fails).
+
+RDEPEND="
+	${PYTHON_DEPS}
+	gui-libs/gtk:4[introspection]
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+"
+BDEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+"
+RDEPEND+="
+	>=gui-libs/libadwaita-1.3.1
+	media-gfx/jpegoptim
+	media-gfx/oxipng
+	media-gfx/pngquant
+	media-libs/libwebp
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	sed -i "s|@PYTHON@|${PYTHON}|" "${S}"/src/${PN}.in || die
+
+	default
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 82fbf27d83b4..32a25196333d 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e8f3f92cac9f..8cce2a2ffa30 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Apr 2023 15:39:49 +0000
+Fri, 28 Apr 2023 21:39:47 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index a53dc19338f5..04f099ff0491 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-04-28T15:39:51Z
+TIMESTAMP 2023-04-28T21:39:50Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRL6MdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRMPSZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDJlg/7BIFSAH1GXWQQUAVW1oSfc8h9nd431zqpTKSZfdlotGmsN1rf7p+5t0TR
-90QwU6KlmTtXEmrmNbp5Py1Ew1bYRDtRtO49wSHc3MynEdgMmkcHqZxRQIqJZr1I
-RdHwFz14ErmjLPjzUb/b6dDcKs0LeJjC8FVrSfvEVYtBGNMLFNl0ttIZkjho+2n4
-kBTBlkSvavDQK07A8Ws2ocFJvylBNXo5lgTNt2KMV8OsDhal9N/MxdzJtHJhOd2u
-MEVM+oUxSjnVGo6wte+Bs43rDyNE7OGA6R+oNX4ZUCZcuZ7V+5ngVLkH6c5kACva
-HS3vg742V4fDXhLMaSRIX1DV8CQM/UaSDJSeo48sPduWYRPC34WjLwdx2zLpORHO
-5FNVIz4qdh7tf0/rV7LBmHFaD8nOG9h6GAPTLqc76VmnlkdujxQC6xpQxekf4DXZ
-eRPItVy+r9ThBWeavoDt8IoOAMTYyBSXFVnf53FxgVCFgkk2ToeiGlLMEWLnCpea
-CP64Wx3BW7G+AP9f7YgyWeC8MZrgfH29NGrV5kLC94S2/+sY6tv6tb3cWAElG+Q/
-wrmkoYlKP0VGaqAt37JqHoXa2x5xiauk5oIGI4iGnNNti99gIMNoq3kaCmvn3quV
-2dIglpIolNpSXJMVnmFvG2/b/FJ0efZGxBndDz7G3pDKZhoM2Xc=
-=KLiv
+klDPgRAAh49Prx1Heid7Qi2nJgK0laCBTgHuF20308vgABdgtyVxf8ZD/+2fHRD+
+yU2SNtFzGEFP69Kt02JuCGH8l7L3T9hc6tXO8LkOaMbw1KuoKA95dsJ9Dsfdkv1H
+AxU9uxNK4lT5OoUzeO0lF9KY3V3q/McpWMSV560RQ3qf9Rkl4GTb+ou7VGlKfodt
+1nKLV68BBEZFC+RKjNLpH85n8uht9TJeUEn2rXGWKgdOw/y5GXiHJsDXp+Pils1c
+UYktG6t4c1MApgzx6Lb3PvnFixwUsfKhyZFTbnsR+XlpqGUM4ChddOdAesnzBWKv
+YUKLFGA7WG2Z8wGxm2a38UOhsUA+VRAge/fsVYHx5tCAPGpCsAV8XynHf+/WDUG4
+inDswRmmU1BRAbCWFyeXUnO6XSdvH6OsF3UtNpFu3IOQH1OssKVsXjBU1//4lnjV
+kTHV56H7A6BId7WhG9ueKxMV81NkbUq0WblSn38onzhtK7EIujYB7BSzittZvFf8
+jo3i+xZlEV9bk3zNS2aIvF0JRWj1NEbW0DGSJBnlGh51eZKDgS5Ral7q7nBOymDx
+ohtvnIGVTNLjuGfNWM1mLmamu14qelegwFOxCiyChbdGJcAK+ypTlk3f/yd2fhXP
+3lYmf2DSsZbvFYobBzsc30/t6M0dar6PiH9clTjrbHUSyQrTjF0=
+=K89F
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e8f3f92cac9f..8cce2a2ffa30 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Apr 2023 15:39:49 +0000
+Fri, 28 Apr 2023 21:39:47 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 961c8da782e7..25f7d94be96c 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 1163687dbf69..736662f8eff6 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-7.3.0 b/metadata/md5-cache/app-admin/ansible-7.3.0
deleted file mode 100644
index 4ab785b0c7f6..000000000000
--- a/metadata/md5-cache/app-admin/ansible-7.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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 test
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=8
-HOMEPAGE=https://www.ansible.com/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=>=app-admin/ansible-core-2.14.0 <app-admin/ansible-core-2.15 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
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible/ansible-7.3.0.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=01fd7f1a40f7d2746d76d9dc34cbc6d6
diff --git a/metadata/md5-cache/app-admin/ansible-7.4.0 b/metadata/md5-cache/app-admin/ansible-7.4.0
index e9aa4739f84f..8ef1ef559049 100644
--- a/metadata/md5-cache/app-admin/ansible-7.4.0
+++ b/metadata/md5-cache/app-admin/ansible-7.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.ansible.com/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-admin/ansible-core-2.14.0 <app-admin/ansible-core-2.15 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
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible/ansible-7.4.0.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1970a2d0972fd3b0dec8307b79fbddb0
+_md5_=01fd7f1a40f7d2746d76d9dc34cbc6d6
diff --git a/metadata/md5-cache/app-admin/ansible-core-2.13.8 b/metadata/md5-cache/app-admin/ansible-core-2.13.8
deleted file mode 100644
index 7e44a7926f48..000000000000
--- a/metadata/md5-cache/app-admin/ansible-core-2.13.8
+++ /dev/null
@@ -1,16 +0,0 @@
-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(-)?]
-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
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
-LICENSE=GPL-3
-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 !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.13.8.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cad9f9acc6e5fb33e2e6c7635f9bd209
diff --git a/metadata/md5-cache/app-admin/ansible-core-2.13.9 b/metadata/md5-cache/app-admin/ansible-core-2.13.9
index b06e8bb5a5a5..49f65220bbc7 100644
--- a/metadata/md5-cache/app-admin/ansible-core-2.13.9
+++ b/metadata/md5-cache/app-admin/ansible-core-2.13.9
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.ansible.com/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3
 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 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.13.9.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=26c4185c0b5fcadb15c55abf052bd005
+_md5_=cad9f9acc6e5fb33e2e6c7635f9bd209
diff --git a/metadata/md5-cache/app-admin/ansible-core-2.14.3 b/metadata/md5-cache/app-admin/ansible-core-2.14.3
deleted file mode 100644
index 2c7400562d9d..000000000000
--- a/metadata/md5-cache/app-admin/ansible-core-2.14.3
+++ /dev/null
@@ -1,16 +0,0 @@
-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(-)?]
-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 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
-LICENSE=GPL-3
-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 !test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible-core/ansible-core-2.14.3.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=da3f3dab555e78a4a939af5e3339d232
diff --git a/metadata/md5-cache/app-admin/ansible-core-2.14.4-r1 b/metadata/md5-cache/app-admin/ansible-core-2.14.4-r1
index 3af1758bf77d..a7a78f86d953 100644
--- a/metadata/md5-cache/app-admin/ansible-core-2.14.4-r1
+++ b/metadata/md5-cache/app-admin/ansible-core-2.14.4-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.ansible.com/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3
 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-1.1.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 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible-core/ansible-core-2.14.4.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2c422a8eb38de3704910ab40f061f455
+_md5_=d2e1cc7027b4cc02268e305b1aec9547
diff --git a/metadata/md5-cache/app-admin/puppet-8.0.0 b/metadata/md5-cache/app-admin/puppet-8.0.0
deleted file mode 100644
index 3367215fbd61..000000000000
--- a/metadata/md5-cache/app-admin/puppet-8.0.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby27(-)] ) dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby30(-)] ) dev-ruby/json:=[ruby_targets_ruby30(-)] dev-ruby/semantic_puppet[ruby_targets_ruby30(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby30(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby30(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby30(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby30(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby30(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) virtual/ruby-ssl[ruby_targets_ruby30(-)] dev-ruby/hocon[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby31(-)] ) dev-ruby/json:=[ruby_targets_ruby31(-)] dev-ruby/semantic_puppet[ruby_targets_ruby31(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby31(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby31(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby31(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby31(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby31(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby31(-)] ) virtual/ruby-ssl[ruby_targets_ruby31(-)] dev-ruby/hocon[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/rspec-its[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] dev-ruby/rspec-its[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A system automation and configuration management software
-EAPI=7
-HOMEPAGE=https://puppet.com/
-INHERIT=ruby-fakegem systemd tmpfiles
-IUSE=augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby27? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby27(-)] ) dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby30(-)] ) dev-ruby/json:=[ruby_targets_ruby30(-)] dev-ruby/semantic_puppet[ruby_targets_ruby30(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby30(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby30(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby30(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby30(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby30(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) virtual/ruby-ssl[ruby_targets_ruby30(-)] dev-ruby/hocon[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby31(-)] ) dev-ruby/json:=[ruby_targets_ruby31(-)] dev-ruby/semantic_puppet[ruby_targets_ruby31(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby31(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby31(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby31(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby31(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby31(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby31(-)] ) virtual/ruby-ssl[ruby_targets_ruby31(-)] dev-ruby/hocon[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby27(-)] ) dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby30(-)] ) dev-ruby/json:=[ruby_targets_ruby30(-)] dev-ruby/semantic_puppet[ruby_targets_ruby30(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby30(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby30(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby30(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby30(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby30(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) virtual/ruby-ssl[ruby_targets_ruby30(-)] dev-ruby/hocon[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby31(-)] ) dev-ruby/json:=[ruby_targets_ruby31(-)] dev-ruby/semantic_puppet[ruby_targets_ruby31(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby31(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby31(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby31(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby31(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby31(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby31(-)] ) virtual/ruby-ssl[ruby_targets_ruby31(-)] dev-ruby/hocon[ruby_targets_ruby31(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) virtual/tmpfiles
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-8.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=65904fa110b17574ad3e7af437bfe0c0
diff --git a/metadata/md5-cache/app-admin/puppet-8.0.0-r1 b/metadata/md5-cache/app-admin/puppet-8.0.0-r1
new file mode 100644
index 000000000000..ada2f3f1e446
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-8.0.0-r1
@@ -0,0 +1,18 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby27(-)] ) dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/deep_merge[ruby_targets_ruby27(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby30(-)] ) dev-ruby/json:=[ruby_targets_ruby30(-)] dev-ruby/semantic_puppet[ruby_targets_ruby30(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby30(-)] dev-ruby/deep_merge[ruby_targets_ruby30(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby30(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby30(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby30(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby30(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) virtual/ruby-ssl[ruby_targets_ruby30(-)] dev-ruby/hocon[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby31(-)] ) dev-ruby/json:=[ruby_targets_ruby31(-)] dev-ruby/semantic_puppet[ruby_targets_ruby31(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby31(-)] dev-ruby/deep_merge[ruby_targets_ruby31(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby31(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby31(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby31(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby31(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby31(-)] ) virtual/ruby-ssl[ruby_targets_ruby31(-)] dev-ruby/hocon[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/rspec-its[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] dev-ruby/rspec-its[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A system automation and configuration management software
+EAPI=7
+HOMEPAGE=https://puppet.com/
+INHERIT=ruby-fakegem systemd tmpfiles
+IUSE=augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby27? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby27(-)] ) dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/deep_merge[ruby_targets_ruby27(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby30(-)] ) dev-ruby/json:=[ruby_targets_ruby30(-)] dev-ruby/semantic_puppet[ruby_targets_ruby30(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby30(-)] dev-ruby/deep_merge[ruby_targets_ruby30(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby30(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby30(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby30(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby30(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) virtual/ruby-ssl[ruby_targets_ruby30(-)] dev-ruby/hocon[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby31(-)] ) dev-ruby/json:=[ruby_targets_ruby31(-)] dev-ruby/semantic_puppet[ruby_targets_ruby31(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby31(-)] dev-ruby/deep_merge[ruby_targets_ruby31(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby31(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby31(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby31(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby31(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby31(-)] ) virtual/ruby-ssl[ruby_targets_ruby31(-)] dev-ruby/hocon[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby27(-)] ) dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/deep_merge[ruby_targets_ruby27(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby30(-)] ) dev-ruby/json:=[ruby_targets_ruby30(-)] dev-ruby/semantic_puppet[ruby_targets_ruby30(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby30(-)] dev-ruby/deep_merge[ruby_targets_ruby30(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby30(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby30(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby30(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby30(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) virtual/ruby-ssl[ruby_targets_ruby30(-)] dev-ruby/hocon[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( hiera? ( dev-ruby/hiera[ruby_targets_ruby31(-)] ) dev-ruby/json:=[ruby_targets_ruby31(-)] dev-ruby/semantic_puppet[ruby_targets_ruby31(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby31(-)] dev-ruby/deep_merge[ruby_targets_ruby31(-)] <dev-ruby/concurrent-ruby-1.2[ruby_targets_ruby31(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby31(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby31(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby31(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby31(-)] ) virtual/ruby-ssl[ruby_targets_ruby31(-)] dev-ruby/hocon[ruby_targets_ruby31(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-8.0.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=7f122502f767c81c1806965652a24d5f
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 8cc7785a5faf..5e9750fa678d 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/bind-chord-2.4.1-r1 b/metadata/md5-cache/app-emacs/bind-chord-2.4.1-r1
deleted file mode 100644
index 285ea4f21c6d..000000000000
--- a/metadata/md5-cache/app-emacs/bind-chord-2.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-emacs/bind-key app-emacs/key-chord >=app-editors/emacs-25.3:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DESCRIPTION=Key-chord binding helper for use-package-chords
-EAPI=8
-HOMEPAGE=https://github.com/jwiegley/use-package/
-INHERIT=elisp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=app-emacs/bind-key app-emacs/key-chord >=app-editors/emacs-25.3:*
-SLOT=0
-SRC_URI=https://github.com/jwiegley/use-package/archive/2.4.1.tar.gz -> use-package-2.4.1.tar.gz
-_eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=a1c5ee264df84bb659986544a32086ac
diff --git a/metadata/md5-cache/app-emacs/bind-key-2.4.1-r1 b/metadata/md5-cache/app-emacs/bind-key-2.4.1-r1
deleted file mode 100644
index 5da78d25216a..000000000000
--- a/metadata/md5-cache/app-emacs/bind-key-2.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-editors/emacs-25.3:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DESCRIPTION=Simple way to manage personal keybindings
-EAPI=8
-HOMEPAGE=https://github.com/jwiegley/use-package/
-INHERIT=elisp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=app-editors/emacs-25.3:*
-SLOT=0
-SRC_URI=https://github.com/jwiegley/use-package/archive/2.4.1.tar.gz -> use-package-2.4.1.tar.gz
-_eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=3eb345e14087e6306639ec0a68501cb4
diff --git a/metadata/md5-cache/app-emacs/company-ebuild-0.1.2 b/metadata/md5-cache/app-emacs/company-ebuild-0.1.2
deleted file mode 100644
index 774f5dc50814..000000000000
--- a/metadata/md5-cache/app-emacs/company-ebuild-0.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-emacs/company-mode app-emacs/ebuild-mode >=app-editors/emacs-26.2:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DESCRIPTION=Company backend for editing Ebuild files
-EAPI=8
-HOMEPAGE=https://gitweb.gentoo.org/proj/company-ebuild.git
-INHERIT=elisp
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=app-emacs/company-mode app-emacs/ebuild-mode >=app-editors/emacs-26.2:*
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/company-ebuild.git/snapshot/company-ebuild-0.1.2.tar.gz
-_eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=bf98785cc0f46df1c1c719b64a2533e0
diff --git a/metadata/md5-cache/app-emacs/emacs-ebuild-snippets-2.0.2 b/metadata/md5-cache/app-emacs/emacs-ebuild-snippets-2.0.2
deleted file mode 100644
index be891b5e7203..000000000000
--- a/metadata/md5-cache/app-emacs/emacs-ebuild-snippets-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-emacs/ebuild-mode app-emacs/yasnippet >=app-editors/emacs-25.3:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DESCRIPTION=Yasnippets for editing ebuilds and eclasses
-EAPI=8
-HOMEPAGE=https://gitweb.gentoo.org/proj/emacs-ebuild-snippets.git
-INHERIT=elisp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-emacs/ebuild-mode app-emacs/yasnippet >=app-editors/emacs-25.3:*
-SLOT=0
-SRC_URI=https://gitlab.com/xgqt/emacs-ebuild-snippets/-/archive/2.0.2/emacs-ebuild-snippets-2.0.2.tar.bz2
-_eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=3ebf56ffba8ebef076282d55750920ea
diff --git a/metadata/md5-cache/app-emacs/use-package-2.4.4 b/metadata/md5-cache/app-emacs/use-package-2.4.4
deleted file mode 100644
index 13accbac487b..000000000000
--- a/metadata/md5-cache/app-emacs/use-package-2.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-emacs/bind-chord app-emacs/bind-key app-emacs/diminish app-emacs/system-packages >=app-editors/emacs-25.3:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DESCRIPTION=Declaration macro for simplifying your Emacs configuration
-EAPI=8
-HOMEPAGE=https://github.com/jwiegley/use-package/
-INHERIT=elisp
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=app-emacs/bind-chord app-emacs/bind-key app-emacs/diminish app-emacs/system-packages >=app-editors/emacs-25.3:*
-SLOT=0
-SRC_URI=https://github.com/jwiegley/use-package/archive/2.4.4.tar.gz -> use-package-2.4.4.tar.gz
-_eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=a3f83a151fb032159aeafc4686e68229
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 54e04ac7a5ee..c726a018eb0f 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/wine-vanilla-8.7 b/metadata/md5-cache/app-emulation/wine-vanilla-8.7
new file mode 100644
index 000000000000..7769d76074c7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-8.7
@@ -0,0 +1,18 @@
+BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) 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 postinst postrm prepare pretend
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=8
+HOMEPAGE=https://www.winehq.org/ https://gitlab.winehq.org/wine/wine/
+IDEPEND=>=app-eselect/eselect-wine-2
+INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite xinerama abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.4[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
+RESTRICT=test
+SLOT=8.7
+SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.7.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=9a6ec2ce315aaa994a48bbadac6890e6
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 2bdc383f3b50..dc5e55bc40b4 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/esekeyd-1.2.7-r1 b/metadata/md5-cache/app-misc/esekeyd-1.2.7-r1
new file mode 100644
index 000000000000..1ffc2c90829d
--- /dev/null
+++ b/metadata/md5-cache/app-misc/esekeyd-1.2.7-r1
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=prepare
+DESCRIPTION=Multimedia key daemon that uses the Linux event interface
+EAPI=8
+HOMEPAGE=https://github.com/burghardt/esekeyd
+INHERIT=autotools
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/burghardt/esekeyd/archive/refs/tags/esekeyd-1.2.7.tar.gz -> esekeyd-1.2.7.gh.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0f204a283d5349333cc46b73206cfa42
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 8dca7b781362..662025a97e61 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/iso-codes-4.15.0 b/metadata/md5-cache/app-text/iso-codes-4.15.0
new file mode 100644
index 000000000000..f7d4968c5c19
--- /dev/null
+++ b/metadata/md5-cache/app-text/iso-codes-4.15.0
@@ -0,0 +1,13 @@
+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/gettext
+DEFINED_PHASES=prepare setup
+DESCRIPTION=ISO language, territory, currency, script codes and their translations
+EAPI=8
+HOMEPAGE=https://salsa.debian.org/iso-codes-team/iso-codes
+INHERIT=python-any-r1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=LGPL-2.1+
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v4.15.0/iso-codes-v4.15.0.tar.gz
+_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=33bca0cc9caeeb745a0fcda3de6fe179
diff --git a/metadata/md5-cache/app-text/uudeview-0.5.20-r4 b/metadata/md5-cache/app-text/uudeview-0.5.20-r4
new file mode 100644
index 000000000000..fcb561ea29a2
--- /dev/null
+++ b/metadata/md5-cache/app-text/uudeview-0.5.20-r4
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure prepare
+DESCRIPTION=uu, xx, base64, binhex decoder
+EAPI=8
+HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
+INHERIT=autotools toolchain-funcs
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c8fba7390579114549377567390afae4
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c5b4c6c002b8..97b7f5f039e2 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/black-23.1.0 b/metadata/md5-cache/dev-python/black-23.1.0
deleted file mode 100644
index 331ac5b684d5..000000000000
--- a/metadata/md5-cache/dev-python/black-23.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-fancy-pypi-readme[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hatch-vcs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/aiohttp-3.7.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/aiohttp-cors[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/click-8.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0.0[python_targets_python3_9(-)?] ) >=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/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=The uncompromising Python code formatter
-EAPI=8
-HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black/ https://pypi.org/project/black/
-INHERIT=distutils-r1 optfeature
-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=MIT
-RDEPEND=>=dev-python/click-8.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0.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 ) 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/psf/black/archive/23.1.0.tar.gz -> black-23.1.0.gh.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=00c957429bf9fdb919580013de3aa336
diff --git a/metadata/md5-cache/dev-python/black-23.3.0 b/metadata/md5-cache/dev-python/black-23.3.0
index dc999c084d95..61e82ca33b56 100644
--- a/metadata/md5-cache/dev-python/black-23.3.0
+++ b/metadata/md5-cache/dev-python/black-23.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black/ https://pypi.org/project/black/
 INHERIT=distutils-r1 optfeature 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/click-8.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0.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 ) 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/b/black/black-23.3.0.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2be439bcf9e276aed3abb98e4697a3ab
+_md5_=4da5980915b825a005faa560368fc956
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-3.11.0 b/metadata/md5-cache/dev-python/jaraco-collections-3.11.0
deleted file mode 100644
index 7adcdaa8bbd2..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.11.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-text[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/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=Models and classes to supplement the stdlib collections module
-EAPI=8
-HOMEPAGE=https://github.com/jaraco/jaraco.collections/ https://pypi.org/project/jaraco.collections/
-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 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-text[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/j/jaraco.collections/jaraco.collections-3.11.0.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f46b60fe6a12a91a4285ae63d05aa269
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-3.8.0 b/metadata/md5-cache/dev-python/jaraco-collections-3.8.0
deleted file mode 100644
index 7c9928cadd4d..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-text[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/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=Models and classes to supplement the stdlib collections module
-EAPI=8
-HOMEPAGE=https://github.com/jaraco/jaraco.collections/ https://pypi.org/project/jaraco.collections/
-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 ~sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-text[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/j/jaraco.collections/jaraco.collections-3.8.0.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3b07ba4814b21fbe29aeeab8f3a15348
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-3.9.0 b/metadata/md5-cache/dev-python/jaraco-collections-3.9.0
deleted file mode 100644
index 90d02ba5902f..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-text[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/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=Models and classes to supplement the stdlib collections module
-EAPI=8
-HOMEPAGE=https://github.com/jaraco/jaraco.collections/ https://pypi.org/project/jaraco.collections/
-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 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-text[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/j/jaraco.collections/jaraco.collections-3.9.0.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f46b60fe6a12a91a4285ae63d05aa269
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-4.0.0 b/metadata/md5-cache/dev-python/jaraco-collections-4.0.0
deleted file mode 100644
index 9d690b0e6446..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-collections-4.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/jaraco-text[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/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=Models and classes to supplement the stdlib collections module
-EAPI=8
-HOMEPAGE=https://github.com/jaraco/jaraco.collections/ https://pypi.org/project/jaraco.collections/
-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 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/jaraco-text[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/j/jaraco.collections/jaraco.collections-4.0.0.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=aea8fea40220ccdd74d93bde4cad24c8
diff --git a/metadata/md5-cache/dev-python/jupyter-server-2.4.0 b/metadata/md5-cache/dev-python/jupyter-server-2.4.0
deleted file mode 100644
index 803ca919efd1..000000000000
--- a/metadata/md5-cache/dev-python/jupyter-server-2.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-console-scripts[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-jupyter[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-tornasync[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/anyio-3.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-client-7.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server-terminals[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_events-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.3.0[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/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/send2trash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websocket-client[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/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Core services, APIs, and REST endpoints to Jupyter web applications
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_server/ https://pypi.org/project/jupyter-server/
-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=BSD
-RDEPEND=>=dev-python/anyio-3.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-client-7.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server-terminals[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_events-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.3.0[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/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/send2trash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websocket-client[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/j/jupyter-server/jupyter_server-2.4.0.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ea0e028305c40ef70d52f28ea8155527
diff --git a/metadata/md5-cache/dev-python/pikepdf-7.2.0 b/metadata/md5-cache/dev-python/pikepdf-7.2.0
index 53e46adb98b7..f7f32ed31452 100644
--- a/metadata/md5-cache/dev-python/pikepdf-7.2.0
+++ b/metadata/md5-cache/dev-python/pikepdf-7.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=app-text/qpdf-11.1.1:0= dev-python/deprecation[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9.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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pikepdf/pikepdf-7.2.0.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1eeef471b6d32b101a965c1cccc812c0
+_md5_=e88ecb76f87e039f372f18de6b81e0b2
diff --git a/metadata/md5-cache/dev-python/pydantic-1.10.6 b/metadata/md5-cache/dev-python/pydantic-1.10.6
deleted file mode 100644
index 37c1cd76d7b1..000000000000
--- a/metadata/md5-cache/dev-python/pydantic-1.10.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=native-extensions? ( dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/hypothesis[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(-)?] dev-python/python-dotenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-email-validator-1.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/typing-extensions-4.1.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/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=Data parsing and validation using Python type hints
-EAPI=8
-HOMEPAGE=https://github.com/pydantic/pydantic/ https://pypi.org/project/pydantic/
-INHERIT=distutils-r1
-IUSE=+native-extensions 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=>=dev-python/typing-extensions-4.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pydantic/pydantic/archive/v1.10.6.tar.gz -> pydantic-1.10.6.gh.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=64ec2057e3356b4351a64c49e7186cdd
diff --git a/metadata/md5-cache/dev-python/pydantic-1.10.7 b/metadata/md5-cache/dev-python/pydantic-1.10.7
index 09a7c6de92fa..2c68516f6e7d 100644
--- a/metadata/md5-cache/dev-python/pydantic-1.10.7
+++ b/metadata/md5-cache/dev-python/pydantic-1.10.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pydantic/pydantic/ https://pypi.org/project/pydantic/
 INHERIT=distutils-r1
 IUSE=+native-extensions 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/typing-extensions-4.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://github.com/pydantic/pydantic/archive/v1.10.7.tar.gz -> pydantic-1.10.7.gh.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=acb40442719be6fb4fc00dbf2ab8cb06
+_md5_=64ec2057e3356b4351a64c49e7186cdd
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-8.0.3 b/metadata/md5-cache/dev-python/pygame_sdl2-8.0.3
index 678472baaa42..a0cfa9241303 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-8.0.3
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-8.0.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/renpy/pygame_sdl2
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 ZLIB
 RDEPEND=dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= 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://www.renpy.org/dl/8.0.3/pygame_sdl2-2.1.0-for-renpy-8.0.3.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0e157682d527689c580d942b87676038
+_md5_=837e5bcd909170ed200279928c780a45
diff --git a/metadata/md5-cache/dev-python/pygobject-3.42.2 b/metadata/md5-cache/dev-python/pygobject-3.42.2
deleted file mode 100644
index 60947cdef88c..000000000000
--- a/metadata/md5-cache/dev-python/pygobject-3.42.2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=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 ) 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 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo[glib] ) test? ( >=app-accessibility/at-spi2-core-2.46.0[introspection] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
-DESCRIPTION=Python bindings for GObject Introspection
-EAPI=8
-HOMEPAGE=https://pygobject.readthedocs.io/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson virtualx xdg distutils-r1
-IUSE=+cairo examples test test python_targets_pypy3 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo[glib] ) 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 ) !test? ( test )
-SLOT=3
-SRC_URI=mirror://gnome/sources/pygobject/3.42/pygobject-3.42.2.tar.xz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	915ec7c25e08d7886558215e6809ca1e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1c40ef898d8433c79accf2523d8f734e
diff --git a/metadata/md5-cache/dev-python/pygobject-3.44.1 b/metadata/md5-cache/dev-python/pygobject-3.44.1
index ec32625f4341..a6c1f083bbb3 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.44.1
+++ b/metadata/md5-cache/dev-python/pygobject-3.44.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://pygobject.readthedocs.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org meson virtualx xdg distutils-r1
 IUSE=+cairo examples test test python_targets_pypy3 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo[glib] ) 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 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.44/pygobject-3.44.1.tar.xz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	915ec7c25e08d7886558215e6809ca1e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=95d05e354a8f9f048fc11335fe321a61
+_md5_=1c40ef898d8433c79accf2523d8f734e
diff --git a/metadata/md5-cache/dev-python/pypdf-3.6.0 b/metadata/md5-cache/dev-python/pypdf-3.6.0
deleted file mode 100644
index 6a730875d052..000000000000
--- a/metadata/md5-cache/dev-python/pypdf-3.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) >=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 unpack
-DESCRIPTION=Python library to work with PDF files
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pypdf/ https://github.com/py-pdf/pypdf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_9? ( dev-python/typing-extensions[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=https://github.com/py-pdf/pypdf/archive/3.6.0.tar.gz -> pypdf-3.6.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/fb7a080b35b3553bd10221282beeda7847959e83.tar.gz -> pypdf-sample-files-fb7a080b35b3553bd10221282beeda7847959e83.gh.tar.gz )
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c11d2d63b66eb357c7e8a0c50ab4915b
diff --git a/metadata/md5-cache/dev-python/pypdf-3.7.0 b/metadata/md5-cache/dev-python/pypdf-3.7.0
deleted file mode 100644
index a663bfdbe31a..000000000000
--- a/metadata/md5-cache/dev-python/pypdf-3.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) >=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 unpack
-DESCRIPTION=Python library to work with PDF files
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pypdf/ https://github.com/py-pdf/pypdf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_9? ( dev-python/typing-extensions[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=https://github.com/py-pdf/pypdf/archive/3.7.0.tar.gz -> pypdf-3.7.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/fb7a080b35b3553bd10221282beeda7847959e83.tar.gz -> pypdf-sample-files-fb7a080b35b3553bd10221282beeda7847959e83.gh.tar.gz )
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ea7927f208ce78d07aba258cf33b7b12
diff --git a/metadata/md5-cache/dev-python/pypdf-3.7.1 b/metadata/md5-cache/dev-python/pypdf-3.7.1
index 2e6eeb9d02b2..0410405f943b 100644
--- a/metadata/md5-cache/dev-python/pypdf-3.7.1
+++ b/metadata/md5-cache/dev-python/pypdf-3.7.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pypdf/ https://github.com/py-pdf/pypdf/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_9? ( dev-python/typing-extensions[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://github.com/py-pdf/pypdf/archive/3.7.1.tar.gz -> pypdf-3.7.1.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/0c3b1d3879c5cd7d913b3d931fa33b37529d7346.tar.gz -> pypdf-sample-files-0c3b1d3879c5cd7d913b3d931fa33b37529d7346.gh.tar.gz )
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6408435a9a4d900c1c0691125ab48b59
+_md5_=7aa8a3b150c9873aaaf079613c425c4e
diff --git a/metadata/md5-cache/dev-python/qtsass-0.4.0 b/metadata/md5-cache/dev-python/qtsass-0.4.0
index a624848c995b..3eb723893e3f 100644
--- a/metadata/md5-cache/dev-python/qtsass-0.4.0
+++ b/metadata/md5-cache/dev-python/qtsass-0.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/spyder-ide/qtsass/ https://pypi.org/project/qtsass/
 INHERIT=distutils-r1
 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/libsass-0.22.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://github.com/spyder-ide/qtsass/archive/v0.4.0.tar.gz -> qtsass-0.4.0.gh.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ef8b663a8c40d1093aee0d914b49768c
+_md5_=4c1a60285028451151a20b38aa65079d
diff --git a/metadata/md5-cache/dev-python/regex-2022.10.31 b/metadata/md5-cache/dev-python/regex-2022.10.31
deleted file mode 100644
index 01952cabd0e8..000000000000
--- a/metadata/md5-cache/dev-python/regex-2022.10.31
+++ /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/setuptools-67.2.0[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=Alternative regular expression module to replace re
-EAPI=8
-HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
-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 ~x64-macos
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/r/regex/regex-2022.10.31.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4ec38ac174f971678826a0b38ddd4f26
diff --git a/metadata/md5-cache/dev-python/regex-2023.3.22 b/metadata/md5-cache/dev-python/regex-2023.3.22
deleted file mode 100644
index 6155f30a02f5..000000000000
--- a/metadata/md5-cache/dev-python/regex-2023.3.22
+++ /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/setuptools-67.2.0[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=Alternative regular expression module to replace re
-EAPI=8
-HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
-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 ~x64-macos
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/r/regex/regex-2023.3.22.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c97da1722557ae3bcb7a6c4d565e079d
diff --git a/metadata/md5-cache/dev-python/regex-2023.3.23 b/metadata/md5-cache/dev-python/regex-2023.3.23
index 04eaff230151..cbbe8b615db6 100644
--- a/metadata/md5-cache/dev-python/regex-2023.3.23
+++ b/metadata/md5-cache/dev-python/regex-2023.3.23
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
 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 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.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/r/regex/regex-2023.3.23.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8b0802a79a378ae1d502ff9bc4e22190
+_md5_=4ec38ac174f971678826a0b38ddd4f26
diff --git a/metadata/md5-cache/dev-python/reportlab-3.6.12 b/metadata/md5-cache/dev-python/reportlab-3.6.12
deleted file mode 100644
index 90ec5afe85a0..000000000000
--- a/metadata/md5-cache/dev-python/reportlab-3.6.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=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 ) 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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:=
-DESCRIPTION=Tools for generating printable PDF documents from any data source
-EAPI=8
-HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
-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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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=https://files.pythonhosted.org/packages/source/r/reportlab/reportlab-3.6.12.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=317b574029e069c99c2a3b9a3f11d212
diff --git a/metadata/md5-cache/dev-python/reportlab-3.6.13 b/metadata/md5-cache/dev-python/reportlab-3.6.13
index 844bbcea0abd..665dcddb7380 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.6.13
+++ b/metadata/md5-cache/dev-python/reportlab-3.6.13
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
 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 ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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=https://files.pythonhosted.org/packages/source/r/reportlab/reportlab-3.6.13.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cd4caacd0314a6b59b73fa19de859197
+_md5_=317b574029e069c99c2a3b9a3f11d212
diff --git a/metadata/md5-cache/dev-python/requests-cache-1.0.0 b/metadata/md5-cache/dev-python/requests-cache-1.0.0
deleted file mode 100644
index 27bc4633b78e..000000000000
--- a/metadata/md5-cache/dev-python/requests-cache-1.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/itsdangerous[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-httpbin[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[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/rich-10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/timeout-decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ujson-5.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cattrs-22.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/url-normalize-1.4[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[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] ) >=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 postinst prepare test
-DESCRIPTION=Persistent cache for requests library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/requests-cache/requests-cache/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cattrs-22.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/url-normalize-1.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[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] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/requests-cache/requests-cache/archive/v1.0.0.tar.gz -> requests-cache-1.0.0.gh.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a18ce69ff91e772cc4437c4c1edd9a28
diff --git a/metadata/md5-cache/dev-python/requests-cache-1.0.1 b/metadata/md5-cache/dev-python/requests-cache-1.0.1
index 1bfa5d9c9cac..490ea5588fc2 100644
--- a/metadata/md5-cache/dev-python/requests-cache-1.0.1
+++ b/metadata/md5-cache/dev-python/requests-cache-1.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/requests-cache/requests-cache/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cattrs-22.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/url-normalize-1.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[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] )
 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/requests-cache/requests-cache/archive/v1.0.1.tar.gz -> requests-cache-1.0.1.gh.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8bb04b9a655520818971a9e8b706cd8d
+_md5_=a18ce69ff91e772cc4437c4c1edd9a28
diff --git a/metadata/md5-cache/dev-python/selenium-4.5.0 b/metadata/md5-cache/dev-python/selenium-4.5.0
deleted file mode 100644
index 6c81fd15fff7..000000000000
--- a/metadata/md5-cache/dev-python/selenium-4.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python language binding for Selenium Remote Control
-EAPI=8
-HOMEPAGE=https://www.seleniumhq.org
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-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=https://files.pythonhosted.org/packages/py3/s/selenium/selenium-4.5.0-py3-none-any.whl
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b6f146d0012082a6e993f71a16a629e0
diff --git a/metadata/md5-cache/dev-python/selenium-4.8.3 b/metadata/md5-cache/dev-python/selenium-4.8.3
deleted file mode 100644
index 5692570a76e1..000000000000
--- a/metadata/md5-cache/dev-python/selenium-4.8.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/certifi-2021.10.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/trio-1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-0.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/trio-websocket-1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-websocket-0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/urllib3-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26[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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python language binding for Selenium Remote Control
-EAPI=8
-HOMEPAGE=https://www.seleniumhq.org/ https://github.com/SeleniumHQ/selenium/tree/trunk/py/ https://pypi.org/project/selenium/
-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=Apache-2.0
-RDEPEND=>=dev-python/certifi-2021.10.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/trio-1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-0.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/trio-websocket-1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-websocket-0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/urllib3-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26[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/s/selenium/selenium-4.8.3.tar.gz test? ( https://github.com/SeleniumHQ/selenium/archive/selenium-4.8.3-python.tar.gz -> selenium-selenium-4.8.3-python.gh.tar.gz )
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7db3f11240c36f6975103a12556762e1
diff --git a/metadata/md5-cache/dev-python/selenium-4.9.0 b/metadata/md5-cache/dev-python/selenium-4.9.0
index 64bd919e16b2..1665f6758654 100644
--- a/metadata/md5-cache/dev-python/selenium-4.9.0
+++ b/metadata/md5-cache/dev-python/selenium-4.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.seleniumhq.org/ https://github.com/SeleniumHQ/selenium/tree/trunk/py/ https://pypi.org/project/selenium/
 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
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/certifi-2021.10.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/trio-1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-0.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/trio-websocket-1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-websocket-0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/urllib3-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26[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/selenium/selenium-4.9.0.tar.gz test? ( https://github.com/SeleniumHQ/selenium/archive/selenium-4.9.0.tar.gz -> selenium-selenium-4.9.0.gh.tar.gz )
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=865bf47030d404d574ae5a560a6d757e
+_md5_=0043bae8db77bbddc462c68cb55f8c33
diff --git a/metadata/md5-cache/dev-python/stripe-5.2.0 b/metadata/md5-cache/dev-python/stripe-5.2.0
deleted file mode 100644
index 269c23c1d01d..000000000000
--- a/metadata/md5-cache/dev-python/stripe-5.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-util/stripe-mock-0.151.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[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/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=Stripe python bindings
-EAPI=8
-HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
-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=MIT
-RDEPEND=>=dev-python/requests-2.20[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/s/stripe/stripe-5.2.0.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8137a9a8bbb812dc8e402f05aaf1f70a
diff --git a/metadata/md5-cache/dev-python/stripe-5.3.0 b/metadata/md5-cache/dev-python/stripe-5.3.0
deleted file mode 100644
index fda8cea9d0a3..000000000000
--- a/metadata/md5-cache/dev-python/stripe-5.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-util/stripe-mock-0.159.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[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/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=Stripe python bindings
-EAPI=8
-HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
-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=MIT
-RDEPEND=>=dev-python/requests-2.20[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/s/stripe/stripe-5.3.0.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=be7dd8f519d8720a5b26ef5239d6caf7
diff --git a/metadata/md5-cache/dev-python/trio-websocket-0.10.2 b/metadata/md5-cache/dev-python/trio-websocket-0.10.2
index 041dc0627062..1373028a5ad2 100644
--- a/metadata/md5-cache/dev-python/trio-websocket-0.10.2
+++ b/metadata/md5-cache/dev-python/trio-websocket-0.10.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/HyperionGray/trio-websocket/ https://pypi.org/project/trio-websocket/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/exceptiongroup[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-0.11[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wsproto-0.14[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/HyperionGray/trio-websocket/archive/0.10.2.tar.gz -> trio-websocket-0.10.2.gh.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=207e46dc246109acea2c33ffc1a98a23
+_md5_=4989a133d7d9f39d197b75096f90aecb
diff --git a/metadata/md5-cache/dev-python/xarray-2023.3.0 b/metadata/md5-cache/dev-python/xarray-2023.3.0
index fafdb7de4276..481c5cdfe6da 100644
--- a/metadata/md5-cache/dev-python/xarray-2023.3.0
+++ b/metadata/md5-cache/dev-python/xarray-2023.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://xarray.pydata.org/ https://github.com/pydata/xarray/ https://pypi.org/project/xarray/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/numpy-1.22[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pandas-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/x/xarray/xarray-2023.3.0.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1501ef3635c8740332f4156618af4d65
+_md5_=d191f57707d54f667cf6cdfe4fe711fd
diff --git a/metadata/md5-cache/dev-python/zope-i18nmessageid-5.1.1 b/metadata/md5-cache/dev-python/zope-i18nmessageid-5.1.1
deleted file mode 100644
index 2a095cd01747..000000000000
--- a/metadata/md5-cache/dev-python/zope-i18nmessageid-5.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !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/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=Zope support for i18nmessageid (tagging source of i18n strings)
-EAPI=8
-HOMEPAGE=https://pypi.org/project/zope.i18nmessageid/ https://github.com/zopefoundation/zope.i18nmessageid/
-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=ZPL
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !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.i18nmessageid/zope.i18nmessageid-5.1.1.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=255db265b5c785c63b18fb850da1351e
diff --git a/metadata/md5-cache/dev-python/zope-i18nmessageid-6.0.0 b/metadata/md5-cache/dev-python/zope-i18nmessageid-6.0.0
deleted file mode 100644
index 4e1d04aaf1d2..000000000000
--- a/metadata/md5-cache/dev-python/zope-i18nmessageid-6.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !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/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=Zope support for i18nmessageid (tagging source of i18n strings)
-EAPI=8
-HOMEPAGE=https://pypi.org/project/zope.i18nmessageid/ https://github.com/zopefoundation/zope.i18nmessageid/
-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=ZPL
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !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.i18nmessageid/zope.i18nmessageid-6.0.0.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=458c21d90007f1aec44d3352fcf0ae4f
diff --git a/metadata/md5-cache/dev-python/zope-i18nmessageid-6.0.1 b/metadata/md5-cache/dev-python/zope-i18nmessageid-6.0.1
index 217213e7b23e..e9f03f7e9f96 100644
--- a/metadata/md5-cache/dev-python/zope-i18nmessageid-6.0.1
+++ b/metadata/md5-cache/dev-python/zope-i18nmessageid-6.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.i18nmessageid/ https://github.com/zopefoundation/zope.i18nmessageid/
 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
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-6.0.1.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=982058697086bcaee4fbbc5bde7ae1a7
+_md5_=caacb03a9da295091a6c44e00eaeeb07
diff --git a/metadata/md5-cache/dev-python/zstd-1.5.4.0 b/metadata/md5-cache/dev-python/zstd-1.5.4.0
deleted file mode 100644
index 0e4269d4c677..000000000000
--- a/metadata/md5-cache/dev-python/zstd-1.5.4.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( app-arch/zstd:= 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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/zstd:=
-DESCRIPTION=Simple python bindings to Yann Collet ZSTD compression library
-EAPI=8
-HOMEPAGE=https://github.com/sergey-dryabzhinsky/python-zstd/ https://pypi.org/project/zstd/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD-2
-RDEPEND=app-arch/zstd:= 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/z/zstd/zstd-1.5.4.0.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ffa28671878f3fd52efbe1a4b0378916
diff --git a/metadata/md5-cache/dev-python/zstd-1.5.4.1 b/metadata/md5-cache/dev-python/zstd-1.5.4.1
deleted file mode 100644
index 2d23bacba0b4..000000000000
--- a/metadata/md5-cache/dev-python/zstd-1.5.4.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( app-arch/zstd:= 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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/zstd:=
-DESCRIPTION=Simple python bindings to Yann Collet ZSTD compression library
-EAPI=8
-HOMEPAGE=https://github.com/sergey-dryabzhinsky/python-zstd/ https://pypi.org/project/zstd/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-arch/zstd:= 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/z/zstd/zstd-1.5.4.1.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6ad3aa61aafe0c1934e12f8a2b80a55c
diff --git a/metadata/md5-cache/dev-python/zstd-1.5.5.1 b/metadata/md5-cache/dev-python/zstd-1.5.5.1
index 3fcca59c39c7..58be11d3e63f 100644
--- a/metadata/md5-cache/dev-python/zstd-1.5.5.1
+++ b/metadata/md5-cache/dev-python/zstd-1.5.5.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sergey-dryabzhinsky/python-zstd/ https://pypi.org/project/zstd/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=app-arch/zstd:= 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/z/zstd/zstd-1.5.5.1.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6ad3aa61aafe0c1934e12f8a2b80a55c
+_md5_=ffa28671878f3fd52efbe1a4b0378916
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 3505966a386d..6911f1718ef8 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/latexmk-4.80 b/metadata/md5-cache/dev-tex/latexmk-4.80
index b935712adf1e..9c1e259080e0 100644
--- a/metadata/md5-cache/dev-tex/latexmk-4.80
+++ b/metadata/md5-cache/dev-tex/latexmk-4.80
@@ -5,10 +5,10 @@ DESCRIPTION=Perl script for automatically building LaTeX documents
 EAPI=8
 HOMEPAGE=https://personal.psu.edu/~jcc8/software/latexmk/ https://ctan.org/pkg/latexmk/
 INHERIT=bash-completion-r1
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-lang/perl
 SLOT=0
 SRC_URI=https://personal.psu.edu/~jcc8/software/latexmk/latexmk-480.zip
 _eclasses_=bash-completion-r1	59cf54afadd3b37d31d9d85c7d7d8067	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3d277071c68a9ec9410fca7f615cc43e
+_md5_=8a279ce8dc1a0842eaa0857ead63802a
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 552999765ce1..5ea894e6c75a 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/gnome-builder-44.2 b/metadata/md5-cache/dev-util/gnome-builder-44.2
new file mode 100644
index 000000000000..237dc386f620
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gnome-builder-44.2
@@ -0,0 +1,18 @@
+BDEPEND=doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ) gtk-doc? ( dev-util/gi-docgen app-text/docbook-xml-dtd:4.3 ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils 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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=>=dev-libs/glib-2.75.0:2 >=gui-libs/gtk-4.8:4[introspection] >=gui-libs/libadwaita-1.3.0:1 >=gui-libs/libpanel-1.1.2:1 >=gui-libs/gtksourceview-5.7.2:5[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.43.0:= >=dev-libs/libdex-0.1.1:= >=dev-libs/libpeas-1.34.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.36.1:=[introspection] >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] ) >=app-text/cmark-0.29.0:0= d-spy? ( >=dev-util/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree >=net-libs/libsoup-3:3.0 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-1.1.0[ssh] ) >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_11(-)] ) 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 ) clang? ( sys-devel/clang:= ) spell? ( app-text/enchant:2 dev-libs/icu:= ) sysprof? ( >=dev-util/sysprof-capture-3.46.0:4 >=dev-util/sysprof-3.46.0:0/4 ) !!sys-devel/llvm:0
+DESCRIPTION=An IDE for writing GNOME-based software
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
+IUSE=clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
+KEYWORDS=~amd64
+LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
+RDEPEND=>=dev-libs/glib-2.75.0:2 >=gui-libs/gtk-4.8:4[introspection] >=gui-libs/libadwaita-1.3.0:1 >=gui-libs/libpanel-1.1.2:1 >=gui-libs/gtksourceview-5.7.2:5[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.43.0:= >=dev-libs/libdex-0.1.1:= >=dev-libs/libpeas-1.34.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.36.1:=[introspection] >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] ) >=app-text/cmark-0.29.0:0= d-spy? ( >=dev-util/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree >=net-libs/libsoup-3:3.0 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-1.1.0[ssh] ) >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_11(-)] ) 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 ) clang? ( sys-devel/clang:= ) spell? ( app-text/enchant:2 dev-libs/icu:= ) sysprof? ( >=dev-util/sysprof-capture-3.46.0:4 >=dev-util/sysprof-3.46.0:0/4 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) flatpak? ( git )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-builder/44/gnome-builder-44.2.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b243ddc057ff26441a86fe308b8ac361
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index f4fc5a6448d4..b5712473f9cd 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/curtail-1.7.0 b/metadata/md5-cache/media-gfx/curtail-1.7.0
new file mode 100644
index 000000000000..e53f69311455
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/curtail-1.7.0
@@ -0,0 +1,17 @@
+BDEPEND=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 ) gui-libs/gtk:4[introspection] python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) dev-libs/appstream-glib dev-util/desktop-file-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 setup test
+DESCRIPTION=Image compressor, supporting PNG, JPEG and WebP
+EAPI=8
+HOMEPAGE=https://github.com/Huluti/Curtail/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2-utils meson python-single-r1 xdg
+IUSE=python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=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 ) gui-libs/gtk:4[introspection] python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=gui-libs/libadwaita-1.3.1 media-gfx/jpegoptim media-gfx/oxipng media-gfx/pngquant media-libs/libwebp
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Huluti/Curtail/archive/1.7.0.tar.gz -> curtail-1.7.0.tar.gz
+_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fa102652b3eee4ddef9167df7ff14628
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index b1f376623ac1..51348950ef8e 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/nodejs-16.20.0 b/metadata/md5-cache/net-libs/nodejs-16.20.0
index 4a78ee54a56e..9d7e275a85e2 100644
--- a/metadata/md5-cache/net-libs/nodejs-16.20.0
+++ b/metadata/md5-cache/net-libs/nodejs-16.20.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://nodejs.org/dist/v16.20.0/node-v16.20.0.tar.xz
 _eclasses_=bash-completion-r1	59cf54afadd3b37d31d9d85c7d7d8067	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ffce966275c3d863cf00a27c59ddef2b
+_md5_=c50b140cf72bf783ec723254141ccffb
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 459f7b5861bd..4528ca559dae 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/pptpd-1.4.0-r3 b/metadata/md5-cache/net-vpn/pptpd-1.4.0-r3
index e8173783710b..8e70b6fd6428 100644
--- a/metadata/md5-cache/net-vpn/pptpd-1.4.0-r3
+++ b/metadata/md5-cache/net-vpn/pptpd-1.4.0-r3
@@ -12,4 +12,4 @@ RDEPEND=net-dialup/ppp:= tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://sourceforge/poptop/pptpd-1.4.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2e36fddf9b4712f1c663315687a1ce11
+_md5_=7aaf3303e8c38b453bdfef65a4ed94ed
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 8a96ab55cb3f..a5f0d81d1718 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/bleachbit-4.4.2-r1 b/metadata/md5-cache/sys-apps/bleachbit-4.4.2-r1
index c6b4322126d9..d2c8df2a47d1 100644
--- a/metadata/md5-cache/sys-apps/bleachbit-4.4.2-r1
+++ b/metadata/md5-cache/sys-apps/bleachbit-4.4.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.bleachbit.org
 INHERIT=desktop distutils-r1 virtualx
 IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) x11-libs/gtk+:3 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(+)] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://download.bleachbit.org/bleachbit-4.4.2.tar.bz2
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=021046fbce0bd757566708239f891597
+_md5_=c179aaf14a512e69eca372c434623530
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 9df203b5ff29..b11568925fed 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.20 b/metadata/md5-cache/sys-fs/lvm2-2.03.20
index c395c4cebb7d..f4ab02c245e4 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.20
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.20
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://sourceware.org/lvm2/
 INHERIT=autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
 IUSE=lvm lvm2create-initrd readline sanlock selinux static static-libs systemd thin +udev
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=udev? ( virtual/libudev:= ) lvm? ( dev-libs/libaio sys-apps/util-linux readline? ( sys-libs/readline:= ) sanlock? ( sys-cluster/sanlock ) systemd? ( sys-apps/systemd:= ) ) >=sys-apps/baselayout-2.2 lvm? ( virtual/tmpfiles lvm2create-initrd? ( sys-apps/makedev ) thin? ( sys-block/thin-provisioning-tools ) )
 REQUIRED_USE=static? ( !systemd !udev ) static-libs? ( static !udev ) systemd? ( udev ) thin? ( lvm )
 SLOT=0
 SRC_URI=https://sourceware.org/ftp/lvm2/LVM2.2.03.20.tgz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=4f1f104375c622be2569cc1ecdd05b8c
+_md5_=c3aa0db72407f8aa84fdd6a67f54475a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 0f4938069fa0..dd5983a2d08f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-04-28T15:39:51Z
+TIMESTAMP 2023-04-28T21:39:50Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRL6MhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRMPSZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCt4w//VVT/x9kRz5KS1u+7ZIQtBJ/AW2N8h74eP1x0eBEDgyAXBuIRweEIZiMe
-quHNp++F8Qgif50Q4kvjUvJERtaK05wlS+HajI1Chb6+61pTRTmNe3wLtUjLS+4H
-8B/TPb6a3Wv+T20u7QmRQK8i3ZhFRGxhxsXm8GETqiMaX/UW0WepYenT4P5Y9Cd3
-aF/C8smaqr7q6FsHCJsmbelKYq5FNLlkWPSS1KPU8thnpbFLzcfYETCPBUCwVQUl
-4vUdjlPu1v5T5FU4wLOQXPkQ/t9k+80hIxOfE+HoV7ZajM9Zn/8B0Jr/M4Y6RuQO
-ooGW/MAfCnGEa5WhB+9oNFH2XwSSbJRkFhYdCv/wLgcBbhbUExRuL+WLT1vqcu9l
-I7eZhz7p5mO9XMHzpKeQlhxRL9pIjMw3saVRMYohbi0ZI7padtKDDNWLoG2Y6Bvs
-4JAz5Gx7DsToMcSNeMUlv+zuRksTFlFKUWTKNWZYPRSummNBW8NZePmIfrqBImmg
-sVYy5Ls9FjVHSHtRoZ7J2L3X7bj9RlBeqT3MrqrgxckEOQrsfezGqrWQRRsNyfCf
-C/ln8hFqlXTXwNjdvTYkL6hCCZkV+nOAKrd1Edu3eNv4qD9ZJwXY2vn4FyNK78bU
-iZpvFAgST5dec/OCGOPKfpZot2cCl7cs95iPuRnPiCPbZvdhePs=
-=qoiz
+klBd2RAAlAJ+syju/V5XaRf/za2HrFIIgN8ViSX5tvE5kaTs9cpHOvQgRVIk15c4
+vN7kMvnaakpeNzaYupfo3TgpzfA2NtSGBdHtP+VmqC0DHKrLMrfujW4+iEa+b2fi
+j1hYInAF9hYxJjygeRIVkpVzS480gfnfOyJ+mkeuEgh8QO59ov4eDJZ6Fnl01lBm
+fq4V3XefOIRj6hZpgN+/MKHTtODqUo+deTDznchuPg7p7n2HofTTFoyEoYECl+P/
+OMJLSIhNUWT5t/WQD+WJRdsfygi1FAryQsuW5P7D6OD2Q/zQ0CFkmwRHUyBRQHaZ
+cKDTe9WuTqbsTUlgQE5fcvvlT3C9/d0jWNQR0SZvqymjjPgu8mDgAGbIz+5lG7Ue
+YxbQKUh/hSk/p1sTJdC29pGQOauBrFA+SRioNFYmgdTnsenKPDBl4oQTNdkXq4CF
+of9S5Fjl36UxE7naE4iuMtDJcMa43KD6vRSGbzlFlgZRVcZVeAzsvQwbNk9N2IN4
+AS/ltS8HS0sxwi+eam3qPa+OF4ydecttuhhO7P9d7xkqcGm2dtSqwJZ7UpVBfIS+
+N5iexwh1okdwPRWc+Fb352O5lSuqY5Cx/xM1FtsWoit9eXTVU8wg/tTqVZlgEsKn
+XUIUUerfEIfIzlb64nlgGfL8X4h1A/A2xI6Dgu1OltwXO2c6VFU=
+=yaLs
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e8f3f92cac9f..8cce2a2ffa30 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Apr 2023 15:39:49 +0000
+Fri, 28 Apr 2023 21:39:47 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index feae7882b4ef..ce0dd3838ae9 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Apr 28 03:39:48 PM UTC 2023
+Fri Apr 28 09:39:47 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index eac28b6ba25b..cb230c3d3490 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Apr 2023 15:45:01 +0000
+Fri, 28 Apr 2023 21:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 966119873416..aa37c98de08a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9953e5c639db4a062441926d4c6bb01319c40230 1682695847 2023-04-28T15:30:47+00:00
+d7be0fd173d14a579fe1fd11da1b6ec889716da2 1682717723 2023-04-28T21:35:23+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 96d71686e9ae..17950d17862c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1682696401 Fri 28 Apr 2023 03:40:01 PM UTC
+1682718001 Fri 28 Apr 2023 09:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e8f3f92cac9f..8cce2a2ffa30 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Apr 2023 15:39:49 +0000
+Fri, 28 Apr 2023 21:39:47 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 6f8105caada7..be09e8c1c6bd 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index fac5a17533f1..7af34e274bb8 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -15,7 +15,7 @@ DIST node-v18.16.0.tar.xz 40467860 BLAKE2B b16749c0212f3aa196ec9fc0f999a023adeb9
 DIST node-v20.0.0.tar.xz 41279796 BLAKE2B 1df8785ca22dea15c6c1f19ec2d3b3d704f9cda6cf13d6e8e8fbbf853515871f18a11a4bbe5ed765434f6f5606975c5254e1826f2e506165ff937ef16d326262 SHA512 cda981227398c1a9023a2212c0d5351eadfedd19d58776dcc470e3ba0213a178b626c37d48fa52548ddd5a70d26a18b66c266856321a0af9ada2b1eac7ee9fd8
 EBUILD nodejs-14.21.3.ebuild 7089 BLAKE2B 5a039629b268d5b88ecb324d1a39415c9ebd810264aaae3c699a8a28333d2330fa904d7ba6295f53db6beb8941f7568415d5af576c7c289a2837f7f53596a4c2 SHA512 c51e35fd2936f3397e14dfab0aea7ac0db20734f4358d2cf804bfaa3173683ed58e47feb71f1c647467e1f69a1be5cf88893899263af0192c9613038c3ae55e1
 EBUILD nodejs-16.19.1.ebuild 6703 BLAKE2B 9b4ec4b35cd13bf388b9e04d15386500d784445786b053e9cf9e1f1ef53250f48b9f1f013bfe768667d7ff3fde4ed0c0bd3ef14d76c945dcb9566a8a10a6d03c SHA512 ef0caf342f6a79b050c4d63fd4c701bbf0e7b5daf2eb3aa6d3d510d99d561df447d9f786f9d4a8296ef7d2b3ec9e6164a98530accaae640d0847b7b25b3afc9f
-EBUILD nodejs-16.20.0.ebuild 6589 BLAKE2B 55087b5a858a7df5db8869e6b629cf5d6f7aa4f2fb59c9d3373da97946452cc9d2b60355c124300533f47671eeec5911633f3d6acba373eb21c69f54d7489f3e SHA512 0f09e4fdf52970cddaeb5691d03d74d725db498a6b104a9882286966a4aee251d10a87efe2658fb232f47675b36c494ca73a2fe3356e14d9513fd8b0651abfa1
+EBUILD nodejs-16.20.0.ebuild 6529 BLAKE2B a38e459db85ae07ad915d2dd07023323aeddcbdad5b198ce3b860da60fd83ea81f20784667869838a3b7cff0db0a51091a0a6363c12aeb54efc0056052b9102b SHA512 4cd853d177e8733889b85f2552f9d3bf5a396dcd7e5817e0f098f3ebb52914400f9cfa39c6cd79dcb52f707dc97ec8fdbeab0116b67b2aacd5d6ec4325e857b7
 EBUILD nodejs-18.14.2.ebuild 7606 BLAKE2B 41a54764b744802268b2b06f09264edfbcb9b1998b032ab689643441ce4d6dc49609c6169a9e61445730ba4224ba141bc93cb7241486c72a2703e442d4efe1ab SHA512 3175d47941fda7b3b031d7a993043248fafa73d763f8cf7b37b0dd1a0b02d8776b83023e4f35b133c701bc42fcc99dce3f41d0fe3005a8dbfbc94c9ce7b5acf4
 EBUILD nodejs-18.16.0.ebuild 7340 BLAKE2B 89a1e2aac7a624bc46c9a89e7be3d84b3de8e7829bd8fa4ab5657f0365ad5ed2f443885c3c11573e6da25bdcdcc6a8e0e743dac8418ac7f10c8d92af9f401259 SHA512 0c7a4e7c3bed8a05ed87a75ee6a5af3d0c8191ae954da48f45c5a8e805584ba4db61fd18c51828bea1ceaae639e7f6bf74ef1a56aab2bf45576384c7f82e8d7e
 EBUILD nodejs-20.0.0.ebuild 7275 BLAKE2B cf845e10bda6b1b0e51cee80d31bd88b96b4288acd04ec29e0b8c4ddbad0627ae6bd4dc2146eff3be6c7c0f6f016c9b7240fb4ad992bb069281ad31564ff2d8a SHA512 9726f7a3c93f9a9db42e0478d9fb30532b236296f2818b55aa449e15abf7f0276922deee46da95f7e86fd489d2de7ab7de23e5a17c5acb06781b775ef8bf9592
diff --git a/net-libs/nodejs/nodejs-16.20.0.ebuild b/net-libs/nodejs/nodejs-16.20.0.ebuild
index 674133fd6675..017b40af8e92 100644
--- a/net-libs/nodejs/nodejs-16.20.0.ebuild
+++ b/net-libs/nodejs/nodejs-16.20.0.ebuild
@@ -48,10 +48,6 @@ BDEPEND="${PYTHON_DEPS}
 	pax-kernel? ( sys-apps/elfix )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-incomplete-type.patch
-)
-
 pkg_pretend() {
 	(use x86 && ! use cpu_flags_x86_sse2) && \
 		die "Your CPU doesn't support the required SSE2 instruction."
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index db7468df2144..532b42ac48b2 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/pptpd/Manifest b/net-vpn/pptpd/Manifest
index 7c99576c3f89..2f208acb61bd 100644
--- a/net-vpn/pptpd/Manifest
+++ b/net-vpn/pptpd/Manifest
@@ -2,9 +2,10 @@ AUX pptpd-1.4.0-gentoo.patch 2360 BLAKE2B ca5ac7babf0ee6752305659ca50ce4c7972c43
 AUX pptpd-1.4.0-libdir.patch 1205 BLAKE2B 4b0d269b4de78346ffe577379824510dfb330e84606ff1b56abda08a4296935c947a0c61188475007c565cb5d5ba987beca61020e20a8cf050c82ff2f9335502 SHA512 927254c2527eada485d7d86940858835712d272fea818e17a6dd81878843b1a58dd6f1230fdc1b5e5ac0cd0fd726956d816655884ac7b8f6ee3c2e6b20e6beb4
 AUX pptpd-1.4.0-musl.patch 381 BLAKE2B b3094ada7db21fcf5e249512d0f3aabb4782562e82dcda1fedfc8d78f70f59a062751e2cc6c03789871cc8b2f79bece8b6f125a7849eefbfca566e0b083d3194 SHA512 ac48f18aea8ce89c55bb102705912391fa4d0f3da237261110dfc3ec04b7c461cd4676419bffeabc52afddb78c8f7a2494df6a60bbd507f306f01be592b9e2b3
 AUX pptpd-1.4.0-pidfile.patch 1348 BLAKE2B 7b19d05f5a8b18069c05e110963cf032dc68c7558a970c00126162d7f7d71a702d4b64f40105a36b5da879b8a6bbd6b16785560ecb1b3214bd91aeac20f00378 SHA512 0d0e4df9cc1827345001ebfb88ec87bdce818792aa2243e92127643ffbf64a2c7d62cb5cd26930085d7533ae32135cbcc36da755adce3297bcad4abf764b3b6e
+AUX pptpd-1.4.0-ppp-2.5.0.patch 2351 BLAKE2B a1c0946549769de653a2b637b983096a4be173b04ceccce8e6f51933db5e79617a5951835a767b98756869b94dcb402057c33f043a90cc4bacbbb5bc4d65c43f SHA512 5968185fe4529543d68f9eb8dee436419ec5ad0643078c286adf9e2cfbc88fc7c2f1a2837a08d53ea73f17576bb9e9cb5ef3b22b9ca22ee5d4b6d855dac3efd6
 AUX pptpd-1.4.0-sandbox-fix.patch 528 BLAKE2B 1b784cbf9eb1699a5c8e31a6ebb64035e9656a175b81ca4df778e9799b22fdb283c851d66e3ba0b9c056cf099011be049bd71d1b47d9839786538d1d436ac0f9 SHA512 7f80c66185207f4d14fd6163e41fed3acc7ffdeea91d3f62e000ab1fcbe6abd8f3bb6a1ea927a9fa29ef1b38b2c0ffe364625e155474c4145126de674cd7f2bb
 AUX pptpd-confd 131 BLAKE2B b1cf43035bb96859e3f69ad2ba8d161fd5e7c98370f407767a74ec9e87fd3187ec127155171bebf3e0655d076d2edb640993ec4445672abb40a9d87fb5a6b008 SHA512 59f118715cf6c36442687a58f46a54519fb5125383e85c4fa352a4c97f8a4e19f46c9715330550755eb9691e8174b70cdfab48fbd14c2707364e8083d6baa488
 AUX pptpd-init-r2 325 BLAKE2B 492d4a17910fd45475337376570e23b2193f0b5471e82a575465eb139a9cf0f9296388962e3dc2584784a4be6aac17edf4da67410ca422498a2f3c39c9baba43 SHA512 5eb0839310b6897aeb5ef067f3bbccc3f302f9d5375fea9c2cf405a6e823560a776a96fa0189b4c9adf1744651a35a41d4fcafc3f9e1ebf5ddeb5d88bece9678
 DIST pptpd-1.4.0.tar.gz 252167 BLAKE2B c7fa9397c0a1b7c1ae5f22f9d7f85ba1bb60966984506f7b7c7b4f5dce69efa717f41e8d9a717e4c6f482d2d3e4052611709e0b825a2fcc63fabf19a53a550f0 SHA512 cfb4caef3025c0721e7fabf8b7bf595739f2d3048555b30616cdadc37e70ba9e1c50561c25091dd617b5448da2816aeaf83aea0fc2ef6b0dd5e3fe35d9591484
-EBUILD pptpd-1.4.0-r3.ebuild 2026 BLAKE2B 8f27575b7dc2a91ecf17c50f1e1a6bd1c7e1a58b32f58148e1dc40435ba97cb4b3a34744f0e9f80ce6f971958a640e15aaa87ebe03e1419e8c3995a015b8b4d0 SHA512 c836a57bd3ad17901e8d6d59320fe1826593a1801b871875a7649089dacb0997814670bfb28607cdcf5f3adfe3719efad7ffef2a95ae7fd4b51fc28d39a68e58
+EBUILD pptpd-1.4.0-r3.ebuild 1833 BLAKE2B 0645f465ba89b60bf67e461b643aaff77637e2e5e042935e8fc8ed2b06fb83b3d20db13e36110364601e00c339b656a3a492c46c0b1fb253a49d36c49a4644ae SHA512 d6abfa2baf4fd811cee7450a74f35dccb515bb2cea780d4c94495a12f8f8c610c4785973998a1e4476c4fd3bba9fbebfa0aa6a4a0438a548011b66ad886065d0
 MISC metadata.xml 469 BLAKE2B e1c0396ab4a78ed9b1b20dab4a3c81fc4058adacdb87d9f287e0ba9dfdb050ee64727ef95433e249fc1054ad1849ef543fbd0ff35cfd4a2c3f08f3d5ec51965c SHA512 d1d9a5a96795964d88f79aaf93b67948f7298d1410e5ec5bf4a0b98eb11f5157eeb71633209ee6491d1ba02e77454ec641c36ad217c7eb084dc3015a9f8b854b
diff --git a/net-vpn/pptpd/files/pptpd-1.4.0-ppp-2.5.0.patch b/net-vpn/pptpd/files/pptpd-1.4.0-ppp-2.5.0.patch
new file mode 100644
index 000000000000..b3525052a873
--- /dev/null
+++ b/net-vpn/pptpd/files/pptpd-1.4.0-ppp-2.5.0.patch
@@ -0,0 +1,83 @@
+https://bugs.gentoo.org/904877
+
+From ea207b89c61e3a201155b973307ee45413f0d058 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 28 Apr 2023 16:37:44 -0400
+Subject: [PATCH] pptp-logwtmp: update for ppp-2.5.0
+
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ plugins/pptpd-logwtmp.c | 25 +++++++++++++++----------
+ 1 file changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/plugins/pptpd-logwtmp.c b/plugins/pptpd-logwtmp.c
+index ac5ecc2..457bbce 100644
+--- a/plugins/pptpd-logwtmp.c
++++ b/plugins/pptpd-logwtmp.c
+@@ -12,14 +12,16 @@
+ #include <unistd.h>
+ #include <utmp.h>
+ #include <string.h>
++#include <limits.h>
+ #include <pppd/pppd.h>
++#include <pppd/options.h>
+ 
+-char pppd_version[] = VERSION;
++char pppd_version[] = PPPD_VERSION;
+ 
+ static char pptpd_original_ip[PATH_MAX+1];
+ static bool pptpd_logwtmp_strip_domain = 0;
+ 
+-static option_t options[] = {
++static struct option options[] = {
+   { "pptpd-original-ip", o_string, pptpd_original_ip,
+     "Original IP address of the PPTP connection",
+     OPT_STATIC, NULL, PATH_MAX },
+@@ -28,7 +30,7 @@ static option_t options[] = {
+   { NULL }
+ };
+ 
+-static char *reduce(char *user)
++static const char *reduce(const char *user)
+ {
+   char *sep;
+   if (!pptpd_logwtmp_strip_domain) return user;
+@@ -42,8 +44,10 @@ static char *reduce(char *user)
+ 
+ static void ip_up(void *opaque, int arg)
+ {
+-  char *user = reduce(peer_authname);
+-  if (debug)
++  const char *peer_authname = ppp_peer_authname(NULL, 0);
++  const char *user = reduce(peer_authname);
++  const char *ifname = ppp_ifname();
++  if (debug_on())
+     notice("pptpd-logwtmp.so ip-up %s %s %s", ifname, user, 
+ 	   pptpd_original_ip);
+   logwtmp(ifname, user, pptpd_original_ip);
+@@ -51,16 +55,17 @@ static void ip_up(void *opaque, int arg)
+ 
+ static void ip_down(void *opaque, int arg)
+ {
+-  if (debug) 
++  const char *ifname = ppp_ifname();
++  if (debug_on())
+     notice("pptpd-logwtmp.so ip-down %s", ifname);
+   logwtmp(ifname, "", "");
+ }
+ 
+ void plugin_init(void)
+ {
+-  add_options(options);
+-  add_notifier(&ip_up_notifier, ip_up, NULL);
+-  add_notifier(&ip_down_notifier, ip_down, NULL);
+-  if (debug) 
++  ppp_add_options(options);
++  ppp_add_notify(NF_IP_UP, ip_up, NULL);
++  ppp_add_notify(NF_IP_DOWN, ip_down, NULL);
++  if (debug_on())
+     notice("pptpd-logwtmp: $Version$");
+ }
+-- 
+2.40.1
+
diff --git a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
index 3a01c176e448..3a013c769e13 100644
--- a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
+++ b/net-vpn/pptpd/pptpd-1.4.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=7
@@ -21,21 +21,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
-PATCHES=(
-	"${FILESDIR}/${P}-gentoo.patch"
-	"${FILESDIR}/${P}-sandbox-fix.patch"
-	"${FILESDIR}/${P}-pidfile.patch"
-	"${FILESDIR}/${P}-libdir.patch"
-	"${FILESDIR}/${P}-musl.patch"
-)
-
 src_prepare() {
-	# Match pptpd-logwtmp.so's version with pppd's version (#89895)
-	local PPPD_VER=$(best_version net-dialup/ppp)
-	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-	sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" plugins/patchlevel.h || die
-
 	# configure.in is actually configure.ac
 	mv configure.in configure.ac || die
 
@@ -48,6 +34,19 @@ src_prepare() {
 	# respect compiler, bug #461722
 	tc-export CC
 
+	local PATCHES=(
+		"${FILESDIR}/${P}-gentoo.patch"
+		"${FILESDIR}/${P}-sandbox-fix.patch"
+		"${FILESDIR}/${P}-pidfile.patch"
+		"${FILESDIR}/${P}-libdir.patch"
+		"${FILESDIR}/${P}-musl.patch"
+	)
+
+	if has_version -d ">=net-dialup/ppp-2.5.0"; then
+		# https://bugs.gentoo.org/904877
+		PATCHES+=( "${FILESDIR}/${P}-ppp-2.5.0.patch" )
+	fi
+
 	# Call to default src_prepare to apply patches
 	default
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d72fe86581ee..01cd95287802 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 1dc79c739cdf..05dbd9aed54f 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,4 +1,4 @@
 DIST bleachbit-4.4.2.tar.bz2 653525 BLAKE2B ae65e310d33c2e523244a32de1ff28081be940a6a2ed2aadf682218ebe7346de3b5f37ab457d4f16542730d617678effbcda461e7080c43cd81c17f6b959018d SHA512 247a1ed0e491e5e02c4bc9a5c2d11d5f1511ef9644b9edf34b1c9326e6515c33dfd60b98bb2dab59eac36ab5e1c9b5ed1e8d7c749261bde90450a2fc717dae6f
-EBUILD bleachbit-4.4.2-r1.ebuild 1786 BLAKE2B 414055160f9bfd2e36995888e1b54e41bf1e243ec0f3f3fc2b96c316147ea6c913cd63045661a241470fc1386fe7710e3d52e6d913981398ce8fe69d68fb1a15 SHA512 86553b3b7b0b163c199b78b16e0a17deecf12747dc2c22a9b2b4cfc052604c838f32dc470c04e9aa9c8aa90341d503f217cfd22119564423c6c2bfef6810d0dc
+EBUILD bleachbit-4.4.2-r1.ebuild 1784 BLAKE2B e2edd231e5559fc48b88eb54a08745ff3fa5c6b42c2ba1d9d7a130ec8c10f2cd55f591c1a72b4094c311a82a0e6a26be5a39799810cb615329fc092901639129 SHA512 e58472a468efd65203197bd87386284f75dcd4476a257fc35c09f27131c39d9d8ed577e6549b753ce837c22074074da56fa32e346cbe15c10e20cb962b4b946f
 EBUILD bleachbit-4.4.2.ebuild 1751 BLAKE2B d961056ffe9264041c13271dda50413bdde2df4fda8e8dcc1a2ac25abf7e4ddd80c4b254a1e16ee9767d30f2bd3118a7abb13a67291905b3c61bad5109787bf1 SHA512 da3878783bea97737d66d1b4fba4b377907eeb7fd1b3cb3ebb2b8833d07111bd664e5cc8f0e44d45c8bed210112b1ff0eb407020a9208b0272e1a89e3590309e
 MISC metadata.xml 557 BLAKE2B 61de1eec1e533aea9a008403d40069d8e7fb3ca2e1217f1ebf8746adf07725bf82011ee6597961443e6474de9908e3b8a70a6aef42439b4aa62a562212846378 SHA512 dc31e0aa896798f20540c5f7119aa7cf60a8ec5e498d8a7a7baf3d73b5287b03083e33f0816d84467acfc221d8bf0dfdeea59734b3048e4194693d63ec453214
diff --git a/sys-apps/bleachbit/bleachbit-4.4.2-r1.ebuild b/sys-apps/bleachbit/bleachbit-4.4.2-r1.ebuild
index 3cc4297cdb73..c6b013a117af 100644
--- a/sys-apps/bleachbit/bleachbit-4.4.2-r1.ebuild
+++ b/sys-apps/bleachbit/bleachbit-4.4.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 027f74d9f031..357e3ec3b6b9 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index cbf082d7c50f..6a66384db351 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -21,6 +21,6 @@ DIST LVM2.2.03.19.tgz 2732219 BLAKE2B 7a5bd024312f149d95361ea24a282c8c68e371687f
 DIST LVM2.2.03.20.tgz 2739763 BLAKE2B 4dc223eca1a370450c3985a5f962a2450a2ed08f1fa40af98d181a1530960a7caa3e896a3b54f0f333e2d6818bf35378b9c491a1488a4d3815959ab0e1f987de SHA512 202ff19f6ab1e1ecdf448beec6c7db1a80885efda1a6eeabf44cd2cea40577405c388eabd86f59f34c6e9e400188050bc6d1a5d5daf02f2beda87eee73cd1a2d
 DIST LVM2.2.03.21.tgz 2742294 BLAKE2B 529bc01b3d1ba6207c9ddc95309b39e6293fcd0286334240b9fdc076da0b7bc7e026338ec0243564ec153f2fb5009014149c3f8e0db0cd47a29418af62068728 SHA512 6024811c3fa92afd2fc13a10d1c3542352aa9a016f40c3ef588bd2f5f3e41245fed4b36c8a87d9f7f8dddc6e13b7253396f5c811f99665df27751676dc7b5bde
 EBUILD lvm2-2.03.19.ebuild 9241 BLAKE2B f114cf3c515ed4190579ba66bda5a5c535e303127cf53df990249776459b84dc50baabcdbea75203d9bfa6baf6739dc7514a980627f592f97e539f35fd3a3038 SHA512 5dd73a9e6d611813b3058ba532b666fcc9fcd5b8d3b37a45a944a931b2c3bf622c6309cfab5c8a6a7e526f60d96d8d3101a6177cc1b4a13c47e77c422c63d659
-EBUILD lvm2-2.03.20.ebuild 9030 BLAKE2B 31c77b28633dc208e3d039ec45697b24443f7fb02e5a86cbb859f8eef45a11857ddb946bbe62faff06d895573c5048331a45aba94c3c6ea1ad66499cc5c2ad21 SHA512 01dd0c73159d416cb78cc32d5f5f80ebca540222324258aa6dc018bf7d78c5838d257702e25a1e17ca01ab61dde423c0dcca23662b6d78800451f8bf372eba7c
+EBUILD lvm2-2.03.20.ebuild 9029 BLAKE2B 1aa068d934227a15aff0d75f829f8ecefb1c8189e66e60737aec62a43f975f079b3268f2339ecc209c7eb98349f3a1024257aae5a086b67339fc42c7ac253fb1 SHA512 b3563b8f5a7915c8646ec085545ee6665052b7a7e598a9bb2710d3bcf6903f0e5cb2561940ffb7d6d142e1ea0f0173992b238521e6ea5d2e8b61b12751743dff
 EBUILD lvm2-2.03.21.ebuild 9036 BLAKE2B 580358da638d0db89447c63186811c1224210648491265656a50ebb39c6d4e03d43fa940799bcdae6b305fa9fd0bf2ac553467207799101c68ad6cabfdc0effa SHA512 39d94908af99920e3130de180a6511782981d028e5ae5256bd1f0bcc2db05de958de8583ef6c4bfca30cca081ea4f4cab385f09ce1add4958d0cd2fc386ebf2f
 MISC metadata.xml 922 BLAKE2B 8688e31c04a110d0e522a13724896a2a7c22a9ce33d8d4384a7fbfb54e3c42c231d3b5791ceda976453d54062c5a8318cd514979fcad177ab1ff2a01b791ca65 SHA512 423e499010daffc24141021bc5328b83f9e39e1534bb30fdbbf6839f4ed426897d764d0ca6d0e96267bc67986d3a2cfa9cc5ec3f0e3b2e7aa5ef34095de95a61
diff --git a/sys-fs/lvm2/lvm2-2.03.20.ebuild b/sys-fs/lvm2/lvm2-2.03.20.ebuild
index 9963a2b481ea..214dba4f7014 100644
--- a/sys-fs/lvm2/lvm2-2.03.20.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.20.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN^^}.${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="lvm lvm2create-initrd readline sanlock selinux static static-libs systemd thin +udev"
 REQUIRED_USE="
 	static? ( !systemd !udev )
author	V3n3RiX <venerix@koprulu.sector>	2023-04-28 23:13:34 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-04-28 23:13:34 +0100
commit	b8395ecde09583851e86d0512adec19f7308d791 (patch)
tree	80f0b26997037858eca514eecb197b37300ba4bb
parent	670fe3b64a21a723fda1e52fe61cad2327f81f67 (diff)