gentoo auto-resync : 27:01:2023 - 13:58:28

761 files changed, 2463 insertions, 16506 deletions

diff --git a/Manifest b/Manifest
index cedfbb8c6c25..af120572f24a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29489 BLAKE2B bde421ca8f2881983a4f94b235e156b3760122ff07378d0b9d1881afe1dfe0b681a2ff123d786ed397c73f0be03c638a8deb52206ebdb0b18006b0fe88906d15 SHA512 6a09f8ebe49a7d62e76bcd3e136c1a59562c6c56a12d20702d3373078e95bf787c98044cad3210ae5d4fac26d6d4b2f26335c635e65ce2a56c2d69743491c22d
-TIMESTAMP 2023-01-27T06:39:52Z
+MANIFEST Manifest.files.gz 29460 BLAKE2B 837ac48640c619bec4a861deb8e29e6e6b90ab093ca2f3270efcef2ad357d20e9e14d52ef539bb830a5d718061481f4b5b9a2491bdfd0a65aa908e59929b5ef0 SHA512 1733227774b2c624aca85a5a7a328abca5d4ed5a76e3d841f43856c5a298e8d14cec33bd37f4f13dc2599c71ce11a5607b674f1494e939bcc02543693d8a9561
+TIMESTAMP 2023-01-27T12:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPTcbhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPTxhlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDpKw//ci48L0bceTqLk0dTjfSX4WXO3Wj4gGvZHPEANrD968Sbzf3Zmlo4VMu0
-2nvDQkmVr0fxiyi3rIb9iCLXjhRIaMzga7gvGsaTE9Pnt459FM/tkgubf2iB1uz3
-O/jEqiBG2qRB15G03za3A8U9KO/OqmOyzs3Ap8ZcpUvMxhOU6UINwU4EyKdMf1Jt
-A2Hk3W6MY08nS1yvJtn4QWEdSKFI41vD0HLtdAyQVoVbPUOasSq7bdyL9hejF83W
-SfVtS75el85l9QQFkhriPPvmUMmr64PsyzgLFJRVOCTktCL/0Gfob+UK1AZBu/Pz
-9bXVRKKgGQEblQJLIKwTIgIiwOGvuSx37wIBWTFbDgdP/2zOdUn2GNu4yzmL8Ltm
-1oPqv3kMiLCdOV8skn7z6/vN7RSoGZvrE1zU8tOJpFzR0okmxp+k4sCdup6Dv9HA
-3Fg5EO7X3cR/A99K2p88QiIpD0zzcz/0CCHaZrzuovP6Ip09YP2rgu3ew0HvnL7Q
-KRCI1Pf4xVLpLXkmxlpm7kXIL2Y1jQVMOXViLkw1aJoZLZCHcgQJwA20WxASDfXW
-MVWGte09CPZsdAeZrQ8SW+7GDWPLrkEE8EsncmM90/8hIcqcucnVMbR/J2MOyLmf
-BqAsvRe4RQpJjFj77+g8UG42B56MDt2jB4EbVEhwtKRVNFmzJ8M=
-=T+W5
+klCgOQ//VkggW5Gpz/MhdrfBN+vp0+XzngFUHjV1m0xim2ICBj38eJQDtANycQ3i
+UxrNVBj1T2pVCm7Ddbv/hjDiYpO+Fc8rRGq5S1y+tpsbgE0hu/T/eQ1GFiuiIIBt
+vl5auBUiA/ZQMi40f5c5+3wWWtXzbyd4VDKT+F6qHDVx7cKcpN6cPET3dvwYQ/Na
+YNYMIBl7vpkroDIXc1YF64uolRz50Lcs+r9lXnoTndnbkT2NBoApLoq5Ku9wAPah
+ybuCOYzGy77rSyyrUVPE5nrQX90XgOPWr4DWbS45KA6Umw3ZbznV7/LApe/oZxBs
+hXRhvgQRG5is7wdBSUrmjMxeJp/Xsy590+fuw0SBLpmcgVEjr9lx8I4XYzpLyqBq
+SuCL9lT7g1wcBm9GOyt+ZyeXbfXbhia0JjJFZjWws+LXrIQpIbvSUvu4CS8yHkJW
+pmXa0zWWeCnHT4DtQnvD+OOr6fibhp43VAuseenVMg8C1cXwpcWKNYvo2teHb+sA
+jkf4LTjrOj1+hvNf1eF0P5Jwzne1NEi5gwECMPF6tJuw7ccHm522ZP8inzF35Qwv
+LAPwy3znoGJjCjNxMJdKMxOdt/RQwmKWdvhU9hi9ix8pJzJSCGuMts0Ht5GjGd6r
+/F/JSSsrVOSjysuKevAvBepmB4eVd1FjOMOOZlKxPzD6Wqh0A0c=
+=KAYw
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e67ce2fd2adb..fa601313a0f1 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 42f0b668f5e2..d15501ca246f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index d39a5b16eb9e..363f9d5dacf3 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,17 +1,9 @@
-DIST aws-cli-1.27.45.gh.tar.gz 2344942 BLAKE2B 02171244d074008721a5da4b9e640b0da3b77ed90ad8acda300b7256ef62eb663f0bee78a52f025e3f6315306602ba3cb8848e89dbfb6abec6342a0ae04b1009 SHA512 d3daa556c6b93c312dae8ff29941d938cfed7f27e62408f06c32abbeb7324d04a3b8997fd1db9feb78ef1ef1eb98ea2fa456fe179c037127558ecf786e5b69c5
 DIST aws-cli-1.27.50.gh.tar.gz 2347235 BLAKE2B cacfe2c8d4fce7de6452a02fa8bcbcde58dbf010328a161e5eecc7305b225264ae68d3e20c6107cfa3b817e2030ffb20dc09a938f8bff59036fab5969e3e6da0 SHA512 af95ad60f2537c12c1353ab0cee045b55834b92b51d0b2fb1bf48991d34f4aa3b61ab20ca438ecba5d8019009065f7993bab64b7e7e0edf89765351c3f4fa168
-DIST aws-cli-1.27.52.gh.tar.gz 2347819 BLAKE2B 1d6c26a9ede3c9cff28a66f7582a84a57dbacfaefce71b8465100abc4822a0fa1e01bf53068895901d5784fcbeb57f74fef9e872d3e145f56582edae920564ca SHA512 00b08ed90e2d67db3e091f49296f4d83b04c5a504373a613f5bf411fb17b5a1d2b7fc8612a8ff748c87dc3debe2b985c6ac2c3226683651a31d4f35d27b7c826
-DIST aws-cli-1.27.53.gh.tar.gz 2349368 BLAKE2B ddae75809b9eb2e8ff5f80cdb4d5730254866dc025c178ebcf76971e53fd5d5fecbf30e20717f4a126cb19624acd961e8c005a0ced118989b062666c8ab2d346 SHA512 8eddc6f801e7e7f8600f6cdde3db28e670fdc83e6266840b507f88e0b176d790450d18f84c921af15fa12408f2f2eb16fc2498668601c3164ef1f503275303a8
 DIST aws-cli-1.27.54.gh.tar.gz 2349811 BLAKE2B 08cb317ea4621273644c39c1152e1a3f8bd9f52ed8c30d7c37dfea9e986ca1597fda1dfbdea8c4043fa783f061609d6f24895997e9f9a3f27d5677c0f9e6c3de SHA512 af4783eef3c1c666b8b3c6d20f1c0177db6d4ce01645b092770cba535dad95609b4bece366355ce6d6a505ac7ab5a2e390d64fb84d6c00e402f9f8ab88db91d9
-DIST aws-cli-1.27.55.gh.tar.gz 2349668 BLAKE2B d9d0318d572e2b165a8177a1c2b76ebad042a142015bda3747038cb893b58eea6babc9e9a04547e9987dea45f505af5fe1f402a0753b780fbc779876e4a91ff8 SHA512 a6b030820c09f67f0a4df84ae0df5f622a25b0df78d203e53fb4c6f09a726a322b02f9faf9afaf9206bf38ee2c311ca2f23e07c03169d11f687ea85d45c5e225
-DIST aws-cli-1.27.56.gh.tar.gz 2358966 BLAKE2B be151bf7c55b932a7a5540ba1b94aeed94fa92eda8f0a680effec6189da9c9247ad52bc9898d7e4ab2aa2f841949be14f55d3e51a879e9a3fc563e403e827ce6 SHA512 e3d6e392ffb2e034172ae4c7cff929f8a462ab5e149aa0b3ec9dd446cfc564bcbed10e32057ccf00d74dcc284da2ad46e860e06fff49b49c63f3db0d45d2f728
 DIST aws-cli-1.27.57.gh.tar.gz 2359650 BLAKE2B 637674f1726828b43a8135b9f7ff9d1f4a05716680aa909829148e4acf7104290c49f90b453294e16cc74d0d200bdfa4049b470a5194df5e3098308d0c088d3b SHA512 be1ac08e57012751f59e63996395b39bf5a9f42381e9a08baffacc2ac9d104c3560c250b2b210608bf6b460fdc31cc1f794a90949a52ebdbb3c22f03e5fb00c2
-EBUILD awscli-1.27.45.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
-EBUILD awscli-1.27.50.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.52.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.53.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+DIST aws-cli-1.27.58.gh.tar.gz 2359921 BLAKE2B da3ead9140407faff60384fa7aafbc27a8a86d088e4516599e573b9e968f00d3e292a8ea6a0eb0a80449f1fef3bb62204dad2a788f10ba87a959218d909da77b SHA512 2bc4dfe5058c847510f4f43006191153b23e5efecc51bb010f9b06ba127504ee40c953bcb6e47d921760f1bc6eb87747971a9a3514f781dd4bd76f30ecd7de81
+EBUILD awscli-1.27.50.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.54.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.55.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.56.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.57.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.58.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.45.ebuild b/app-admin/awscli/awscli-1.27.45.ebuild
deleted file mode 100644
index 2d91a172182b..000000000000
--- a/app-admin/awscli/awscli-1.27.45.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.27.50.ebuild b/app-admin/awscli/awscli-1.27.50.ebuild
index 62c19f3a63fb..2d91a172182b 100644
--- a/app-admin/awscli/awscli-1.27.50.ebuild
+++ b/app-admin/awscli/awscli-1.27.50.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 # botocore is x.(y+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.27.53.ebuild b/app-admin/awscli/awscli-1.27.53.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.53.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.27.55.ebuild b/app-admin/awscli/awscli-1.27.55.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.55.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.27.56.ebuild b/app-admin/awscli/awscli-1.27.56.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.56.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.27.52.ebuild b/app-admin/awscli/awscli-1.27.58.ebuild
index 62c19f3a63fb..62c19f3a63fb 100644
--- a/app-admin/awscli/awscli-1.27.52.ebuild
+++ b/app-admin/awscli/awscli-1.27.58.ebuild
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index e613df478f2a..8f5f735e1449 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 2ccab29702c2..7385ad54f022 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -4,5 +4,5 @@ DIST ccid-1.4.36.tar.bz2 677047 BLAKE2B b3d48f1c51b64d260b7055251fb04aeea4a22cc5
 DIST ccid-1.5.0.tar.bz2 689961 BLAKE2B e5621f9af647028787cddd1b5a0d674420b4bf0c532a8527b4e10773bbd8af6f6600e7c40039e27f1ae182504d4b69b5e1e4aae509154ebd9653a34bd085f820 SHA512 fa2eac306066255fd89e8220e2b8d82811ce9e284baa155ea968b7afe0f113a94b1ee1898578d02fb8cde0634b6fe60ae8af956089ce5401c11bb90c3b334d5a
 EBUILD ccid-1.4.35.ebuild 1547 BLAKE2B f9c400087032250e51f1103a4ea19491fbc68b47f4a02ff9474a7182b7dcc7405f4e128d9f02663685e4e33bb565354e2550f27ad86a253181c2c63e31cc50ee SHA512 267e3b6d789a33ebc01d0586524c423cbf03434ff34040d39c1039be235f982546b39acad51b38d4deb779786a542d5c5f843f3464abe8d3d30712d156a35197
 EBUILD ccid-1.4.36.ebuild 1559 BLAKE2B 6b86ca4567944315a7657d089d24ad5fd43d57bc07ec57df76be6c76429af1b6d49d14fceb5a7ca03d91df56a53c43c6583e6ac1f7fa014ba0733f36a2a8b393 SHA512 35f30a6ee169905978a247f8c82b7ab2e26b27f004c6077137cc083efd5098cf44ebb3a39e1582abbb25d9024783eddf91ab2e072d5f5e87364ab8e7ac6a3d89
-EBUILD ccid-1.5.0.ebuild 1620 BLAKE2B 8e3bba27a7adca4032c28f6e4348ba0c0a99bf45a45187dc903f1fbda4898d512083a684bb1c19ac58e014f9be9ea6c84a3956554af7362ec0d00297d4bef20f SHA512 3498ad33188e9b45d3d7b13cdb819b5923cb1e13580c18dd3bcc6f9bfa9b10ebec863b8ad80e67a568040821694f79a201b039186fab2f3708d799f438362570
+EBUILD ccid-1.5.0.ebuild 1619 BLAKE2B a391736ac1266a4dc1f93505a85fd90524fdf41e1ddd17f78e68b91609ff2e000e392e40251cf54d2a0e059be851cec4b30b77e36b6e62387516433823471cea SHA512 2c5fe91ed7ceb067f9dd15b44e79cefcb6ff79070108faa0144010cdb116392976b152b8ae881884868fb66b039e94f5ea1b9fe8da96baad2a025ebe809a7705
 MISC metadata.xml 410 BLAKE2B e62b5075deab55dab4f862dfe242085935f383cd51d35f3a61a7e2aeb4d913f3352980d28cdd7ff4ac41f5bf0adf44c763f8267a8e141908fd4371e4656cbc87 SHA512 aabb5b8462ef6146d0230a6d67656fbc8fb2e4a25036e72b4ce9fa3a7ffb29ea1ae0d7eb8bc474343ea654dec649d13749fa844516689ae3f3e33734e0a24d3a
diff --git a/app-crypt/ccid/ccid-1.5.0.ebuild b/app-crypt/ccid/ccid-1.5.0.ebuild
index d59c8acf74ec..7f2dc7492c10 100644
--- a/app-crypt/ccid/ccid-1.5.0.ebuild
+++ b/app-crypt/ccid/ccid-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 6ec7afebfba0..c343eb352891 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 6955f4dfdc3e..711238392009 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,8 +1,6 @@
-DIST kicad-doc-5.1.12.tar.bz2 74217615 BLAKE2B f0906fdb0cf697348e06b63ef0003630a9035d47732c9a22ed3c4fee2f21c02f85fda51eee5149291b72326adc4899b31198178ee6e6ac0d494361cec6c06208 SHA512 db678d91ea5f564ca3f266829c297362cfd6cf35a5dced2ede5e7c9c38a37ca1037b264ee9314fa5c4a9d8197fcd92484ad4cae3668ea9741947d38c7ac7f910
 DIST kicad-doc-6.0.6.tar.gz 80517799 BLAKE2B 58d1bab65637e65b8ce79f6e8e9e913a1fb0d5d22a1241c7d10f0440c12a6f8ac2b758d6852a1138fe0587bc695905c0f2b2d017e79e7e5283ecb4e49ab1d5ff SHA512 90f809ea5923b59169884e090263ccb2c0a9705ddc4ce3817e78736dbebb820a6189eeca4058919b6a53164d8f75746b49bc7667e5e0e534e0c9d3fa8af1f44a
 DIST kicad-doc-6.0.7.tar.gz 80519836 BLAKE2B 228f33e23aff2f7229e33c24410c1b604c1edad42ba26a42862d924526967724761d4fb82bc32cfd45c7999317330d411e25d2c46f0ac3faeaf5333f1415d9ab SHA512 4619b8394e7aca7f880ace7dbf46bdc8bf2f794719587db3f550c2f3d7731fdebb4afd5028f59477cf8e0563a9099502f41649f136828a424ebe29fc67e2259d
 DIST kicad-doc-6.0.9.tar.gz 81321926 BLAKE2B 0885d0210afcc83c2ccaad3a0caac912e8f756e69c4569e543a81440e14b6e3ead68ccc427f4dcd9026ebf86a8e3c45487955479bf8c43ce9bb6680de9da777c SHA512 be8ae3bbebce334d7d7ab0e24bf3712aaa83b078f1a4495b755cdd9a5ff8e55951dbd82c5ac17c5aeba66008a9e6ef1b9f104f51ad340cb7cb88abdd86e5853d
-EBUILD kicad-doc-5.1.12.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f
 EBUILD kicad-doc-6.0.6.ebuild 1951 BLAKE2B 9509f70dc7e6fc065583b2a0b917367378d789e3eb4c08afc28457296e73891d547524b27ea4c80919386cbd772cd79a24174985d751f75b50b286d1a2cdf7b6 SHA512 7224b385730f1b4a2998e490e9e740e89560b669ca15cedc418ae4312c88ef6cc08383b4f51c0594aa5804f453ca215adbcfaaca257669b9fc675cfe80e65328
 EBUILD kicad-doc-6.0.7.ebuild 1952 BLAKE2B 969b242a5958ebf769bfa97af3efade6f75b836d6ae0865e33b5ec374efea582bac93f99e2f3251dee62688d0d97f1054919c3a7b08e32431829cd8c2a54ad94 SHA512 b45d9c3400cfddfeae471750e9d2cfd2b2ceb6ea1595277ec8f76e9e806f927714e9bbae079cfbc222eb3a5806283159b07ac4331e31b2ae1683316a00119b55
 EBUILD kicad-doc-6.0.9.ebuild 1952 BLAKE2B 969b242a5958ebf769bfa97af3efade6f75b836d6ae0865e33b5ec374efea582bac93f99e2f3251dee62688d0d97f1054919c3a7b08e32431829cd8c2a54ad94 SHA512 b45d9c3400cfddfeae471750e9d2cfd2b2ceb6ea1595277ec8f76e9e806f927714e9bbae079cfbc222eb3a5806283159b07ac4331e31b2ae1683316a00119b55
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.12.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.12.ebuild
deleted file mode 100644
index 86c28051d6d2..000000000000
--- a/app-doc/kicad-doc/kicad-doc-5.1.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="https://docs.kicad.org/"
-SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="html +pdf"
-
-LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
-IUSE+=${LANG_USE}
-REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
-unset LANG_USE
-
-BDEPEND="
-	>=app-text/asciidoc-8.6.9
-	>=app-text/dblatex-0.3.10
-	>=app-text/po4a-0.45
-	>=sys-devel/gettext-0.18
-	dev-perl/Unicode-LineBreak
-	dev-util/source-highlight
-	l10n_ca? ( dev-texlive/texlive-langspanish )
-	l10n_de? ( dev-texlive/texlive-langgerman )
-	l10n_en? ( dev-texlive/texlive-langenglish )
-	l10n_es? ( dev-texlive/texlive-langspanish )
-	l10n_fr? ( dev-texlive/texlive-langfrench )
-	l10n_it? ( dev-texlive/texlive-langitalian )
-	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
-	l10n_pl? ( dev-texlive/texlive-langpolish )
-	l10n_ru? ( dev-texlive/texlive-langcyrillic )
-	l10n_zh? ( dev-texlive/texlive-langchinese )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
-		-DSINGLE_LANGUAGE="${L10N}"
-		-DKICAD_DOC_PATH="${EPREFIX}/usr/share/doc/${P}/help"
-	)
-	cmake_src_configure
-}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 4d487a1d5120..ac41211e05fc 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-awk/Manifest b/app-eselect/eselect-awk/Manifest
deleted file mode 100644
index 45d838fbb741..000000000000
--- a/app-eselect/eselect-awk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eselect-awk-0.4.tar.bz2 1687 BLAKE2B a733bbd48ad6d4e5aa1a159eac0b5b55d0b7a844588212eeff522a3ac3c3e689e52456108a9734192de2364b9927652314cd6d0142af6726018db8197ba09784 SHA512 3e4130cc5a126e2978cc9c990e238700e109d2ea5ab0b734dbd45a10ebdbcfdf0a718ee672e76c3b674f4986921cebdaa6b37c22d34815170011766ee7dba99d
-EBUILD eselect-awk-0.4.ebuild 504 BLAKE2B dec42c544fbdf969a51a3ae6ebdf6c119cd28bb8d1365682c48317269ca0b6a0d56fdc6c67a1cdbe4cfea9a552a8ef4c741f50a87a406e56b1f904c8f7dc61b8 SHA512 b069b05a84a4b84eea3ae6f93dad201ebde393681a9fb920f3901aaae0cb4720828d2e7618c979e0a6b22f658906f3d9375f82a179b4bb1e9ace3a9420db652c
-MISC metadata.xml 363 BLAKE2B fe0b46812126a66a8df78792057d9480b9b3ffb0c82ecf8bfe629d8c21ed66479714314bd5ce1788d07e99ace1c7966b7b96f779b69e6b3986fad33b27cabf05 SHA512 3844a55114e11af1aabf421ea08c6e49736a4eead5f79c0f2d190796ec9735e9e8ff4e3ef29e5519d15e4df65fe8e7dce5ad1512d3d9504a6ffbde6823b15875
diff --git a/app-eselect/eselect-awk/eselect-awk-0.4.ebuild b/app-eselect/eselect-awk/eselect-awk-0.4.ebuild
deleted file mode 100644
index c8845e15cce3..000000000000
--- a/app-eselect/eselect-awk/eselect-awk-0.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Manages the {,/usr}/bin/awk symlink"
-HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-awk.git/"
-SRC_URI="https://gitweb.gentoo.org/proj/eselect-awk.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins awk.eselect
-}
diff --git a/app-eselect/eselect-awk/metadata.xml b/app-eselect/eselect-awk/metadata.xml
deleted file mode 100644
index bbd1ffb10a80..000000000000
--- a/app-eselect/eselect-awk/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>base-system@gentoo.org</email>
-		<name>Gentoo Base System</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="gentoo">proj/eselect-awk</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-eselect/eselect-sh/Manifest b/app-eselect/eselect-sh/Manifest
deleted file mode 100644
index 8d3bad46f286..000000000000
--- a/app-eselect/eselect-sh/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX sh.eselect-0.4.1 341 BLAKE2B 9f1723010505a9a364c83799af6ae4a354bf40e31c911a47cbd93b79362bfa255c8cd7eb1e1a50c3e10dbd02cbb22b53c8727571f63a362fa55c4c76afc2029c SHA512 610078d4c889708ba00a3c6cc6185b6d395b64c680e2da0dfd72a4e9debdbb3b001a089d8bddf0e7d8bb92175a80be823867331661e9b7b3e66a0bf754c4cf8c
-EBUILD eselect-sh-0.4.1.ebuild 614 BLAKE2B 5e65296c5a0299134203376c6cf0943c9a8b523801ad9a6b0bd545734f223906fd91ad218954a8787d418dbda68b117313b2094a7b20c03169177e99a01e0082 SHA512 4c0a1ca7bac51c2067ebacf02fb31fb27b44cb26965a24c11c44eb7764e712439ebbee35ae449d8ff054cb5bce629caf07e7f23aedea463e1062ceca6431c290
-EBUILD eselect-sh-0.5.0.ebuild 963 BLAKE2B 33073b3e65e83da7b317ea07efb117f27db49e0bf9c246dcc2d951b604806be60747c829f09f3f861ecff242c60c2bbd18298b3e2791c20ab207c91832d9f7c6 SHA512 a8f61370c2736c85198360f85ea045d8c7d66d0cdfbedd467f55ce5d11a68082e689b53bd34c50e12b19ed48c92e6167a439026b9302551d7a48a6e67ad1b7a9
-MISC metadata.xml 272 BLAKE2B 583272860b0b9615e8d57fed7ced1a93035bf0c25285d230412ac7af2e48a8156c2e9d9c0581da80f913a2748eb76579b64648fd1e22ce0bc89da66aafa30809 SHA512 19c90c888b76564e32674364a753ba2d6a0b9ce6f3a97f45bb876c32f83c8206e6ec318e0960747b2003a4c3a426994f25c6b83da8b294d575f45e80c6105d89
diff --git a/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild b/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild
deleted file mode 100644
index 8d11908d4feb..000000000000
--- a/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Manages the /bin/sh (POSIX shell) symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-eselect/eselect-lib-bin-symlink"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}"/sh.eselect-${PV} sh.eselect
-}
diff --git a/app-eselect/eselect-sh/eselect-sh-0.5.0.ebuild b/app-eselect/eselect-sh/eselect-sh-0.5.0.ebuild
deleted file mode 100644
index 6a89133477cf..000000000000
--- a/app-eselect/eselect-sh/eselect-sh-0.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Manages the /bin/sh (POSIX shell) symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="app-eselect/eselect-lib-bin-symlink"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins - sh.eselect <<-EOF
-		# Copyright 1999-2022 Gentoo Authors
-		# Distributed under the terms of the GNU General Public License v2
-
-		DESCRIPTION="Manage /bin/sh (POSIX shell) implementations"
-		MAINTAINER="mgorny@gentoo.org"
-		VERSION="${PV}"
-
-		SYMLINK_PATH=/bin/sh
-		SYMLINK_TARGETS=( bash dash lksh mksh )
-		SYMLINK_DESCRIPTION='POSIX shell'
-		SYMLINK_CRUCIAL=1
-
-		inherit bin-symlink
-	EOF
-}
diff --git a/app-eselect/eselect-sh/files/sh.eselect-0.4.1 b/app-eselect/eselect-sh/files/sh.eselect-0.4.1
deleted file mode 100644
index 286c321816d9..000000000000
--- a/app-eselect/eselect-sh/files/sh.eselect-0.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage /bin/sh (POSIX shell) implementations"
-MAINTAINER="mgorny@gentoo.org"
-VERSION="0.4.1"
-
-SYMLINK_PATH=/bin/sh
-SYMLINK_TARGETS=( bash dash mksh )
-SYMLINK_DESCRIPTION='POSIX shell'
-SYMLINK_CRUCIAL=1
-
-inherit bin-symlink
diff --git a/app-eselect/eselect-sh/metadata.xml b/app-eselect/eselect-sh/metadata.xml
deleted file mode 100644
index 996eb9fa78a2..000000000000
--- a/app-eselect/eselect-sh/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 6a10ebb762fd..822cf15825d2 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/rdfind/Manifest b/app-misc/rdfind/Manifest
index d7ee2464c61f..52374c0e97c7 100644
--- a/app-misc/rdfind/Manifest
+++ b/app-misc/rdfind/Manifest
@@ -1,4 +1,7 @@
+AUX rdfind-1.5.0-configure-nettle.patch 877 BLAKE2B 805bd6ac55fefad6de8b6ab772da22d099ed60224c69965dd18b9bdf5cd460db23fb9aa11ccc45c3e944b0ea1a2356ae65915e14d028fbaa5db596d9c9de9119 SHA512 f88567af4df32470ed2b1e2d310d047e8945984204a1d075309610d5a60e4c45e055843a663b85f5d56b688aec10796fa0d24fb1cc9168e54264eadbe7ebd76b
+AUX rdfind-1.5.0-gcc-13.patch 1055 BLAKE2B 2508b977bd3ad65cce435d4d987af843ecd2435d422252c1ac44353fe1ee4b4e4c0fd25b8b415d270e6f63440d0618b14548fc35d91433ce979e20d3f4415dc7 SHA512 0310cb32ea88da84b20f52162ebc6b4e87d45be9187bc2e59054c8577a35c4e2dbbf54329677e3b5c32801705ac4a0ec32a39e0474d4bcd83ae41e473170a0bd
 AUX rdfind-1.5.0_include-limits-header.patch 509 BLAKE2B 452f26f332850bcad3dbc6aa61cfcbc0c0fbde595330e12160572dd00b9bd4be3bf7f80bcf5b6eaef58adf211b1e5ad2e44c8ed46451a7d684e6b4dcce519150 SHA512 cfae0145b4b657060d465dbd841f3b5e3260cb4a63bfe4706038810b64020f4b8067fc3d5607a9c1480527378d45f4b7aa56a67178d720af318b584968ca17e6
 DIST rdfind-1.5.0.tar.gz 55200 BLAKE2B ad031acba85b6dead8ec3cfb2dfeb13bce424ee3b70dabc2b1ecaf0bcab8ae64c33ce1df22a54b430876d95ff59a58a2c3dc86d93f551ca8dc069488d3319e6d SHA512 007e54c90a74a20913ce8af6e6ecc90414c503260d88afa5a98525d43a7b6445762210c6a957beacdc99ff3dab95adb4100a2553454d177c0cfa3cbbc937f495
+EBUILD rdfind-1.5.0-r1.ebuild 794 BLAKE2B dec79cdb1aa6d588ce9b28ebd33508d545ac5a137704685a412a40737bbab46a1c98fad4d96f05796f3d6291bf384c2adf617093317478b9fc1ee0d86c0cfd61 SHA512 ca20fb4d840ece7f9a4f3f5b4e6b4df8c97307d097286fb52cc22d73eef71be9ca103ff5b644ab74a8474b1368f3725f42a666d61d5c6a506e13f2d88eed40e7
 EBUILD rdfind-1.5.0.ebuild 702 BLAKE2B a49a5d26b9ecd34a66e7fb7dd50e7999c13a684310553042755fc8c42661bd92ff0a44c075f20505ce1308e31f323cefa51b0e5d85343cd0346bbebd9de7b4e5 SHA512 51de6b38a3b72aff83b3424f59bbcbf41939847409429b6e01a7742cba765b3cc015587108ac8f8b6a40d04373711dd50996a1e15ee2b4d6aab0b9794d56aecc
 MISC metadata.xml 841 BLAKE2B 32b8bde4c5907e3c1cf8cbecf78f1c10c9fe49efc9ce5748af35815c7d5a5ab958a440c6da5d7680f52d72ab200230813f33a54503edc274cd6d588716ee153b SHA512 bd25cb0e6341ef0202ed7c9b23db2de735818c3eb31b557145a12dca62cbe7298db4e7ad13b7f3c899055b51db13264a77a9eaf378e89e5f62886237e93bd142
diff --git a/app-misc/rdfind/files/rdfind-1.5.0-configure-nettle.patch b/app-misc/rdfind/files/rdfind-1.5.0-configure-nettle.patch
new file mode 100644
index 000000000000..d95fde911a00
--- /dev/null
+++ b/app-misc/rdfind/files/rdfind-1.5.0-configure-nettle.patch
@@ -0,0 +1,23 @@
+https://github.com/pauldreik/rdfind/pull/115
+
+From 823a4deb61f6f9b91b0cfc4a7e7b20922c635777 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 1 Sep 2022 13:13:50 -0700
+Subject: [PATCH] configure: Fix check for AC_CHECK_LIB
+
+Check for nettle_pbkdf2_hmac_sha256 from libnettle instead of main()
+which is not in nettle library
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,7 +46,7 @@ AC_CHECK_HEADER(nettle/sha.h,,[AC_MSG_ERROR([
+  On Debian-ish systems, use "apt-get install nettle-dev" to get a system
+  wide nettle install.
+ ])]) 
+-AC_CHECK_LIB(nettle,main,,[AC_MSG_ERROR([
++AC_CHECK_LIB(nettle,nettle_pbkdf2_hmac_sha256,,[AC_MSG_ERROR([
+  Could not link to libnettle. Please install nettle
+  first. If you have already done so; please run ldconfig
+  as root or check whether the path libnettle was installed
+
diff --git a/app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch b/app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch
new file mode 100644
index 000000000000..1597b89d7119
--- /dev/null
+++ b/app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch
@@ -0,0 +1,35 @@
+https://github.com/pauldreik/rdfind/pull/129
+
+(drop limits bit as we already had a patch for that)
+
+From 8c317f0fd5fde95a9aae2319053a196a166aec88 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 25 Jan 2023 21:12:47 -0800
+Subject: [PATCH] include standard headers <limits> and <cstdint>
+
+gcc 13 moved some includes around and as a result <cstdint> is no longer
+transitively included [1]. Explicitly include it for uint64_t.
+
+Fixes errors like below
+
+../rdfind-1.5.0/rdfind.cc:225:30: error: 'numeric_limits' is not a member of 'std'
+  225 |     o.maximumfilesize = std::numeric_limits<decltype(o.maximumfilesize)>::max();
+      |                              ^~~~~~~~~~~~~~
+
+...
+
+| ../rdfind-1.5.0/Fileinfo.hh:70:20: error: 'std::int64_t' has not been declared
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/Fileinfo.hh
++++ b/Fileinfo.hh
+@@ -8,6 +8,7 @@
+ #define Fileinfo_hh
+ 
+ #include <array>
++#include <cstdint>
+ #include <string>
+ 
+ // os specific headers
diff --git a/app-misc/rdfind/rdfind-1.5.0-r1.ebuild b/app-misc/rdfind/rdfind-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..47ff98c85d67
--- /dev/null
+++ b/app-misc/rdfind/rdfind-1.5.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Find duplicate files based on their content"
+HOMEPAGE="https://github.com/pauldreik/rdfind"
+SRC_URI="https://github.com/pauldreik/rdfind/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-releases-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/nettle:="
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/autoconf-archive"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.0_include-limits-header.patch"
+	"${FILESDIR}/${PN}-1.5.0-configure-nettle.patch"
+	"${FILESDIR}/${PN}-1.5.0-gcc-13.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_test() {
+	# Bug 840544
+	local -x SANDBOX_PREDICT="${SANDBOX_PREDICT}"
+	addpredict /
+	default
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index c023dd29266c..ec75fda50862 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gander/Manifest b/app-portage/gander/Manifest
deleted file mode 100644
index f206dbc6f760..000000000000
--- a/app-portage/gander/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gander-0.0.1.tar.gz 8882 BLAKE2B 29c25fedabff3936e13789ae31f2e06871cfe4eb31a0eed1d36150ec219e741d25ba1603d0151d026777c81dff8461a1c051e4c02bff2488d8b9d6888ebe9618 SHA512 d72b2fd92ddd646369f8eb16d73a67e7b793aa84109231365abebec3ab2e14a8c76bae301271ec1cc82850a71bcb217a72f969086554e6c850117b5492215d57
-EBUILD gander-0.0.1-r2.ebuild 796 BLAKE2B 7e5c3078f1dc1271487a31fad7ed8fd9a741e452039c0e349851cfdb4b2151f769a25313cfd8199cfe8ffd71596d8bfdde9be097c0c6848e00dd44a38a2c6443 SHA512 9d5fc37d4dad35e1df14d2b97a1bd92db24d9f76a1fe7ab1aa58c30e3c1044bed29f26bbca9fbc8cf0c694572493e3f1c2cce55f1973c02bbe03134a71b254d8
-MISC metadata.xml 326 BLAKE2B 6a5d01a474dc60b61cc93ae42a149c97584c99ad281c437916f38b1480c69ac17aa87a506705f8879a5f28ca80b581f9eeb7a8a4de23af386858a0f9e1e09546 SHA512 2c7c6dff031808964e0d2f59c16f92c6e4adc54d8648a67397b4214adf64b02387c628efd1353fb448d711ca46bb828306458ebc9373f515e481cb516c1444ee
diff --git a/app-portage/gander/gander-0.0.1-r2.ebuild b/app-portage/gander/gander-0.0.1-r2.ebuild
deleted file mode 100644
index 76b5cbbe237b..000000000000
--- a/app-portage/gander/gander-0.0.1-r2.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
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Statistic submission client for Goose (anser.gentoo.org)"
-HOMEPAGE="https://github.com/projg2/gander/"
-SRC_URI="https://github.com/projg2/gander/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-apps/portage[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? ( dev-python/responses[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Portage exports random configuration options *overriding* its own
-	# behavior into the build environment.
-	env -u PORTAGE_REPOSITORIES pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/app-portage/gander/metadata.xml b/app-portage/gander/metadata.xml
deleted file mode 100644
index b4083e29dfcf..000000000000
--- a/app-portage/gander/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">projg2/gander</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index f5e146643406..f8f1e0153b6f 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index ef8dc94e73e5..daa5a1b55686 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -2,5 +2,5 @@ AUX dash-0.5.11.3-check_nflag_in_evaltree.patch 1195 BLAKE2B 9624038cf627e68f651
 DIST dash-0.5.11.5.tar.gz 240681 BLAKE2B 71c5e0acc127a01c75233b6d0a563979e5d856f16e3d108a68eb54d0b4b00f527f382e3e6aa963f9cff71bfaea2f524ba204ed04b7d006bd781784b2351e38c4 SHA512 5387e213820eeb44d812bb4697543023fd4662b51a9ffd52a702810fed8b28d23fbe35a7f371e6686107de9f81902eff109458964b4622f4c5412d60190a66bf
 DIST dash-0.5.12.tar.gz 246054 BLAKE2B f4c5e7088d7b591e0890a0e1363ef4f70074f4033ae34d3f82d71379cee78876e1e89b5d8e4afa3ce9380f8d94c3e8970c480a21257f87706112dd883667893e SHA512 13bd262be0089260cbd13530a9cf34690c0abeb2f1920eb5e61be7951b716f9f335b86279d425dbfae56cbd49231a8fdffdff70601a5177da3d543be6fc5eb17
 EBUILD dash-0.5.11.5.ebuild 1821 BLAKE2B 2cb09b41813022e3ea6efeb956f55cd55b25cd6b956048e4a70ce18882ab2f250b2e8ddbba66afd43c45b394cacf6b426c7b18b93c011a46cc63df72a9049094 SHA512 83c7d9d0e982e86913f3fce7c3ba0114a4c53b1b56fa0775583cc082236100c8474279d3a0779312d28205c8915812d440ec3c21c995bb545cd5bdfc46ec498d
-EBUILD dash-0.5.12.ebuild 1757 BLAKE2B 86517115ddef8f4b26c1cf9f92444945e96dafc63d5844ca847a1436a424e560938e0e882a85e77a92c8ea99ad480f38f3855c92c31686da5a9654028bed2da8 SHA512 a81503f55bde1f7e1aa5d0bf41fa64b4c9616be6e8743bd4462e87bc06c379b2d3870c570e50a4dbb29816b1634a1e5843200f462f5162187140b159bb327925
+EBUILD dash-0.5.12.ebuild 1756 BLAKE2B 61f307fd5900cb4192f0715c2853be9f78845783512de4e1e44b3422e345289b203dd3b26d34abe5e44510c833206047017d2d88dfccc90f0d29a3713f9c1bdb SHA512 c1b71d692a2c164e52aa8fc210e40b20a1dda7b46045031461d8bbf6098751cc7322b61597c5575f108f93c787d8e582c10357d1f8c9714395b8d940bd1b3e8d
 MISC metadata.xml 491 BLAKE2B 3d08132186e59ebe99a373e66213bfbba27182568e7eecbf508746d0906f980e3ebfdf216435a92b5493c13d40046dae037792258386d37f3eebcaa153fb3bf3 SHA512 8b441641d69c13cc5aeb93ad447c387b85d4b1958b67673df6ac5867073e4f204e6e06e35f3b92083266539bf3a0b1ee568aa2aa502ff8b27b9e54bed18b4d84
diff --git a/app-shells/dash/dash-0.5.12.ebuild b/app-shells/dash/dash-0.5.12.ebuild
index eaa6df32d1ac..0476571e258c 100644
--- a/app-shells/dash/dash-0.5.12.ebuild
+++ b/app-shells/dash/dash-0.5.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit static"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index dee99004e372..3b68eac795dc 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -6,6 +6,6 @@ AUX zsh-5.9-musl-V09datetime-test-fix.patch 641 BLAKE2B 693f3caf1e98ba971d776f1a
 DIST zsh-5.9-doc.tar.xz 3130444 BLAKE2B 96b635b438f8a90bc1f3c15c8a287ab392ba830e975e49b7f1c09d12de44c250dcf33d1d6dc93b58693839af2e57eb5c9d4e874ca08dd82fe876cb5ca26e6508 SHA512 5cc6abcdcfb4f5ad7bc4a31364ca49dfd87ae03e0082d89cc2ba1f00570f6757266ee60894ad31b562408de91494c22f177b414b03cb78c31d92328686be9860
 DIST zsh-5.9.tar.xz 3332400 BLAKE2B 3ecd6d080ff47b78d228d9bf5c1bafd3dfc602beb681ec533ce1039041d0e93143ebd7e0e73a9aed0789e27ca42d58a55f3b6e2c7d89113ab3ee99112dec46d1 SHA512 d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e
 EBUILD zsh-5.9-r1.ebuild 6477 BLAKE2B e5056ec62f5aa5a9ee2e53f02e68cd91a6080dbca1d8a96bc52b7f3dc18f5e9804017390c443d74324b898a19a57671022efef5f3234f96e0fec81ae6f3979f7 SHA512 d62f608777b9831da8d227eecd822b6510d2d67f3970e95fc428245e9668e1bf8787e4cd385b7ab45d3add9a36d3b21d1cd8f98404dc204898a6f6dca68b428b
-EBUILD zsh-5.9-r3.ebuild 6475 BLAKE2B ba1b514a41f3c93df8ad4d0d5525141251636dc4e0152a613178387bd3bb2661227e8ea1fd8e47502ba1eee582fb910dbcacd7b2235f7b399bb1d7afd2dc4e9e SHA512 12558bd32c49193264acc589d8cb735aacdb24e61ece54172e65a4a2daa3cc0026fbea80a954c3df695380ec45070896ee3e940b88b3f842a03bf6be064576bd
+EBUILD zsh-5.9-r3.ebuild 6469 BLAKE2B 78b57cffdc83ea98315ba5e151e6e6eef36f386824f7ab534185559a3041f61cade3d598df33daf713df1259efe12fec3208d9fe92e466e071d9c44d69eef988 SHA512 350bde1dae9fad7de0f82f3f30b3ffb7a62699b5645af5eb8f0e736bf78ccfc0f340f6901ee264695577df3a01345063abab57206decdae014eb7c935dbface6
 EBUILD zsh-9999.ebuild 5898 BLAKE2B a0343e0caa2b715c1d35060f6d907e48449e6163007f7cd944a9374174e3efbcc8c0599f29af409114f291beca97635db89ad2aba07595b1c48820f3bb7c1563 SHA512 75496f76a2146eae389d8ba1f4c6aea2dcc9bb1c38a2c5ef6844d14e6272c2f26eb0daa082780bd224457e20fc76b9c1ade64bbd7832909c221a1b9266080a82
 MISC metadata.xml 659 BLAKE2B 659f50310f4925023da341663c06672715fee9853f56a4f538c54e5c5a38c6fc494a5f35cb144de7b0f2ae74402fe48eed4b1402c3fd718cde9017505f94b0d0 SHA512 fa1929d584f7c29e861f6e07e2c359400a4e725d5037837f1bcfdba1867b78c200bb583539b9e03bfc03a60d32893c75528c18a177497cfdaf88f42a190f4e7e
diff --git a/app-shells/zsh/zsh-5.9-r3.ebuild b/app-shells/zsh/zsh-5.9-r3.ebuild
index d9080fa1236c..05a149894d5e 100644
--- a/app-shells/zsh/zsh-5.9-r3.ebuild
+++ b/app-shells/zsh/zsh-5.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 		https://www.zsh.org/pub/old/${P}.tar.xz
 		mirror://sourceforge/${PN}/${P}.tar.xz
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index aed67f3aa66f..fc792e4ef4ba 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-super-smack/Manifest b/dev-db/mysql-super-smack/Manifest
deleted file mode 100644
index e3129e90bde4..000000000000
--- a/dev-db/mysql-super-smack/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX mysql-super-smack-1.2.destdir.patch 420 BLAKE2B be3b49d142a32f6ed00edbd6085d20f202f1d3061ad2e1463f2ea7be434ae1114bd9b776a03840ae9e4baff209b43a25b089a0e3863181273146e462dfcb3e7c SHA512 9319fb29af0e91bedc969a0c5f02bcac386274aa179af7ef3130b18ac9bfa36a0a422a76e50abb777323cac242283c1b680051689a6269ab7e567b5ae53a216b
-AUX mysql-super-smack-1.3-autotools.patch 6988 BLAKE2B aaf6d8cedd4a01f2f11cd80b953ea6787fa2e218ee452b009e49c1e16b05f3548072f0e65a6eed6effbcb29c65f8d576181b30e7f503242f4b0d835e79020be1 SHA512 9aa29299b945b84e6979c0c9f0184c7e0ffafdcb63ead926b05a11c3f12f6e88b1bd3157e24c6623da26bc5d5d2a5eeb20c0870286db2b4708981c9b3a27c8d3
-AUX mysql-super-smack-1.3-gen-data.patch 2265 BLAKE2B 42f85a5779968d13262ddf3b726d4522912bc29c4d81fce41fe61caeab85c7fa93be5c3497dc21a0acabc67e59446cc941deb6fb98ac2154cf7f84214b500ff6 SHA512 6a08a3ccc158e7c8e0500a8d3231d0b1fc0d0f4a41e2a5bf40426e480c6fc373b0fa7ff5c08b5d40afe559a34b97fd00412c43fe9212047f2c4d063b98ac2154
-AUX mysql-super-smack-1.3.amd64.patch 702 BLAKE2B e986f6c487d05c9de0ee3f3a397a2c63d21c05209efc48e8fa173975b88839baa6100150d0cdd6df42b7435cc8a411b5235cf92a586850ae3d57cb564a8b95a8 SHA512 5ac9c130534d5cea6caa70f6373850181ae81c68c1eb3cb9e7a774bdeeafdf822582fe9cb548b9eb1268a2b4edc516461b95238454abefcdd25677066d720da9
-AUX mysql-super-smack-1.3.gcc4.3.patch 241 BLAKE2B 5f7dae8deb353e6129cedc5a085b933928caf3731b3ad673a56366886ece5cd8b60fdc78657bc3b0925dd171fbeba7e6df24261524efbc6f40ef9b473a11cf9f SHA512 500d8e7ee919b5359b14d22a2e9d26c0ed8cd0936376cd5179be3a92f99c753dd4b3a6cdee417468721a60aa727e09763aff64ce055e43c7ccd52b4937aaff30
-DIST super-smack-1.3.tar.gz 155375 BLAKE2B aabcd6ab6c7da0e847c734bd57b7228a0c37f41aac789e63a8285b5a0fb43360101728ff6a2dc84b63cf9c0b5361770aa909382f9e2f50abdc2ea1e8407f835b SHA512 5343fa78bdf483c1019c9e25d1fdb15581342d49b863a536eb1cf8c38bde5641fdf135fe5a8ec87f74051fd9766b2f5e4f09f963afe2eb1cd7ea41edfa260920
-EBUILD mysql-super-smack-1.3-r5.ebuild 1531 BLAKE2B 6c645568599cfed9255a431ba25b643de8afbeda5e2d9526037090c2b45f7da2be4e7f21bb3f320d99f27d50ed5bf0cd554260d6d53b6c71adbd36d1f7eadb71 SHA512 48d3269345eea4d43eb93e2bb95716efa95c7185d5c7638963bd01a095234379609bee3faa0c77567db374ccf8a92982413ab38c195cd518905dee4ee60d1258
-MISC metadata.xml 323 BLAKE2B 9b0447d87c9b774dd35df6f600a65277fa0ff42abaae9abcbdf8cfef461feba9b1d333699d5a210799ee1f5408e1fe7e47faababa5ff63ebcb5833ac68349964 SHA512 d0c11eddb2bd8b7c1d8dc0b30cf6d5f9bf990e5f2846caae2960f973ca9896f5c37049ba1dd95397347fe02c4b8a1a167c88b71f19ff3ee9c27b2ff6d587aa40
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.2.destdir.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.2.destdir.patch
deleted file mode 100644
index 02399905a11e..000000000000
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.2.destdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- super-smack-1.2/Makefile.am.orig	2004-02-23 19:57:22.000000000 -0800
-+++ super-smack-1.2/Makefile.am	2004-02-23 19:57:40.000000000 -0800
-@@ -23,8 +23,8 @@
- DATADIR= @DATADIR@
- 
- install-data-local:
--	$(mkinstalldirs) $(SMACKS_DIR) $(DATADIR)
--	cp -rp $(srcdir)/smacks/* $(SMACKS_DIR)
-+	$(mkinstalldirs) $(DESTDIR)$(SMACKS_DIR) $(DESTDIR)$(DATADIR)
-+	cp -rp $(srcdir)/smacks/* $(DESTDIR)$(SMACKS_DIR)
- 
- 
- dist-hook:
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-autotools.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-autotools.patch
deleted file mode 100644
index 97e1e1aaccc6..000000000000
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-autotools.patch
+++ /dev/null
@@ -1,255 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -16,9 +16,9 @@
- 
- # Process this file with autoconf to produce a configure script.
- 
--AC_INIT()
-+AC_INIT([super-smack], [1.1])
- AM_CONFIG_HEADER(config.h)
--AM_INIT_AUTOMAKE(super-smack, 1.1)
-+AM_INIT_AUTOMAKE
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
- 
- # Checks for programs.
-@@ -31,6 +31,14 @@
- AM_PROG_LEX
- AC_PROG_YACC
- 
-+AH_TEMPLATE([HAVE_CRYPT], [Define if we have a crypt()])
-+AH_TEMPLATE([HAVE_MYSQL], [MySQL Support])
-+AH_TEMPLATE([HAVE_ORACLE], [PostgreSQL Support])
-+AH_TEMPLATE([HAVE_PGSQL], [Oracle Support])
-+AH_TEMPLATE([SMACK_DATADIR], [Sample .smack data files])
-+
-+AC_CONFIG_MACRO_DIRS([m4])
-+
- # get super-smack datadir
- AC_ARG_WITH(datadir,
- [  --with-datadir=DIR      Specify default smack datadir],
-diff -aurwN a/m4/crypt.m4 b/m4/crypt.m4
---- a/m4/crypt.m4
-+++ b/m4/crypt.m4
-@@ -0,0 +1,5 @@
-+AC_DEFUN([AC_FUNC_CRYPT], [
-+    AC_CHECK_LIB(crypt, crypt)
-+    AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT))
-+])
-+
-diff -aruwN a/m4/lex.m4 b/m4/lex.m4
---- a/m4/lex.m4
-+++ b/m4/lex.m4
-@@ -0,0 +1,6 @@
-+AC_DEFUN([AM_PROG_LEX],
-+[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
-+AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
-+AC_PROG_LEX
-+AC_DECL_YYTEXT])
-+
-diff -aurwN a/m4/libz.m4 b/m4/libz.m4
---- a/m4/libz.m4
-+++ b/m4/libz.m4
-@@ -0,0 +1,4 @@
-+AC_DEFUN([AC_LIB_Z], [
-+    AC_CHECK_LIB(z, compress)
-+])
-+
-diff -aurwN a/m4/mysql.m4 b/m4/mysql.m4
---- a/m4/mysql.m4
-+++ b/m4/mysql.m4
-@@ -0,0 +1,76 @@
-+#serial 1
-+AC_DEFUN([AC_LIB_MYSQL], [
-+    AC_ARG_WITH(mysql-lib,
-+    [  --with-mysql-lib=DIR    Look for MySQL client library in DIR],
-+    mysql_lib=$withval, mysql_lib="")
-+
-+    if test "x$want_mysql" = "xyes"
-+    then
-+        AC_MSG_CHECKING([for libmysqlclient])
-+        AC_MSG_RESULT()
-+
-+        mysql_ok=no
-+
-+        SAVE_LIBS=$LIBS
-+
-+        mysql_lib="$mysql_lib /usr/lib /usr/lib/mysql \
-+                   /usr/local/lib /usr/local/lib/mysql \
-+                   /usr/local/mysql/lib"
-+
-+        for dir in $mysql_lib; do
-+            if test "x$mysql_found" != "xyes"
-+            then
-+                if test -f "$dir/libmysqlclient.so" ;
-+                then
-+                    LIBS="-L$dir $SAVE_LIBS $LIBZ_LIB"
-+                    MYSQL_LIB="-L$dir -lmysqlclient $LIBZ_LIB"
-+                    AC_SUBST(MYSQL_LIB)
-+                    AC_CHECK_LIB(mysqlclient, mysql_real_connect,
-+                                 mysql_ok=yes, mysql_ok=no)
-+                fi
-+            fi
-+        done
-+
-+        if test "x$mysql_ok" != "xyes"
-+        then
-+            AC_MSG_ERROR([Could not find libmysqlclient in '$mysql_lib'])
-+        fi
-+    fi
-+])
-+
-+AC_DEFUN([AC_HEADER_MYSQL], [
-+    AC_ARG_WITH(mysql-include,
-+    [  --with-mysql-include=DIR
-+                          Look for MySQL include files in DIR],
-+    mysql_include=$withval, mysql_include="")
-+
-+    if test "x$want_mysql" = "xyes"
-+    then
-+        AC_MSG_CHECKING([for mysql.h])
-+        AC_MSG_RESULT()
-+
-+        mysql_found=no
-+
-+        mysql_include="$mysql_include /usr/include /usr/include/mysql \
-+                       /usr/local/include /usr/local/include/mysql \
-+                       /usr/local/mysql/include"
-+
-+        for dir in $mysql_include; do
-+            if test "x$mysql_found" != "xyes"
-+            then
-+                if test -f "$dir/mysql.h"
-+                then
-+                    MYSQL_INCLUDE="-I$dir"
-+                    AC_SUBST(MYSQL_INCLUDE)
-+                    mysql_found=yes
-+                fi
-+            fi
-+        done
-+
-+        if test "x$mysql_found" != "xyes"
-+        then
-+            AC_MSG_ERROR([Could not find mysql.h in '$mysql_include'])
-+        fi
-+    fi
-+])
-+
-diff -aurwN a/m4/oracle.m4 b/m4/oracle.m4
---- a/m4/oracle.m4
-+++ b/m4/oracle.m4
-@@ -0,0 +1,10 @@
-+AC_DEFUN([AC_LIB_ORACLE], [
-+    ORACLE_LIB=""
-+    AC_SUBST(ORACLE_LIB)
-+])
-+
-+AC_DEFUN([AC_HEADER_ORACLE], [
-+    ORACLE_INCLUDE=""
-+    AC_SUBST(ORACLE_INCLUDE)
-+])
-+
-diff -aurwN a/m4/postgresql.m4 b/m4/postgresql.m4
---- a/m4/postgresql.m4
-+++ b/m4/postgresql.m4
-@@ -0,0 +1,75 @@
-+AC_DEFUN([AC_LIB_PGSQL], [
-+    AC_ARG_WITH(pgsql-lib,
-+    [  --with-pgsql-lib=DIR    Look for PostgreSQL client library in DIR],
-+    pgsql_lib=$withval, pgsql_lib="")
-+
-+    if test "x$want_pgsql" = "xyes"
-+    then
-+        AC_MSG_CHECKING([for libpq])
-+        AC_MSG_RESULT()
-+
-+        pgsql_ok=no
-+
-+        SAVE_LIBS=$LIBS
-+
-+        pgsql_lib="$pgsql_lib /usr/lib /usr/lib/pgsql \
-+                   /usr/local/lib /usr/local/lib/pgsql \
-+                   /usr/local/pgsql/lib"
-+
-+        for dir in $pgsql_lib; do
-+            if test "x$pgsql_found" != "xyes"
-+            then
-+                if test -f "$dir/libpq.so"
-+                then
-+                    LIBS="-L$dir $SAVE_LIBS"
-+                    PGSQL_LIB="-L$dir -lpq"
-+                    AC_SUBST(PGSQL_LIB)
-+                    AC_CHECK_LIB(pq, PQconnectdb,
-+                                 pgsql_ok=yes, pgsql_ok=no)
-+                fi
-+            fi
-+        done
-+
-+        if test "x$pgsql_ok" != "xyes"
-+        then
-+            AC_MSG_ERROR([Could not find libpq in '$pgsql_lib'])
-+        fi
-+    fi
-+])
-+
-+AC_DEFUN([AC_HEADER_PGSQL], [
-+    AC_ARG_WITH(pgsql-include,
-+    [  --with-pgsql-include=DIR
-+                          Look for PostgreSQL include files in DIR],
-+    pgsql_include=$withval, pgsql_include="")
-+
-+    if test "x$want_pgsql" = "xyes"
-+    then
-+        AC_MSG_CHECKING([for libpq-fe.h])
-+        AC_MSG_RESULT()
-+
-+        pgsql_found=no
-+
-+        pgsql_include="$pgsql_include /usr/include /usr/include/pgsql \
-+                       /usr/local/include /usr/local/include/pgsql \
-+                       /usr/local/pgsql/include"
-+
-+        for dir in $pgsql_include; do
-+            if test "x$pgsql_found" != "xyes"
-+            then
-+                if test -f "$dir/libpq-fe.h"
-+                then
-+                    PGSQL_INCLUDE="-I$dir"
-+                    AC_SUBST(PGSQL_INCLUDE)
-+                    pgsql_found=yes
-+                fi
-+            fi
-+        done
-+
-+        if test "x$pgsql_found" != "xyes"
-+        then
-+            AC_MSG_ERROR([Could not find libpq-fe.h in '$pgsql_include'])
-+        fi
-+    fi
-+])
-+
-diff -aurwN a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -16,7 +16,8 @@
- 
- # Process this file with automake to create Makefile.in
- 
--INCLUDES = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@
-+AM_CPPFLAGS = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@
-+BUILT_SOURCES = super-smack-yacc.hh
- 
- noinst_PROGRAMS=test-dictionary test-client test_tcp_client
- bin_PROGRAMS=super-smack super-smack-gen-data
-diff -aurN a/src/super-smack-lex.ll b/src/super-smack-lex.ll
---- a/src/super-smack-lex.ll
-+++ b/src/super-smack-lex.ll
-@@ -6,7 +6,7 @@
-   #include <ctype.h>
-   #include "query.h"
-   #include "parse.h"
--  #include "super-smack-yacc.h"
-+  #include "super-smack-yacc.hh"
- 
-   static string q_str = "";
- %}
-
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-gen-data.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-gen-data.patch
deleted file mode 100644
index 37abfe35ec97..000000000000
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-gen-data.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nuar super-smack-1.3.orig/smacks/select-key.smack super-smack-1.3/smacks/select-key.smack
---- super-smack-1.3.orig/smacks/select-key.smack	2005-05-30 03:04:38.000000000 -0700
-+++ super-smack-1.3/smacks/select-key.smack	2008-11-13 22:27:48.125627179 -0800
-@@ -24,7 +24,7 @@
-   min_rows "90000"; // the table must have at least that many rows
-   data_file "words.dat"; // if the table is empty, load the data from
- //this file
--  gen_data_file "gen-data -n 90000 -f %12-12s%n,%25-25s,%n,%d";
-+  gen_data_file "super-smack-gen-data -n 90000 -f %12-12s%n,%25-25s,%n,%d";
- // if the file above does not exist, generate it with the above shell command
- // you can replace this command with anything that prints comma-delimited
- // data to stdout, just make sure you have the right number of columns
-diff -Nuar super-smack-1.3.orig/smacks/update-select.smack super-smack-1.3/smacks/update-select.smack
---- super-smack-1.3.orig/smacks/update-select.smack	2005-05-30 03:04:51.000000000 -0700
-+++ super-smack-1.3/smacks/update-select.smack	2008-11-13 22:27:45.070167829 -0800
-@@ -24,7 +24,7 @@
-   min_rows "90000"; // the table must have at least that many rows
-   data_file "words.dat"; // if the table is empty, load the data from
- //this file
--  gen_data_file "gen-data -n 90000 -f %12-12s%n,%25-25s,%n,%d";
-+  gen_data_file "super-smack-gen-data -n 90000 -f %12-12s%n,%25-25s,%n,%d";
- // if the file above does not exist, generate it with the above command
- }
- 
-diff -Nuar super-smack-1.3.orig/src/Makefile.am super-smack-1.3/src/Makefile.am
---- super-smack-1.3.orig/src/Makefile.am	2001-02-24 03:44:30.000000000 -0800
-+++ super-smack-1.3/src/Makefile.am	2008-11-13 22:27:37.693573246 -0800
-@@ -19,7 +19,7 @@
- INCLUDES = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@
- 
- noinst_PROGRAMS=test-dictionary test-client test_tcp_client
--bin_PROGRAMS=super-smack gen-data
-+bin_PROGRAMS=super-smack super-smack-gen-data
- test_dictionary_SOURCES=test-dictionary.cc \
- 	dictionary.cc dictionary.h \
- 	die.cc die.h \
-@@ -57,7 +57,7 @@
- 	tcp_client.h tcp_client.cc
- super_smack_LDADD = @MYSQL_LIB@ @PGSQL_LIB@ @ORACLE_LIB@
- 
--gen_data_SOURCES=gen-data.cc die.cc die.h
-+super_smack_gen_data_SOURCES=gen-data.cc die.cc die.h
- 
- # yacc needs to generate a y.tab.h
- YFLAGS = -d
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3.amd64.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3.amd64.patch
deleted file mode 100644
index c2c5db0c56f0..000000000000
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3.amd64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- supesmack-1.3/src/query.cc.orig	2005-04-30 14:51:29.000000000 +0100
-+++ supesmack-1.3/src/query.cc	2006-08-15 22:06:06.000000000 +0100
-@@ -197,7 +197,7 @@
-     {
-       string s((*i).first);
-       int str_len = (*i).first.length();
--      if((unsigned)p + str_len + 3 *sizeof(int)  < (unsigned)p_end )
-+      if((unsigned long)p + str_len + 3 *sizeof(int)  < (unsigned long)p_end )
-       {
-         *p++ = (char) str_len;
- 	const char* q_type_name = s.c_str();
-@@ -216,7 +216,7 @@
- 	die(0, "report buffer overflow -- too many query types");
-     }
-   
--  len = (unsigned)p - (unsigned)buf;
-+  len = (unsigned long)p - (unsigned long)buf;
-   *(buf) = num_recs;
- 
-   if(write(fd, buf, len) != len)
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3.gcc4.3.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3.gcc4.3.patch
deleted file mode 100644
index ec99b5da2217..000000000000
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3.gcc4.3.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/dictionary.h.orig	2008-10-31 19:12:51.000000000 +0100
-+++ b/src/dictionary.h	2008-10-31 19:13:12.000000000 +0100
-@@ -23,6 +23,7 @@
- 
- #include <string>
- #include <vector>
-+#include <cstring>
- #include <time.h>
- #include <stdlib.h>
diff --git a/dev-db/mysql-super-smack/metadata.xml b/dev-db/mysql-super-smack/metadata.xml
deleted file mode 100644
index 80c2abfd5594..000000000000
--- a/dev-db/mysql-super-smack/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>robbat2@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>mysql-bugs@gentoo.org</email>
-		<name>MySQL</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r5.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r5.ebuild
deleted file mode 100644
index bd76dac46b7a..000000000000
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_P="super-smack-${PV}"
-
-DESCRIPTION="Benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL"
-HOMEPAGE="http://vegan.net/tony/supersmack/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+mysql postgres"
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="
-	sys-libs/zlib:=
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:*[server] )"
-RDEPEND="
-	${DEPEND}
-	mysql? ( virtual/mysql )"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.destdir.patch
-	"${FILESDIR}"/${PN}-1.3.amd64.patch
-	"${FILESDIR}"/${PN}-1.3.gcc4.3.patch
-	"${FILESDIR}"/${PN}-1.3-gen-data.patch
-	"${FILESDIR}"/${PN}-1.3-autotools.patch
-)
-
-src_prepare() {
-	default
-	# Clean up files so eautoreconf does not pick up any
-	# deprecated autotools macros.
-	rm acinclude.m4 aclocal.m4 acconfig.h config.status config.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=gnu++98
-
-	local myeconfargs=(
-		$(usev mysql --with-mysql)
-		$(usev postgres --with-pgsql)
-		--with-datadir="${EPREFIX}"/var/tmp/super-smack
-		--with-smacks-dir="${EPREFIX}"/usr/share/super-smack
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc MANUAL TUTORIAL
-
-	keepdir /var/tmp/super-smack
-}
-
-pkg_postinst() {
-	elog "The gen-data binary is now installed as super-smack-gen-data"
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 5373334c9d5b..34fc6e874361 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index b0db33ee0b08..b0b5e8cdea0b 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,7 +1,5 @@
 AUX commons-daemon-1.3.1-Make.patch 508 BLAKE2B a7645b93b44f15b4ebb9a0864a3c467999bcb0becf006f2806f897a26435140017384fb8cf14151e3a7b969c9397c4047f47e2a35f53904a9a013d5f085ab04c SHA512 f01c485a0832aef27b1fa6b681c7f66096a0206d6e75e702e32bd6131eb1ea4d85fb363d12eb6d29c386d2af773ca0ff17f14ea7a6ebc8469e641b0760e9a82f
-DIST commons-daemon-1.3.1-src.tar.gz 287642 BLAKE2B 02e85a5534af7f804a0374789506ee25ee8313987c68153974aa938b983745ae44d579f17deb362764d1a03b04bc552115bd69ef28b4f7d3bbb06f3bb4199814 SHA512 b810ac152f8296d980a4fb3786eff9d147b234dc2377df5fe1bded0824c694c9e82a7ef50b0a63c3e6432dfc4684a3aa2ce8d583aacb740bd4664c3dfb8b8f16
 DIST commons-daemon-1.3.3-src.tar.gz 290415 BLAKE2B c9c175ba52cef25ce6d1b56c7466aa5e775ed1ac3ca7c710c3519574c35e8a66ff5846313de8da594511ad411e802b7e0b647cbfd66a50abaaa0d39574a4e103 SHA512 ec246e2c05d66408374ba56b3715b13f8f24f89af11fa00c2381dc19c188f1b6228f19351c97d5774808a804b83fdbdfb8f537d099db062c39ffd281c142ee77
 DIST commons-daemon-1.3.3-src.tar.gz.asc 873 BLAKE2B 01fc7ec60393f2077a2bbf80aacb1a03b821cb52f88d87010f26a5811e2695d08b7c01193d00c2fb1a28bb875b63a5a0a935feadf7c1f00c4799aafa32592804 SHA512 c42b36acd45665daeda06a59006f05fd9846817e4e1065ef89dfedef060216ecce0316d06400437e4fb5138cf41c2fe52790cd5da9306c64e3000a3765bad2a2
-EBUILD commons-daemon-1.3.1.ebuild 1559 BLAKE2B fc04c3bff7ab689fafc90dcc7e90b3ae34a1d4662d7ee597ce9616a5191b628c4581e69df342970ddd3fb2e9a278d2bcb23a944fda72db3e045d192ca052433d SHA512 7518da1a0efa66f76d9f601429329e690f2447f60903d0c520de07be7a366045c282bc9998d0aa5d9443352702fff5549534cbbc70339dc0729f077a49f337ec
 EBUILD commons-daemon-1.3.3.ebuild 1611 BLAKE2B e48d4e87cb120df6cd38e73f7b3d5029106d6b6b4f5de505b2b86ae0bfdf2815dcc492f0cfc8927e1bd798f5259982452ef1f743a0594b686b2cad501f7aaabc SHA512 2ee0975cd3af3b20627bd10c36fe18791045eeb01d2e433aa87052d0d51b29106d1378874960814805b194af42d6bffe0f9a1c8cd6e110a54a3fba0cc0b0c85e
 MISC metadata.xml 693 BLAKE2B 327524cf8db429b89ebf8e16745b6125fdfef850402000b1ddefa96254aa827a1fa8a2bd61af3ac219b26f0fd14f7c6d9718462f095ef1264b6119ccbc21f9be SHA512 ab8232bbc9d93e5c3f056f3230f3cf4bd095dbf8985a25094b8ba541679814d4dc10e3a211537397577f30d3d84d3335a0d512b26ca82b14a58f3994b6954810
diff --git a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
deleted file mode 100644
index baa152a4895a..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-daemon-1.2.4.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-daemon:commons-daemon:1.3.1"
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple toolchain-funcs
-
-DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
-HOMEPAGE="https://commons.apache.org/proper/commons-daemon/"
-SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-PATCHES=( "${FILESDIR}/commons-daemon-1.3.1-Make.patch" )
-DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt )
-HTML_DOCS=( PROPOSAL.html )
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="iso-8859-1"
-
-JAVA_SRC_DIR="src/main/java"
-
-# There is only org/apache/commons/daemon/SimpleDaemon.java
-# which is not even run upstream ( mvn test ).
-# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-# JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	pushd src/native/unix || die
-		./configure
-		emake AR="$(tc-getAR)"
-	popd
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-
-	dobin src/native/unix/jsvc
-}
diff --git a/dev-java/felix-framework/Manifest b/dev-java/felix-framework/Manifest
index 793c9b98ddd1..ab7b011fe635 100644
--- a/dev-java/felix-framework/Manifest
+++ b/dev-java/felix-framework/Manifest
@@ -1,3 +1,3 @@
 DIST felix-framework-7.0.5.tar.gz 505118 BLAKE2B 3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec SHA512 58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3
-EBUILD felix-framework-7.0.5.ebuild 3583 BLAKE2B 748cb21585def179ffda1c0835b3f3065d113c2fb4a2c67f89f827f6467f24935b54274077b5eb524a221a536ba04b516f96e37a5fae82f8465eb962c0dea23a SHA512 9ed2eb5fde2a3f1b1361a1a9d45e9236fb5781b4d0cae24dd72662f01aade4bd12bbb20e360180545b44f1eb4c1c9f51ff7dfb9b3c56f67d58b30af9f3dea414
+EBUILD felix-framework-7.0.5-r1.ebuild 3357 BLAKE2B bb26fb46b16d94b5f8ec006764589a0107c45ccef65987c2789c98de8c3cb899ccd28796ea96782bd6a5e8be6233d3610e40c8a4820370d41afb1ee9cbbcf4ce SHA512 bfdb2d45a56e6085cdcdaac3e2da2bd5d70c3b32dde3e09bf653c02279d0e12b675274904ddf3cf91463d5bb2e9fcda63dd1875f19036a4bb9efabef0646da92
 MISC metadata.xml 455 BLAKE2B 69e2d92cd05dd44530363b6920e0673ac8f6d87cebf7ca931d4699378062348b83391fdfeaa4dc95d470a718d363fa7e6578f949b6f8f3510317f6d63bc7c514 SHA512 585dc4c8a3fb5c6c01940c887207346065ca9c7499abdb79ab6f6554a05fe6b27734e48101cb0dab61b8e0e32417bf28e722947864bd0ea3d48296198a3f3264
diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild b/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
index df163b2381bb..11539e0d1f65 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-framework-7.0.5.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -15,6 +12,7 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Implementation of the OSGi R8 core framework specification"
 HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-framework.html"
 SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/org.apache.felix.framework-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -42,7 +40,7 @@ DEPEND="
 	dev-java/osgi-annotation:0
 	dev-java/felix-resolver:0
 	test? (
-		dev-java/asm:4
+		dev-java/asm:9
 		dev-java/easymock:2.5
 		dev-java/mockito:0
 	)
@@ -52,8 +50,6 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
-S="${WORKDIR}/org.apache.felix.framework-${PV}"
-
 JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
@@ -62,7 +58,7 @@ JAVA_TEST_GENTOO_CLASSPATH="asm-4,junit-4,easymock-2.5,mockito"
 JAVA_TEST_SRC_DIR="src/test/java"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	# 58,91 pom.xml
 	cat > src/main/java/module-info.java <<-EOF
 		$( sed -n '/<moduleInfoSource>/,/<\/moduleInfoSource/p' pom.xml \
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index 8d24fba7bf90..c8323540be76 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -3,8 +3,6 @@ DIST NotoEmoji-Regular.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2e
 DIST NotoSansSC-Regular.otf 8481960 BLAKE2B 3eee2c1e6be5e013d2ed679ccb361221e3e410150c7dc32d570382355e80e540c71be9009ece9951eea2379fb08fc05d8bcd65e941677660c55b450d660e8b03 SHA512 cbdd317d16099d24736457eef631353c7830a1a3c132b01f2cdc1e6a0c21a78e3b1fe8479b3f40179e7630a15cc23a093775bb22d521dba39376bb367d497b21
 DIST OpenSans-Regular.pfb 100962 BLAKE2B ff906c67a79df9d8deb9736f7439ba5429b72940b6a6fa49751fdea88adef70a3b57f28b2c31014da3206efe601095a8caeb98382fb36f8544afd0bec5cce355 SHA512 2787fcecc0feb1c9e6ff0d8de6193658413863e44eaab572751ca7e6c3b369c0a9731f4952cb0821f307760f0422f77c5f0d3fe7df6b054643fb39423e8d70ee
 DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc
-DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
 DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def
-EBUILD fontbox-2.0.26.ebuild 1959 BLAKE2B aec4115a79052a22fdf2c82604a75c9af57e01aaf10dc4fcb640f9959f8553f68775c25d15ff16a18a907b13765fe4f405e086c99627c72918d05a3b507221de SHA512 e09fdd42a7ef24a11a6714c11717f65e80f5329b4b9073928fbc4cf91f2bbd240ce8959f087e59dd741f8b4d0dcd7cfab8e436ad6fe6100a206f16f65a7d085b
 EBUILD fontbox-2.0.27.ebuild 1989 BLAKE2B b3835819318f95235327f4a3267e7a385b8c50d24353c480432a7bc3880bd8f49aa7f74ad5ea101780ea7f4262985bd081c054c4e26cc738cf660c1b2a5e0d97 SHA512 3e3119f4e49971f7e2c06e180167c7399d009e252c83a02094e68d18118647e73782915421fb32e113bf1f2b75abab40f897d27c5212c5898ca6ed26e9779abe
 MISC metadata.xml 571 BLAKE2B 1ffa3f19fb3e5035c5a73503ce6abbeb02de7ea42fb74e21eecb30aa3827085802644b797f197f35d9001d86ec969b0cc6cbdaa634ab0d003fa65bd03c3d09ab SHA512 e1b958bb3eff6c3428581dd3851b8857048e81df192b87ad91fc61d3074a4ebf88dfecf6310ac96a3da6ba6b96d476ef1e258781e36b8f0c5cbf3110d5608f8e
diff --git a/dev-java/fontbox/fontbox-2.0.26.ebuild b/dev-java/fontbox/fontbox-2.0.26.ebuild
deleted file mode 100644
index 693dc662a08d..000000000000
--- a/dev-java/fontbox/fontbox-2.0.26.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild fontbox-2.0.26.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:fontbox:2.0.26"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
-	test? (
-		https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf
-		https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf
-		https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf
-		https://issues.apache.org/jira/secure/attachment/13036376/NotoSansSC-Regular.otf
-		http://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pdfbox-${PV}/${PN}/pom.xml
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CP_DEPEND="dev-java/commons-logging:0"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/pdfbox-${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_test() {
-	mkdir --parents target/{pdfs,fonts} || die
-	cp \
-		"${DISTDIR}"/SourceSansProBold.otf \
-		"${DISTDIR}"/NotoEmoji-Regular.ttf \
-		"${DISTDIR}"/DejaVuSansMono.ttf \
-		"${DISTDIR}"/NotoSansSC-Regular.otf \
-		"target/pdfs" || die
-	cp "${DISTDIR}"/OpenSans-Regular.pfb \
-		"target/fonts" || die
-
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/jol-core/Manifest b/dev-java/jol-core/Manifest
index 55e80412dcb6..337c8a6ce181 100644
--- a/dev-java/jol-core/Manifest
+++ b/dev-java/jol-core/Manifest
@@ -1,3 +1,3 @@
 DIST jol-0.16.tar.gz 120373 BLAKE2B 06301e1802c89c76038aec2247cbb45d96cc74afa9f099500f8e5f33b919117e85744bc2b8214b6c9e765a2579a43f256eecc2ba8537e76c81aceaa8694f49dc SHA512 d9abf579d0230f2b6d0e0a33ee11c9599b4f36d945239dd8670bbd00591137c2229e5251b32dd5405fd4b08e0070af70e6b04e4ea4be0c28c4d5bc94874858de
-EBUILD jol-core-0.16.ebuild 956 BLAKE2B af95545690764c9d5478a4ecf4e29ab8455aac4ba06e0cd3867c7aa5a47188be59702530e121d90b00efa9c5c304bea2527f875d97ffe85dfd199522a228ef0f SHA512 c1154530ce7439af30ee8e5d1b8682fde69dd533b6eb191e71dafac7800186e085b383c5f205f5ac9158249e218a0af08b74c415d3d29ed9867bb2e1a4f1aac8
+EBUILD jol-core-0.16-r1.ebuild 852 BLAKE2B 1f4ff93be61472f1de0d78908677f8db2d15a1610d78c69f65196b1dac2dac387fd443e11395c4e6f2afe8d17751c3b1b0642ea58d64292459d94a423989e6d8 SHA512 6e8e1f609bcb43850a3cc9fdb8a80e376eae17c14ec4f0b3a80898adb58a3b2752919bcbe3982b7e7fc1a94fdf83fe31077a78ffe01c33fb970393a76836e356
 MISC metadata.xml 313 BLAKE2B 3925dd7555fc2d9739c092e1949399e496d7b2d40bc2219dd95a5c3bba98e398e57e64eb30414e6efe5e432582ec52b3b2926c7858da7a09ec2590f72b52948a SHA512 e7d4a307cc24ee5ff8f7d5c1c65c87bd7ff2edbc48730355f05faa50c35c7f3dcb4d4667dce909ce77d299da603503b2c30eab4e68f1293f5f4410d20bd53314
diff --git a/dev-java/jol-core/jol-core-0.16.ebuild b/dev-java/jol-core/jol-core-0.16-r1.ebuild
index a36940d2c74b..18b26a837482 100644
--- a/dev-java/jol-core/jol-core-0.16.ebuild
+++ b/dev-java/jol-core/jol-core-0.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,8 +13,8 @@ MY_PN="${PN%-core}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Java Object Layout: Core"
-HOMEPAGE="https://openjdk.java.net/projects/code-tools/jol/"
-SRC_URI="https://github.com/openjdk/jol/archive/refs/tags/${PV}.tar.gz -> jol-${PV}.tar.gz"
+HOMEPAGE="https://openjdk.org/projects/code-tools/jol/"
+SRC_URI="https://github.com/openjdk/jol/archive/${PV}.tar.gz -> jol-${PV}.tar.gz"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="0"
@@ -23,7 +23,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 DEPEND="
 	>=virtual/jdk-1.8:*
 	test? (
-		dev-java/asm:4
+		dev-java/asm:9
 	)
 "
 
@@ -34,12 +34,7 @@ RDEPEND="
 S="${WORKDIR}/${MY_P}"
 
 JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS=( "${PN}/src/main/resources" )
+JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
 
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,asm-4"
-JAVA_TEST_SRC_DIR="${PN}/src/test"
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,asm-9"
+JAVA_TEST_SRC_DIR="${PN}/src/test/java"
diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest
index 6a66af3cfaf1..0617c1cdde47 100644
--- a/dev-java/log4j-12-api/Manifest
+++ b/dev-java/log4j-12-api/Manifest
@@ -1,5 +1,3 @@
-DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 DIST apache-log4j-2.19.0-src.tar.gz 11764795 BLAKE2B 02ec7c5c825cabe9994a2f50d6761110f87a19ff46874c00d46986da7338c32148f3b6c3551c95721aaf94b71d1d5ce8bcea32462e11fa3fe0c3cbbc0cf5f887 SHA512 c72859c415e701921497bb4f02047fa022083f66b4d21b1dbae28361bd73498b2eae335b9a1ac2d7f796df734a6d54db2701ae5ebf999197597e9e2ad064c271
-EBUILD log4j-12-api-2.18.0.ebuild 3316 BLAKE2B c675a6ad27275209484176ecdf25761ced841c600121f1175cd78f8c0649899df8e8de64e40863d69853289a47f51e3296ae455cbd0014dcd7d0bec7b3029e57 SHA512 f4f0bfe344ce508b2e3ebade246bbff3122f5701949e6e0fd11557cbe531c52ba6b688eeb3103f8838a69769a499c9b279a53bad2b857c794ca8a9013b3186c8
 EBUILD log4j-12-api-2.19.0.ebuild 3518 BLAKE2B f297a7ea6f112fca913b3608be99c41482be54db3cc9b198aa0c6b19a6449aee004cf9f0f2d0a818a379f3e1ab5c084866bba76583057a4983994d3b1c4f9cad SHA512 a6ec7b0fd763713a1345e0065ae0d58218319eb8559192faa69d8e0a29d4e14030bb96b68922a48b0afe756085604889640e6195850cc1fbc079ce1beb95b9b7
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild
deleted file mode 100644
index 7bc2e52908c5..000000000000
--- a/dev-java/log4j-12-api/log4j-12-api-2.18.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom log4j-1.2-api/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-12-api-2.18.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.18.0"
-JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j 1.x Compatibility API"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# We don't have junit-vintage and junit-jupiter
-RESTRICT="test"
-
-# Common dependencies
-# POM: log4j-1.2-api/pom.xml
-# org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
-# org.apache.logging.log4j:log4j-core:2.18.0 -> >=dev-java/log4j-core-2.18.0:2
-
-CP_DEPEND="
-	~dev-java/log4j-api-${PV}:2
-	~dev-java/log4j-core-${PV}:2
-"
-
-# Compile dependencies
-# POM: log4j-1.2-api/pom.xml
-# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!!
-# POM: log4j-1.2-api/pom.xml
-# test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0
-# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!!
-# test? org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
-# test? org.apache.logging.log4j:log4j-core:2.18.0 -> >=dev-java/log4j-core-2.18.0:2
-# test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!!
-# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.4.0:4
-# test? oro:oro:2.0.8 -> >=dev-java/jakarta-oro-2.0.8:2.0
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/javax-jms-api:0
-"
-#	test? (
-#		!!!artifactId-not-found!!!
-#		!!!groupId-not-found!!!
-#		>=dev-java/commons-io-2.11.0:1
-#		>=dev-java/jackson-dataformat-xml-2.13.0:0
-#		~dev-java/log4j-api-${PV}:2
-#		~dev-java/log4j-core-${PV}:2
-#	)
-#"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*
-"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_CLASSPATH_EXTRA="javax-jms-api"
-JAVA_SRC_DIR="log4j-1.2-api/src/main/java"
-JAVA_RESOURCE_DIRS="log4j-1.2-api/src/main/resources"
-
-#JAVA_TEST_GENTOO_CLASSPATH="jackson-dataformat-xml,commons-io-1,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,jakarta-oro-2.0"
-#JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java"
-#JAVA_TEST_RESOURCE_DIRS=(
-#	"log4j-1.2-api/src/test/resources"
-#)
diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
index 0c6fd1122977..cc0d56724384 100644
--- a/dev-java/log4j-api/Manifest
+++ b/dev-java/log4j-api/Manifest
@@ -1,6 +1,4 @@
-DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 DIST apache-log4j-2.19.0-src.tar.gz 11764795 BLAKE2B 02ec7c5c825cabe9994a2f50d6761110f87a19ff46874c00d46986da7338c32148f3b6c3551c95721aaf94b71d1d5ce8bcea32462e11fa3fe0c3cbbc0cf5f887 SHA512 c72859c415e701921497bb4f02047fa022083f66b4d21b1dbae28361bd73498b2eae335b9a1ac2d7f796df734a6d54db2701ae5ebf999197597e9e2ad064c271
 DIST apache-log4j-2.19.0-src.tar.gz.asc 858 BLAKE2B 36cefcd5f016919d18a7d74121bbd913be65e32daa38cef312c167be5c4a0e722aac1c2c802f95792c7c7e8e455a755cd3c5a737b34c36ffa061c60eb6488775 SHA512 0de52ad15d593330631cd26feb4827f1dadc4858c16e33c33099efe27cddf854c5c4ed7f0cde4c6593bc74e573b6378e7f993477d02215295ec7992b81d0b338
-EBUILD log4j-api-2.18.0.ebuild 3007 BLAKE2B 5a40542111a3afd18b3814622d370bcab1fa8eb908335b9464f9f4d8545e1080aa1ef43022bb06847b4f2ed0b10b08c8151278db08ee7002a2e3528b2916a787 SHA512 1b447d0637decee4783728d4e562def111869ef0e7990e09d0c1f3547247317a1dfea3934c4024428b42fc2c6ba524af14d79188001d2fa2c64db2d62776408c
 EBUILD log4j-api-2.19.0.ebuild 3317 BLAKE2B 0a2ccf1611911f5b4af691bd913725113064c2a239ad26aecf07a67e320055b39964c54b93b6a80aa8113905811929ca0507835227c1e0dd579c34786d5d2c73 SHA512 50ffe684dcb6dd5df4464b132c7f07cda6564847aac26846230323ade55468a70bc8b0579df0cd64e65072545189a70da695904628def6a306f5ac2c677ba340
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api/log4j-api-2.18.0.ebuild b/dev-java/log4j-api/log4j-api-2.18.0.ebuild
deleted file mode 100644
index 918cc1725411..000000000000
--- a/dev-java/log4j-api/log4j-api-2.18.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.18.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-api:2.18.0"
-JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j API"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# junit-{jupiter,vintage} is not available in ::gentoo
-RESTRICT="test"
-
-# Compile dependencies
-# POM: ${PN}/pom.xml
-# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
-# POM: ${PN}/pom.xml
-# test? com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
-# test? com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!!
-# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!!
-# test? org.assertj:assertj-core:3.23.1 -> !!!suitable-mavenVersion-not-found!!!
-# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
-# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? uk.org.webcompere:system-stubs-jupiter:2.0.1 -> !!!groupId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	dev-java/osgi-core:0
-"
-#		test? (
-#			!!!groupId-not-found!!!
-#			!!!suitable-mavenVersion-not-found!!!
-#			>=dev-java/commons-lang-3.12.0:3.6
-#			>=dev-java/jackson-core-2.13.3:0
-#			>=dev-java/jackson-databind-2.13.3:0
-#		)
-#	"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_CLASSPATH_EXTRA="osgi-core"
-JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
-
-#	JAVA_TEST_GENTOO_CLASSPATH="jackson-core,jackson-databind,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
-#	JAVA_TEST_RESOURCE_DIRS=(
-#		"${PN}/src/test/resources"
-#	)
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index 56d9307caed6..eb7a385a7fd7 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,5 +1,3 @@
-DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 DIST apache-log4j-2.19.0-src.tar.gz 11764795 BLAKE2B 02ec7c5c825cabe9994a2f50d6761110f87a19ff46874c00d46986da7338c32148f3b6c3551c95721aaf94b71d1d5ce8bcea32462e11fa3fe0c3cbbc0cf5f887 SHA512 c72859c415e701921497bb4f02047fa022083f66b4d21b1dbae28361bd73498b2eae335b9a1ac2d7f796df734a6d54db2701ae5ebf999197597e9e2ad064c271
-EBUILD log4j-core-2.18.0-r1.ebuild 8527 BLAKE2B af5aac4dc73b2b44b8c81b43b99b70ebba8b2893044516cffb97adcce4a98cfd314d0ee0ff0ddbc9276cc6c05c69f0fdefb89af4bdfc962ee8888002220079c7 SHA512 6ac65512701fb4a655257a9844f995bd0cdf91bb170e7a192f772b027662806edfd548c4174628c0c69ea82083b2d0d167533de5b90e71552c04747fd34b11c1
 EBUILD log4j-core-2.19.0.ebuild 8754 BLAKE2B adf025c108c73f92e864c7b2d738fcdef3d78b85eca63845cecf14bd580ff3b4b794a7060d717e2904036a914cce2934f52f07b5072062a4ee1e9c732d6ca6f1 SHA512 95177eb4e946e4b4e26a86bb5caeb651af60c5efc6cae61931f441261ae0b5f6b84a01d50fb05fd58ea6f3d01271ac0befa65ddef7328c57a14a478c2138986b
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild b/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild
deleted file mode 100644
index cafb2b256299..000000000000
--- a/dev-java/log4j-core/log4j-core-2.18.0-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.18.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-core:2.18.0"
-# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j Implementation"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# We don't have junit-vintage and junit-jupiter
-RESTRICT="test"
-
-# Common dependencies
-# POM: ${PN}/pom.xml
-# com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0
-# com.fasterxml.jackson.core:jackson-core:2.13.3 -> >=dev-java/jackson-core-2.13.3:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.3 -> >=dev-java/jackson-databind-2.13.3:0
-# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3 -> >=dev-java/jackson-dataformat-xml-2.13.3:0
-# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3 -> >=dev-java/jackson-dataformat-yaml-2.13.3:0
-# com.fasterxml.woodstox:woodstox-core:6.2.8 -> >=dev-java/woodstox-core-6.2.8:0
-# com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0
-# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0
-# org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0
-# org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0
-# org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
-# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2
-# org.jctools:jctools-core:3.3.0 -> !!!suitable-mavenVersion-not-found!!!
-# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
-# org.zeromq:jeromq:0.5.2 -> >=dev-java/jeromq-0.5.2:0
-
-CP_DEPEND="
-	dev-java/commons-compress:0
-	dev-java/commons-csv:0
-	dev-java/conversant-disruptor:0
-	dev-java/jackson-core:0
-	dev-java/jackson-databind:0
-	dev-java/jackson-dataformat-xml:0
-	dev-java/jackson-dataformat-yaml:0
-	dev-java/jansi:2
-	dev-java/javax-mail:0
-	dev-java/jctools-core:3
-	dev-java/jeromq:0
-	dev-java/kafka-clients:0
-	dev-java/lmax-disruptor:0
-	~dev-java/log4j-api-${PV}:2
-	dev-java/slf4j-api:0
-	dev-java/woodstox-core:0
-"
-
-# Compile dependencies
-# POM: ${PN}/pom.xml
-# javax.activation:javax.activation-api:1.2.0 -> !!!groupId-not-found!!!
-# javax.jms:javax.jms-api:2.0.1 -> !!!groupId-not-found!!!
-# javax.mail:javax.mail-api:1.6.2 -> !!!groupId-not-found!!!
-# org.osgi:org.osgi.core:6.0.0 -> >=dev-java/osgi-core-8.0.0:0
-# POM: ${PN}/pom.xml
-# test? ch.qos.logback:logback-classic:1.2.11 -> >=dev-java/logback-classic-1.2.11:0
-# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
-# test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!!
-# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!!
-# test? com.h2database:h2:2.1.214 -> !!!groupId-not-found!!!
-# test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0
-# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# test? net.javacrumbs.json-unit:json-unit:2.32.0 -> !!!groupId-not-found!!!
-# test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0
-# test? org.apache.activemq:activemq-broker:5.17.1 -> !!!groupId-not-found!!!
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.apache.felix:org.apache.felix.framework:7.0.5 -> !!!groupId-not-found!!!
-# test? org.apache.logging.log4j:log4j-api:2.18.0 -> >=dev-java/log4j-api-2.18.0:2
-# test? org.apache.maven:maven-core:3.8.5 -> !!!groupId-not-found!!!
-# test? org.awaitility:awaitility:4.2.0 -> !!!groupId-not-found!!!
-# test? org.codehaus.groovy:groovy-dateutil:3.0.10 -> !!!groupId-not-found!!!
-# test? org.codehaus.groovy:groovy-jsr223:3.0.10 -> !!!groupId-not-found!!!
-# test? org.codehaus.plexus:plexus-utils:3.4.2 -> !!!groupId-not-found!!!
-# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
-# test? org.hamcrest:hamcrest:2.2 -> >=dev-java/hamcrest-2.2:0
-# test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!!
-# test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!!
-# test? org.junit-pioneer:junit-pioneer:1.6.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.platform:junit-platform-commons:1.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-core:4.4.0 -> >=dev-java/mockito-4.4.0:4
-# test? org.mockito:mockito-junit-jupiter:4.4.0 -> !!!artifactId-not-found!!!
-# test? org.slf4j:slf4j-ext:1.7.36 -> >=dev-java/slf4j-ext-1.7.36:0
-# test? org.springframework:spring-test:5.3.20 -> !!!groupId-not-found!!!
-# test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
-# test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!!
-# test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!!
-# test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!!
-
-DEPEND="${CP_DEPEND}
-	dev-java/jakarta-activation-api:1
-	dev-java/jakarta-mail-api:0
-	dev-java/javax-jms-api:0
-	dev-java/osgi-core:0
-	>=virtual/jdk-1.8:*"
-#	test? (
-#		!!!artifactId-not-found!!!
-#		!!!groupId-not-found!!!
-#		>=dev-java/bsh-2.0_beta6:0
-#		>=dev-java/commons-codec-1.15:0
-#		>=dev-java/commons-io-2.11.0:1
-#		>=dev-java/commons-lang-3.12.0:3.6
-#		>=dev-java/commons-logging-1.2:0
-#		>=dev-java/hamcrest-2.2:0
-#		>=dev-java/log4j-api-2.18.0:2
-#		>=dev-java/logback-classic-1.2.11:0
-#		>=dev-java/logback-core-1.2.11:0
-#		>=dev-java/mockito-4.4.0:4
-#		>=dev-java/slf4j-ext-1.7.36:0
-#		>=dev-java/xz-java-1.9:0
-#	)
-#"
-
-# Runtime dependencies
-# POM: ${PN}/pom.xml
-# com.sun.mail:javax.mail:1.6.2 -> !!!artifactId-not-found!!!
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_CLASSPATH_EXTRA="jakarta-activation-api-1,jakarta-mail-api,javax-jms-api,osgi-core"
-JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
-
-#JAVA_TEST_GENTOO_CLASSPATH="logback-classic,logback-core,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,hamcrest,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,mockito-4,!!!artifactId-not-found!!!,slf4j-ext,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#JAVA_TEST_SRC_DIR="${PN}/src/test/java"
-#JAVA_TEST_RESOURCE_DIRS=(
-#	"${PN}/src/test/resources"
-#)
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# Process the @Plugin annotation used on Log4j 2 built-in plugins
-	# to generate a serialized plugin listing file
-	# https://logging.apache.org/log4j/2.x/manual/plugins.html
-	local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor"
-	local classes="target/classes"
-	local classpath="${JAVA_JAR_FILENAME}:$(\
-		java-pkg_getjars --build-only --with-dependencies \
-		"${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")"
-	# Just in case java-pkg-simple.eclass changes the path in the future
-	mkdir -p "${classes}" || die "Failed to create directory for classes"
-	local sources_list_file="${T}/sources.lst"
-	find "${JAVA_SRC_DIR}" -type f -name "*.java" > "${sources_list_file}" || die
-	ejavac -d "${classes}" -cp "${classpath}" \
-		-proc:only -processor "${processor}" \
-		@"${sources_list_file}"
-	# Update the JAR to include the serialized plugin listing file
-	local jar="$(java-config -j)"
-	"${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . ||
-		die "Failed to update JAR"
-}
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index 659e99f364e6..78a695b0912d 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -1,4 +1,3 @@
-AUX 2.0.24-tests-ignore.patch 669 BLAKE2B bde2c9ffc223f5b390c1574abfbc26404bf35d6ee33f795704a98fec615b89f8d8f4f81ecfcc46bb46e28c32868650c0db4d145f2fee04e0ff9d9a3ccb231b68 SHA512 dbf7497789c62a74d78af9b3865f9158711d378ca2881fcffea128f5945ec9268f980edb2dcdd2aeb80c77771b815f75412f4cf58e58315a91860f91f2989f0c
 DIST PDFBOX-1031-1.pdf 79480 BLAKE2B d0d43ddc3e66e59701634f85f6cca844d790a19f9dbdea93a2b1101d3228368ee02b31dc71520619429bd2dc559fd4e9c2447ef1a292a3ed7e01e74be1092a90 SHA512 f943df43cc2a6929caa484c79eafa44b06a5902e325139e19e1f1ebda7c5fd0c86cc221311659d68351c0ff56d921350ff61e97b9d2c425180d810842c963a5b
 DIST PDFBOX-1031-2.pdf 84803 BLAKE2B 4876cb705f855b2fb788ec7584f554bc40037ddae41d7966957d0ea70acf2b15b92b415b1aa325f6c8a8e17b6a2cd6aa4b9cd60fb036905ad4bb2b0f16921772 SHA512 8a9e836ad77c3e9e1e75476f4b46ff4b8958c099970bf57a0b4789fd37236b2bed7e1f14909fa0e3bbacf1a867c1a5c56cbe293383275c1b9c6c0396bec51085
 DIST PDFBOX-1065-1.pdf 30200 BLAKE2B 5d4da971a0b9608292c5bffe18eb18fbd46de66b0fd3cda16c438f4b24bf0f332cbb8e9b9f4c2ba308f908ae286fec748fa66f3d7ebb9552cce38049b9fddc71 SHA512 6b44f363653a9c0cba049495d0ed67659f98b2622b25d647ae556dc4a708847f6c3e4428aa5de2fa0d67f5e8ba08183abf9e8e640e474c6b00c544782e3bba3e
@@ -39,8 +38,6 @@ DIST genko_oc_shiryo1.pdf 124896 BLAKE2B c3a9921afb052ee4fe5080a1f1e66d991e3041f
 DIST ipag00303.zip 4295310 BLAKE2B b68dd7dd7a7320894d782350c4598572c31d6ef492f9572adc2aac20ca98b5c5027995c0169bf815bc1e3a64d635b0e2d4e378b749e034f2fe718bcb7901d40a SHA512 59535137c649a2f8bdbb463cd716426811a6003a65883ca6e45bb0af1d526b3889af0fba3a353e90bc8d373cd32b90a27ff9ff6916ecbccb42e922c09e9b046a
 DIST ipagp00303.zip 4295877 BLAKE2B e096303106029daaedae9befb003f70c2c7d00b858f89f5f8fffb9fc73679e63ec0dde8e0304cad2c611aa74d3cf1bfea56b9ac35e6838953d38b028654f5434 SHA512 26d0a9bfba7f5457a98b0bf45a4a6b081bca4140047a0886625691231459f8c81a6cdbe523e9abcbd45fd7caed21d78f1baf3a2cf9167320f6b79be3d697cb5b
 DIST n019003l.pfb 79155 BLAKE2B 2995cd6e35de2d49cc6d4a5f6c7461396b23e14c6403cd7aecedbd5cec904fd0c42a114c4c5f5079fd1fad306dd8ddba649a13424ec5183395fb0fc1cbe2abb9 SHA512 8eafe21ffa6f3d7d0a50e9f4e5bcdeb727e804b552d74e65b709e778c9ed4605e5aa63743be285f0bc17ad162768583fec4196e1d1146d98f8703359247f22d0
-DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
 DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def
-EBUILD pdfbox-2.0.26.ebuild 10949 BLAKE2B 49db375f1f781700a9e2df91dca92d1ddd72362380b23e864fe2be798abca98e9b8b15e148c4b968a1992252b7914fa843f11ee25b39214b97042ec81568ac11 SHA512 3e3f68c8eae5058863ba3f3e873c15bce59c5c28a542fb0486a4014fbded704eab14db04fecbcba7d10e7f61d7a061ebfc7b873880b0b45b2ec991ff0ab2c9ab
 EBUILD pdfbox-2.0.27.ebuild 11027 BLAKE2B f44e3dbc3b5b6bc65a27a53f826a1eee50f10c2df9329e0e6cff1381844cc041e81c7f06b87c1387b6933dd9c50a81b730726b178ad4234b2accf0cfd9791ed7 SHA512 9e4509481e9d39f12056f5a1ac487bfaf9b607379914d5b02971458975c2e60692d94f699d1858ef721bbff4e9a53616f9a89d5f78c6dee1c79161d57d2f58c3
 MISC metadata.xml 782 BLAKE2B 96e76863aeaf1791f4a7a44aeb49df8b5a9bf91ac0d8d69e5642128df590456a2d38c64c84e8b50c917d3361bbaeb880a1b7744b994db9eee5ca8d250d765d6a SHA512 d7d47cc9eb182780424161f2a136cdec74bbe0cf4d63f52bfc77df8ad4fadc2bb9f3bd7b1ccff667d25928b4e0bc4a979b725ce77f1dff244585713ca40f88cc
diff --git a/dev-java/pdfbox/files/2.0.24-tests-ignore.patch b/dev-java/pdfbox/files/2.0.24-tests-ignore.patch
deleted file mode 100644
index 6454aa776324..000000000000
--- a/dev-java/pdfbox/files/2.0.24-tests-ignore.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# public void testPDFBox3826() throws IOException, URISyntaxException
-# https://issues.apache.org/jira/browse/PDFBOX-3826
---- a/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java
-+++ b/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java
-@@ -44,6 +44,7 @@ import org.apache.pdfbox.text.PDFTextStripper;
- import org.junit.Assert;
- import org.junit.Before;
- import org.junit.Test;
-+import org.junit.Ignore;
- 
- /**
-  * 
-@@ -133,6 +134,7 @@ public class PDFontTest
-      * @throws IOException
-      * @throws URISyntaxException
-      */
-+    @Ignore
-     @Test
-     public void testPDFBox3826() throws IOException, URISyntaxException
-     {
diff --git a/dev-java/pdfbox/pdfbox-2.0.26.ebuild b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
deleted file mode 100644
index 13e5a7c7f68f..000000000000
--- a/dev-java/pdfbox/pdfbox-2.0.26.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild pdfbox-2.0.26.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:pdfbox:2.0.26"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library and utilities for working with PDF documents"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
-	test? (
-		https://issues.apache.org/jira/secure/attachment/12481683/1.pdf -> PDFBOX-1031-1.pdf
-		https://issues.apache.org/jira/secure/attachment/12481684/2.pdf -> PDFBOX-1031-2.pdf
-		https://issues.apache.org/jira/secure/attachment/12486525/1_testfile1.pdf -> PDFBOX-1065-1.pdf
-		https://issues.apache.org/jira/secure/attachment/12486526/2_testfile1.pdf -> PDFBOX-1065-2.pdf
-		https://issues.apache.org/jira/secure/attachment/12490774/a.pdf -> PDFBOX-1100-1.pdf
-		https://issues.apache.org/jira/secure/attachment/12490775/b.pdf -> PDFBOX-1100-2.pdf
-		https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf -> PDFBOX-3656.pdf
-		https://issues.apache.org/jira/secure/attachment/12852207/test.pdf -> PDFBOX-3682.pdf
-		https://issues.apache.org/jira/secure/attachment/12888957/079977.pdf -> PDFBOX-3940-079977.pdf
-		https://issues.apache.org/jira/secure/attachment/12867113/202097.pdf -> PDFBOX-3785-202097.pdf
-		https://issues.apache.org/jira/secure/attachment/12890031/670064.pdf -> PDFBOX-3947-670064.pdf
-		https://issues.apache.org/jira/secure/attachment/12890034/EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf -> PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf
-		https://issues.apache.org/jira/secure/attachment/12890037/MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf -> PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf
-		https://issues.apache.org/jira/secure/attachment/12890042/23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf -> PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf
-		https://issues.apache.org/jira/secure/attachment/12890047/FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf -> PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf
-		https://issues.apache.org/jira/secure/attachment/12892097/c687766d68ac766be3f02aaec5e0d713_2.pdf -> PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf
-		https://issues.apache.org/jira/secure/attachment/12893582/63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf -> PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf
-		https://issues.apache.org/jira/secure/attachment/12896905/GeneralForbearance.pdf -> PDFBOX-3999-GeneralForbearance.pdf
-		https://issues.apache.org/jira/secure/attachment/12919726/sample.pdf -> PDFBOX-4197.pdf
-		https://issues.apache.org/jira/secure/attachment/12938094/Quelldatei.pdf -> PDFBOX-4308.pdf
-		https://issues.apache.org/jira/secure/attachment/12952086/form.pdf -> PDFBOX-4408.pdf
-		https://issues.apache.org/jira/secure/attachment/12953423/000314.pdf -> PDFBOX-4418-000314.pdf
-		https://issues.apache.org/jira/secure/attachment/12953421/000671.pdf -> PDFBOX-4418-000671.pdf
-		https://issues.apache.org/jira/secure/attachment/12953866/000746.pdf -> PDFBOX-4423-000746.pdf
-		https://issues.apache.org/jira/secure/attachment/12966453/cryptfilter.pdf -> PDFBOX-4517-cryptfilter.pdf
-		https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf -> PDFBOX-4750.pdf
-		https://issues.apache.org/jira/secure/attachment/12914331/WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf -> PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf
-		https://issues.apache.org/jira/secure/attachment/12962991/NeS1078.pdf -> PDFBOX-4490.pdf
-		https://issues.apache.org/jira/secure/attachment/12784025/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf
-		https://issues.apache.org/jira/secure/attachment/12867102/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf
-		https://issues.apache.org/jira/secure/attachment/12929821/16bit.png -> PDFBOX-4184-16bit.png
-		https://issues.apache.org/jira/secure/attachment/12943502/ArrayIndexOutOfBoundsException%20COSParser -> PDFBOX-4338.pdf
-		https://issues.apache.org/jira/secure/attachment/12943503/NullPointerException%20COSParser -> PDFBOX-4339.pdf
-		https://issues.apache.org/jira/secure/attachment/12867433/genko_oc_shiryo1.pdf
-		https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip
-		https://moji.or.jp/wp-content/ipafont/IPAfont/ipagp00303.zip
-		https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb
-		https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg
-		https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg
-		https://issues.apache.org/jira/secure/attachment/13002695/13._Korona_szallo_vegzes_13.09.26.eredeti.pdf -> PDFBOX-4831.pdf
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="+tools"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-# Common dependencies
-# POM: ${P}/${PN}/pom.xml
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# org.apache.pdfbox:fontbox:2.0.24 -> >=dev-java/fontbox-2.0.24:0
-# org.bouncycastle:bcmail-jdk15on:1.64 -> >=dev-java/bcmail-1.68:0
-# org.bouncycastle:bcprov-jdk15on:1.64 -> >=dev-java/bcprov-1.68:0
-
-CP_DEPEND="
-	dev-java/bcmail:0
-	dev-java/bcprov:0
-	dev-java/commons-logging:0
-	~dev-java/fontbox-${PV}:0
-"
-
-# Compile dependencies
-# POM: ${P}/${PN}/pom.xml
-# test? com.github.jai-imageio:jai-imageio-core:1.4.0 -> >=dev-java/jai-imageio-core-1.4.0:0
-# test? com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0 -> >=dev-java/jai-imageio-jpeg2000-1.4.0:0
-# test? com.googlecode.java-diff-utils:diffutils:1.3.0 -> >=dev-java/java-diff-utils-1.3.0:0
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.pdfbox:jbig2-imageio:3.0.3 -> >=dev-java/jbig2-imageio-3.0.3:0
-# test? org.mockito:mockito-core:3.10.0 -> !!!suitble-mavenVersion-not-found!!!
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/jai-imageio-core:0
-		dev-java/jai-imageio-jpeg2000:0
-		dev-java/java-diff-utils:0
-		dev-java/jbig2-imageio:0
-		dev-java/mockito:4
-	)"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( README.md {NOTICE,RELEASE-NOTES}.txt )
-
-PATCHES=(
-	# adds @Ignore annotation to
-	# public void testPDFBox3826() throws IOException, URISyntaxException
-	# https://issues.apache.org/jira/browse/PDFBOX-3826
-	"${FILESDIR}"/2.0.24-tests-ignore.patch
-)
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH_EXTRA="pdfbox.jar:pdfbox-debugger.jar"
-JAVA_TEST_GENTOO_CLASSPATH="jai-imageio-core,jai-imageio-jpeg2000,java-diff-utils,jbig2-imageio,junit-4,mockito-4"
-
-JAVA_TEST_EXCLUDES=(
-	# excluded upstream according to
-	# https://github.com/apache/pdfbox/blob/2.0.26/pdfbox/pom.xml#L123
-	"org.apache.pdfbox.rendering.TestPDFToImage"
-
-	# Causing test failures. Upstream does not run these tests.
-	"org.apache.pdfbox.cos.TestCOSBase"
-	"org.apache.pdfbox.cos.TestCOSNumber"
-)
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	einfo "Compiling pdfbox"
-	JAVA_SRC_DIR="pdfbox/src/main/java"
-	JAVA_RESOURCE_DIRS="pdfbox/src/main/resources"
-	JAVA_JAR_FILENAME="pdfbox.jar"
-	java-pkg-simple_src_compile
-
-	if use tools; then
-		einfo "Compiling debugger"
-		JAVA_SRC_DIR="debugger/src/main/java"
-		JAVA_RESOURCE_DIRS="debugger/src/main/resources"
-		JAVA_JAR_FILENAME="pdfbox-debugger.jar"
-		java-pkg-simple_src_compile
-
-		einfo "Compiling pdfbox-tools"
-		JAVA_SRC_DIR="tools/src/main/java"
-		JAVA_RESOURCE_DIRS=""
-		JAVA_JAR_FILENAME="pdfbox-tools.jar"
-		java-pkg-simple_src_compile
-	fi
-
-	if use doc; then
-		einfo "Compiling javadocs"
-		JAVA_SRC_DIR=(
-			"${S}/pdfbox/src/main/java"
-			"${S}/debugger/src/main/java"
-		)
-		if use tools; then
-			JAVA_SRC_DIR+=( "${S}/tools/src/main/java" )
-		fi
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test() {
-	einfo "Testing pdfbox"
-	JAVA_TEST_SRC_DIR="pdfbox/src/test/java"
-	JAVA_TEST_RESOURCE_DIRS="pdfbox/src/test/resources"
-
-	# tests failed with S="${WORKDIR}/${P}"
-	find pdfbox/src/test/ -type f -exec sed -i 's:src/test/resources:pdfbox/src/test/resources:' {} + || die
-
-	mkdir --parents target/pdfs || die
-	cp \
-		"${DISTDIR}"/PDFBOX-1031-1.pdf \
-		"${DISTDIR}"/PDFBOX-1031-2.pdf \
-		"${DISTDIR}"/PDFBOX-1065-1.pdf \
-		"${DISTDIR}"/PDFBOX-1065-2.pdf \
-		"${DISTDIR}"/PDFBOX-1100-1.pdf \
-		"${DISTDIR}"/PDFBOX-1100-2.pdf \
-		"${DISTDIR}"/PDFBOX-3656.pdf \
-		"${DISTDIR}"/PDFBOX-3682.pdf \
-		"${DISTDIR}"/PDFBOX-3940-079977.pdf \
-		"${DISTDIR}"/PDFBOX-3785-202097.pdf \
-		"${DISTDIR}"/PDFBOX-3947-670064.pdf \
-		"${DISTDIR}"/PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf \
-		"${DISTDIR}"/PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf \
-		"${DISTDIR}"/PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf \
-		"${DISTDIR}"/PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf \
-		"${DISTDIR}"/PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf \
-		"${DISTDIR}"/PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf \
-		"${DISTDIR}"/PDFBOX-3999-GeneralForbearance.pdf \
-		"${DISTDIR}"/PDFBOX-4197.pdf \
-		"${DISTDIR}"/PDFBOX-4308.pdf \
-		"${DISTDIR}"/PDFBOX-4408.pdf \
-		"${DISTDIR}"/PDFBOX-4418-000314.pdf \
-		"${DISTDIR}"/PDFBOX-4418-000671.pdf \
-		"${DISTDIR}"/PDFBOX-4423-000746.pdf \
-		"${DISTDIR}"/PDFBOX-4517-cryptfilter.pdf \
-		"${DISTDIR}"/PDFBOX-4750.pdf \
-		"${DISTDIR}"/PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf \
-		"${DISTDIR}"/PDFBOX-4490.pdf \
-		"${DISTDIR}"/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf \
-		"${DISTDIR}"/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf \
-		"${DISTDIR}"/PDFBOX-4338.pdf \
-		"${DISTDIR}"/PDFBOX-4339.pdf \
-		"${DISTDIR}"/genko_oc_shiryo1.pdf \
-		"${DISTDIR}"/PDFBOX-4831.pdf \
-		"target/pdfs" || die
-
-	mkdir target/fonts || die
-	cp "${DISTDIR}"/n019003l.pfb "target/fonts" || die
-	unzip "${DISTDIR}"/ipag00303.zip -d "target/fonts" || die
-	unzip "${DISTDIR}"/ipagp00303.zip -d "target/fonts" || die
-
-	mkdir target/imgs || die
-	cp \
-		"${DISTDIR}"/PDFBOX-5196-lotus.jpg \
-		"${DISTDIR}"/PDFBOX-4184-032163.jpg \
-		"${DISTDIR}"/PDFBOX-4184-16bit.png \
-		"target/imgs" || die
-
-	java-pkg-simple_src_test
-	rm -r target/test-classes || die # avoid to run previous tests again
-
-	if use tools; then
-		einfo "Testing pdfbox-tools"
-		find tools/src/test/ -type f -exec sed -i 's:src/test/resources:tools/src/test/resources:' {} + || die
-		JAVA_TEST_SRC_DIR="tools/src/test/java"
-		JAVA_TEST_RESOURCE_DIRS="tools/src/test/resources"
-		java-pkg-simple_src_test
-	fi
-}
-
-src_install() {
-	# https://bugs.gentoo.org/789582
-	default
-
-	java-pkg_dojar "pdfbox.jar"
-	if use tools; then
-		java-pkg_dojar "pdfbox-debugger.jar"
-		java-pkg_dojar "pdfbox-tools.jar"
-		java-pkg_dolauncher ${PN} --main org.apache.pdfbox.tools.PDFBox
-	fi
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-
-	if use source; then
-		java-pkg_dosrc \
-			"${S}/pdfbox/src/main/java/*" \
-			"${S}/debugger/src/main/java/*" \
-			"${S}/tools/src/main/java/*"
-	fi
-}
diff --git a/dev-java/xmpbox/Manifest b/dev-java/xmpbox/Manifest
index e547af034822..143982a9bcdb 100644
--- a/dev-java/xmpbox/Manifest
+++ b/dev-java/xmpbox/Manifest
@@ -1,5 +1,3 @@
-DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
 DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def
-EBUILD xmpbox-2.0.26.ebuild 1707 BLAKE2B 775bfd44df6055da28f3256d411035d98de8d247199ad3c0b3e63f2a030937dde311e08bc24433c21a6aa8e6e1856b15bf302f175190f06ee60559751938d31c SHA512 600198cbc3142f6e29ceb07843016d29863c4d98de95aafd1dc72480b6c36aedd655b7002311c05d4e7a4d985373ddbf9da5dbc2a3281cc3f1b9a4f9bbcfb9f3
 EBUILD xmpbox-2.0.27.ebuild 1617 BLAKE2B 768a66165f403000c657e8c1d00e1efb1a9d967ec641558b5e56164047585e1440371ed3e7c6c4daa21c89ef9617ccb075f23c1ce421a0fa51b27fe0228195d7 SHA512 3cf69b46e86e5b6e313e97304d38443b00f1f74fa94b68b4488926eb6e0bde4a7da7032bfe316014004ce2c97c0556433439d3a71056973f0f68866e16efe0d2
 MISC metadata.xml 597 BLAKE2B af69fd45c044a79514701234978475dbd127d305667a831a88ef2ba2fc2e8fe903c77ddfa7e179466e004467da1002cc56f310628c1e69adbcfa40fbe485110b SHA512 baf1c43dc731ac2cc2f5a6e099b4334f06d352d1324e78b1cea4b3d839c55ca36cf368b6cf4f6b5bb41fb0be9c35e1c41546ff93141e7316d84ff9f94074efa9
diff --git a/dev-java/xmpbox/xmpbox-2.0.26.ebuild b/dev-java/xmpbox/xmpbox-2.0.26.ebuild
deleted file mode 100644
index 2782e6957f22..000000000000
--- a/dev-java/xmpbox/xmpbox-2.0.26.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmpbox-2.0.26.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:xmpbox:2.0.26"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open source Java tool that implements Adobe's XMP(TM) specification"
-HOMEPAGE="https://pdfbox.apache.org"
-SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CP_DEPEND="dev-java/jaxb-api:2"
-
-# Compile dependencies
-# POM: pom.xml
-# javax.xml.bind:jaxb-api:2.3.1 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/pdfbox-${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# 1) initializationError(org.apache.xmpbox.parser.PropMappingTest)
-	# org.junit.runners.model.InvalidTestClassError: Invalid test class 'org.apache.xmpbox.parser.PropMappingTest':
-	#   1. No runnable methods
-	org.apache.xmpbox.parser.PropMappingTest
-)
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 9883078330b2..4f6b4b3f3f7a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/crossguid/Manifest b/dev-libs/crossguid/Manifest
index a26b2c3227e7..bfb50b6e5286 100644
--- a/dev-libs/crossguid/Manifest
+++ b/dev-libs/crossguid/Manifest
@@ -1,3 +1,6 @@
+AUX crossguid-0.2.2_p20190529-gcc-13.patch 702 BLAKE2B 2fc8ee7f1ce45a1e32c371c0f9e58b2c29dea5060e408cef2888b1c29df0fd755ee719a697dbb63c8a256982d637f67731bb2608a3437772c1f3c02b146c1f92 SHA512 445a4bd99e739816121d6c53513e93afe4fc2fec01100ba77d501b3509aee78e9e878d43ad5a41ed6326a9e4b484eea07144c88df201f5a3df21e7563eac7adb
+DIST crossguid-0.2.2_p20190529.tar.gz 141660 BLAKE2B 0f78a8ab5a420297f666b3b8156d499a9141ec25c049d4d2bb2ba594dc585abe211a149b83c605cce4f5530207231a065d5f3a87a0c969781de8c6381afa2527 SHA512 f0a80d8e99b10473bcfdfde3d1c5fd7b766959819f0d1c0595ac84ce46db9007a5fbfde9a55aca60530c46cb7f8ef4c7e472c6191559ded92f868589c141ccaf
 DIST crossguid-0_pre20150817.tar.gz 46569 BLAKE2B 3384b6c507c4713f5ea0d6012138f3543445a42c7353e934e267b91275f7cf75720a446f5fe24f334b1022946f856a65f5c158d0036c999c761e626c1e30062a SHA512 823ca301f1d3b78a778649cd9169194d98dd33c65cadd5bfb9f86429e82049c99c17e09f093b92675981d2aac2aac25b60cbb157fad57a3e1bada826edd8ba0a
+EBUILD crossguid-0.2.2_p20190529.ebuild 1056 BLAKE2B 03bca0b8d56f33461d502074be542ad0087392193b3b9f2a77150b3bb90f23d6f7d9bfff15eaba54170c876c627a0ecbe2a6d44dcf5a3cdafb4be2316437ef7e SHA512 8c043cd35805251d928f2fa60559248ab61126a2cc6885d96ac4b55c7916035ee23c3227700868da8bbaf0949a2a8f535f6287c9b744b94e1ae86ceeab3a8ba5
 EBUILD crossguid-0_pre20150817.ebuild 1032 BLAKE2B 2d63883ba1fc235c678274273589cd16a79dcdbbfb7d6f9fb13ccc8d39de5484b1001c22e52fb0001695c957f266ad45d2761faa7a20abfa08874aeb4a91ed82 SHA512 f43ed76d3c8c891f3145b623ce752cbbfdb2c654228cd7c26b4e3831d511db5ca7dc91a68fa069a31ef98e5270ddd842d5c1de985284a341a09f43a01c925187
 MISC metadata.xml 250 BLAKE2B 3eed42090c61630ad5ee992ff42e44e7dd0ada2d5c592a17704a41227e269a92ef865f94b8b8c8a183fdb70416c72b4443a36aa32a80cd564ca607da9efecdef SHA512 9dd0ce1118a790f7fb41e03b4de0c0f8ba90fbdab93f9b92c6bd443c92b8c6a3816f257b7f0953c216fee3726c3b48628d6fdd66e26a51e50738f832ebcc98fb
diff --git a/dev-libs/crossguid/crossguid-0.2.2_p20190529.ebuild b/dev-libs/crossguid/crossguid-0.2.2_p20190529.ebuild
new file mode 100644
index 000000000000..a5fb5914d365
--- /dev/null
+++ b/dev-libs/crossguid/crossguid-0.2.2_p20190529.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo cmake
+
+MY_COMMIT="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
+
+DESCRIPTION="Lightweight cross platform C++ GUID/UUID library"
+HOMEPAGE="https://github.com/graeme-hill/crossguid"
+SRC_URI="https://github.com/graeme-hill/crossguid/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# We use libuuid from util-linux.
+DEPEND="sys-apps/util-linux"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.2_p20190529-gcc-13.patch
+)
+
+src_prepare() {
+	# https://github.com/graeme-hill/crossguid/pull/62
+	sed -i -e 's:-Werror::' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCROSSGUID_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	edo "${BUILD_DIR}"/crossguid-test
+}
+
+src_install() {
+	cmake_src_install
+
+	rm "${ED}"/usr/share/crossguid/LICENSE || die
+}
diff --git a/dev-libs/crossguid/files/crossguid-0.2.2_p20190529-gcc-13.patch b/dev-libs/crossguid/files/crossguid-0.2.2_p20190529-gcc-13.patch
new file mode 100644
index 000000000000..b18880cca2e8
--- /dev/null
+++ b/dev-libs/crossguid/files/crossguid-0.2.2_p20190529-gcc-13.patch
@@ -0,0 +1,24 @@
+https://github.com/graeme-hill/crossguid/pull/67
+
+From 1eb9bea38c320b2b588635cffceaaa2a8d434780 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 25 Jan 2023 22:09:26 -0800
+Subject: [PATCH] include missing <cstdint>
+
+gcc 13 moved some includes around and as a result <cstdint> is no longer transitively
+included [1]. Explicitly include it for uint{32,64}_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/include/crossguid/guid.hpp
++++ b/include/crossguid/guid.hpp
+@@ -29,6 +29,7 @@ THE SOFTWARE.
+ #include <jni.h>
+ #endif
+ 
++#include <cstdint>
+ #include <functional>
+ #include <iostream>
+ #include <array>
+
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index d4f645c86e17..60ee63a8f6c3 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -6,5 +6,5 @@ DIST gmp-6.2.1-arm64-darwin.patch.bz2 2520 BLAKE2B 3d4e9dbd29dc9aa81f0c9e0de4a59
 DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
 DIST gmp-man-6.2.1.pdf 827583 BLAKE2B 9aa25457a3c488e37cc7d54d825253ab749a3780919570579b319cf607001de50b212ca387b70213abcc5ab428b4525bdb9cd8ae932798a2d7928da98ce3f353 SHA512 f2d9d02e97975355ef490e921fedc94fb7687c3661eec8fa2e94a1622b6e59b17b3879eb3ec1f2df8edac100f727175144d107f4c49c602b773c43bc9e91dbcb
 EBUILD gmp-6.2.1-r2.ebuild 3151 BLAKE2B 9271870022046d8f5b9eef93d432a72125fec063bf6b953ef120dd9d1070c30ba54cc68bd2b4377fb004a41b88bc36054e92dbd8f04ef43e164c1542422edb4e SHA512 98e20537ac7584f7d21bced0067fccdec0f2ca15d6878354530051e214c097bc85a45b3f5587f9c83458209d12112dd338ba9725ccc91ea2c4caaf01ea2cf57b
-EBUILD gmp-6.2.1-r5.ebuild 5459 BLAKE2B c2b521fff9c88d1f1339fea80026183e2630f7bfc79ff89eb457ba0c01b80b5d8c98845ee4916b2ba299a919842a22f1e237b60401348dd3cc55014e57bbee04 SHA512 03063ea3fed01da01ecfe5b1e233f3293790ee9bb3f8cbc4a72e5b97832ce147b80ec09c513b97dfd5504ebbba91bb75c14dffb48f860e5944db63eae38d1b36
+EBUILD gmp-6.2.1-r5.ebuild 5457 BLAKE2B 22a4334ae8c12200a2ec2290def9fc6a8048bc3c3235f61074e2ff2c625a24aab45cf9153ceb38c593110e4cd6e7bf265ffca126f4be244bdffbc0530e79434e SHA512 aa93a78498a44c7e41e697fd4acf210023479479f2b0f01df4b7806ec47748ccc1ac1a59c611a1eee9d319c111d9f1855dc5425ef961cb1926ba8b8717aeb0fa
 MISC metadata.xml 1044 BLAKE2B b6c7a609f9b8756693ae49f80508e73483145a9f4a8e3e63f25bdeb53dec0bca9851415f097722b1d646d57ae444fe4fdb98aef83d8a7cb15068672322dd5279 SHA512 4e47e1b850637db4b9d62d3a355587679cda1f245fcd264c6399fd4c463b0efbb2ec29cb4845efdb0795ba1dfa0dbc4c2186e983c6648352c9b41d871f388580
diff --git a/dev-libs/gmp/gmp-6.2.1-r5.ebuild b/dev-libs/gmp/gmp-6.2.1-r5.ebuild
index 4512e22e2c27..6c7b9275a84a 100644
--- a/dev-libs/gmp/gmp-6.2.1-r5.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1-r5.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}"/${MY_P%a}
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +cpudetection +cxx pic static-libs"
 REQUIRED_USE="cpudetection? ( asm )"
 RESTRICT="!cpudetection? ( bindist )"
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index a259429ece79..38f5fc102c0c 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,12 +1,9 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69
-EBUILD libclc-15.0.6.ebuild 1667 BLAKE2B 496db7dddd88d6aba0a9bf96b9b874022da60073993b456316fd391b9c0ed76134fa4af3cae20df64af47884755aa68ea586fe4410d5a4eeea86b51a99566dd7 SHA512 155adf1cacc694b7a1c4d54b60ead79158796f56b5437109f7f6262c8d40d79181c2d78ec3a2028b5159973ae42da6ca85e159fb95818dfdfb6e384be7fdc25f
 EBUILD libclc-15.0.7.ebuild 1667 BLAKE2B 496db7dddd88d6aba0a9bf96b9b874022da60073993b456316fd391b9c0ed76134fa4af3cae20df64af47884755aa68ea586fe4410d5a4eeea86b51a99566dd7 SHA512 155adf1cacc694b7a1c4d54b60ead79158796f56b5437109f7f6262c8d40d79181c2d78ec3a2028b5159973ae42da6ca85e159fb95818dfdfb6e384be7fdc25f
 EBUILD libclc-16.0.0.9999.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
 EBUILD libclc-16.0.0_pre20230107.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
diff --git a/dev-libs/libclc/libclc-15.0.6.ebuild b/dev-libs/libclc/libclc-15.0.6.ebuild
deleted file mode 100644
index 6e24b29779b1..000000000000
--- a/dev-libs/libclc/libclc-15.0.6.ebuild
+++ /dev/null
@@ -1,81 +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 cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-LLVM_MAX_SLOT=15
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/clang:15
-			spirv? ( dev-util/spirv-llvm-translator:15 )
-		)
-		(
-			sys-devel/clang:14
-			spirv? ( dev-util/spirv-llvm-translator:14 )
-		)
-		(
-			sys-devel/clang:13
-			spirv? ( dev-util/spirv-llvm-translator:13 )
-		)
-	)
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-llvm_check_deps() {
-	if use spirv; then
-		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-			return 1
-	fi
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	# we do not need llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-		-DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 715bed27c205..54f732c989be 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -5,5 +5,5 @@ DIST pcre2-10.40.tar.bz2.sig 310 BLAKE2B 9609111a64b66893b12e36d1cbc77b64d6a0cc3
 DIST pcre2-10.42.tar.bz2 1799866 BLAKE2B 40aa096745548c489a00ead87a191a4d24ecd924a5b8f00401c1273176de15ccb23510882467c8e2b5c1256b97db46fba5fcdfbd9f0d61d86a29d74bb4bca7a0 SHA512 72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3
 DIST pcre2-10.42.tar.bz2.sig 310 BLAKE2B 2125d7e23f7e75847573e3caeb8d55da5d8e0df3d166bf8b638b998aebacaefb4e88df7e813d6977af2dc7d82c93b7179ad0043c4f46fc4e06d99d214b0b7fcf SHA512 22ce3c7903835b1cf835ac6cfa725badecc982f1504382e62525c88307b2e3bd8951f2221fdd3d73920843e69f714b6df99fe741069e610f1f809087512a31f7
 EBUILD libpcre2-10.40-r1.ebuild 2967 BLAKE2B 0c087143613d9e99ab1af30739b9cd8c27e1f9c574e4095cc4bf8493dcb28b0c5c9fb3e5d8c489c1a15808f1be29bb5442489c4d230a902dab67e5586f7af993 SHA512 ff546db5cbf866d3d2a15982e1b7dee4a2d00ac815cb5125911d726969482d31360895a943fb66b7ba4e79d500d00d4e47942a341a05e21f22d166a89b92bf40
-EBUILD libpcre2-10.42.ebuild 2519 BLAKE2B ac1d2b94be05e75900ada4cf0699bc337c088b0c957f73a3153d8981d07845d42c980dedd667b690ab98d8337c4d96d4242df113f2aab32040255cef59cf39ca SHA512 ba0a5b627e13952de6eb996e7b56057b48d89403c25488af841cf8aa61760ede3a3f91428fb72a2c6dde89cabfea8cc930564675121376f07c59d36edc6ae553
+EBUILD libpcre2-10.42.ebuild 2515 BLAKE2B 29c32b28adaf9832a43c1ccab2cb03b538918946b3490d2d9cb61d7cae50010c3549448cb1e44cbb22709ee448afcd6625f5947ce981256dc9911d4a09345624 SHA512 0282dab3f9e281130f412937d081f51f50baee163f174faa8c7d54db7a7115fde9c0beadfa66e9f50193c985d7e760b92236bef5bfb1354efd8cd20d84e4ab0d
 MISC metadata.xml 1087 BLAKE2B 693e7f9a4d9cac7b2aa5f24804826f79135a0475770b8ef5058b09542c3b19d30ddef438029dc0358b997ebc032ab103432b1274723c81882f1b5359455c765a SHA512 74dcb822827b8cc3e86c525ab3e2ee302d39ee00d5b4515f9fd6f4a157ae1522a2edbd08b97c2950d9370878f41eb59e414a145d6beae430dab57ea10df68460
diff --git a/dev-libs/libpcre2/libpcre2-10.42.ebuild b/dev-libs/libpcre2/libpcre2-10.42.ebuild
index c8948edf597e..a4fe2829c736 100644
--- a/dev-libs/libpcre2/libpcre2-10.42.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.42.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
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index ec7456e5b44a..29a0ab21695d 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -18,5 +18,5 @@ DIST mpfr-4.2.0.tar.xz 1477532 BLAKE2B dd88ae3a6a910ad8faeb791b49c3b1085de5d0d4c
 DIST mpfr-4.2.0.tar.xz.asc 228 BLAKE2B b281a11528a69418739b0122b4130d9cf212569f9ded8def685b31afe700ea776dd40ac0de7aa6de1bbd5d03a1dc9726ed4278cc6cccfacd1147681a6de27f70 SHA512 ce64346cce89bc38fee161a5e01c349c97c69b626547e54a522b741949cb27bba1668d123143fd03b015f9bdd692bcba08c7b85cf4d4cea9f7834383e04d4bbc
 EBUILD mpfr-4.1.0_p13-r1.ebuild 2700 BLAKE2B 46afea4da633c055ece8404cfabe6171abb568061a33445a58a961b55a3eb23ed28f08011efc001de2fdccc79c3ab34cc2d798be48928b74d2d1a302b8273cf2 SHA512 2e088ffc2e2343d8ce54b62ff625df579ea9236e31981f893c478f1e2b14e19d3bfa332d98fe9c486793a23acf76b231abf8ada2c1f4e7319bafa9ace3daf2fa
 EBUILD mpfr-4.1.1_p1.ebuild 2700 BLAKE2B d0919339898557385a9c92140166dd80c696245b529209159bc859e5d0286578d24c33eea2c721620e0ca387902c5605490766dbc1fdf4331575629307da5d31 SHA512 d494afde24458372a17c8bf92d8faf41de64d6f0ed6547563c2851f670c0203dcc8452500baf4d1f72f082d96e5f0f1f61ad1aed7d9639e4601d69c4fa172768
-EBUILD mpfr-4.2.0.ebuild 3123 BLAKE2B 65ea979e52693d4e414999c37bb07bc101558396ef2c0e50b9937e6660a9cf4503a55c63661ae07410fd8ae0895073205fdfb84fba6c3423a3ca1b39272022c0 SHA512 209572e8efe239176d25cdaf998d8b73e155c5943f9ba03d6acb2bd92cb540b93bb1ce1087bb9cee3900e0a527f1e9ffe448f3905853ab54b01e41ef9ccdd6f7
+EBUILD mpfr-4.2.0.ebuild 3118 BLAKE2B 829444b557678117abad47f22dbcf62bec3921067939f5ff68d55d1ac68a5df700f5b50f18b091a520c127261aee148167aa4952a6e29e94cc5299c7c783c802 SHA512 d1119809bf805b56c71d9f74e7bc4a6a88e5065ab817af679c448cd6004fb2b0732fe31fb39c43603c14acaf68077fa088e5ddf645b99ee7103dffa1a94781d4
 MISC metadata.xml 344 BLAKE2B b7a0bcfbcf945ce2b6d58a9a2078c823c12de5ef8261ec009612b58a833deecb7caaf864f0b55e0c46aac004c58feb7a1f88f6d78b584c2e25c403cfb1de96a0 SHA512 8b8b5ae00a4f9ba76c193c5d84f27cce973963f4db109219394efccba3a8e8bebb7f241658a0b682331e34c66ee99332f871d826abf6ec5a4ced4f3dce381fe9
diff --git a/dev-libs/mpfr/mpfr-4.2.0.ebuild b/dev-libs/mpfr/mpfr-4.2.0.ebuild
index b80366c8f91b..dad63683df51 100644
--- a/dev-libs/mpfr/mpfr-4.2.0.ebuild
+++ b/dev-libs/mpfr/mpfr-4.2.0.ebuild
@@ -40,7 +40,7 @@ LICENSE="LGPL-2.1"
 # preserve-libs.eclass usage to pkg_*inst! See e.g. the readline ebuild.
 SLOT="0/6" # libmpfr.so version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="static-libs"
 
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index c1aedc8a1a88..aef3bf6506aa 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 41b84cc3ea6f..0b6f3658b091 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,14 +1,11 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-ocaml-13.0.1.ebuild 2596 BLAKE2B ea2f01c1534a1d3bdb2f92d9593ec8476ce203c3862abb8e6fbbc3e1a9ced480fe53513da4d12e105a4ab62e8c1bce016822a3e7227357659f491eabf1118a46 SHA512 66f7fc112517469cded9b22fe844674aa16b9c6aa8360bbc034f9aa5de2c6fa945f1a2bb1d5a46f14690323bee85cd6669888ba7bbd7b64649454bf7a50f8d86
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 40fea3429bbf2e22f45598a679d9e5c6fa06343081a3a0a7c238bcbc8c3f270fea924ad57cab4f580adef66fe269eec188e6ed9f46772907063267805b7b51c7 SHA512 da649915c4804091ac68d9011a2370560f71e88952d13975a5f882e2c485d561fa0a5a43c61dd48f196534eae1e10aa6e46a9a9f6959d998ca850128c75a2615
-EBUILD llvm-ocaml-15.0.6.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
 EBUILD llvm-ocaml-15.0.7.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
 EBUILD llvm-ocaml-16.0.0.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-16.0.0_pre20230107.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.6.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.6.ebuild
deleted file mode 100644
index a4c2028823e8..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.6.ebuild
+++ /dev/null
@@ -1,115 +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 cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index f2cd0a09ed18..a7cd6a1491ec 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/phptal/Manifest b/dev-php/phptal/Manifest
deleted file mode 100644
index cf53b7b1482c..000000000000
--- a/dev-php/phptal/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST phptal-1.3.1.tar.gz 272883 BLAKE2B 4914b8bb40464f22417fd7ed7dbf88709b95b69a69a905a5152ff640dd5af6af2be7c7d67a622d78029e4075b6b19d8d1bf537a4a6ccc0c97260e5183a961ecd SHA512 74856cbeab3f8d9d552bcb7275a0180fd25e7703230c90e4343fbe9be4001118b091fabbace89efa98a8bf0344f46edf36c4ba709ed0e9b040b82204ea3b7290
-EBUILD phptal-1.3.1.ebuild 835 BLAKE2B eaeb92593eb536a5fdc4825cb6eaf8252124b83ac8d0968329954e3409bd998226faeeeb02e1ac7ac95fab3199376694a4d9de766eeec711b056b58d8548d123 SHA512 0b86a9be16fbbad1ab9f4c81299f5e601e3fce2d5d938d3f1142a344a3b5d0024177c381e34734299f2068a50a349c6c7a34eff34ebd0230ddadcec6c20374bf
-MISC metadata.xml 246 BLAKE2B b757b37f65a31ba151570156deb3f5eb41b48e8aac74482eef15d2ed6e226bc92d81273b09ab0e23c11318ca70a28d8171647efffab80822f855f85c60c6d5eb SHA512 712dba655975625f88dbe0545fbe94fecf6b4ac214031bb178aa33661e90c8c949e66e868b371832b88af741ae7b043c3c1fb246259366b2f38f66e69e543f05
diff --git a/dev-php/phptal/metadata.xml b/dev-php/phptal/metadata.xml
deleted file mode 100644
index dabe2462bc03..000000000000
--- a/dev-php/phptal/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>php-bugs@gentoo.org</email>
-    <name>PHP</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-php/phptal/phptal-1.3.1.ebuild b/dev-php/phptal/phptal-1.3.1.ebuild
deleted file mode 100644
index 852ecd7ec345..000000000000
--- a/dev-php/phptal/phptal-1.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_LIB_NAME="PHPTAL"
-
-DESCRIPTION="A templating engine for PHP5 that implements Zope Page Templates syntax"
-HOMEPAGE="https://phptal.org/"
-SRC_URI="https://github.com/${PN}/${PHP_LIB_NAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-lang/php:*"
-DEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )"
-
-S="${WORKDIR}/${PHP_LIB_NAME}-${PV}"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/php/${PN}
-	doins -r "classes/${PHP_LIB_NAME}"
-	doins classes/PHPTAL.php tools/phptal_lint.php
-
-	dodoc README.md
-}
-
-src_test() {
-	[[ -z $(locale -a |grep en_GB) ]] && ewarn "Tests require en_GB locale to complete"
-	phpunit || die
-}
diff --git a/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.8.ebuild
deleted file mode 100644
index ed97153de754..000000000000
--- a/dev-python/Levenshtein/Levenshtein-0.20.8.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
-
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
-HOMEPAGE="
-	https://pypi.org/project/Levenshtein/
-	https://github.com/maxbachmann/Levenshtein/
-"
-SRC_URI="
-	https://github.com/maxbachmann/Levenshtein/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-
-DEPEND="
-	>=dev-cpp/rapidfuzz-cpp-1.7.0
-"
-RDEPEND="
-	<dev-python/rapidfuzz-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# sterilize build flags
-	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
index 9a0cb251b057..bc20ac588157 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -1,7 +1,5 @@
-DIST Levenshtein-0.20.8.gh.tar.gz 36607 BLAKE2B 8c35c47768a21651c7922151f9a4ba24782106fee1cc2eada2b81924b3e340aa929ec8b9944a7ea9cfaf8934da49cc377849e599fedebb6187afdfd486e8b9f4 SHA512 3a248b5d1a18c8afeffaa637c831b07266dd36a094b713c18b7182a49de7df9a3b7316d00e9329e2ae49f92c601e32a61590338e30a7e4f33ffe0d76c6219061
 DIST Levenshtein-0.20.9.gh.tar.gz 36617 BLAKE2B 8e995f1c1648c81bea20844f7afc3c5dddd7dc31e5b6fc99a96930130c7f85bb32c4c4c85b319149d8511f6591ede96098038ea1b502a3e33a42ca3d21db4e2a SHA512 1d5dccd33ae8bd19b234861435212c7a57ba330a5f76a45c9e5b8ac3e401bc3d5eb3c72aea20e66bf0ebaaa6b760131dfef07fb5a2cf4d7191b595e1d962d93c
 DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
 EBUILD Levenshtein-0.12.2.ebuild 630 BLAKE2B 7f74159f1e57e0b9040b8b0a6af3c52d1c64661639b2f3ef1a569b5ad91d36a939c044ec3e4ba499158e57930285b8a81cf8a48e89b5b330966cefaffd015c4e SHA512 8ce08ce36977336487a1b870c2e474bc257f05db1b14b39cdcd56d5f0bb3cb14ab768ba6e13a79804f99578ff6dc841b7e19186b9ce6e1b529b4c7ac2a636b0a
-EBUILD Levenshtein-0.20.8.ebuild 1032 BLAKE2B 3418e5b30bb3ca69600a49347437bab509af14eb86d07178d04ff977098177efdefa242a239223aed97b60927f2bfeacc23862931a3580a31c5a019ed7f9fbf4 SHA512 ef06dd27672bcc49c2b5739933a3964b942ba1146ffe21aa0e1b0216780b9cbb7183c0736242f3a11ada7d34d6304fab72b8cb440bb1e2e0fa6ad1f17739f567
 EBUILD Levenshtein-0.20.9.ebuild 1032 BLAKE2B 3418e5b30bb3ca69600a49347437bab509af14eb86d07178d04ff977098177efdefa242a239223aed97b60927f2bfeacc23862931a3580a31c5a019ed7f9fbf4 SHA512 ef06dd27672bcc49c2b5739933a3964b942ba1146ffe21aa0e1b0216780b9cbb7183c0736242f3a11ada7d34d6304fab72b8cb440bb1e2e0fa6ad1f17739f567
 MISC metadata.xml 378 BLAKE2B 59900a9f2532c274a220466ff9bd5db4a4830b221119a95a0fdf82928b90c64b458b16c26257b69093ac08346bafbe54189bdb873bb8f119753a4f2243973eb9 SHA512 26b3ddc5d3843122a47941cb1e388e41f6a3f98e3f8d2f5108f50240b5c9005edb2b1e2df55c9046d48a8b4e07941f8ccd4fdee129f4ac948a47a6207b73c7ba
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d1399cca1740..051605909e7d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index 6852060a0e4a..4652d783f174 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -1,5 +1,7 @@
 DIST Nuitka-1.3.7.tar.gz 4029412 BLAKE2B daa123ff224d442bc5afe251cf2658945a8cf7ca2c173307da81a72cf915c7110958bb7650b9bc2d3ff98f6867530554125b37d3f1e30d5bd784f648e8da785d SHA512 afff1e77bdce22ce41ca0d9824392f2319ab7b9754d26a00f6001bab09402d8f8665a921077d4e08958e4508fb922c833e4c16d25a04da6925a84a96cee0a87c
 DIST Nuitka-1.3.8.tar.gz 4030106 BLAKE2B 5e762b2dde0d86f8dd78bee101ee3492468a628468c485d06759c2c1e6829f647e429122227425806c7063c5071968a73ce24865e957db67465726d42796070c SHA512 34f5b6e9f859ed194b5928bad3b6042fdccd9d798dfc0cbed9bcbb623a093ee700adbfd2887c1322703d69494a4ffae556c7cadb4b4b0178990867f3693bdd35
+DIST Nuitka-1.4.tar.gz 4121399 BLAKE2B 6f431ce01e5efc18cb71fffa8d4db1479adaab48f91c5943fe97d9252dd80ec6a875e0fbc480b13b38167534254a9fb589664d7d95b7e679b22e3c4ef27f5a5a SHA512 cc07b8c35e75c3d34566d335e27789900095c35bf411e284c262f7a85f54ee9922b8f2aa0a75e72e2b77559f594183ea84aeba5691e600181fc706680bb55136
 EBUILD Nuitka-1.3.7.ebuild 1191 BLAKE2B 11fe3e2a6dd185eb1a80fdc1b317d1b36d67780cc3f4c445ec882abab4285c68632ffb180a8bc676d60328736b77757f1348f28ad8b57435d037304d1b7f172a SHA512 afd8b49b1a3dcf541926d21ebf397a35c2e51b8f333ff774b89a86a6538541a330e8a142ffb88d52f3035b721bdcb9d8731dc3e9e1b5191b8cfaf0cbf26262a1
 EBUILD Nuitka-1.3.8.ebuild 1191 BLAKE2B 11fe3e2a6dd185eb1a80fdc1b317d1b36d67780cc3f4c445ec882abab4285c68632ffb180a8bc676d60328736b77757f1348f28ad8b57435d037304d1b7f172a SHA512 afd8b49b1a3dcf541926d21ebf397a35c2e51b8f333ff774b89a86a6538541a330e8a142ffb88d52f3035b721bdcb9d8731dc3e9e1b5191b8cfaf0cbf26262a1
+EBUILD Nuitka-1.4.ebuild 1191 BLAKE2B 11fe3e2a6dd185eb1a80fdc1b317d1b36d67780cc3f4c445ec882abab4285c68632ffb180a8bc676d60328736b77757f1348f28ad8b57435d037304d1b7f172a SHA512 afd8b49b1a3dcf541926d21ebf397a35c2e51b8f333ff774b89a86a6538541a330e8a142ffb88d52f3035b721bdcb9d8731dc3e9e1b5191b8cfaf0cbf26262a1
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/Nuitka/Nuitka-1.4.ebuild b/dev-python/Nuitka/Nuitka-1.4.ebuild
new file mode 100644
index 000000000000..3ad289dde538
--- /dev/null
+++ b/dev-python/Nuitka/Nuitka-1.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_10 )
+
+inherit distutils-r1 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="
+	https://www.nuitka.net/
+	https://github.com/Nuitka/Nuitka/
+	https://pypi.org/project/Nuitka/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/scons[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
deleted file mode 100644
index e0d535e1784b..000000000000
--- a/dev-python/PyContracts/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX PyContracts-1.8.14-fix-py3.10.patch 5460 BLAKE2B 4c30458b9a731788055b1a5cd21ff973800e1aa82dedd613d3ebb7e3fe92f6d5264d7ecfb8bcb2ba6c67e5cfc495e894a66ab40e3d22ec818da923daafbc353e SHA512 3c6bafd95ef86c77e05ddf7c3c54bbbcf49f7275edd7f0d8a9bcbb04d95c4070e32f4b1bb1bd251351e970caf5eb469d110a9cd10cfd78ed4ad8967c8c8caae3
-DIST PyContracts-1.8.14.tar.gz 92346 BLAKE2B 507fdfb313347d6650f21326b6b70b73f17cd702f25d06d97e5d84f84c9bf7f23cceb48d918727158d02081115344a4194e307caed59510265dacbf267774ab4 SHA512 95f8c76e35cc7549fefa069d9c354fc1d4a55dcab0f3fd322cb86aed92c7bfa75a06eabb7540ff991d590a90cdec781906b856291002a82ee5ab0072cdcf6ccd
-EBUILD PyContracts-1.8.14-r1.ebuild 1042 BLAKE2B 792ccfe4a0e74afa7daab87655105540b0f8ba6a14ca9636b460c929f2191da867e2ad47e1de5e7f8269fa6bbf7404e4f4ce1b12379e62a3514e79ef242dce9b SHA512 8287fc6fb488b56cdd925b8b74c3a4038c4eaa6f239cfc8a80ba122ba48e4a1884c7d5d171f67f795e1d103b6b3a8cf944356556bfe473c246f15ae9ad7997fc
-MISC metadata.xml 413 BLAKE2B b731255a39193db2f861e4907dd6066170892c7cf325a6efc2b82e998d46dd2aba2a9343011075ba4a08e9f6b675783dce66989b2ca1598099acdd0d875644b9 SHA512 70ffaa45a305c0883b13f579d1b4293009e5cb619197a01ab78e27a3a26e32072fe7e88b081df04d19af576c19cc88dbbe21522b4d8f3765d6b697049c6a2f06
diff --git a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
deleted file mode 100644
index d77287470a4a..000000000000
--- a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Declare constraints on function parameters and return values"
-HOMEPAGE="https://andreacensi.github.io/contracts/ https://pypi.org/project/PyContracts/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( $(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		' 'python*' )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests nose
-
-pkg_postinst() {
-	optfeature "constraints on numpy arrays" dev-python/numpy
-}
diff --git a/dev-python/PyContracts/files/PyContracts-1.8.14-fix-py3.10.patch b/dev-python/PyContracts/files/PyContracts-1.8.14-fix-py3.10.patch
deleted file mode 100644
index 754b40efabd8..000000000000
--- a/dev-python/PyContracts/files/PyContracts-1.8.14-fix-py3.10.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From d23ee2902e9e9aeffec86cbdb7a392d71be70861 Mon Sep 17 00:00:00 2001
-From: slorg1 <slorg1@gmail.com>
-Date: Tue, 16 Apr 2019 14:13:52 -0400
-Subject: [PATCH] + upgrade to use collections.abc as needed for python 3.6+
-
---- a/src/contracts/library/map.py
-+++ b/src/contracts/library/map.py
-@@ -1,7 +1,11 @@
- from ..interface import Contract, ContractNotRespected
- from ..syntax import (W, contract_expression, O, S, add_contract, add_keyword,
-     Keyword)
--import collections
-+
-+try:
-+    import collections.abc as collectionsAbc  # python 3.6+
-+except ImportError:
-+    import collections as collectionsAbc
- 
- 
- class Map(Contract):
-@@ -13,7 +17,7 @@ def __init__(self, length=None, key_c=None, value_c=None, where=None):
-         self.value_c = value_c
- 
-     def check_contract(self, context, value, silent):
--        if not isinstance(value, collections.Mapping):
-+        if not isinstance(value, collectionsAbc.Mapping):
-             error = 'Expected a Mapping, got %r.' % value.__class__.__name__
-             raise ContractNotRespected(contract=self, error=error,
-                                        value=value, context=context)
---- a/src/contracts/library/miscellaneous_aliases.py
-+++ b/src/contracts/library/miscellaneous_aliases.py
-@@ -1,12 +1,16 @@
--import collections
--
-+try:
-+    import collections.abc as collectionsAbc  # python 3.6+
-+except ImportError:
-+    import collections as collectionsAbc
- 
- 
- def ist(C):
-+
-     def f(x):
-         f.__name__ = 'isinstance_of_%s' % C.__name__
-         if not isinstance(x, C):
-             raise ValueError('Value is not an instance of %s.' % C.__name__)
-+
-     return f
- 
- 
-@@ -14,33 +18,32 @@ def m_new_contract(name, f):
-     from contracts.library.extensions import CheckCallable
-     from contracts.library.extensions import Extension
-     Extension.registrar[name] = CheckCallable(f)
--    
- 
--m_new_contract('Container', ist(collections.Container))
--# todo: Iterable(x)
--m_new_contract('Iterable', ist(collections.Iterable))
--
--m_new_contract('Hashable', ist(collections.Hashable))
- 
-+m_new_contract('Container', ist(collectionsAbc.Container))
-+# todo: Iterable(x)
-+m_new_contract('Iterable', ist(collectionsAbc.Iterable))
- 
-+m_new_contract('Hashable', ist(collectionsAbc.Hashable))
- 
--m_new_contract('Iterator', ist(collections.Iterator))
--m_new_contract('Sized', ist(collections.Sized))
--m_new_contract('Callable', ist(collections.Callable))
--m_new_contract('Sequence', ist(collections.Sequence))
--m_new_contract('Set', ist(collections.Set))
--m_new_contract('MutableSequence', ist(collections.MutableSequence))
--m_new_contract('MutableSet', ist(collections.MutableSet))
--m_new_contract('Mapping', ist(collections.Mapping))
--m_new_contract('MutableMapping', ist(collections.MutableMapping))
--#new_contract('MappingView', ist(collections.MappingView))
--#new_contract('ItemsView', ist(collections.ItemsView))
--#new_contract('ValuesView', ist(collections.ValuesView))
-+m_new_contract('Iterator', ist(collectionsAbc.Iterator))
-+m_new_contract('Sized', ist(collectionsAbc.Sized))
-+m_new_contract('Callable', ist(collectionsAbc.Callable))
-+m_new_contract('Sequence', ist(collectionsAbc.Sequence))
-+m_new_contract('Set', ist(collectionsAbc.Set))
-+m_new_contract('MutableSequence', ist(collectionsAbc.MutableSequence))
-+m_new_contract('MutableSet', ist(collectionsAbc.MutableSet))
-+m_new_contract('Mapping', ist(collectionsAbc.Mapping))
-+m_new_contract('MutableMapping', ist(collectionsAbc.MutableMapping))
-+# new_contract('MappingView', ist(collections.MappingView))
-+# new_contract('ItemsView', ist(collections.ItemsView))
-+# new_contract('ValuesView', ist(collections.ValuesView))
- 
- 
- # Not a lambda to have better messages
--def is_None(x): 
-+def is_None(x):
-     return x is None
- 
-+
- m_new_contract('None', is_None)
- m_new_contract('NoneType', is_None)
---- a/src/contracts/library/seq.py
-+++ b/src/contracts/library/seq.py
-@@ -1,7 +1,12 @@
- from ..interface import Contract, ContractNotRespected
- from ..syntax import (add_contract, W, contract_expression, O, S, add_keyword,
-     Keyword)
--import collections
-+
-+try:
-+    import collections.abc as collectionsAbc  # python 3.6+
-+except ImportError:
-+    import collections as collectionsAbc
-+
- from past.builtins import xrange
- 
- try:
-@@ -38,7 +43,7 @@ def check_contract(self, context, value, silent):
- 
-             return
- 
--        if not isinstance(value, collections.Sequence):
-+        if not isinstance(value, collectionsAbc.Sequence):
-             error = 'Expected a Sequence, got %r.' % value.__class__.__name__
-             raise ContractNotRespected(self, error, value, context)
- 
---- a/src/contracts/library/sets.py
-+++ b/src/contracts/library/sets.py
-@@ -1,7 +1,10 @@
- from ..interface import Contract, ContractNotRespected, describe_type
- from ..syntax import (Keyword, O, S, W, add_contract, add_keyword,
-     contract_expression)
--import collections
-+try:
-+    import collections.abc as collectionsAbc  # python 3.6+
-+except ImportError:
-+    import collections as collectionsAbc
- 
- 
- class ASet(Contract):
-@@ -13,7 +16,7 @@ def __init__(self, length_contract=None,
-         self.elements_contract = elements_contract
- 
-     def check_contract(self, context, value, silent):
--        if not isinstance(value, collections.Set):
-+        if not isinstance(value, collectionsAbc.Set):
-             error = 'Expected a set, got %r.' % describe_type(value)
-             raise ContractNotRespected(self, error, value, context)
- 
diff --git a/dev-python/PyContracts/metadata.xml b/dev-python/PyContracts/metadata.xml
deleted file mode 100644
index ab1d67f3e345..000000000000
--- a/dev-python/PyContracts/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">PyContracts</remote-id>
-    <remote-id type="github">AndreaCensi/contracts</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 71c016878e22..dba70cbeb2b9 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,6 +1,4 @@
-DIST PyPDF2-2.12.1.gh.tar.gz 6581775 BLAKE2B b65a8a82c1d20036705a3a7564a03bc70dfdc66a9c1b8b3e6e2473630a575a98ddf798c48f52d3fd45583220cad5f2029190be9d761aba2a23a3d8f334d3e45b SHA512 2b832d10cb9217de503a6d4ee7b137aa68f98d6c21f0a8db09d722e02c853cc1a5b6d4df78a99e7a0b9681b572b04a133458b05026978b4979cde796433437be
 DIST PyPDF2-3.0.0.gh.tar.gz 6608776 BLAKE2B 636be14b5f3912824703dbfd6137f1ea7b97f4405cb9d6d14f9b02feff6900936f8148424e75c3aa733e144bbd13602404051b2c3c6b63b92c246205b6204b8a SHA512 417a401d1dfaf96e07bf196f53cfe12af50d45d812c48d57db576e596ad8cd029c5b03f801180a12b31c34f9acbb65d5f802b428792cfdb5a18c013ec87c5e37
 DIST PyPDF2-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz 9027166 BLAKE2B 912bb9fbd632bd0ad2cc2e865a1e6870ad7064aa2cf4d6f96217f63ac685e9a511f0bb20c22d48ae970a2eb171b27a0fa680fa42892425531f69735840cf741b SHA512 07a71a3566dabcea5dc8a549949d0f0c0f9483d5d9f85851d6e4e702dd374b348469a80e5300d18983e560ee9a44d0639b55eb338023b9ebbdb26c6f8c455e07
-EBUILD PyPDF2-2.12.1.ebuild 1252 BLAKE2B 9506713d7b711e6fdc90ff0e9523553aa58d8952d55a085df5c8489571d7f3495370286654fc8e79530d0cfcee1b6798f86965f2ee82711284d6ec1ec610a6b9 SHA512 33cdbd5b3c51af75da7f07c47325c023f6bbd624ae038eceb4b2409cac12d5c9e32d23fab4c37169400797d9af64c4ad03fedfcc0c99e233a62056acc067a0f5
 EBUILD PyPDF2-3.0.0.ebuild 1277 BLAKE2B 7ec2ab3abebf6df5115313c86aff43cfc1bbe6bf94ebf346132b3785e4be3b3eae675fa542fb3d6d8bcfedf4c30749afdc081af164823363ce741157704aa66b SHA512 195f5d3d2ec29fef458c9c7b64ce43b92df5823a97aa4232efb04ca6b353c56630c0e8f468a0ae40700d8c5e73417a1f1080f57fcdd01d908452baca1f85bce0
 MISC metadata.xml 375 BLAKE2B 2493f7d2ef79342af0ef890e3683fa55255d869c684bba7224ab3afab61e77a239e323c8e63138ce4fea23c32348458cd27a0c58a3b6640854ec27b26cdb40cb SHA512 5e0d6e18e0005e4f323468b8fbfa26dc7ba33d26a94d5fda11c40f62ece84578c1f08843c9f0cf96f0d918d22063f494d486a6d692cecb5b407efaaf92aa9b8b
diff --git a/dev-python/PyPDF2/PyPDF2-2.12.1.ebuild b/dev-python/PyPDF2/PyPDF2-2.12.1.ebuild
deleted file mode 100644
index 4b506b191087..000000000000
--- a/dev-python/PyPDF2/PyPDF2-2.12.1.ebuild
+++ /dev/null
@@ -1,58 +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=0fe84b30ed33ff3daa9293e44349b8618f135699
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-RESTRICT="test"
-# 150+ tests require network, too many to deselect
-PROPERTIES="test_network"
-
-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}"/* "${P}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/PyUtilib/Manifest b/dev-python/PyUtilib/Manifest
deleted file mode 100644
index 0a55d38d9964..000000000000
--- a/dev-python/PyUtilib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX PyUtilib-6.0.0-tests.patch 510 BLAKE2B 729853aaeebbb3de8ed7a9a8e466a5df3addcbd755e9951d3745ca46a13c8a4b42844b80392c687acb586d8f4edfb04f43fe158395ad1e7f92ec1df919b93bd9 SHA512 3779c4d0c20b967275e67091500b00d7fae3c5ad655e518a50dc653eb11d17c468a46ff67bb928f1652b4cd95c81cff724f5cde875e1e5fd8667c76312c9ec3d
-DIST PyUtilib-6.0.0.tar.gz 1569916 BLAKE2B ee4085b597e928c5d6602b647f122c562f2e05dcaf300217cea9c5bc652f6acb5dbe5a075cbbbc1b81497987ab5c658f86cc3e44e16cae02a37d546b2e925a9b SHA512 7841a84ee8d66d2d7af3db810e4d787030acbd8e3e81c3f61251ea160931feddeab6f4d205977a411964359f1cb7e7e59e846593c113093e01c48b81784f7477
-EBUILD PyUtilib-6.0.0.ebuild 1131 BLAKE2B fe973305f656e21feb7c820974803d744b2c48cc01949d58c565fac503c78f6ac0ae06b8079269a23f32fe0ecc5db0577ddd27bd3a7f5d77dd0346a1081df33c SHA512 6fb3dc4f4f3b328d2ac766c6f671005b69ad4b4d64a68275ea828c6cac057ec1e04b488a6d6baacbee17bf34396ad50756c106cefb147872bd3b93afe3575342
-MISC metadata.xml 424 BLAKE2B b1f7f100094d235fc3d266bc84cf39208b5afd1fbf419fc796ed2884527a641dea52173d607e6d40f0292316695e8ead2d387cf4c427c0983ee32d8620b08f6b SHA512 be42d862d2b6af906fcd65cb073eb7daf1540cdfd41e451fc8a1766875e875e501d7deeaa3410146cd07fe78f94a9fed1d7cfbe935db47e44144844f573af154
diff --git a/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
deleted file mode 100644
index 95679756d18e..000000000000
--- a/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of Python utilities"
-HOMEPAGE="https://github.com/PyUtilib/pyutilib"
-SRC_URI="https://github.com/${PN}/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN,,}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/PyUtilib-6.0.0-tests.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${ED}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-
-	local -x PYTHONPATH="${PWD}:${TEST_DIR}/lib" \
-		COLUMNS=80
-
-	if [[ ${EPYTHON} == python3.10 ]]; then
-		# Fix for very small output change of expected output in new version
-		sed -e 's/optional arguments/options/' -i \
-			"${BUILD_DIR}/../doc/workflow/examples/"*.txt \
-			pyutilib/misc/tests/test_config.py || die
-	fi
-
-	eunittest
-}
diff --git a/dev-python/PyUtilib/files/PyUtilib-6.0.0-tests.patch b/dev-python/PyUtilib/files/PyUtilib-6.0.0-tests.patch
deleted file mode 100644
index 33dcd4605818..000000000000
--- a/dev-python/PyUtilib/files/PyUtilib-6.0.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/pyutilib/component/loader/tests/test_egg.py b/pyutilib/component/loader/tests/test_egg.py
-index c8674d0..7126e5c 100644
---- a/pyutilib/component/loader/tests/test_egg.py
-+++ b/pyutilib/component/loader/tests/test_egg.py
-@@ -23,6 +23,7 @@ except ImportError:
- 
- 
- @unittest.skipIf(not pkg_resources_avail, "Cannot import 'pkg_resources'")
-+@unittest.skipIf(sys.hexversion >= 0x03090000, "Example eggs not generated for python >= 3.9")
- class Test(pyutilib.th.TestCase):
- 
-     def test_egg1(self):
diff --git a/dev-python/PyUtilib/metadata.xml b/dev-python/PyUtilib/metadata.xml
deleted file mode 100644
index b6c9c5fcc9da..000000000000
--- a/dev-python/PyUtilib/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">PyUtilib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
deleted file mode 100644
index 73c0af9c4dda..000000000000
--- a/dev-python/blessings/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST blessings-1.7.tar.gz 22844 BLAKE2B 3694d3e421416bf876265fd0877240b2e0d61e8c58dfa63a6e74dd2f5efd2307cc4a0eef0e825adc0c0f37f6e78e15640362f9477c0dc5c89846416e16f180a9 SHA512 9b1e3eded3fa588c48898d88ba466836be8f25264ce908a2289504e8f13b01315ae1686ee34c0e3a44cdd2bf73da8c1b65e0aaf49ffc0e5b29c412a497c3d76e
-EBUILD blessings-1.7-r1.ebuild 872 BLAKE2B 94d5246635c75bac77858983bff697f2e8505a4f37a631fc2feb4fcd0e833035ecd3b5688cf29acd4725b209e2c42959370faf3d47c86a872730a3cccd2e4cfe SHA512 b0cd95153720e16753845ebad7af38e4c0b2e0f14869ff3ad992a2cbb66f72bcabe758290bdc344d66ae5980f18030fb7bce29e6b64f3b41c3bce6a1967bc42b
-MISC metadata.xml 451 BLAKE2B 448082939a1f02b3c481b4877c1a0caf5b5545e5e8220a5232af612ad45ec605d0f251f2d66d3d44219d7af1da139e95852cdf19de2859dcdaa4461ff729d5aa SHA512 2e17e0eb21c10236ada1a3e55ebfab2a20f1029ad89aacadc2dfaa0b2d4d5d879a14517b8d9a406c45f802dee3df925a2b18f6846e1c3c05616daf6a00feb82a
diff --git a/dev-python/blessings/blessings-1.7-r1.ebuild b/dev-python/blessings/blessings-1.7-r1.ebuild
deleted file mode 100644
index 0e1b1cbc68e7..000000000000
--- a/dev-python/blessings/blessings-1.7-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
-HOMEPAGE="https://github.com/erikrose/blessings https://pypi.org/project/blessings/"
-# https://github.com/erikrose/blessings/pull/136
-SRC_URI="https://github.com/erikrose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
-
-python_test() {
-	# The tests need an interactive terminal
-	# https://github.com/erikrose/blessings/issues/117
-	script -eqc "nosetests -v -w \"${BUILD_DIR}\"" /dev/null \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/blessings/metadata.xml b/dev-python/blessings/metadata.xml
deleted file mode 100644
index b5accce9787a..000000000000
--- a/dev-python/blessings/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">blessings</remote-id>
-    <remote-id type="github">erikrose/blessings</remote-id>
-    <bugs-to>https://github.com/erikrose/blessings/issues</bugs-to>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6ae26edc5dfb..5ea6bebc7dd4 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,18 +1,10 @@
-DIST boto3-1.26.45.gh.tar.gz 587548 BLAKE2B fca56cad5fa8bf3bfa34f76aa7014d6ee1129653ec8f0b2c0bb0c2b250814d855e732c4ea4252435a1674138ff00e757cec706ac1a1daa8f6e7969d7f0b65811 SHA512 e872efdc764d20b8d264d7a7e984d9427a0f5bd0a78d895812c2e40a4cf97ba0c483129492b5fe698ac8e123a3a23d6fde4e92cc075632ec7b9d0ed55d0b57b4
 DIST boto3-1.26.50.gh.tar.gz 589841 BLAKE2B 98808cc2811f6371152b75424abe7da24230beb9caa4fcb62c273c232998fa1bbd4195d47e173c181f6b77cd95c6d90e21dc6126d65a0ce5453244cc03a5a12f SHA512 d4a8fd68c7fa099009e491f697ce3089a7f9d54433d25aa76d2733facde82f62f3955efc8ea5156dabce9502a2912847d45f7e1ab5dc71c1db26ca5d2b4ae220
-DIST boto3-1.26.52.gh.tar.gz 590511 BLAKE2B be56b8dd5cb919e042860ab5d80727edb9e4baa50def10e150d8472808614c9b6665e86afd5481476ea37073aaf9f444bd19e107ddb6d3675b1bd0220d451866 SHA512 6e793e19f3632137db8d40889462f793f7c4f54bd41a1e50dc892abd1539a512c19efc86fa0b7364c646f08b563919c7673c6cdf1f5279f330f556ba347c1091
-DIST boto3-1.26.53.gh.tar.gz 592023 BLAKE2B 07f09144913b7506dcb790e9a72adacecafdfb80fd22805c0cb4c91d07f147bd76b29a6008b12402449469334e059ab3fd7dff189f6122714077ea6d153999f5 SHA512 c555d769e89234670db1b87e0b5ff90c1b18315c6083e3ed286ce016a756424ef84a928103fa85d36d294b6f44854799f52a12f6633456e79e409547b37952cf
 DIST boto3-1.26.54.gh.tar.gz 592401 BLAKE2B 7fd5bb10cda2b27fc43a7efa65c4651d95c8ddb7c94b424847f21010f9d748398a9efc47118ed7d2d90369664dddd4903fb8c4e7bc3ba3f70643a565b426023f SHA512 86d315eba84d783d327d19b41a593f193d9b356a205f29a1589e43e43519aa6eedefc26e7b23234dade6ab0bbb309d8039b011d0ba766757be8eb7a57c22f49b
-DIST boto3-1.26.55.gh.tar.gz 592495 BLAKE2B 3e187731eb2eefafb349709df589ee7001f234059a9d68a4170fd3643e1eaa8528b6f6b89d32a239375ff792df93dd675b8effcbd18b8167de23aea313ac87a1 SHA512 59eec6c16e7010cadd11235806204c50b353d9ec101595ad6838ea72407d55849854aa68da088a94a2e56802d3caeec8fb1d5a432ed360c20edce1fff44ff273
-DIST boto3-1.26.56.gh.tar.gz 592747 BLAKE2B d74dbfc691212267b6c755a853e80fd6affec257f89e79626646d0b75f3b96a95e8b39924eb7ec9a091b59102f016ef26a33cfbec8c2e19b28216677cce1adfe SHA512 61bb273c64b5adbbb8eb67636719b92c270636d533a64f2531ec40d266afb0dc31c261b7bb38aa98b42121a70d7226d282b8041c638dcb0e2907d803a37c0b3c
 DIST boto3-1.26.57.gh.tar.gz 593947 BLAKE2B 5a30f237d992bb766b3afaced8b9e01c792c857a02aee5ba589f0f03c4c8eace3b32920d1dd62554fbb85d14b7f96789590d4acbc764dd3c56208fa5bf2dea1d SHA512 112719584ad122373e5aa24ebb6ea5c87772cdab71f59274b2f2172d92c72ed6894645253e15e12a808a83e14b12d27fde8a9fe086ccc33b987166de3fe0984b
-EBUILD boto3-1.26.45.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
-EBUILD boto3-1.26.50.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.52.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.53.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
+DIST boto3-1.26.58.gh.tar.gz 594149 BLAKE2B 5bf0ec6a321826a6f7cc346e6051e6b4d99451d0222ccf9445a9f24f561dd1797333a05d44addf1bea9b2b7e18b952c5acfa9f51a5d275fc7b34c5e8c5ab4342 SHA512 16a68f232cfdfbd4c8c6368d520c5826150039f069819aaf608a2e8b03845739a8014c54ba1fb57eeba8ebe4c6ad8e3b135d2a6a4dccd9d41de98fa0b730142d
+EBUILD boto3-1.26.50.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
 EBUILD boto3-1.26.54.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.55.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.56.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.57.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
+EBUILD boto3-1.26.58.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-9999.ebuild 1586 BLAKE2B 44b7d2804e4a484ed5fb864ca2c60348f4e4eb2265c1ba946adf27b31052dd9041f148c1ec935af0bdcabc66109ad3b479dac167613c679a2d9e42f689182734 SHA512 bf11d1114aaff8762b6162a7ba94223e2eb180868e8395aafd1f466c48683514a3ae755baac40d7e0e1afb26ab49e14d30f39266382661b01e8f7ec53d71f145
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.45.ebuild b/dev-python/boto3/boto3-1.26.45.ebuild
deleted file mode 100644
index d6d605bdb0c6..000000000000
--- a/dev-python/boto3/boto3-1.26.45.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.50.ebuild b/dev-python/boto3/boto3-1.26.50.ebuild
index 9523f65d5fb9..d6d605bdb0c6 100644
--- a/dev-python/boto3/boto3-1.26.50.ebuild
+++ b/dev-python/boto3/boto3-1.26.50.ebuild
@@ -25,7 +25,7 @@ else
 		https://github.com/boto/boto3/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.26.53.ebuild b/dev-python/boto3/boto3-1.26.53.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.53.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.55.ebuild b/dev-python/boto3/boto3-1.26.55.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.55.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.56.ebuild b/dev-python/boto3/boto3-1.26.56.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.56.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.52.ebuild b/dev-python/boto3/boto3-1.26.58.ebuild
index 9523f65d5fb9..9523f65d5fb9 100644
--- a/dev-python/boto3/boto3-1.26.52.ebuild
+++ b/dev-python/boto3/boto3-1.26.58.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d20cf0ba8993..4026a678a72b 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,18 +1,10 @@
-DIST botocore-1.29.45.gh.tar.gz 11090136 BLAKE2B 4c5cbd6e80a061793276b40124124c6c8e8c0d9f5bfbe4d5089d755b7af8399635107ed94da6602b2d0788159c1d883b7821db989fe47ad02bcf8bbaa7784b08 SHA512 dfbbc2b30449fa7526794489d3f0c3951e81ddbf53d7915d4492697398febd3b4b918604054a85c950c26a2423e969042de395b8b513688dcf8ad3fe305df4f7
 DIST botocore-1.29.50.gh.tar.gz 11116392 BLAKE2B a9d12740ea927b6331b8593b9d7ae2af51feb4df740f8e9e260372d601791aebd699f569d6a3d6041f9c8ecb852a2493f872148aca5120a01c5773148e42a960 SHA512 3661a3b3a5bba8be0d14d24ec85d50fea0d2001721871be84c13396a8f7244797e24b6b1de46e8b9d903c76312f939b122c206ec4f8dcac0b76e8d77b59198cf
-DIST botocore-1.29.52.gh.tar.gz 11118743 BLAKE2B b0e87bd7387154d7502f9e1f7d16842db18d3bdea831ffe178f8a2642a973643b2a6ab36260ca8bd1800144f3e7c1473fc0912b1e439df20703c2ee128233f15 SHA512 c7acf1bee61b76ccf74a6d85657911d76c41d7bbb48eac2a22ca0fc5f6efbe196b833c76659094acccde332e15cdec7e291a34ee0df7d7683cabc6f591634af0
-DIST botocore-1.29.53.gh.tar.gz 11124794 BLAKE2B 0d5fd0a4e9ffb0d077cf740df604b1f6536e58e18079e4051da16cb07f2c383e2e19c9aada45cc13b347f696ee5cc89073a8bc2b38aadfff4693c933afcf7941 SHA512 ad3003bddb51ec6099799fe87ccc37392815dbdb83ee9fb772ea90ce779f066f593e1e9450f67f0a4aa487c97f98f47f361e1a9368e8e933f302fad026bcbde4
 DIST botocore-1.29.54.gh.tar.gz 11127081 BLAKE2B 7c2d11d968ca6a4d3b23b12c44cb8f050ac1848f75280c44bbb2f3567860204ed8615bd1596e02b8d0222f4d54c22a8559114365ec6a69e4a01a166a821d8c8a SHA512 4ba58c9b881ff95149ba1a5805453885208cdb68f197cc9a6c13cc9ca075e988ae33e4809f2970d9c48fa426e26c06d83686b8bbf4ff69d4a7cfe26ef3f903bf
-DIST botocore-1.29.55.gh.tar.gz 11128407 BLAKE2B 182c39bc0e1b40a5ef8cd4bbb87243972282a6cfcfea7d1b6830790c8b759c67e6cad18e93d7a56224efa0d97b96edc06853f1df12a22c11a694beb677e75880 SHA512 02fc018e313b9ee4c2c745343bf8977a5311cd9264fc1186cbf19610d1ca8224f362b29432f7a2676fe85d03b1102e7e2736f4933ba564784f0e61832f3989a6
-DIST botocore-1.29.56.gh.tar.gz 11128363 BLAKE2B fd6a416e822294ef5ba2e33e7a1bdde026031721d54185514845651e196957a2a17cb9cfba1ff0c6766cdcb47697d27898796586f9144cc5116ec13b818dd911 SHA512 a452d10560432b0fc96ffa9db0e716e57c71b522c9cccdc852087240ddfee22005e7f553be0618c0319d5404d9627e1ccd8682320d8d3f03d78bf41ae8c913be
 DIST botocore-1.29.57.gh.tar.gz 11132049 BLAKE2B 748a8b709cb6bff1a1bb38757ad68c31aa680589ed59e7c3f73b6563a5b9572ace96102ffda56643d33f0dee98f30f8443a431c7869ccfe54a311964ce781b5b SHA512 adbd760b8238b259bcc1eb3ba42cdb702b60eb6fece73a5bda5129a974826655157e702cef6a1114c2e3bd036b1cf22ebbead6e78bf88129fe68b02de1f38dae
-EBUILD botocore-1.29.45.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
-EBUILD botocore-1.29.50.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.52.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.53.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
+DIST botocore-1.29.58.gh.tar.gz 11135559 BLAKE2B 937b00f1a3c4e3ec818846549bc0cef391c86d3fee9bdd53285111e51c2c52145e7e904020511ed32f2247dd4f150f036f40feeac1a6f899781aff057f9a6d85 SHA512 5cfe5fb174cc14018cd2b7b7af15110665d7ca22f5ae827ba939ce12e71a45e9b5cab8d7ec656fa94c450d46c430a5541cd5bfe92d82da868424db4f8fa4fb2e
+EBUILD botocore-1.29.50.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
 EBUILD botocore-1.29.54.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.55.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.56.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.57.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
+EBUILD botocore-1.29.58.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-9999.ebuild 1808 BLAKE2B c88307d04e9daf86db23c54e39fb14931a6e60ab83593db191859652e67c90cfac45263f60c0211f81bfa10fe755b9023924713f2855324c929322d557b4ec17 SHA512 16e3144cef752302fa7ad350f5bb86301d41c0223f9ea41ed784083f2475d48efae095d82da95f93f77fadc86dea96b6aad1f1bce96bd926be01ef2d519fe230
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.45.ebuild b/dev-python/botocore/botocore-1.29.45.ebuild
deleted file mode 100644
index 5afa7a9459c5..000000000000
--- a/dev-python/botocore/botocore-1.29.45.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.50.ebuild b/dev-python/botocore/botocore-1.29.50.ebuild
index 0f4daaa48e81..5afa7a9459c5 100644
--- a/dev-python/botocore/botocore-1.29.50.ebuild
+++ b/dev-python/botocore/botocore-1.29.50.ebuild
@@ -24,7 +24,7 @@ else
 		https://github.com/boto/botocore/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.29.53.ebuild b/dev-python/botocore/botocore-1.29.53.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.53.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.55.ebuild b/dev-python/botocore/botocore-1.29.55.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.55.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.56.ebuild b/dev-python/botocore/botocore-1.29.56.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.56.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.52.ebuild b/dev-python/botocore/botocore-1.29.58.ebuild
index 0f4daaa48e81..0f4daaa48e81 100644
--- a/dev-python/botocore/botocore-1.29.52.ebuild
+++ b/dev-python/botocore/botocore-1.29.58.ebuild
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index f34ec35d81f1..6f80530f7b50 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,14 +1,11 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B a388aec9e6fdc4d1305d7ac851d6f5e0f689cc3bc90f078f6ca273385d39192cfd0d0ea78564def7d269e7e436602f80b7841faab791125e0146bcfdfe31ecbf SHA512 6024fc6489b77c80a45943cd345e5652653c43f9f633e12933ca8a372da1b6a0c2a7df5595c726b773be1d64422140bf9a4aaf5645b840af473b439a2e706180
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 0452806a0baf8641d44d86c91b95958fe3bdef74fe62c32e6cb90c90ee8718c61fe9649d2f9ac17b127d65c64cba9093adee742f455be720ca2bf558131cee05 SHA512 5179df9990802cfcedcd59b8a38a6198cdfddb511fb872872c2e4cfc95531f114acb6bb43395c74659c6b46a42da32213e8312e2ed71b6e317a7270a12cfa214
-EBUILD clang-python-15.0.6.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
 EBUILD clang-python-16.0.0.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-16.0.0_pre20230107.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
diff --git a/dev-python/clang-python/clang-python-15.0.6.ebuild b/dev-python/clang-python/clang-python-15.0.6.ebuild
deleted file mode 100644
index c46cb818209b..000000000000
--- a/dev-python/clang-python/clang-python-15.0.6.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_{9..11} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/errorhandler/Manifest b/dev-python/errorhandler/Manifest
deleted file mode 100644
index f77cc5d47065..000000000000
--- a/dev-python/errorhandler/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST errorhandler-2.0.1.tar.gz 8534 BLAKE2B 2a1db016acef81b5e625800614b2b5084cb6e8175d623e42726a728018871d200709ec66db16847ae0cf604551925a18fd2207c861388844f324a6eaae4bbe90 SHA512 b2fe44f400551e2af8aa589aefce042ee761893678b211a0e3ec7eb4527803001ac930d0941425f6e1487d36493d0c8f439e0bf672536ec27f041309fd69420e
-EBUILD errorhandler-2.0.1.ebuild 477 BLAKE2B 94317743bb52a7fbe2f4e29a4bfe22fa88cb8f20581b02519a96027009d215380979a2e5d04c5d183d547cee5b081de29991d1b53755edef010f9d315d6ba595 SHA512 46b475dd00d750cd05781d26e50135ca8e97a41f5912c1ee944afb4cc4bc019c7bb4778b52d7e5966cff58153a4309365beb1a0202fdbbff74972a0ef16e8c08
-MISC metadata.xml 326 BLAKE2B 736ad3889439a453fbc89aa9c4231998d16879f3a12b8ea3231c01435c579cebbdf0014fdd337e934164b027936e85311e84797503033be1b9912358a844e7a3 SHA512 d5d036c576e11bfe095b4359b5388b6a94f01e3cd1a5475e6d06400dc75b1fc4191e50d788ab1b43598a7d0a153237299db1e8d535021ba3028b88e6238877ff
diff --git a/dev-python/errorhandler/errorhandler-2.0.1.ebuild b/dev-python/errorhandler/errorhandler-2.0.1.ebuild
deleted file mode 100644
index 09231fb53fc8..000000000000
--- a/dev-python/errorhandler/errorhandler-2.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Logging framework handler"
-HOMEPAGE="https://pypi.org/project/errorhandler/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="
-	dev-python/pkginfo[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
diff --git a/dev-python/errorhandler/metadata.xml b/dev-python/errorhandler/metadata.xml
deleted file mode 100644
index c86463f80cee..000000000000
--- a/dev-python/errorhandler/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">errorhandler</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
deleted file mode 100644
index 6de5426e49f9..000000000000
--- a/dev-python/flask-restful/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flask-restful-0.3.9.gh.tar.gz 118195 BLAKE2B a4f18c3faf06a7c9b628657aafbab4b9492793d9a61ab60a3e4d8112e0fb5e120cff2f2dae87915e44915838572ae0ca1737025ad5f906c2a953afc4b1f49c6f SHA512 34bea8ed6e9de3ad1c2ca63e7af67ed2a175f84c433b08ff643f91d88feda0e3c1c3967deb2fe5ad308b05f373b10c08245edf65ed97a7c5a3683aa900e9edf2
-EBUILD flask-restful-0.3.9.ebuild 951 BLAKE2B 470554fd55aa05577d3137fb81b08c8e2cd8a894ce69c9e0d14ff79c519c7c9aa861d5a0f02c83ad381f6d04fb4a27dfb26db066d3ac5e550de0eda5cacdd926 SHA512 28a65c401a9e024d3925bdf20bfd57f93efdd642ca35f732eac830fbf7f4872eb996126770409d3b003171037d196da5258f4130a957373318d0c1abae43316e
-MISC metadata.xml 408 BLAKE2B a999a92075c7eb50cba003c8d16fcab33ace733d72d271cfc9bf00a0a0a8a657b829eb96792e3ddc3e09f2bdf9b65985534df5360228bfe5ade57063f4ee4c0a SHA512 8a286919263d29429ab1848db90c3a9badd98c1ebb003c58baf219a60a2f68cea94c542b4e9feb1d8659f8ddb973954a8342bee8759826ee54ac552cee8f3a6e
diff --git a/dev-python/flask-restful/flask-restful-0.3.9.ebuild b/dev-python/flask-restful/flask-restful-0.3.9.ebuild
deleted file mode 100644
index c6599d468dc1..000000000000
--- a/dev-python/flask-restful/flask-restful-0.3.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple framework for creating REST APIs"
-HOMEPAGE="
-	https://flask-restful.readthedocs.io/en/latest/
-	https://github.com/flask-restful/flask-restful/"
-SRC_URI="
-	https://github.com/flask-restful/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
-
-python_install_all() {
-	use examples && dodoc -r examples
-	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-restful/metadata.xml b/dev-python/flask-restful/metadata.xml
deleted file mode 100644
index 8562704324cc..000000000000
--- a/dev-python/flask-restful/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">flask-restful/flask-restful</remote-id>
-		<remote-id type="pypi">Flask-RESTful</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index 62250c08c937..21a404678890 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -1,3 +1,5 @@
 DIST funcy-1.17.tar.gz 112383 BLAKE2B 150133f72ed165bdc9adc3a9f4954dfd5b846dea7b1ee2cae0d6621ebaec3e2ba986cd6596fd86482036aad6476913caec0868db9cf55c067fdbf62ac10953e2 SHA512 d48ce3b7a7b8ee7512df109d651f40ca4dadf681acca6ab0a4857a2ea408f20f6345b9b416ca8b1e924050a842648192b8fe79381c202361bc4d2e25bd55ad05
+DIST funcy-1.18.tar.gz 277530 BLAKE2B 78e86e23b3908924de1de62dd567ff8ff52079a9a7529923c84f67a3c5f768d232164d758763db1ce941986c28012dbcb3c146412998b1d1d6064efcc0ff4bf9 SHA512 274fec59c1fddc58248b5f8c81686955706333bbd33a1d567f62694c70449ef2488fae6bf76418b8ff3c6655fad12ed344cc6c90a84c5b10412e32fbdda016fe
 EBUILD funcy-1.17.ebuild 484 BLAKE2B 570a5c1969cf16e65fb2fc7a840f777f5aa4b9fa95439e05c277f69848929b72a15b9ceb22f5fbd877371e03856d50b555e02c7550ca0fc692d9da8722842c24 SHA512 dc7963bf04635626b278b8011ab47c7e3529ce442d78b7a898721269c57b9abb3641ef19a8f965d9b5565769e3b14afbde67b7dd714a1ecfb0ac215237179234
+EBUILD funcy-1.18.ebuild 552 BLAKE2B 699b6b54df8fb023dec2badd2d3df6301d7befd7dcd2aac6a301e6255e403ed93ecd0695d7db722989a7ac45ef732612447ae025eb0432ee953b53ce313ed44c SHA512 1b46d3735fc095c175aa4d50b241ecd7add50e2b6c6c5e589ec4d92d99ea1934dd11d47aaf39adf4f76d5a6a61629a413754e8c1f9549630bc8dbd606730cabf
 MISC metadata.xml 491 BLAKE2B 70c6646bc4496af1ef98d1178b2b4bf9d876ee0a3664e878af184d12b162c9c926d14bd8dd7987355c4bef86ce53fb65ea96abe2384198f2c054c3835e78f982 SHA512 31d13ddb7d20c36c98e5a4068e96881200122425608e8877c133483117b565b44d65800bcc61dc6ad7e407b6c9953a3f53afd52aebd1a5c25aa1ceacc067c744
diff --git a/dev-python/funcy/funcy-1.18.ebuild b/dev-python/funcy/funcy-1.18.ebuild
new file mode 100644
index 000000000000..9a149505ee00
--- /dev/null
+++ b/dev-python/funcy/funcy-1.18.ebuild
@@ -0,0 +1,28 @@
+# 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..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of fancy functional tools focused on practicality"
+HOMEPAGE="
+	https://github.com/Suor/funcy/
+	https://pypi.org/project/funcy/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/whatever[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index e173f9dbdfcf..9f8a77b52d57 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,8 +2,10 @@ DIST hypothesis-6.62.1.gh.tar.gz 9342261 BLAKE2B 68ffa2294e667e1182ddc96d2b25957
 DIST hypothesis-6.63.0.gh.tar.gz 9342417 BLAKE2B edd4795c9fc4e254fda89fff7554965f350c9dcb738095f4ddb1da16a169ea0b72a52ce4321543efa97f69382a76307d622c37e81e3372867e57ad9ef2060d0b SHA512 9e863d72abea9431d027fbffe39107bb95dc9e80c423d2a69b039489119841fbcc99ddf54248b5d8a797bccdeb450760101862baa3be113c7715430591d054a6
 DIST hypothesis-6.64.0.gh.tar.gz 9345246 BLAKE2B 2ee9a14e84bb72a8248c28096a31b4873f51c121b6446cbcd5d2831418f769ba464d2aead1a52f3da23e640f46e05e7af8927c65113fc7fb3ea59086324c2210 SHA512 4da49b4ab62e9c90770c098653d3b43bbf3fbf8b7aca27546ae2ce0be7923cbabe240a73d124e4e48fc9b8a3e06d31e336b18b875b743992e175acfe2cddd270
 DIST hypothesis-6.65.0.gh.tar.gz 9347619 BLAKE2B 5e67e4659d883209aefe3a459620a2d9774122cb15137851f291365846b179130a1209b18aabd4cb120dd5f522e2ac1b3928904e9b25b10109ae779926712220 SHA512 93ecf5bd72e6f8ff69acb8056f2bb26011cbc997c58bbf3055f17c4690d6fe21f22d6e2a86bc3e7172063c85278b7abc42904028ac73174d6f2855ff7175449f
+DIST hypothesis-6.65.1.gh.tar.gz 9347804 BLAKE2B 555b8eb742b35cffbc0985394b7b830fbff0c601c031b270ffb50c8e1e8437b99c4f827b92cfc74f5239aac43b34e70520b3674129c70338ad010b289552b14b SHA512 faa1330477a5932b47af5c0b70742a81455aba85f5ba19e355a1678a23e62612a8972e510f3bd0f133491fdd5c2f293a4ea2f75e181dedaa3304d789e3bc90cc
 EBUILD hypothesis-6.62.1.ebuild 2132 BLAKE2B be04a23a6cc71d17c7585c98d1df3e8bf9a32c84897a5328fba61561c756d8bbcbfdcf778debfa99d3555f430f697720a1bcf083e3422d55116f5649e901ae44 SHA512 61d1b1390b920c328bbafd1b80c7f1c934f5483972bfaba692ed95cd5478bbaa62bc65438665037b6bc10b0050477c02597f2fdc9536963d6769f23cdcd5f721
 EBUILD hypothesis-6.63.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.64.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.65.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
+EBUILD hypothesis-6.65.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.65.1.ebuild b/dev-python/hypothesis/hypothesis-6.65.1.ebuild
new file mode 100644
index 000000000000..c793a8a143d2
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.65.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imread/Manifest b/dev-python/imread/Manifest
deleted file mode 100644
index 9f4709ab8c22..000000000000
--- a/dev-python/imread/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST imread-0.7.3.tar.gz 131492 BLAKE2B 060bcd8312f24f2966f840a6403486a9a9a2f6b9d033e92f0268594711f4fa06530c2a825103683b1041570c43c3af584faf10acf45a95e693dc83c81da4190d SHA512 401ec64fd4a65fac1cf2e1bd929cad00a8d704c6c03b8a10256d1e9c27cbc83b47a11567731a42c731aca3df9a5101b7ff90bb51f869695b1405c642e16486e7
-EBUILD imread-0.7.3-r3.ebuild 692 BLAKE2B 38e8bf77c2a8236c72245faa901aefb0a5f8088b9ce24228504c3759b89f2125cae1873210a3233917e6930ee1a6bcef5cd8baba7ea484d024381650c95b335b SHA512 c15cb06410f802ef7892d2e6128ba3437c00ecab029221cab6f868f4780076b1589f43f8dcd8e3ee58404566c83304656545d925419cd50a7d46ac035afeb673
-MISC metadata.xml 538 BLAKE2B 48d807d1f9e08aca0ffebca50db1ec165f2fbb6ba0f3d840dcebf194b5c1b8514c6f3af0c0fee90f30d776ba7438bbffe44d312203e927092971c24222cd563b SHA512 b0ec1797edc02bdde312b66afbf79930b7b438ed6987638202b373155ca6ae7439cc6b3d3976ab721f60a497313bcde53b60755a904f80a5b16c1c58c05f14ff
diff --git a/dev-python/imread/imread-0.7.3-r3.ebuild b/dev-python/imread/imread-0.7.3-r3.ebuild
deleted file mode 100644
index 86a2232cd262..000000000000
--- a/dev-python/imread/imread-0.7.3-r3.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..10} )
-inherit distutils-r1
-
-DESCRIPTION="Read Image Files"
-HOMEPAGE="http://luispedro.org/software/imread/ https://github.com/luispedro/imread"
-SRC_URI="https://github.com/luispedro/imread/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libpng:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libwebp:=
-	media-libs/tiff:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests setup.py
diff --git a/dev-python/imread/metadata.xml b/dev-python/imread/metadata.xml
deleted file mode 100644
index ba84112ea6ac..000000000000
--- a/dev-python/imread/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		IO with images and numpy arrays.
-		Mahotas-imread is a simple module with a small number of functions.
-	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/luispedro/imread</bugs-to>
-		<doc>https://imread.readthedocs.io/</doc>
-		<remote-id type="github">luispedro/imread</remote-id>
-		<remote-id type="pypi">imread</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/influxdb/Manifest b/dev-python/influxdb/Manifest
deleted file mode 100644
index 324020227fcf..000000000000
--- a/dev-python/influxdb/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX influxdb-5.3.0-pandas-future-warning.patch 638 BLAKE2B a8cba22ef423b5162666fe9157516dae077355139f323ee98149cfdbde15fc12de163cfb54009ab8bfebf2697c4b539f512de19d6d066aa28623e7e9f272b411 SHA512 0d2a6213efbcd56b9908924a839fe63d369dc7ec674e3d1603a81649969f47fe085b6ab163028384752a033a98d358de2d7c651618370c018d05df7152b74e52
-AUX influxdb.conf.template 476 BLAKE2B 50416cccd720729d28b50d6cd4bcd6582c959b932c75f8dc64525e96be35242cd8dd36b3f689383e22b0eed3925b0c97dc42dbaabdd76dcc3cca4d5f49d8cc0d SHA512 3b8f9dfa149ed0e8aa25c8db8b39968e01ba7f81b9db037a0e05740c27d617dea8101efc9b9ddb00bf354cea7eefe5ad318b2ba309276e5ba4500bc3dc9db62e
-DIST influxdb-5.3.0.tar.gz 66683 BLAKE2B 28dd955fb26eb9a984bb910f26655720c566c08a8178f8aa08b5eb66a6f02933a6f3cb2d26981ffcfc3fd9a017fae2ad27b61f32e2a7916c55d723ffea5b248a SHA512 49ae48dc56ea8f6c6d4103f33207a35af4877c292ff4bfd32ebf8ff35fae816f570e64657406fdf9ef13092c69e7e2d1f0c641124445d35731a4a37812f67242
-EBUILD influxdb-5.3.0-r1.ebuild 1131 BLAKE2B d4cdcce39df715aa36a7b403e248510f0795494dc0949bcd0b80e0fb10602274593fc219c1f97b02237392c2dc0bc51107c9d11fa0103a377dc5219029aeeeb2 SHA512 a196729bc05a6d112ce02df411795acd9b46612723557c1821074fd18ccd6f39d7773805357ade87185f08945681a04880274f0138ee468a876fd42f9eee0b6e
-MISC metadata.xml 303 BLAKE2B 095c22f1e9ef7c834e5cd23d54bdeaa0843e89dfac388bb193cfc7e0ad7ebde4606c03d2310eb0115a3280ebb9fa4a4a0b91802686c2d960fe11f4a07af6b97d SHA512 e7a6e172b166e67e825d20e0f43087f5dc2e13fe7e7ce7cb7cf7dab0e2796d657eb4c6913fb740a91cf77be18385469d855ec9e673c799965d6e83dd57994adf
diff --git a/dev-python/influxdb/files/influxdb-5.3.0-pandas-future-warning.patch b/dev-python/influxdb/files/influxdb-5.3.0-pandas-future-warning.patch
deleted file mode 100644
index efd510fc8420..000000000000
--- a/dev-python/influxdb/files/influxdb-5.3.0-pandas-future-warning.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/influxdata/influxdb-python/pull/845
-
-diff --git a/influxdb/_dataframe_client.py b/influxdb/_dataframe_client.py
-index 600bc1ec1f47..7f2b4ee2989f 100644
---- a/influxdb/_dataframe_client.py
-+++ b/influxdb/_dataframe_client.py
-@@ -294,7 +294,7 @@ class DataFrameClient(InfluxDBClient):
-              'time': np.int64(ts.value / precision_factor)}
-             for ts, tag, (_, rec) in zip(
-                 dataframe.index,
--                dataframe[tag_columns].to_dict('record'),
-+                dataframe[tag_columns].to_dict('records'),
-                 dataframe[field_columns].iterrows()
-             )
-         ]
diff --git a/dev-python/influxdb/files/influxdb.conf.template b/dev-python/influxdb/files/influxdb.conf.template
deleted file mode 100644
index efcff78aa6ce..000000000000
--- a/dev-python/influxdb/files/influxdb.conf.template
+++ /dev/null
@@ -1,29 +0,0 @@
-bind-address = ":{global_port}"
-
-[meta]
-  dir = "{meta_dir}"
-  hostname = "localhost"
-  bind-address = ":{meta_port}"
-
-[data]
-  dir = "{data_dir}"
-  wal-dir = "{wal_dir}"
-  index-version = "tsi1"
-
-[http]
-  enabled = true
-  bind-address = ":{http_port}"
-  auth-enabled = false
-
-[[udp]]
-  enabled = {udp_enabled}
-  bind-address = ":{udp_port}"
-  database = "db"
-  batch-size = 0
-  batch-timeout = "0"
-
-[monitor]
-  store-enabled = false
-
-[hinted-handoff]
-  dir = "{handoff_dir}"
diff --git a/dev-python/influxdb/influxdb-5.3.0-r1.ebuild b/dev-python/influxdb/influxdb-5.3.0-r1.ebuild
deleted file mode 100644
index bac0f7a85e03..000000000000
--- a/dev-python/influxdb/influxdb-5.3.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="InfluxDB client"
-HOMEPAGE="https://github.com/influxdb/influxdb-python https://pypi.org/project/influxdb/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="test? (
-		dev-db/influxdb
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}/${P}-pandas-future-warning.patch" )
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# The tarball is missing this file.
-	# <https://github.com/influxdata/influxdb-python/issues/714>
-	cp "${FILESDIR}/influxdb.conf.template" "${S}/influxdb/tests/server_tests/influxdb.conf.template" || die
-	default
-}
diff --git a/dev-python/influxdb/metadata.xml b/dev-python/influxdb/metadata.xml
deleted file mode 100644
index 73af78486c54..000000000000
--- a/dev-python/influxdb/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">influxdb</remote-id>
-		<remote-id type="github">influxdb/influxdb-python</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 4b40b4d2cd07..2dd7762849e8 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,6 +1,8 @@
 AUX jupyter_client-7.0.6-test-timeout.patch 1270 BLAKE2B c039b22d8f0c2893738a1b832bb82fa19c746dae8bfa839fd16056076e9a905218201d2cfe8896c4e826a09424656657d109b12893d21fee0d8e6b6952d55ae3 SHA512 66d57b9efae86bc2531d35634f35a5d74de6d467329aaea7a487b010b582440cdb8a91e318a3c6ce7f26d9fdae6aff7adff3a59c57d053695076b9f1c092fbf1
 DIST jupyter_client-7.4.8.tar.gz 328958 BLAKE2B d05976563c5550ba46a9525c76dae325a107a664c7cc6711fc43333ea9ee747c4b69084e1f4d3118b0baa69bd42781bdd49ce59bf6e608f5520e82e295ffff2c SHA512 dc7eed72ac6c820448e6d8a96c2bee7964706ba608ecaddc8b8aa17f33727ffc04c5a509cd8d7ee78876ce646fc6a508bacdc7b07473555efdad9dd2960ad089
 DIST jupyter_client-7.4.9.tar.gz 329115 BLAKE2B 8b43b237ac79bc51e40e403cf4a3ada18d03437094dc1dd9b9988adb1bcfbc56ba4b2373d3dd858df583b723723127f934c01544f3d6a576886b012364674f0f SHA512 0de91309ffddd2da50ae69bff4f7ecd741398171982f66488e6367d78388c6844b353bed1834684fa4af890364120ce09f2fa6b3ed7778c501058ae558439969
+DIST jupyter_client-8.0.1.tar.gz 333329 BLAKE2B 90be4e3d0271d8fb957e2766e523d333ade3811877aabe55f4768c789cab2782ba6594943d040a23efedb266f2f873b51cd37bc48a9e2603618fb074ca2c1d48 SHA512 c7c643f71e25bbd2b6742e20a6609253517704ca15360ad7f4494e8c96155daa331e218d073f83bc75f23f1b242e626313da95fe1766c29d07e10cd65b7046f0
 EBUILD jupyter_client-7.4.8.ebuild 1209 BLAKE2B 8889fec0b7f86f01bae55a528e69c7b04804cf11c7b9782c9ef334c291b0c2adf2750193b47dbdd4fe0295e7ffb78e36825e06411a0f9c2a197e3d33967c7588 SHA512 de28921c90362a4109b783a16dd4a82f965c9e4debd2c6b22b39185e75833c44b15854b32b278de3b6c316458019732dbe0a462d38706061fdc87e75d07137d6
 EBUILD jupyter_client-7.4.9.ebuild 1217 BLAKE2B 0b82ac2503d37e7744c18ba47ba908197cbdb6e42a6d4ca97f520241f65a594ae3324055835e7ddaedd72f4025ba33834ac74c3bd61ec2c50f0c1133be90c1a0 SHA512 bd087d694a4988fda2bb3d1dbf51ea6d34524e2f0ea4fe8e08506141f8bf5e53fc0478a4d2962848e4401ffd1fc10a3c53e509c613b575510e233a885976a950
+EBUILD jupyter_client-8.0.1.ebuild 1332 BLAKE2B 304965d7845ad52631cd0fb43042bea38c6eae5e67cbe3f85997f35dcc6b529036dc753bcbcffc95c58b5ea247d4cfd3ac39ab44cb6fb5e6dece938b1a241b1c SHA512 7bd62e11b740ec4a36798bbddc754305aee7bdfb2974d74d85fda2dfdde3078b008b9a1668332dc62f954ef9371a3d09daa95bbd0cc782c52ceb62232b06c1df
 MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter_client/jupyter_client-8.0.1.ebuild b/dev-python/jupyter_client/jupyter_client-8.0.1.ebuild
new file mode 100644
index 000000000000..c930f1f2ad9c
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-8.0.1.ebuild
@@ -0,0 +1,50 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_client/
+	https://pypi.org/project/jupyter-client/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter_core-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+	' 3.{8,9})
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
+		>=dev-python/pytest_jupyter-0.4.1[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO: times out
+	tests/test_client.py::TestAsyncKernelClient::test_input_request
+	# TODO
+	tests/test_multikernelmanager.py::TestKernelManager::test_tcp_cinfo
+)
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 347a634318e5..7a52e00066c2 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,14 +1,11 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 466b161d1ab30326cfc1cb4b52293a1a8483176deb2fed65b04a70d0b92b84b82ee98e475c84ab5ab94a6c6411da7f7a86f4aaa676ec0311492d77357f67272d SHA512 320f5675b1b73356beeb3a2a71f6591780905f02264ef13c8d0ba77743a975accd50d854b0f16e770047e46e601f4ebd03b46b7756157c98cb6e08d9caa29899
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B ff939004df0d10a698e942c99ecf3bb11fe8e0c035e3dfb0ac495f2368d83bb89cccb11de0878b3555c4047b8d0e4b969e5cec8aef8891aabf2d16a550696870 SHA512 7be9e5f983bffabf30c954e45ede8fb6b30013b84cbd50f66fa3a2185b0223b4ede7466d40376453283e9ca806da1ae80afe6e6fee001ede95b78226bcc7267d
-EBUILD lit-15.0.6.ebuild 914 BLAKE2B 5ec2a2dc492bcd56b0f4461b5f2b9eb2a948327027b98b9afd8dc022dcdb8b99012c91710b69432384e96cbceb1bb5351e259b02f0191aacda74edf07046b736 SHA512 46c55b6eed3ad82d459c3a1c52623ee928169401f56745b436904af6ad58959bc4b503d1fd0fe7bcf4cf1846db0f386a25ad9ccca46a0e1a61fb2a925b5073de
 EBUILD lit-15.0.7.ebuild 914 BLAKE2B 5ec2a2dc492bcd56b0f4461b5f2b9eb2a948327027b98b9afd8dc022dcdb8b99012c91710b69432384e96cbceb1bb5351e259b02f0191aacda74edf07046b736 SHA512 46c55b6eed3ad82d459c3a1c52623ee928169401f56745b436904af6ad58959bc4b503d1fd0fe7bcf4cf1846db0f386a25ad9ccca46a0e1a61fb2a925b5073de
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-16.0.0_pre20230107.ebuild 877 BLAKE2B e0fb3eb26a481420f154c6c7306824e929cbea060ec0e28c28991c39f86f756ee5d004abf6c76775975e053a588df73b2fd121a55617621c8a179899adecb41d SHA512 9799e40aa5ad07879a049777666963e225ffc97618fdae22869e8c8a648b0e33554859c525fad2307e23b96616bf24847c1ad7aa3e69353927c03f975b3bcbb8
diff --git a/dev-python/lit/lit-15.0.6.ebuild b/dev-python/lit/lit-15.0.6.ebuild
deleted file mode 100644
index 800c8de63435..000000000000
--- a/dev-python/lit/lit-15.0.6.ebuild
+++ /dev/null
@@ -1,42 +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 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index e495b27eb9ab..e915095bb19e 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,3 +1,5 @@
 DIST nbclassic-0.4.8.tar.gz 19875247 BLAKE2B f6a4ff226ebd7c39fa657e06c1854e24ef7e50e893cc1a0b52c0cef194f8638b26a3b4a74d6d4077c055470bf1a7895995e184f3678b1157813981223631f6a6 SHA512 a0b6cc7823da3e7bd3ae7627994fd6a0e79adcc201763e6597e41d0f2a1fe287edb38903e4240702a34e20bd5e3c32c5460ca3b3355f59585bd2aa8dc46276f2
+DIST nbclassic-0.5.1.tar.gz 20178622 BLAKE2B 1ff79c9af218011c697016ecef149f42e683607eebb8e199ef75957d9d3127858ce8f443aeedb60844e3277b4c8cd4959d123658a5103ab2112fec469ef01a96 SHA512 1dabc27ad115d1961e7881e7a51653449cae291c74aea222bbf92d49cb7bc9657ae1f1d9a81eafbd70bc0cafd57b75cd2c76bebf91aabc5fdd9eede534f1cec9
 EBUILD nbclassic-0.4.8.ebuild 1365 BLAKE2B dd7a680c12e12c66bc981b28ce7b943c0960a5e1f1e30a5403e7bf93608da4abc1bc5842c66c67b143386beb681250614da0c6ca05dc20c09ebd848b7d2b15a1 SHA512 ccb7e84b29e6a1a7fac65d02dd285713964f7d5f51db327f8c33f95e52d27efb24b0ed02a5a62ffe2f42d057a81281eeab06fd3ce9a394b0279d45b1ed8a17d0
+EBUILD nbclassic-0.5.1.ebuild 2340 BLAKE2B eeb7e86f6c1d0bfc559ee6dd72f8fa76f7cecc8f0826742fa7957644e6740d07a230ecc3dde47bbd701252d669cc863a0b86bfa5bb52dd129a8ab46c1d656859 SHA512 0b638441e7083232dd95f26efaae819fecbbfc60a11aad9f0d8cf416448b9223fb495f19d99bb0293e902469b9c734c700979eb4746d84e7ef26d3eb18e6413e
 MISC metadata.xml 407 BLAKE2B 8be751d3f2e0e1e2952c39cd1846285ebb994d833022767dde609294ee9f98044b1189934e7d27c3134b1f06c95705687491dbf52739bdd0bc17f06cfdff53cf SHA512 6cc07376da4e55e5df153fdb0f43371ed415bed6db1bce2f67dd113d1e0f1994974dd6bee746021efb2d8c36ca2ca534109227c541d38b37b652a68b9642f2cb
diff --git a/dev-python/nbclassic/nbclassic-0.5.1.ebuild b/dev-python/nbclassic/nbclassic-0.5.1.ebuild
new file mode 100644
index 000000000000..a74dc32439bf
--- /dev/null
+++ b/dev-python/nbclassic/nbclassic-0.5.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=jupyter
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/nbclassic/
+	https://pypi.org/project/nbclassic/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
+	>=dev-python/notebook_shim-0.1.0[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+
+	<dev-python/notebook-7[${PYTHON_USEDEP}]
+"
+
+# dev-python/nbval is missing impls
+BDEPEND="
+	test? (
+		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		virtual/pandoc
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx_rtd_theme \
+	dev-python/nbsphinx \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/myst_parser \
+	dev-python/ipython_genutils
+
+EPYTEST_DESELECT=(
+	# TODO: package jupyter_server_terminals
+	tests/test_notebookapp.py::test_tree_handler
+	tests/test_notebookapp.py::test_terminal_handler
+)
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_tornasync.plugin
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move /usr/etc stuff to /etc
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
deleted file mode 100644
index b05ad4777754..000000000000
--- a/dev-python/ndg-httpsclient/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ndg-httpsclient-0.5.1-expiration-test-fix.patch 17191 BLAKE2B 6dd375fe61ac3b55c5660f7fa70fed69d026f148da439d1acb417cb5107f1834be3e5dd089c3daf4e658fba107e3484baef5d0d5161d803b31bb549dd8f77469 SHA512 cd78bd9c39f7b5ea12fe55cdf08351804db98c9871e2f9de9f593c1cbe167ce988c556752392d4112ba4cfe978b5f41a5dc3e8917f9247508c1f514827ffb648
-DIST ndg_httpsclient-0.5.1.tar.gz 26665 BLAKE2B 1c7f0a8d41b945d2b2a51cd69397ab0943cb91e25013c931f055c5608bc3a0106a99d9b126e8caaac9f8d9b409ec117631fb23f19dfd3194b783548ce3536050 SHA512 b2b4c1b1df87ea1a94811b9ae831e7bf32af27258f487fd5ec319e0e6e0d79dfdb1f7bfadaf397d0693a8a7f0720df170a7fc946aaf10c82e3957ac5464f672e
-EBUILD ndg-httpsclient-0.5.1.ebuild 1111 BLAKE2B 5ddb1f157bb8b691cfb3b3c636c12fd63934551d4ffad60e67e04b3fbd485dde6aae1f0562bcd5d2a285029e5d77b7cbd629809da65ab92a38b1ae49ba19ca4b SHA512 36aa32a28e8e29cec312eb70e4a368603f6e056a94378ad62f797d029d9ebaecf1d2db8143f436a188a8c08f6d35d72d46bfe3b4aac617b37a183eda9e2a5ff4
-MISC metadata.xml 419 BLAKE2B 60193b41119296983c604afd02ba7e6d42a8629685436e59c7998c6751d6d03c7ee396d06b5a24f36730ff1aac6fdb8635291dd69ff173ca47ee1e5666ec6118 SHA512 522d2ee170450b69e190a6a6e1b87615a56ca253f128799aa2d3c4327d40e2530fb350162b212a5382ee712ffc3caa3ddd351e6bdea92ed40b0b82e4aa96fbb2
diff --git a/dev-python/ndg-httpsclient/files/ndg-httpsclient-0.5.1-expiration-test-fix.patch b/dev-python/ndg-httpsclient/files/ndg-httpsclient-0.5.1-expiration-test-fix.patch
deleted file mode 100644
index b1328e89a6fd..000000000000
--- a/dev-python/ndg-httpsclient/files/ndg-httpsclient-0.5.1-expiration-test-fix.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-Patch is from upstream:
-https://github.com/cedadev/ndg_httpsclient/commit/370c1ec9713e68f8d9f2cd9984cb42a269cea384
-
-Note that we drop the useless gen-csr.sh script for now, as it doesn't do everything
-we'd need it to anyway.
-diff --git a/ndg/httpsclient/test/pki/ca/7e15277f.0 b/ndg/httpsclient/test/pki/ca/7e15277f.0
-index b9b6ac9..9a4ab56 100644
---- a/ndg/httpsclient/test/pki/ca/7e15277f.0
-+++ b/ndg/httpsclient/test/pki/ca/7e15277f.0
-@@ -1,20 +1,30 @@
- -----BEGIN CERTIFICATE-----
--MIIDLjCCAhagAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQDDAtOREcg
--VGVzdCBDQTEMMAoGA1UECgwDTkRHMREwDwYDVQQLDAhTZWN1cml0eTAeFw0xNjEy
--MTUyMTMyNDNaFw0yMTEyMTQyMTMyNDNaMDcxFDASBgNVBAMMC05ERyBUZXN0IENB
--MQwwCgYDVQQKDANOREcxETAPBgNVBAsMCFNlY3VyaXR5MIIBIjANBgkqhkiG9w0B
--AQEFAAOCAQ8AMIIBCgKCAQEAv8L7md7A3NvKIYndyjHV7f1xVH6gJ8JPrecxAiVs
--nidsYUm8saBV/dFf1jPMQ6hdjIuxLXlopLxThkHlCes/OTxLzBFLvFQQaxLExTsX
--OmgeM4q20a2JLTqkmItPIYDVTYgi0EaF+I9Z1BwWGEfYr3uTizpr48rnzpXgRwrZ
--rjRc53zLKpeqyBs7Qmg5Jlzmk/A+UWJ2ryCWLY9KFE3uPstybYpwq7YayD6upVwc
--vedhh+zpXU3E9r/cnlZ4sKSP2M1QSOTb2l5XnlOU/MLODYW70uItNqs1j1XPuHYh
--/ikO+jmjPUtL0IE47+LcaMU6BpaOCLzcjsSn/DDMYcDB7wIDAQABo0UwQzASBgNV
--HRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU9S+bGqsW
--uQzR/yHDdHoU6afNTE0wDQYJKoZIhvcNAQELBQADggEBAF2scAHd7xjgnJqAUX0b
--7f7QKjpuYHrt48tH+pFOh5j3IgdOqTgRLc/N8lEqoH4M0lKZKbBerM9FiQ4eXCwy
--3Rswn3wXPvi3HJGgvZYUt8J6KY5+syHU4iuzuSHOjznC0lLZkRz6kfZHX+paqro4
--1CsHhCt3ew17QMWEP6UtfZfBCg+kiEfBtSsTUIth0HgdH033PWh5v+nOzGN+3o2t
--ORlzpttV+0RLlsw54l51I6rCEnfKOKtEy491JUs2whUwzp9v8tG4jev3PDVWhSSS
--6jaSNvW4v7SDH0pnw52ZWzaRtA/pV/dCQOlqJ87wDNPdoVGpwqtYF/7Zdw2ty4gU
--oSM=
-+MIIFLjCCAxagAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQDDAtOREcg
-+VGVzdCBDQTEMMAoGA1UECgwDTkRHMREwDwYDVQQLDAhTZWN1cml0eTAeFw0yMDAy
-+MjcxMDM4MDhaFw0yNTAyMjUxMDM4MDhaMDcxFDASBgNVBAMMC05ERyBUZXN0IENB
-+MQwwCgYDVQQKDANOREcxETAPBgNVBAsMCFNlY3VyaXR5MIICIjANBgkqhkiG9w0B
-+AQEFAAOCAg8AMIICCgKCAgEAoLeKc7StJLjyWuPBc+0pg8y5QJ4VQFzOc1jXbhqo
-+GugSvV/BpTqAPPCbd5hkET8nMIHkZ6EkXWNlxvYvrqKOKnrTvw3WUjEmsdoHkaXA
-+hq+v1IHbPbCQbB+RCCObuxlZ9Y72llUrODATb7dc9Odc4LCLPR/9+FjncB1d5b4x
-+Qt74VolID0dCd5dmMqy+lUYjsyLSycItmWcamdMEEPCop6AXlkAq3Q3eQDxaHtly
-+IOmyrYv2EWnFH5FRevhJdTnb48FdUTDya3T+BWpRqzF/Rh3NmI05JTbmSutCOs8m
-+SgSyi0JTNgaOaLlbtYVBLEkETUHPWABWwrXghIMIHaw3BZas2a9nlKE6zQSBxjsC
-+M/jJopgCDjLIxCw/SZ/Koovye/yvhMKYo71YnQCIv+1pIaL7GMrxMQZzrJiUVlpY
-+XtCyjx+5uiD4WuKCq6/aEKUd3o6ZdmNhkG8R0uBmivwxAmuMoMssCZC2GG7dBG+a
-+FlAG0OW+qzez4njjVwT7ePaO/ggRm6yJRNo7s3+SlEppV/orKLH4+O7FJm2HwTIB
-+Z3HSObrOJtjlcjM5pzhAFC4M0ul9vnCcnaFmhzB7bH7h8X7RaqECuHIhhfWTUiEP
-+f+riC5C962eGMqJH3zzPaXCKFVgyYXtphRZJYzf3oU4bGn69uumPl47McLd9lseR
-+uLkCAwEAAaNFMEMwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYw
-+HQYDVR0OBBYEFIYdooV3qYYhM6aq0LTBYQWA9j1BMA0GCSqGSIb3DQEBCwUAA4IC
-+AQAzqykz00ztLxbAEVc8QbfxMYVa5QYp4Ljdl7Wb4IPb4WY6fDkkJ1wRNg/KWZov
-+CkTsiFvQSG5eHEVDLPUjW4WJ+eJI3uPeNjUTB+9i88pjbLqP1VBeiNdpTcOAu4w8
-+cosK1wk6K3LNHATXZArD+8mHEFAHinuqlYwkBekIPBgMgbKr/WlaowV7fkIAUpxm
-+K2W7oLt3ZvWmFrsFcywLsyXmA8EC3d5svQ01YLHE7xJUcjatKSJyc+0dnMNy+ZZN
-+6NTPCefHwi5ShWWmkwtmvCChzePpYP/tBqkAIHLB7js2nHLZYtJYT1CqOGHdy3bL
-+DWHYU527Dj949K03/ZE8jkBqzQje5uAw9bqluydXXkAtMO8rMktIsEjZuMsyzD1b
-+Z8qdeHvwHQjnA1fvMuAO2QDTb8zGc8Mcn2/Jbj9ZD61cej75GWPIDolwSmMIA7fT
-+HyyD8NiOnqM1tGQZQWGTlwZidH6Z7jUASZd+J/+pVKyFmA6ecgo54/w/wTQSv/6S
-+ZWGp4ZYdjdpZ/coX2kbulej+Z3m0m4WB66LbvKD8zCYymRu5ULtS59QElliDKERS
-+U41awYtdgP/R/cz/SBoYxPvY/n1sOWT0mQp1+ctehDf+tDMirjOst71eq6n/85CR
-+NuP+k4yntJuzOjuxZ2MI8iuGDrqi/rFx2AhXXNCkCFDArw==
- -----END CERTIFICATE-----
-diff --git a/ndg/httpsclient/test/pki/ca/ca.key b/ndg/httpsclient/test/pki/ca/ca.key
-new file mode 100644
-index 0000000..4e79919
---- /dev/null
-+++ b/ndg/httpsclient/test/pki/ca/ca.key
-@@ -0,0 +1,52 @@
-+-----BEGIN PRIVATE KEY-----
-+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCgt4pztK0kuPJa
-+48Fz7SmDzLlAnhVAXM5zWNduGqga6BK9X8GlOoA88Jt3mGQRPycwgeRnoSRdY2XG
-+9i+uoo4qetO/DdZSMSax2geRpcCGr6/Ugds9sJBsH5EII5u7GVn1jvaWVSs4MBNv
-+t1z051zgsIs9H/34WOdwHV3lvjFC3vhWiUgPR0J3l2YyrL6VRiOzItLJwi2ZZxqZ
-+0wQQ8KinoBeWQCrdDd5APFoe2XIg6bKti/YRacUfkVF6+El1OdvjwV1RMPJrdP4F
-+alGrMX9GHc2YjTklNuZK60I6zyZKBLKLQlM2Bo5ouVu1hUEsSQRNQc9YAFbCteCE
-+gwgdrDcFlqzZr2eUoTrNBIHGOwIz+MmimAIOMsjELD9Jn8qii/J7/K+EwpijvVid
-+AIi/7WkhovsYyvExBnOsmJRWWlhe0LKPH7m6IPha4oKrr9oQpR3ejpl2Y2GQbxHS
-+4GaK/DECa4ygyywJkLYYbt0Eb5oWUAbQ5b6rN7PieONXBPt49o7+CBGbrIlE2juz
-+f5KUSmlX+isosfj47sUmbYfBMgFncdI5us4m2OVyMzmnOEAULgzS6X2+cJydoWaH
-+MHtsfuHxftFqoQK4ciGF9ZNSIQ9/6uILkL3rZ4YyokffPM9pcIoVWDJhe2mFFklj
-+N/ehThsafr266Y+Xjsxwt32Wx5G4uQIDAQABAoICADoHa08xyl57BM66c4wW8qlr
-+Dux857FwkP5m8ooHx/DHIJUN8Q5mnAzk102MUX1ErzK9g6nDLi0mCYaYN0k32lsO
-+NExEg8DzjEQlNBxrm6NF5he1t2KD0PGpSCWHLeCVW7zlHLXVFKDaAvqQW1j1/LwI
-+Io40ce/sscvyXofob0L03Pfp44HYufASU00ywDGHvLYeebttiCdeaeVmoo43Rr4X
-+eMzAaHmeW0QYRnXjD2lA2En/Qh6xcQJf5uqeoW9ZL8MBe18obC9Oc7Wi2NAWNB0t
-+/6D4RMziEK62WRiA2RNatNjBXugf3+WCH9HfxlNmHc6DV4kvviPZpbJS2WhVWRvx
-+8fgodN3nT6Rbl+bgc1yy8BUHzoBecRELStpZFapsYnEhXzXJkmLtwxVF5gIvVwMR
-+fKJKTFqpVzfD+XFP2VonbDrhgIHSEK3TtKmks7tkB/swz3ftIQiTvGq3Oca+22so
-+8P4xVRsmzAoyumeJgK0pW12hg891HKQzrcITiO2XO5TM+3RszOJq7/KSi4d7ebS0
-+Cd/+g0F3VrfI32VTQv2eS6YKHyHxzZIwq1OdRDQCl8ZCMUk72MpF80rjJfZCXgII
-+/Yq65ez60eW+JsF5Ua+jaSFfjAjQiFxLyUUZxY0yIybzNWsDeyy2+kqya+rvvc8c
-+3LQc0pkJiROaWXr6NOcBAoIBAQDPpv+RdON4DLA5DZjs9nDlh2Q9jxHoRPIcPVUJ
-+shQUILjCQxeYyeOww7g/p0BhA/3BHhJSxCKkvHbo3OD0S/G2TOmpHjifR9Lvv5vm
-+pN/t5EJYJHbXUIA7XKq9wHLvg8W1cA+RjPaGGlTIoCZNTXh11p741fUxdcNtOCPH
-+p+OBE1nVZFotpZllKafL6n4vRurwpt/Ip6pygCMKQ8fllkNmSX4UwXxNPBgJyO+J
-+mW1Vp2EMHqVOr5mZaj0hH6iddazsBIF2cFbz8bnP06kuhDqKzXQR6T2FelycFyfl
-+OH0vC1E6F/cr7YfDxcxSBrtHTnxmUk4vJc0nlT78FiLwH/dhAoIBAQDGIvw+t5ue
-+gG9DIEjd5eJyI9rCOdyMy67gavbkLywzzfAmIpD23zMoPp1yyhB1oXMGjWns5AJz
-+vZ+9I+aiLoxGHFumq5FnWgxq6GSOb+xgmL8SiwRSjjc850vGjkWRNpx7/hcD0T7m
-+qAAHxYOowtW4FRg4xmJM3YIK/NQ3gYz0Kqn61BnXwrbJSga91fTybtXqTIPCoK7G
-+cJQMIXijChl2HahtL2dn+e3VNktLmRqYcG1gGOcS0qZKgLikiZaXJobm87AHVB8J
-+gnpN7GjeQekilE6zYg1v9mJ4KGtn9jlc+z5in8M9gzxh1UMtJGmo7eLiKpxjnnI4
-+MmOqfmfvB7hZAoIBACfLyY8G59FKHTvR70z6rghPOlbR5IyvKfdfibyh9FcnLkGM
-+uij+CDUITXdlhmERcsBgEwLps/n+ZIucSUCIjXpyoxVWRWPBUBvCjQ5W6tOcu1pJ
-+Ir2BIBJAYDideWmNx4ZOQ62RZm2s/jK0/qIyBrQOvcjSuHsSJrH34GOTOXazTrQm
-+12GIKy3IHfBmsGg/Hyef06OQ/omTJSQCeXz2n1QrIY64xinHKpQ1fjLQxLN1sJOy
-+C9xYqwdL5QtEFfyXYNyawHUCcqet2/6IghP4I4AWf/guyyuZl8YSagL0IImzkY2g
-+qi4xB6PtdIsD30B7Ojwh6fn/NKIxaDDHzUpX1gECggEBALrBzTsce52J99Wwv54Q
-+ikIF07PRMDax4jL7/50TbbmiumJnoHZh6elcI7JIDf2iYTZi4t38COepa8Cu7zwd
-+XfDT1/ugqdxd/2hhhi7QBmECeM90o21hSWWpqj4Majw22obw+CaL+5sT7Xtly/St
-+OR9bGsqhC5TiESpkJ2/uN7sJ39BiTb2Wdg4DLZmP62L737wJxQQVyseW46UPg5NB
-++L/hspi/3tsds/SNSamHNY9MIXw73MpcLYv6CpBkc8Ii+XMFbP1raBnhl4CNfkdI
-+nwQOAKSKnpnTBfu2NY73ghhHZQU3C6OWaLradog9Uy58k6eUfHZVqdmYfWL95N9k
-+SnkCggEAQ9oqCgTs1H8pEVZPGGAGMjoFJT69HH+tKI3I/kLTEkJFP5zVz/jlFWqD
-+E5E935r9WexLSHazZFwb6CAaeJuzuYKfZmOgCKSPmHLkop1jR1yBqvzjXPPqJo9b
-+Si6igNS7ufEw1uM8ru+/wCYrUA20sVQSeECNL1B1re1Av8AtMvNCJxkclo5o6A5P
-+mFygoVlpPasKJr8dzMExtcLdtHl6XbpNS55kcO/JpnevhUTVpq3URvpsf21xmFuj
-+fy27gWvcokG9WLpuPyd90ShzocJyjLRXteFcjHkPtNwUJc3QGh8xlPoqs7MfSA76
-+ep2Pg4lXDl4+iO5SDobGse4Ka/Pkkw==
-+-----END PRIVATE KEY-----
-diff --git a/ndg/httpsclient/test/pki/localhost.crt b/ndg/httpsclient/test/pki/localhost.crt
-index 99711dc..74a393a 100644
---- a/ndg/httpsclient/test/pki/localhost.crt
-+++ b/ndg/httpsclient/test/pki/localhost.crt
-@@ -1,19 +1,30 @@
- -----BEGIN CERTIFICATE-----
--MIIDDTCCAfWgAwIBAgIBADANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQDDAtOREcg
--VGVzdCBDQTEMMAoGA1UECgwDTkRHMREwDwYDVQQLDAhTZWN1cml0eTAeFw0xNjEy
--MTYwMTA3MzJaFw0xOTEyMTYwMTA3MzJaMDUxDDAKBgNVBAoMA05ERzERMA8GA1UE
--CwwIU2VjdXJpdHkxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEB
--BQADggEPADCCAQoCggEBAMOuihdNsoWgVg+DsRBc4kckQ5oiCVsx9NiRkUoCE3mu
--dQb6pCRhoD3vjMMt18Ajr9xNMtqTtP3lqQ4iId4bd3WaNc2L4a9698QOnpY+Z70T
--0pFckNvVcC+5kXHPCFsm/jIVsjJDdPQWM0fFqPGZTwQ8ssS5P9jdB2JHchHFOCWd
--IYYO0jY1BEJ1AXeK4XzfU0/00s0LnleLrbEpNB9ckQaSbLU7I9o7fDr/5+WbV8tI
--C5OG/ZZW7jlc4t4TLpzkUatBGW3c2PKJPgtWBAbtScxbtHB4mXV6iwmp3hlLT6tx
--vKD+b8TFpxGPdoOfIHX6/hjMJa+kr4Z4MDHeNfHu6eUCAwEAAaMmMCQwDAYDVR0T
--AQH/BAIwADAUBgNVHREEDTALgglsb2NhbGhvc3QwDQYJKoZIhvcNAQELBQADggEB
--AHm7NNZvti4QfopARMIcuokWHac18Ka7HBRE04WxLw9vKuYYu1m7d/0sUhk3KuBB
--ANOyzlt5y7ecEIAqxGe0m1yftD4Dgj33wB7kHvbIKUceKI563PM757RgDm6C70/p
--3OwOCcx2FsSaKLFBdtahzv1cMriN7JpEoa1qT3MnmFyaK8hEaXxbRGwDDAXRgOix
--ftOkNc5w0glQ7dl9CYq2QvsnMtG327pvyo6lBTKNjFzppZ/msOagPONuAcrtLAiU
--wTNk5Aqlj6a+Njtq/LJFdeyYsVxwuqvVnEsU+9FJFL8PYrWpG8fA1dIXaPS+06Oi
--vAMwOmVKhtgKvbaGcYa6efM=
-+MIIFDTCCAvWgAwIBAgIBADANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQDDAtOREcg
-+VGVzdCBDQTEMMAoGA1UECgwDTkRHMREwDwYDVQQLDAhTZWN1cml0eTAeFw0yMDAy
-+MjcxMDU2NTlaFw0yMzAyMjYxMDU2NTlaMDUxDDAKBgNVBAoMA05ERzERMA8GA1UE
-+CwwIU2VjdXJpdHkxEjAQBgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEB
-+BQADggIPADCCAgoCggIBALAc2LCkaet7eZdOPQgSRcz2e1mJQ3qwMqT1BdMn+AG/
-+9ZMInCftXmJBHpb5WKeA4hclCP+sFUfaxt2TcJ7rNsPX6rkN5JFwMAIDMzjaq8Dr
-+1ZYjenTvInnb6tWIK2KP9nVdJRxSCXHIdN0pvJQdyi+3LOnTHyfHKIH9lTBLf2HY
-+Y1tpGFDWL/ywHbh7krUkIfC3vSx6xZXBNgStIH4gjpP2DxKfuPmSw1Kae2vOKcRJ
-+29PwB/H1TaPr0VvQTNN+cBC2oOehXpH/QRbU8Nye7uq4z/llKD5LMZAOJe7VUU5A
-+zxUH7DE27824CmS1ywd5JueyednsnsTjltEayQcnvAm/OEIr6rO0aDVmZH40i/W1
-++NdiWgGxt3OrvjU71BQAlaknshv2xDx9UNsLrQ+iOpDdsYxpD84s4Za0V+qnq1J5
-+QCSD7oaQLi4SG9nPLC+wpEhMCVGCHtClfL1NVSBYVycbPp1iLQP3xCiwV9058XVP
-+T2psI+PaPLeXp1ZNpEkRl+/UyAdDKqb3C6nE1tqNbTURhuL/ECFFHiH1k4mlGZfG
-+n2YL90ROqKFm6YdYE357vPrdjDbow32Cqt8wJqTE3mIaxZH+vLqKRezbU8fmo+7g
-+yEMePsCTWw0yXPyorioLAbFZBO5512sa09CXLGmeTaLs0215zaK81HnAgMwFWT+9
-+AgMBAAGjJjAkMAwGA1UdEwEB/wQCMAAwFAYDVR0RBA0wC4IJbG9jYWxob3N0MA0G
-+CSqGSIb3DQEBCwUAA4ICAQASq7gPmWVMjm6XzmHJ2LSIJAjGEmjWSNBf1rvbEItH
-+NjxzLu4VfiShgj9y53yWoNJSJGGGtoKmaNQK63x9GzTQbN60izXlW20FP32b9Idz
-+6y7Ta4JSqNx1Q/OW+ABsWZZ68Ob19XLr8QY5fog3Teh7Q0jzln/rxteB7OUTJ5QC
-+o5Nq7PDlg/R9buRZnHHb1tmBHbSbkXK9wjgSQMtbga2EQuewJ5KYHYUrdYsklg2u
-+wqnxtL7iND1dGcG2J3QKdC2fT1i7EdU5ZFvDxo9VOPvQmrIzzHKfyfgmOD3QhOrz
-+2rCcze86Vi8zlk0yk8oQNTjLndnJgSWYq0OFl7iape1ObblulILDhb80RI5N6pK2
-+WIb05Kl4Sm/bNcphi5KHtQlr7HzSNojr4qgHlo5KdQ6IW/ZOIGHgq6OjcifAIsKw
-+wkojOqriFdeKAiU83bWvxVUW/F9Yfe/hHCjjRxp6xMRoGTh63jGmAWxu/WR9GpFP
-+pfVsHLHg3p8tU4TusU1I5TuHZ/8B7atpFdlS5J8mc5bVB6oHYuaJVg4bbMGQIfll
-+m5CTfEKfTxkLjVtUGEhmoutb60qnXECNhUYFef69hMZ5VOUj4gAC8e2JKm/8yjG+
-+K9USxsK1YTAMIKBbLqNsJmOB8mz08CxPU8R6XCvzDPr4rqnG18IcUxAlbYiH77eA
-+qg==
- -----END CERTIFICATE-----
-diff --git a/ndg/httpsclient/test/pki/localhost.csr b/ndg/httpsclient/test/pki/localhost.csr
-new file mode 100644
-index 0000000..a3c5181
---- /dev/null
-+++ b/ndg/httpsclient/test/pki/localhost.csr
-@@ -0,0 +1,26 @@
-+-----BEGIN CERTIFICATE REQUEST-----
-+MIIEejCCAmICAQAwNTEMMAoGA1UECgwDTkRHMREwDwYDVQQLDAhTZWN1cml0eTES
-+MBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-+AgEAsBzYsKRp63t5l049CBJFzPZ7WYlDerAypPUF0yf4Ab/1kwicJ+1eYkEelvlY
-+p4DiFyUI/6wVR9rG3ZNwnus2w9fquQ3kkXAwAgMzONqrwOvVliN6dO8iedvq1Ygr
-+Yo/2dV0lHFIJcch03Sm8lB3KL7cs6dMfJ8cogf2VMEt/YdhjW2kYUNYv/LAduHuS
-+tSQh8Le9LHrFlcE2BK0gfiCOk/YPEp+4+ZLDUpp7a84pxEnb0/AH8fVNo+vRW9BM
-+035wELag56Fekf9BFtTw3J7u6rjP+WUoPksxkA4l7tVRTkDPFQfsMTbvzbgKZLXL
-+B3km57J52eyexOOW0RrJBye8Cb84Qivqs7RoNWZkfjSL9bX412JaAbG3c6u+NTvU
-+FACVqSeyG/bEPH1Q2wutD6I6kN2xjGkPzizhlrRX6qerUnlAJIPuhpAuLhIb2c8s
-+L7CkSEwJUYIe0KV8vU1VIFhXJxs+nWItA/fEKLBX3TnxdU9Pamwj49o8t5enVk2k
-+SRGX79TIB0MqpvcLqcTW2o1tNRGG4v8QIUUeIfWTiaUZl8afZgv3RE6ooWbph1gT
-+fnu8+t2MNujDfYKq3zAmpMTeYhrFkf68uopF7NtTx+aj7uDIQx4+wJNbDTJc/Kiu
-+KgsBsVkE7nnXaxrT0JcsaZ5NouzTbXnNorzUecCAzAVZP70CAwEAAaAAMA0GCSqG
-+SIb3DQEBCwUAA4ICAQBQ+niVozKfjJP1VCTDb88/mAGEpEOGF+BXwN7EdQKAwZva
-+vAxQSpqt8h0EYyToPCV6P5GNzFQ/rRW2OYgWwXEHk3ptiQzcJzIF/F9CbE9vgYO5
-+Xvosxy3uyJr15sAoS+qL4jEXg7dDni+LesYYR5qx6l/5nYG/6ql0Z/K9+Z/1xrci
-+00Ml6+xq/oT1kc0JQYuUKnMXgQb6Mishyt+ESoRDFt6oFqlza7TNhC/Q3YxuOjqw
-+Hr3rc1T9L8ArYFMhwjCBSitJS9ojqtPyXTkE4ZrQoaAAl/jdwbiHQ81/PQErgrk4
-+3RkyokdrOkeK2CssJ402s8ybnbYzaI+wg4K7r4APsiOXAacfVObmPYzQLamqCNkE
-+hcGD6Yp9JpSgVWH+cTHa47slz3RjLxMW0EMfffYOlsWlxnlY+LHTMrphfd7otSlD
-+c3lSbUgURW6babKQBxOULR0AooaJK/uHgarb+6xNQoPTA7RSDfemfBGu+xAxIeE8
-+xPRXH6DYjhzwiHB8tFKcfdXX+MZCQ+QUHsbeVLVl+0kkw3J5bRTo5lS6menuzbPA
-+osnOO2IMBrhctgspj6MJg6lyFyWUDYzWn0JU6+rF/NHmnrlFgJ5in1eg1u783bXJ
-+0jKPpw1QAOz+gI2MHKx2Tpbu43UtAb/35GtW711e6lhm3gZUxjVQj7qhfW1pcw==
-+-----END CERTIFICATE REQUEST-----
-diff --git a/ndg/httpsclient/test/pki/localhost.key b/ndg/httpsclient/test/pki/localhost.key
-index 98a3db4..4be01f3 100644
---- a/ndg/httpsclient/test/pki/localhost.key
-+++ b/ndg/httpsclient/test/pki/localhost.key
-@@ -1,27 +1,51 @@
- -----BEGIN RSA PRIVATE KEY-----
--MIIEpAIBAAKCAQEAw66KF02yhaBWD4OxEFziRyRDmiIJWzH02JGRSgITea51Bvqk
--JGGgPe+Mwy3XwCOv3E0y2pO0/eWpDiIh3ht3dZo1zYvhr3r3xA6elj5nvRPSkVyQ
--29VwL7mRcc8IWyb+MhWyMkN09BYzR8Wo8ZlPBDyyxLk/2N0HYkdyEcU4JZ0hhg7S
--NjUEQnUBd4rhfN9TT/TSzQueV4utsSk0H1yRBpJstTsj2jt8Ov/n5ZtXy0gLk4b9
--llbuOVzi3hMunORRq0EZbdzY8ok+C1YEBu1JzFu0cHiZdXqLCaneGUtPq3G8oP5v
--xMWnEY92g58gdfr+GMwlr6SvhngwMd418e7p5QIDAQABAoIBAGgyO2PXQpU24DyY
--oiMVYoQBQmIDd7nwqvDa6mNfIaGsjLIvqlGZDmuMcAbKFVVBa3ZCQS70ce60aMWW
--1TPgqkab28RclMsNDnt+UWGtTy32LSyr/pKgX4F6LYFNfaST6c0fkmiDVPZYD+xK
--ywAC43ldHM/12JKQd0sUwh/GRXR4/Y9anWR4uLcfWCRU/7JVefdUe1VWeeelCMB4
--wCcv9aQeFKnKeRopg5sryMo0thXSJCrO7UTSBmyasgNlMjUFpIIlPZQrWKXBtN48
--NT7yGZ4j4RpSS8jhIxZASmyj1eyn2bZEk5SFcFM0wN78lOIOyGBB50QJBSEuKvHT
--suFBzI0CgYEA53PCyAxHcA4wfuZJgF24VTVUpyZEjjTBRtLrZxUrIagVph5iS9f8
--X8henBabaNBB/xsb17qPesCpqGJJEj2XpSKjTQdzmjCUZV8oZSLW87esXwm0Jfb6
--dmDqShwlph5l31ZG27I2uTMV8HE8PAOta5rBEFsEwEZDmwtsIvwu6NsCgYEA2G+Q
--ZbFelFC6+aGKPTPrPVzX45IMPRE23f3euTJdEA+T06BD60LC0jQlxmQghlDUZkxs
--s9ihPnj2nHuaxJyR4G+/56oba5Jds2ZAiU7FNGZpBHh5J6tUligRJ8cjdRiKJheb
--H6imcRiD++6P2PnQUPuSnfnxo+yxDotUxtfflD8CgYA3brIn10kEvWFAA0d3Rvru
--7Wbo4XFp3ZisrbdTaO57kRYeQwinwYLgLcz69S8jWz1zK7rvX+8dJyd6/I8jnzzC
--gBk8SZyWQSxJWxEBp+ZzWHogCOLsdMpnr65tMXCS6JTdeHxgAb65fFK002nptbfD
--Hb0/fY0Vv75RU9sCRgO2IQKBgQC+MALuKZdXsz0qIRZtw5LCQDSBiBPzEY5qMiym
--BqiadWXMP/eO4wJ5XlOXauLdxGdwYVXgD8tZL0hdp4wPmxng47H5q5QeyeZGv+KU
--BcDq09cSk567CiXxMNIqZyY0PlUfNf0dK8DeftFz72U+H/87OmXTJhB9oH7RrgPY
--G1gfVwKBgQDiCfLBoEfwOpif1XAglNdIv6J1M3rwS85txHlY8H91iiBaoKosLzdj
--ZTeqOn6ofsWj1NaR8OudZApZZT1gHjmDUnpzrQZvHn1gelsVwoZfXs1ZWX+J4giD
--Rt3aZFRc4uPVgVNLHf4kADWao5bwvbxWfx74J2LQ4QJ4rxFumeg8HA==
-+MIIJJwIBAAKCAgEAsBzYsKRp63t5l049CBJFzPZ7WYlDerAypPUF0yf4Ab/1kwic
-+J+1eYkEelvlYp4DiFyUI/6wVR9rG3ZNwnus2w9fquQ3kkXAwAgMzONqrwOvVliN6
-+dO8iedvq1YgrYo/2dV0lHFIJcch03Sm8lB3KL7cs6dMfJ8cogf2VMEt/YdhjW2kY
-+UNYv/LAduHuStSQh8Le9LHrFlcE2BK0gfiCOk/YPEp+4+ZLDUpp7a84pxEnb0/AH
-+8fVNo+vRW9BM035wELag56Fekf9BFtTw3J7u6rjP+WUoPksxkA4l7tVRTkDPFQfs
-+MTbvzbgKZLXLB3km57J52eyexOOW0RrJBye8Cb84Qivqs7RoNWZkfjSL9bX412Ja
-+AbG3c6u+NTvUFACVqSeyG/bEPH1Q2wutD6I6kN2xjGkPzizhlrRX6qerUnlAJIPu
-+hpAuLhIb2c8sL7CkSEwJUYIe0KV8vU1VIFhXJxs+nWItA/fEKLBX3TnxdU9Pamwj
-+49o8t5enVk2kSRGX79TIB0MqpvcLqcTW2o1tNRGG4v8QIUUeIfWTiaUZl8afZgv3
-+RE6ooWbph1gTfnu8+t2MNujDfYKq3zAmpMTeYhrFkf68uopF7NtTx+aj7uDIQx4+
-+wJNbDTJc/KiuKgsBsVkE7nnXaxrT0JcsaZ5NouzTbXnNorzUecCAzAVZP70CAwEA
-+AQKCAgA7nFgAWnZ7vZyniVUBMWYs/VU9Nkf/9DoAOeuR0JqSxQ3ziduJbEAhU9dt
-+1NKcR/S/Tsrf97hwTO45O9nIAOfVnHUX1EsEq4ukcr7YxLOUJn9yRWoCwJrT0ouH
-+YYMF5qLOkQuprV8DA44C+kiZfgfc5MywDMUj6racYWApK7TfQqZG36jaW9V8W4SD
-+2FgNNkDCwP6oWpocmXyWUp+H8a8xB/2MGUI8P+AbSqzyDaN3jGR7NWkLDjQMgxqn
-+UDdg8xAtqBOIs8dV9adregJZOva1vn6u9P2NMFiDYTaXw960dR1jCf55nhXHdT8X
-+Xa1uRyTTEkdKa1xGWp7HAqD+6gUsWw+fuavVMmMcgBm4tYSvFActBPZrpIuh6H1e
-+8g/ow+mnn1E/sfeu5vbvYCaq5mhchC7T9snI0FDH+eDqa9xBIqBA/f11IFE/kryA
-+zw2ZdieB5EtW9E8yMOdfVhTAj5y3nuBPcQPwlWVpoYY7PVX407qth3SpT7x8Xgan
-+lZFFraKvQ2MSI3iOrzHCinlsvc8SsmWJifDHAFxFmqead+Yi+M/BH0F8zkFikvmp
-+swWGE5znZX7EBiSVBwx7H6IFH+3HhAPVnADW4WIyykdoEydNczX0STuoj7XJdKiS
-+BPgse3aYfvy7bDpwUhdKbjT97Uvsm3Zj3HkEl8X1TMK2MtqUYQKCAQEA6PpoGQke
-+p2LRLsVdOekYG2M4uJDNtqEQ5qaZxrYEMupFPlcZv7JbIyqmE98hgKAaf+mE2fJq
-+Qn5puydgaLfsHjmcn3UUDTEvLnAx9Qrp79md5VFwOcAtTNA/eKhJSYujAMedJlFC
-+RcnHuxK3qWy0VODDx2qwqC+9GBUtH/fREQ8SXeJXfnGVwaR8vsWgtti3JefvcP21
-+pHKmA8EpAK7tEuJuKBbqabbNXfsBswpfKnlG4DwcEbIWyOZ6GjSJKQuVvDQ6dGcI
-+YW6wC0jiqvMr8g5KbpfXP9uWhOTMg5epQqn9ALEetpnRZ3pIzLauW/pKKhcm48wG
-+mnADLBsYLvyuFQKCAQEAwYPtbG2RhFhMfOJjZxOVx6h/0HDsfRYmV9YZXpSs9lJE
-+9em0hdoA2ZF+aO8kjgWpZzG/yEnn9ZYTrks6vD+Q+bxXmtGOgt5YgB9XcaOFzhMy
-+QbqN9ChqZ7FezhWnYVz05GA9WQ0YqNmC7wRN22DlYUkkSx8vViDTpcTxZrgq+KAS
-+7h3tpENsQ9W8VEzCnKk8UcvvvbrjLDZ9AdZhbsgWa6YMxzEHduS7XnRk4pzKsLoD
-+zE+Flu5f0TYZoivNCt2v8qZToUt+3x63clgSxssxh40HCkpq8X46EvGSySTADRN9
-+ZQTnxF+IxrsBg08DEkvYujUHyOx9gjSsdwPu1jPdCQKCAQAi9YAtUYsB/vf4lrD4
-+gZuWcHsQZtoXb2/DzHgCs0lKApFFW3iHpVG7oyisjqzOSjfvvbCrq456T9G5vZzf
-+2clad7aizsSlfh3gUAGPDYYw8WyZ/nBimg2yGwWLK2Vj3col0c4o88SICFEqJxLc
-+H22n1tpJ0B6V/iPXu0W8KEl8z9AnulD6rjyUhAQb9De7eCVzUKxDPi7FcFas9Y0b
-+hyQX01ZIObgPCNkkIwgMP6AsFWqnNx3XIev9VWg5Cm0SdaSQSx4CXXuKczuDVfp9
-+QGP1vGM62Rn5gQ/C/Toa/OTvFeba9bjwGYCskFLgNQFQ1+vNCRBS2kibX/d55M7q
-+LgxJAoIBACq29jdS0CYIX4nJZuuftRYHKX9XDbxmoTwONDdeVfdhHXuyhHhvMHTV
-+2rNK5iS7NzNiFdUeCyd4Ywu761EWLugRHL09uFlGvv447NJWp/he4F8F0MOuEB6n
-+VifjO7kQDbZDUAdSDrlmmbIsnwrnjno07N/wGEDIqi8TE736tPGAU+1fic8SWtl2
-+WkW5U9PEv13GyDp3ACIIPPuk2IjdfaVxV6y4M8+YmYs14fbraQotZR06CGDSaTAC
-+4xGa3X2ihW3oLNmTkoOpghCpRCvBOkOTa5Rn7Mc1d5gq3p2rkQDR5oHf3VDJTaWg
-+LatQS3tEZqhjgD5nhSSyf8cdhSCe/hECggEAW8H26QCB+oDaQjevURUbkT4a5tE3
-+sX9bGXlpAK+JE/hMJqxspNmXeTKm/GsMKT/JGaOIqstIYNsILjAihGbZj9OalOnX
-+re4rVYq5Cs7mDXVP7vLSeyX8Z6Y8qiWiwtx3UMwMXYs6+2qPbHFPr5Ult53rswaE
-+lIbGdYbPouEGPXxs4J0Xy4h+CQtCi5UVuR16gq2gPmqhMwLz19gXRPh3V+5hH32B
-+cgnqMKgAKxoJNpuPBL/v1OJ9YTFwFUokUMk3IzgTsblOXtxtpAlomv1lX6Y5JQxX
-+aBw0t8HRxMF+fdqq5xHEcgvp+CWqBNuPXdVPAH25nibsPuTgnPIb27PTew==
- -----END RSA PRIVATE KEY-----
-
diff --git a/dev-python/ndg-httpsclient/metadata.xml b/dev-python/ndg-httpsclient/metadata.xml
deleted file mode 100644
index fecb5a6e9fbb..000000000000
--- a/dev-python/ndg-httpsclient/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">ndg-httpsclient</remote-id>
-    <remote-id type="github">cedadev/ndg_httpsclient</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
deleted file mode 100644
index a7a07d13c1b7..000000000000
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
-HOMEPAGE="
-	https://github.com/cedadev/ndg_httpsclient/
-	https://pypi.org/project/ndg-httpsclient/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
-S="${WORKDIR}/${P/-/_}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]"
-# we need to block the previous versions since incorrect namespace
-# install breaks tests
-BDEPEND="
-	test? (
-		!!<dev-python/ndg-httpsclient-0.4.2-r1
-		dev-libs/openssl:0
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-expiration-test-fix.patch"
-)
-
-distutils_enable_tests unittest
-
-src_test() {
-	# we need to start a fake https server for tests to connect to
-	( cd ndg/httpsclient/test && sh ./scripts/openssl_https_server.sh ) &
-	local server_pid=${!}
-
-	distutils-r1_src_test
-
-	kill "${server_pid}"
-	wait
-}
diff --git a/dev-python/nose-random/Manifest b/dev-python/nose-random/Manifest
deleted file mode 100644
index b580601347d4..000000000000
--- a/dev-python/nose-random/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nose-random-1.0.0.tar.gz 3776 BLAKE2B 18dc40b13fcb970c4d2edeb6be9c6f3e710b36d14dcdc4a56c6e3ecf811ab2acd6be3e1c1cea2231eb5dc10581c77f201220354c77f3d9f67d89d894ed8b4f24 SHA512 9c62413fb00c3b774954ae7a65b08b122ae0dd2b24377efba8de345597b4ce4952aad09a0c2fea7f9d92f57a3664908fccd6eabadf32074a35978c958ea2b66f
-EBUILD nose-random-1.0.0.ebuild 527 BLAKE2B 275faff15a8a23926c5f0469862041e2bfec2b05c6f21b7343a7cc9ecc2022803f53f603891c8511500fd93b0525d6a6aae311c74377c9ed9dccde6ee0f1a673 SHA512 8e0e34f639ef576c7d2471db9513571ae981fe9b2960dc2fe05d8f34334a2904cb1738e34c09fe3ba766fec9b8f8579bc41856070ee4fd3a392d3b6dccc388e5
-MISC metadata.xml 339 BLAKE2B 59546b2165364d562089446ba45bab4c7b50ed8534687f9d8177e6f7b124d741a4ccb1b3d637bff0982ab80cfba440d8f24ea2a5a957549502ddb505b89764be SHA512 2494846329fd4c23e6b11403d5a1afb1ef849435de6a5e217663cae14087d39038e150b9c92fd0630db3f037dfaab0fee5d5a0f59a6291ffc63e2121a10db74e
diff --git a/dev-python/nose-random/metadata.xml b/dev-python/nose-random/metadata.xml
deleted file mode 100644
index d36e8f010987..000000000000
--- a/dev-python/nose-random/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/nose-random/nose-random-1.0.0.ebuild b/dev-python/nose-random/nose-random-1.0.0.ebuild
deleted file mode 100644
index 0b75cf8ca3ad..000000000000
--- a/dev-python/nose-random/nose-random-1.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="Nose plugin to facilitate randomized unit testing"
-HOMEPAGE="https://github.com/fzumstein/nose-random"
-SRC_URI="https://github.com/fzumstein/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
-
-# no tests
diff --git a/dev-python/pilkit/Manifest b/dev-python/pilkit/Manifest
deleted file mode 100644
index ec2dbc2e46e3..000000000000
--- a/dev-python/pilkit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pilkit-2.0.tar.gz 160077 BLAKE2B def84c3444c5ffe7e1b9c016c2fe15de222d6765e7ce4652ef2f6864af59fdc89b9bde5c7a63097838ab3fc054c81529dcb4a13cd3fb3ee8a0f141f6b0030c10 SHA512 7732c67bc00db53c6849c907233381cca7f9055d55d479958a7b97db277524ac280753fd40c0023fe2b34f98b7261134f993585e658275ccd4c67f357c13de51
-EBUILD pilkit-2.0.ebuild 658 BLAKE2B 667759835225f899a32c18f1c1af6428f8abd70d3fa9e554cdaaf5f293c27e3cc14ee74800c46ac749537804a54a4c4f881214a9406e8bcd6932f2c921ba7cd8 SHA512 bf593865d4628211d687749d7b4c476011b4be76546f3163ee9d5934ee65b8ba4cab72b1778066eeae382346f4198087f609edbcb359dbf81a1788c245646862
-MISC metadata.xml 608 BLAKE2B 0bf111de29aa750d091579192028e07f4785a1532ffe8c854fa08efda13473a3f3b795eab653bc93141f96f45b9373ec221f7b84baa5876b372f076f70a20ce7 SHA512 c60e1c01e82b8cc98b1eadd9a3a1d60e4fb0d0d75ae98195cf22bd45c2f317124364dee3d175f57f22903559f50814dabfdaef29793a8cef9ae44a4ebf641ebd
diff --git a/dev-python/pilkit/metadata.xml b/dev-python/pilkit/metadata.xml
deleted file mode 100644
index 31d4ed19ac57..000000000000
--- a/dev-python/pilkit/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>thomas@gstaedtner.net</email>
-		<name>Thomas Gstädtner</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pilkit</remote-id>
-		<remote-id type="github">matthewwithanm/pilkit</remote-id>
-		<bugs-to>
-			https://github.com/matthewwithanm/pilkit/issues
-		</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pilkit/pilkit-2.0.ebuild b/dev-python/pilkit/pilkit-2.0.ebuild
deleted file mode 100644
index 15073a21bb77..000000000000
--- a/dev-python/pilkit/pilkit-2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of utilities and processors for the Python Imaging Libary"
-HOMEPAGE="https://github.com/matthewwithanm/pilkit"
-SRC_URI="https://github.com/matthewwithanm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},jpeg,zlib]
-	)"
-
-distutils_enable_tests nose
diff --git a/dev-python/pytest-toolbox/Manifest b/dev-python/pytest-toolbox/Manifest
deleted file mode 100644
index 2a79b4a6cc20..000000000000
--- a/dev-python/pytest-toolbox/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-toolbox-0.4.gh.tar.gz 8594 BLAKE2B fb1f19513e9e4b191c3eb995cc5e9445bc9f19affef87350d925c5465210c4de945b91120f86664c1dcf02a638595a7725cf88e3244e377ae77558c70d65643a SHA512 ed27700ff77cd607be808142cc310cd2b7461e55b3f8352d304ef8ca6c5e6c060c67a63238a1025407868ab8e229c4a16eaaa56aa75000159762001accb67752
-EBUILD pytest-toolbox-0.4-r1.ebuild 1039 BLAKE2B 76b925d17c414eb5264e773b5428a47ff331f684df373fa28bee6ea7d5ea79560ebef279ddf0057f08f242ce6c7b061e7dac05c9ec39833517da2d26bd60cae3 SHA512 0aadea59d2f3d4bf50891d6aa1b4c2c0ba93cca92db2595c7dc68bf01d953ad53fcf454c71754712a6b73eae9d33bd6085900aa9543964c3ca643a292db9a2dd
-MISC metadata.xml 419 BLAKE2B 4d9d5836c30bf06f5b7cdc563cea54b206d17bd08ab192642f06697d81c8d7e4ed1094aa3851e905594dc233c7381937f2397149b19944e071019d6d5cd774c4 SHA512 044a0eb820497c6a01bcc0358d62cdcb6a071f82d98a81ca2b052108401db5dd07a993bc0a622631ce96a7add97b9686d20b015088b6cd6089eed830155b8f7f
diff --git a/dev-python/pytest-toolbox/metadata.xml b/dev-python/pytest-toolbox/metadata.xml
deleted file mode 100644
index 3143de31e5e4..000000000000
--- a/dev-python/pytest-toolbox/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>arthurzam@gentoo.org</email>
-		<name>Arthur Zamarin</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">pytest-toolbox</remote-id>
-		<remote-id type="github">samuelcolvin/pytest-toolbox</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild b/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
deleted file mode 100644
index 6ddd8aa376a2..000000000000
--- a/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Numerous useful plugins for pytest"
-HOMEPAGE="
-	https://github.com/samuelcolvin/pytest-toolbox/
-	https://pypi.org/project/pytest-toolbox/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/pytest-toolbox/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pydantic[${PYTHON_USEDEP}]
-		' pypy3 python3_{8..11}  # TODO: python3_11
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/addopts/d' -i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/pydantic[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_comparison.py::test_close_to_now_{false,true}
-		)
-	fi
-	epytest
-}
diff --git a/dev-python/python-zipstream/Manifest b/dev-python/python-zipstream/Manifest
deleted file mode 100644
index bef03b8e65e6..000000000000
--- a/dev-python/python-zipstream/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-zipstream-1.1.4.tar.gz 21376 BLAKE2B 84b022f93dedfb46da911c3ed800c3a6eb3685bf9c6180b9aac5d4d085748216f53759f83a085fa57f245033281aa4be1578b4051e8a855bcd2300aed7820460 SHA512 722c1d7db91dc47064fc51f1182417f46923b8f42a56e854f1fa125eaccfc7f86d3deab71709226a798a1caf5a84a8a7fa7d3564065ab91afbad434ed787ce32
-EBUILD python-zipstream-1.1.4.ebuild 424 BLAKE2B 5ab578525c88decd1846457e463209b6777b0115f0da1e4a427f8b99a211afd49b16e440e134afb6d719baa390b8bd887e626ada01b4610d2efa67e3466b10a7 SHA512 7dbc40dee0e0a666732c4ef68e7c0e367d3ff4d5697709af7912bbd5a9244d43db03d32516b3ffe8461198ad6c013af829e908563062d4360211c7240127de70
-MISC metadata.xml 429 BLAKE2B 127c10fc0b3547def46d36155735e2bff0d8b0e2b1c0d51711a176713c1d7395338129a1135094ce14270af84948c5a6a735306564123ad46c58a2af13d961ed SHA512 d95004eb62e6d2c23f5b719b98e42e6dca325f0859d920365064d7560467fe61f0904849298babab9c15a583e9732d2736c40f165b19c737b44e4e468b260d99
diff --git a/dev-python/python-zipstream/metadata.xml b/dev-python/python-zipstream/metadata.xml
deleted file mode 100644
index 3446665906e7..000000000000
--- a/dev-python/python-zipstream/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">allanlei/python-zipstream</remote-id>
-		<remote-id type="pypi">zipstream</remote-id>
-		<bugs-to>https://github.com/allanlei/python-zipstream/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild b/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
deleted file mode 100644
index f6fcf1d2987a..000000000000
--- a/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A zip archive generator"
-HOMEPAGE="https://github.com/allanlei/python-zipstream"
-SRC_URI="https://github.com/allanlei/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests nose
diff --git a/dev-python/qiskit-terra/Manifest b/dev-python/qiskit-terra/Manifest
index 78a9f4e46b5b..c80d08742469 100644
--- a/dev-python/qiskit-terra/Manifest
+++ b/dev-python/qiskit-terra/Manifest
@@ -5,7 +5,9 @@ DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616de
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST crossbeam-channel-0.5.6.crate 90292 BLAKE2B 7da87ab15c384754d2493dd1a30e83550cd4b2b749b7f0c24de131f054e3a2e521e1bb4ba10094378c8f4c7bdf19218e35b10562c50b4ad1d2871bf6f821e488 SHA512 de6a42ffede95750a13e3b9af6ab26cbc498125860cd8e4d227c7361bd831e558254a48bdef5cf901585a915003071b0efa321f2011f282218c364780f62f44a
 DIST crossbeam-deque-0.8.2.crate 21237 BLAKE2B f00948fe90806fcbf1585c0404250dc84bca2cf27733bf7f2a0aa957e618f916162f41124333329a5b1e84909cbae3d93fb3b4461ab23e9dd97672c7d520d5b7 SHA512 a50a878d843d6eb1b5b92321ce6bfb87a23d3c16e820b1ff55472f0bd3d29b41d09ea95e1b9ccb2790f6687c043dd9ada1cd5124705e24292ccbd8fae1f243b3
+DIST crossbeam-epoch-0.9.11.crate 47900 BLAKE2B 2deb54409587df48e0686731dded6600816e4c2b82369c47fd2e00ecd59f29935cb3e7f9bf3457b99831bea088830a625370c4c07ce56cb78ccdc62a6ad7715c SHA512 3fff7ebe038993af5117460e0ff89318541afea8d16f3bb991cd37f9fabff58f1cf122a8163af03c275af4ba6802b264f516fbf12f9a9f8ec978f0f8024187a8
 DIST crossbeam-epoch-0.9.13.crate 48313 BLAKE2B 6e548cd39fb400732dc179c5b7185555bdb8a367b5d3a27dcabe9ad36db6e9858604dee210fe487de8f9127fd6d0db1ef1fd04a1cc8cdcf34bedcf980c048555 SHA512 a4578e0e535f301b73f0332778e79b327bafea6afa43284317fccc49b410118360866a2dea8ac22f2977f309d07c663e5d95fbfa852ab795d414c170ee4e06bf
+DIST crossbeam-utils-0.8.12.crate 41785 BLAKE2B 486aaa80eb0fff5740690d8a63c7b41dd06c19cd141f4e12c8f133f5ffa93a121d4e24e19390851051ef07ba63480d9ce3bf751621ada3a420ab6982a0445e28 SHA512 0e1f17887615b1883c3a0c4f0fb908999d550bd0041e8333eebbe43a964838d948fc1e5892e4ebd31e59ad53e5fbb5ebf6741dc1dd8b61907429f691c84de2d2
 DIST crossbeam-utils-0.8.14.crate 42127 BLAKE2B 3e31e6371e46aba6697501a34e1b737680dcb692c0d1ba7cc1ce7025ec70ee69f7595e3abd90fb52c11e42cb43fa5fae6103f97add35cf87b0a68ea83213d0d0 SHA512 fa00a57c41c9daa152f8a6c6f4d3c77986de1aa21585984adf577e244c2f121db014ba2beb92241590e1cf78710e77d9a703ce4a4d44d8854bc3e60690151393
 DIST either-1.8.0.crate 15992 BLAKE2B 5b9254d54ced1f23447cc78fca74f12085c37e3c2da441b30521819025ebb808e8cbd9cbcec811f8b3951030914c1736b8bda61744d1323af8c5b8b0a3ef3ee9 SHA512 5089b218af067b51ee39c085568a1a6f542e8f68b362207bd7126cbcd2b76783cd21cc1517a1d088ce4dad1714be03a3660f50e9498a0bb43a8676cd7ec490d2
 DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab
@@ -13,33 +15,46 @@ DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b25
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285 SHA512 946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85
 DIST indoc-1.0.7.crate 13716 BLAKE2B fe515fcf534a552feba188aea5d5da0febc123db24485eb887a3431592780fd468f6409167457c68a7ef6368fcad71c14fcd7922bf2de29794a341d7d4cbbf0b SHA512 b60e534953d600bc2de3d6951f9da67ca3ab3c78fdce3e9c5f91e544ca848aef0c22c35a26fe7a39c07bd916a79fdf496269fecfa5491a58e178f37b2965b348
 DIST libc-0.2.137.crate 606185 BLAKE2B 6724b7ddc2460fef1d0f20efee8726162d904b92987f9de2d3dda06c9cd49124c9fa43a9b39e84d78c03d217ed8ffd30e0dc55a4eb31970413d56fd58ea00adb SHA512 1ef979dc59a7ec4aad7229ec5b40be0ec9a8496c7a2177d325db62f3eab00d72c8d2277d517c0093e0750de12fbb4e45b67133604afeef9153b8e1d4aa0baac4
+DIST libm-0.2.5.crate 113322 BLAKE2B 1893273dda30ca8eb6f614992069893dca39288fd4a2f3c49827dd3ffc64030f1729a9761f01f5fe649db64c6ed15a8ba47d93ed9484de1c19bd3de57700f567 SHA512 4d56501fdc86011f1b707b349c409564c85c2484b185adf9dc5d5a8a8fcca8c0e172c95ee5dbfb428b7b13d8cfb1e23c596d3ae3bfa878f2019fabd3258c7863
 DIST libm-0.2.6.crate 113690 BLAKE2B 5828bf7a14fc62b28da148284988292646909bba60b2d82bbc6ee482fe0791576133d9666edb1b57bd5208469c78f2b2560223631fad4dc74b7e0d42627ca5d2 SHA512 6ba263c95f1c555e66fbc5a5f7d0f2aca4e20f6aaeca27c3baa4d17aa00b88830334736fc58d268d98e50bcab65220507b0d8e7973fcdbf14600ab3f20c34a56
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST matrixmultiply-0.3.2.crate 49247 BLAKE2B 7f7eff4e0c7b71d942319caab54df7b75e3bb6e6fc7c224312da0a607c78894010b870a5649b7ce20767f622b64141752c55d3ab77cb0a394295041cb2e2a73a SHA512 9a6203c0f604474007b2d28b4db5b83282315de39c775cedefe1c1793ed8b48e83ad01c21669076a77bc28a75eeb847defbcd662239854e8e32acf71bbc800bc
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
+DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
 DIST ndarray-0.15.6.crate 275225 BLAKE2B f17e028e7d57670f136d777dc2bb720dd52bc3d9fdbc0e2de5f5c2fcd9f6310f0bc39299fadbb53e0d1588e1e64d9f2b5daf20e30dd95517bbfa597b9572581f SHA512 19037ba1de0ea5f8e0cba5d8735d6192c1674007529289a357e9c5e036a1af88b48ba8a26b4929663403159f6700bd00d04becd9b1fdd4c07990bbeddfc20ead
 DIST num-bigint-0.4.3.crate 97799 BLAKE2B afe9a08bf20dc974dcea12b5f9dd465e8b399a0cb0a6d0028d08f7f753aa4dfc929710e4dae883e67633d9dda073f995287e5315b1487e8f99f8f23f1f70e581 SHA512 4b38eaa8b51119dbc7cd8a1e177f37ec935ee348b693a93378742e9bfa68fe5f7e5062b7f34638283c23f04d2127451d796d310cd8adb64dc8e865b28708374f
 DIST num-complex-0.4.2.crate 29341 BLAKE2B 8fbf8f22b0a59c794b7657693dbdad7384a56c2b74e9d54992f15bdb19231ebca08f16a282f0a97280cd94d3ff728bd3358a50f8c22bbe0a3f51c7c2b499c851 SHA512 b073ac863d4a389468ed4e0a3d71c453c25dcb535a9e98e38d236b60ab0950ab5be512b1f427f5f74a20b6bc24398f864d9a1e0ab717a84a01b7b89ac3517048
 DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
+DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
 DIST num_cpus-1.14.0.crate 15673 BLAKE2B cc706b01681898799a5388fba863d2e8d13eb09644ecb92cb93a3f1c8b24527ad259c455cf56fe06d8ed6193ac1e8968d62a50824e4906e2ab66fc53e6e654be SHA512 c3b19f7cad14947c9860ed81617e2f7492f69248c8436ce83429cae9fe09d7be04c813233b54ca216e7dc2e03b76f46c5659154f89bb804e702f23b78feb3507
 DIST numpy-0.17.2.crate 66754 BLAKE2B 5ac3de861fa36e0d27eb117faf2be1e9a872fd507ad847d8fe193f56e309dfbae1fa4a1a77300ae88eecd695ba4578f4dfbe70940cedfb4f332ecf8930862b39 SHA512 b428d290ebf023676af5f7d0f2578e69f195f35213cf4b30c0ab6692428e907dd91afeaf6ced7e89ad46005f99c9653cce362684560f7208aa646243a0b67534
+DIST numpy-0.18.0.crate 65263 BLAKE2B 51cc77d4566c99bded9438980fa1f19a71cd7d668df040857b507b048fb2e628b06ebfc07dc2d0daa26fd556d4170efe82cc34bf5324b5f07362ee65ffcffc6e SHA512 00b21d6a7b6235fcd6f640ecb911b960d5d1d74655e3ac15b7d9069b17f5ff2c12e2d5cfe1bcde99cd02d989d0bdec86da52f34fa12804e931dab797519277fc
 DIST once_cell-1.16.0.crate 32120 BLAKE2B 59bfc8a44f1fec72442e3d34bf4be3a5af073f854f07b3618b2857c759dca4a0fa6ba358514ae28c25d745b01bb7b390ffe9ed6e296d163fd3dd67e49092b87a SHA512 bc199570ee43bde9245a2c4637ae738e370ce9988635c8342349ceb6fb158f376247b69f9ec4ea0e6d76b934decdc77a524299ebde96c0a2c2d29d9501b9a568
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
 DIST parking_lot_core-0.9.4.crate 32359 BLAKE2B 98629cee7346434103d0e9776d89d1c875c023c3fe91d47beae2f3029fe8bdcbe7dedadd262012ad9d1a1e624ffbebe6d3a9165623e40077ab9d0fa4b768cea7 SHA512 6dae00356b759ad1dd08c1edbcc3ffcc86ad412af98a5e4cdf4fc622d0feb79bdb3900c4f72e76cce803c667a6d8581b44264980816ebdc85d59ddaa881a2990
 DIST petgraph-0.6.2.crate 182513 BLAKE2B 553dc5c95ad38c52a014b20b10b7138f6eb105f11772c4852cafc9930dcdb159847c87202211a780888d81997efc38e18255c784a71f3fefe5c1177461df1c74 SHA512 6a4ad4bc630e486ac2db107a9ee3e0d6116e76788d2d182a086649eb00321cedbb7c9165012a3957aa276c0eb29e0b2b25210311ea3c662f2467d3ef1afb3fd9
+DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
 DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
+DIST priority-queue-1.2.0.crate 32057 BLAKE2B b858eac5ca05efcd0d630b0e4ac5a4de60f9fb08a44705e681d045e1cc367b6a08a89cd4178f997f9d9aea7ea2eab6e3422c94f1ee8b951f3256fb4a42fc3394 SHA512 62c84d0f2b81243aa71a631a35cf20b905e130a54da5b29c193afab249a00933d6b63203b81747b6d2007c7b6707cb9039cdb1d356e87b2d551899b5bf3cdf2e
 DIST proc-macro2-1.0.47.crate 41955 BLAKE2B dbfc20b61443225130d08b05deeba56e63e76921e56359c9b0531798b18778d6ddcb56c3372fb6ccc68586a6c1dc725054f0e83f93e8623cb5ff6a7a2ed3dc83 SHA512 60c5d0dcbdee7ddab40664882d3cf5a868f7ea5b49ebab3b4419c3f325582b816625e73e0d1737bbd46bd7d765ece6c81c2ff4be894555d4b255f5cb9255e931
 DIST pyo3-0.17.3.crate 408939 BLAKE2B e67ce34c626dbede3c76abf66ba5078827e8a75644ff9fbd83eccf3d53096a3c2e0991da8b3489ea9984c665751308bcf4aa9c3d31dd62c72127694156a7a0a9 SHA512 5c83ea76202edce13c370d023562a9009382e36fdf3fcd7c4dea844ab8e5e048db4cc79a9c0ea98fb7017a83da16924ba0981ad98bd83e75e2fac434738e9740
+DIST pyo3-0.18.0.crate 410258 BLAKE2B 02d7906839107a1c6d9ce9ab247d28984e6482143d1d86328889eb8d32537df6a316bf9e51fd95883856e92a68560c9a9fd4dd5c5ca8e1bdb4e1b55fbeaa4035 SHA512 8eca3313ce9574aa2bf92a55f597261e7883607d85cca22c43689a657a087ae9a8dd8b6ffe9961f438c6a3328719236135a0e90ab8461dc84999de66457d8f7e
 DIST pyo3-build-config-0.17.3.crate 29230 BLAKE2B 193df0c15a2150505c823338e76f4d75e2f28158626edf332da2b10b6a81bfaf7f95a3a32c9f218717504b2f0dd80d3fb61c78ab3df9cb9024c3686f8ca002b0 SHA512 92652ffdfb3f6c3c8a1c2f97f5e2ed19175ba6bad5cd0f0c113b569369193aa18d95adc780bbdb8202d815a1ec0b6aeaf40d93d64faab42f4e8b452c806906a2
+DIST pyo3-build-config-0.18.0.crate 28756 BLAKE2B e64bcf3231338d4877c9a2dcf2aab59aa4bce9951ca39f9c7a7377e669ebd1ff0d45c025394e2d1a0b6fcde1fd19f100ea555f18a62869d4f7c5cd656740a9ea SHA512 1e49ee06e2308394572aba0905830f2e978782b81c0c09290b8fa2a30950dfb3ec7f1c04eff5dbeafd658d2155290cfa74307d80fd5064aa92af66de42b38501
 DIST pyo3-ffi-0.17.3.crate 62854 BLAKE2B 3f1c519b210de0aee19b832845c1d44237f780f18173ddc1b1cef5eac1060fab40fd8dbec067a49e4d28fc7edcd0bd751f54438ad42a8b98641de0517052c64b SHA512 c08481d1530207fee544a5dde14253415e5451c1c013b86ac1f0e9bcb3c1df7866764cd11bad523105b6821725560329b89ff689b3aa2f0698cdab148d0fc12e
+DIST pyo3-ffi-0.18.0.crate 62767 BLAKE2B a56d139a8639c5483086fa206518ceb5c2720afd36081e02b5ecf4f1c45c1133592165e8168905fc5bd6bf8fd8f1d729fec89da9a17f979e0af2bdf64b32d254 SHA512 d55792933ebecf0119a3591a1ed76334915bec5273d47c1f1b60ccb8959d4b0072952ed7da1838640b0882b7b6ba01bcf0f4758467e07c9b5d823d68098aedda
 DIST pyo3-macros-0.17.3.crate 7257 BLAKE2B 4c5e166a37c31f2cc21b7dce9b46dcdaeea0f12299c421430efe72b47ac954f10680bf6ecb28a5f0058abaf22519f6ce05d21e5de534e362ceb9847049601f4f SHA512 f99d38ea69b1d46599d203908d12eb3fe4869a48b21b3eaba0c9c8e52b9f2b3c5ea72505dcb9b3330450dd724eeba859eef724fe9624ebbd8bd3cbcff7372df1
+DIST pyo3-macros-0.18.0.crate 7078 BLAKE2B 399a018a38ff60ab5f608063d4ed4a3243af437aab6314742689907eece14af982626307810cab97112fd16f0d3b4b6f7eb2fc1349577e66436d74727b16bf43 SHA512 336ea59c648b9310ecca4f3878ce609076b79d5b40201c8e8ccf565deb348d222229da793ed6394509d9020d75c1b489f96dbc3dedad6ca2b3dae25818502440
 DIST pyo3-macros-backend-0.17.3.crate 49992 BLAKE2B a922c3c2c1f494002fa8592704c43ddbb4d9bf650187adcfc94f82c1275bcb69d444ede404d1b40bdf1e199427e8de880464b76c7385c2f96633544ad021c4b4 SHA512 b4dbddc3ac7ae542560459376127cabdbb4de83c04d70a4efe0976fa94e6ce94a7a62723f689a8fbb1d795fc235b1ac3611f8b4985ae2af0db4a9dc08de48927
+DIST pyo3-macros-backend-0.18.0.crate 48261 BLAKE2B a95dee8233a7fed386860f052202348753823091cce26fa0a41c659da7a62cb0c20ff9a540c33366ce57a90aa953699c9b555dab817d43855f0911ca7cec2ff3 SHA512 051c5bdcdeb60d3a19ecd12099d5906eb7fa4624005e3207b1a225fc6b9cd6606e9b9f9f4f145f934ac88e1915e587ed760734e738a752df72cb20d9550a78d4
 DIST qiskit-terra-0.22.3.gh.tar.gz 9258519 BLAKE2B 5046390a9ecec5508d558e2d4609b0308d37367cf82ffb677d0e540e8213f9fb82e8774c4c128072b6c89fef190764c41e6f9de3ab754ba1a5884d21002f930a SHA512 787e0a3ad95974f3fc8300937569704da4db7b2681f985ba359a30170516587f4be9523e7c9892dc0e2ccf0faf2bdf6e9905bb5988dc1022467ac313ec7f0bc4
+DIST qiskit-terra-0.23.0.gh.tar.gz 9524936 BLAKE2B 409e9de2012bc10394669499a4b0f0c9eb5ca730b859ebd04bc620354b86a295610433e3a49e6300904b3927309d7fa52149de16a1083f89667928cb016448e5 SHA512 cc6fc9d7b794c00a4fad549c8be2d52021470c4d8d39a51de8c312c0096e6fc2af27e9234d0dfbcf96a8620e28ba9a075ccdd939d59e72f66078cd671f92b37f
 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
@@ -51,9 +66,12 @@ DIST rayon-1.6.0.crate 166335 BLAKE2B c6e7af33a464a34a85f69a42139a355c4461e13034
 DIST rayon-core-1.10.1.crate 70008 BLAKE2B aa6dc470af3464ddd20f75faa5793bbc684d1550e44e0148134be7219dbded5dc7c1a1da96487ce9132330f26a587d9861b64be342566d6550cf3806a764d51b SHA512 a9261aa4a648029f50bcca30bd991ef51353c258b9b8c98027efe9ff62e4b7be200e59bc7aa9144d9a3d39873b01bbe104c1d7875d61e02e089bb04e0312798f
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST retworkx-core-0.11.0.crate 33658 BLAKE2B a742f0d310eb45bc9ade507f9bd7c1b75c879b67515176f5c944ca95c51ec664af2d08f0f708441c6f652df9443c4d44f66873c24b1c64208b3839652f187861 SHA512 8ed81f6373496d5e668025b63bf3446653111ed6d65ea2fcc17a5d232cb14820b8ac3f4a9059ffce2b0f9d8508e0a7409f87915ab22457113281569e9ee4f8f4
+DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
+DIST rustworkx-core-0.12.1.crate 50409 BLAKE2B d66e057a56828adcb55b6f073674c1fd5558c48b59db47282ec74ab3c3ccfb1cd8b3e2c597e2fda06070c89e365da37a6be85d35b005222f33f535dd34cd242e SHA512 a30d27208ecde459eea080718f485118ff6860ee677ace55ce66063e7bdc8de7322f92da39fd1f8beb2363edbb2f0ba4b674e5b1baec638727c21ccdbe24c98f
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
 DIST syn-1.0.103.crate 236495 BLAKE2B fd139b1a8b4449e9be6eddf0036c19b93b876182a03f36954f79eaf79abd5e53667a8a9fcb5c872c96639779307fa293f597831ff838a41d90e1ea201f8a4797 SHA512 3dc0f564ac1a4ce85060926c0897158da0baa127a46bb318506f4fdc79e53d9439295e8ed6a2d5ffcf15d9f6651081b7602cc2a091538e8df061b545f7e3bfe7
+DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06
 DIST target-lexicon-0.12.5.crate 23224 BLAKE2B b1d31ec4ca5a529882b76a6a6bc8bbf978cfe8d7c9da0227879898ce1f2180e4d43225360bb4b4a7e9f3229ad1f4297b57c77d285c471c9c724759b0e987f6f0 SHA512 6df675ab1ebab2ff2844c3dfdaf58de3c340868ad9cd7b8c0d63d4fc9fa25e78027643d34c19b4634913c5294de7b330fb5a100984df58e4c943b3ab21ebfaca
 DIST unicode-ident-1.0.5.crate 35455 BLAKE2B 7e14ce97ac53a88ccec015dea690918a673dc5b49e44de7fdcb5421871da35c4f514c6db9a363d6f4bfcf2e9a61a50a593d345d0b6f388ea882b17a00cd0335d SHA512 d355370daac356d900cd4c0a792d6c0eff114524c4bffce4d7e74469fe2117883ee00bf0e27d950b72e88739473f2045d5f83440a0aedfede97b4d9163b64a6c
 DIST unindent-0.1.10.crate 7703 BLAKE2B 75458d7f21ded1eca4bb3f7f55b2fa73bf92b2309316eca1b2ffaa0c9f8d7cd8c7851b96688f6597f4af6973f70e9053c2708c1228fa6a9784e41c778488c4b7 SHA512 46ff1a2c042972af2fe5958677b2fa5adf3b9edbb168bd66cc93baf9d1b128f583d9502b83f174b35866343b57a57c8a91a465eab267dddae919af24095bf6bd
@@ -68,4 +86,5 @@ DIST windows_x86_64_gnu-0.42.0.crate 692493 BLAKE2B e00eae443cfed300480924465426
 DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf5db046ec945cb21ede76d2da477589e15d062ca6f04906dac80fdd2ef9fcda9244490aad86b401d0156eb6b65ba3599098e8cfe7 SHA512 242e11b4a0d50a0ffe8d0e26e971de30ef4d29260ae6749403d39cb4278297a240c1ec4112bb38151cbb11a6f3c8a743e84cd75b6a76adfeaee8e623649c9ecf
 DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
 EBUILD qiskit-terra-0.22.3-r1.ebuild 4029 BLAKE2B 7a9785ed07276a2ee063ca8616fb0625ac400ea90170d9419cf72d50c8a0a7e95593d53a6373acf43cdcebc7b35c2820205ab7f0b287634c7bc46a7b6520abc7 SHA512 c8e84e53e8aa832c29550fef67187bbb47fb2aa1434adf93668c8d3383e42e089d04eded49ae205f4fb8e65b55f59083d606e77e711804e55902313097d5d718
+EBUILD qiskit-terra-0.23.0.ebuild 3932 BLAKE2B 641d36a1084bee8e7611885a77699f0b87ddc6bb1675b82a36fd01e92cda5933b2ebefa5f47d6b7f2071061e093fe01fc3d0020490122721a1c0125b4cfab066 SHA512 d217a6d63bec35c54b680e9720d483b4b22a07a2a0580a483d33317d90dda22fb3d41f2cfb32ec30161217df0088bcf6bcfa02f7b78b5f4455ae5ccebb812c17
 MISC metadata.xml 1099 BLAKE2B 4d2ae544b77d18aafe53ad0bfdc7bc32b9656eb4096d8f2ed0c2e71e8718d260d1030207753cd4e0b10748ec7508813f84a5232e7d491348be2c7ca1fcc5d860 SHA512 113bee16467977079ee15aab442d9255f9d3d3ad29dc27f2082b1f9b902856ce827aff722f988d4a9da2bc8762523002d8acb5702271ef87c188990c2b677038
diff --git a/dev-python/qiskit-terra/qiskit-terra-0.23.0.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.23.0.ebuild
new file mode 100644
index 000000000000..3fcd499d482c
--- /dev/null
+++ b/dev-python/qiskit-terra/qiskit-terra-0.23.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	ahash-0.7.6
+	ahash-0.8.0
+	autocfg-1.1.0
+	bitflags-1.3.2
+	cfg-if-1.0.0
+	crossbeam-channel-0.5.6
+	crossbeam-deque-0.8.2
+	crossbeam-epoch-0.9.11
+	crossbeam-utils-0.8.12
+	either-1.8.0
+	fixedbitset-0.4.2
+	getrandom-0.2.8
+	hashbrown-0.11.2
+	hashbrown-0.12.3
+	hermit-abi-0.1.19
+	indexmap-1.7.0
+	indoc-1.0.7
+	libc-0.2.137
+	libm-0.2.5
+	lock_api-0.4.9
+	matrixmultiply-0.3.2
+	memoffset-0.6.5
+	memoffset-0.8.0
+	ndarray-0.15.6
+	num-bigint-0.4.3
+	num-complex-0.4.2
+	num-integer-0.1.45
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	numpy-0.18.0
+	once_cell-1.16.0
+	parking_lot-0.12.1
+	parking_lot_core-0.9.4
+	petgraph-0.6.2
+	ppv-lite86-0.2.16
+	priority-queue-1.2.0
+	proc-macro2-1.0.47
+	pyo3-0.18.0
+	pyo3-build-config-0.18.0
+	pyo3-ffi-0.18.0
+	pyo3-macros-0.18.0
+	pyo3-macros-backend-0.18.0
+	quote-1.0.21
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.4
+	rand_distr-0.4.3
+	rand_pcg-0.3.1
+	rawpointer-0.2.1
+	rayon-1.6.0
+	rayon-core-1.10.1
+	redox_syscall-0.2.16
+	rustc-hash-1.1.0
+	rustworkx-core-0.12.1
+	scopeguard-1.1.0
+	smallvec-1.10.0
+	syn-1.0.103
+	target-lexicon-0.12.4
+	unicode-ident-1.0.5
+	unindent-0.1.10
+	version_check-0.9.4
+	wasi-0.11.0+wasi-snapshot-preview1
+	windows-sys-0.42.0
+	windows_aarch64_gnullvm-0.42.0
+	windows_aarch64_msvc-0.42.0
+	windows_i686_gnu-0.42.0
+	windows_i686_msvc-0.42.0
+	windows_x86_64_gnu-0.42.0
+	windows_x86_64_gnullvm-0.42.0
+	windows_x86_64_msvc-0.42.0
+"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit cargo distutils-r1 multiprocessing
+
+DESCRIPTION="Terra is the foundation on which Qiskit is built"
+HOMEPAGE="
+	https://github.com/Qiskit/qiskit-terra/
+	https://pypi.org/project/qiskit-terra/
+"
+SRC_URI="
+	https://github.com/Qiskit/qiskit-terra/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(cargo_crate_uris)
+"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT
+	Unicode-DFS-2016
+	|| ( LGPL-3 MPL-2.0 )
+"
+SLOT="0"
+IUSE="+visualization"
+KEYWORDS=""
+
+RDEPEND="
+	>=dev-python/rustworkx-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.10[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
+	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/symengine-0.8[${PYTHON_USEDEP}]
+	>=dev-python/tweedledum-1.1[${PYTHON_USEDEP}]
+	visualization? (
+		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
+		>=dev-python/ipywidgets-7.3.0[${PYTHON_USEDEP}]
+		dev-python/pydot[${PYTHON_USEDEP}]
+		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
+		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
+	test? (
+		app-text/poppler[png]
+		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
+		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/qiskit-aer[${PYTHON_USEDEP}]
+		>=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
+		test/python/transpiler/test_unitary_synthesis.py::TestUnitarySynthesis::test_two_qubit_synthesis_not_pulse_optimal
+	)
+	local EPYTEST_IGNORE=(
+		# TODO, also apparently slow
+		test/randomized/test_transpiler_equivalence.py
+	)
+
+	rm -rf qiskit || die
+	epytest -p xdist -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/socketio-client/Manifest b/dev-python/socketio-client/Manifest
deleted file mode 100644
index 873a5ba24e74..000000000000
--- a/dev-python/socketio-client/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST socketio-client-0.7.2.tar.gz 23488 BLAKE2B 8c638dcc8ed30fb01a31e36f8175ef7e6b77b37dac0a66f1ef663a372458ccb34bac2ed58fce31a3856eb3d067ad8dc20f7d4a332b2af10ae12717bbb786349f SHA512 850839f804953c706458467c9e35c4c3637d3a61ff55042ef0b6f98e39a277faa97a0a3d7b1e18210e68ec32bb4ca793cd404631e0e2b533e61ad5d05cbc18fa
-EBUILD socketio-client-0.7.2.ebuild 1708 BLAKE2B 28b0e90a948717f3cafe83675f75079f87e1f9733a0e0f716b461d2b906bfe765ac0e8b40a45e35b4e362c39628dcebf4efb3a1283f70f6fd96d11bae35a3272 SHA512 79ea2af7758b49f2edd18b58edba99aec2314c88ce420d5e54922f25eca98dc80c79485c27688fa5e6047eb7039abe1c99a9e7bc9f8e8308e340c6c1a43ccba4
-MISC metadata.xml 467 BLAKE2B 2b0a2483db2f4fdd351061d1131649ed92d345940dab6967de8ce51809a932e824595fc852abf3240a988e566ce5385cb232a1c2cb9c8e6c466f55d5b3f5e508 SHA512 f1997eeddba6cfa54edc7941e75e809b88c5f5f2e34ff739877d9f971118f1fd1cdf940176b8a4dcec4e4381e1fd127304f854dfb16a108893a0bed610de859a
diff --git a/dev-python/socketio-client/metadata.xml b/dev-python/socketio-client/metadata.xml
deleted file mode 100644
index 61b88ed00a2a..000000000000
--- a/dev-python/socketio-client/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="pypi">socketIO-client</remote-id>
-		<remote-id type="github">invisibleroads/socketIO-client</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
-<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/socketio-client/socketio-client-0.7.2.ebuild b/dev-python/socketio-client/socketio-client-0.7.2.ebuild
deleted file mode 100644
index 849bbbdc744f..000000000000
--- a/dev-python/socketio-client/socketio-client-0.7.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-MY_PN="socketIO-client"
-DESCRIPTION="A socket.io client library for Python"
-HOMEPAGE="https://github.com/invisibleroads/socketIO-client/ https://pypi.org/project/socketIO-client/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-		dev-python/websocket-client[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	# https://github.com/invisibleroads/socketIO-client/issues/90
-	# This runs the suite but has nill output to the screen
-	# The bug filed will hopefully yield a more conventional testsuite
-
-	# The import of SocketIO need be made with abs path to run the tests
-	sed -e 's:from .. import:from socketIO_client import:' \
-		-i socketIO_client/tests/__init__.py || die
-	sed -e 's:from ..exceptions import:from socketIO_client.exceptions import:' \
-		-i socketIO_client/tests/__init__.py || die
-
-	"${PYTHON}" socketIO_client/tests/__init__.py || \
-		die "Tests failed under ${EPYTHON}"
-
-	# Return to original form for final install
-	sed -e 's:from socketIO_client import:from .. import:' \
-		-i socketIO_client/tests/__init__.py || die
-	sed -e 's:from socketIO_client.exceptions import:from ..exceptions import:' \
-		-i socketIO_client/tests/__init__.py || die
-}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index fb24f0937e9e..c09866b1ec04 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,7 +1,9 @@
 DIST SQLAlchemy-1.4.44.tar.gz 8516775 BLAKE2B 647a43b2c01bcf066891e6bf2247271ff051ebc0d75c2e06b04879d058aacc54dced5d1af00c9489ba515621c56bb6f358836e1658f0069295f125675956797e SHA512 ba4e022f7af77cdf099b59a7af088852d7d4e0b4c6d632a63d244f501ff0b76837e601de63619f219fe50e6d526cd13415c4e623a6127afb0a2f24b87a4c3ece
 DIST SQLAlchemy-1.4.45.tar.gz 8535958 BLAKE2B 09e777584067532ed77d8dca9d86996b22317395338aa056d91d7ae1600d6b7111ef714d04980f87ab517007dd6a581c5552efa9c4a676e88c567f339f227fe6 SHA512 4c6e9ef84c6517f47493ad6ce6d366bc0e7222e7a668d43c7b9f4919e87076a5f7687dc525060e430be23c5d9f12e7ef9d97d679040ff132244aa2b3418974a9
 DIST SQLAlchemy-1.4.46.tar.gz 8544238 BLAKE2B 8ef4aae61bee3c9c54b953a9ba34074d8cac0d54d8ae3389f40fa99f57755b2ee0a8a7826e0835fada2d82b96559d974172c9d9781ec746c79006f59d7a5bba0 SHA512 1977c6125e9f45a45b7941c1e0164866bd5ea72839e619d4e259db9a5370fe2b4f191257f3c9ddb28b5c22617a71d359620601c54d9273c38b3281a6c2f5ff03
+DIST SQLAlchemy-2.0.0.tar.gz 9188064 BLAKE2B 2c81b9663c14851f10d6987645b9c7185067ad680107d2c59ccb3a67ffec0507d30e646d8fb283919ed120203b64591b089f6b840ab97d8e7c59bddd4793319e SHA512 54bde6047a94fc6b050ca6e4b6136ab2a62de0f55665c07a7bec953c75462e32908e88de5c2dc42ee45cd0b8b9f155dd33d148408ab5e3cc579b0e13cdf00801
 EBUILD sqlalchemy-1.4.44.ebuild 2860 BLAKE2B 8fc052f4930f2369bbbbd336fbfdbf6b2a19b12d51e16f1876262ef1aa344f5d5db75597148a9d46f4144495c2f41a7e735c099bc059c27991f5c4c0c9d73495 SHA512 f043f2491f60baeb6db0055dc2cbe5d0d073e843a9784b8859baebdd37f0300be9b93a83c3910fc0f08e1cd3931b7d35f8a833f8c97f9737f9481dbee6f86087
 EBUILD sqlalchemy-1.4.45.ebuild 2860 BLAKE2B 8fc052f4930f2369bbbbd336fbfdbf6b2a19b12d51e16f1876262ef1aa344f5d5db75597148a9d46f4144495c2f41a7e735c099bc059c27991f5c4c0c9d73495 SHA512 f043f2491f60baeb6db0055dc2cbe5d0d073e843a9784b8859baebdd37f0300be9b93a83c3910fc0f08e1cd3931b7d35f8a833f8c97f9737f9481dbee6f86087
 EBUILD sqlalchemy-1.4.46.ebuild 2868 BLAKE2B e3ff805ca18dda82d8e0d7a66e01ece0a8b15d448fc9564646c13bcd431b9f190e0b7ff8744f3dc29a2a67d80670849429fa6620e719ca76cb23921d376ff885 SHA512 d9ecebd20be2b2573da130eeb2ed76972a02b9908f2b57b106b8af0e3cc6e4e7fea885ad415d8789436a990c45a5039f2cf8684702dc6ba071bc380fb60214ad
+EBUILD sqlalchemy-2.0.0.ebuild 3798 BLAKE2B 996b35343eaa5df38b348e55c37efe8a7dfa45fe9deccf08be295cb4389ec473b1f1b1b618c5eb379f008996ad1edcc6d4f0105e297adb71485fdcd99cc5eba7 SHA512 18d66db9aeaa45a9f461415424860ab005881de2265fabfc536939abf5ed683d8a0ee31e3c0664c893ab39907b29e19c2366293484f30497f60dff4ce4254820
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.0.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.0.ebuild
new file mode 100644
index 000000000000..3242eab60351
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.0.ebuild
@@ -0,0 +1,112 @@
+# 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} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		test/ext/mypy/test_mypy_plugin_py3k.py
+	)
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+		# TODO
+		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
+		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
+		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
+		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
+		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
+		test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_3_40_1::test_cant_parse_datetime_message
+		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_delete_single
+		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_insert_single
+		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_update_single
+		test/base/test_utils.py::ImmutableDictTest::test_pep584
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/stapler/Manifest b/dev-python/stapler/Manifest
index 9a8459fc8455..d486fcb833e3 100644
--- a/dev-python/stapler/Manifest
+++ b/dev-python/stapler/Manifest
@@ -3,7 +3,5 @@ AUX stapler-1.0.0_p20220330-fix-tests-for-PyPDF2-2.x.patch 317 BLAKE2B 700090366
 AUX stapler-1.0.0_p20220330-port-to-PyPDF2-3.0.0.patch 11876 BLAKE2B bcb22eece9e360e32bc6ef40ccdaac176fa6c2b265d962c52b399497f8347291f597a6a3b806fdf315937509d32b68bed79ccc580b2b4eb4789a5b7d4fbba2a6 SHA512 698cdbf12d36549c7e35c636b76e98bffe0f5b826bda8872f6a06a0cdb815bd855a63dc250a4f30aeb459d572db4fd54af81371664fd48cbf35aaf9b3f759061
 AUX stapler-1.0.0_p20220330-use-poetry-core-backend-for-PEP517.patch 1080 BLAKE2B 6342f8cc0931736aa6868749552da18d1c41656815f954826c6e9b2b1be0a18b45f8a8baac95d3e0f364c7c53ec7c6efb888a67b162134a9165f387e6d0c7824 SHA512 26b8d141dd765be117e9df42b78d79f68f1593e09420badb10793df007d031189627d2b3bab36635228a4337bb5b9c199472be41953be3973dd20bdddbffed11
 DIST stapler-382f1edc62296e071093a5419811a2fca9d78d93.tar.gz 43659 BLAKE2B 10c24868d51086b37dd2d517aa84e3c3fc0b6becc7a29ebf496646bdd65494eb0c43488f725241d7bd7b3083ce5703538db3e05de9976a2e5029731fc2e645d2 SHA512 acd2dfec0dfab46b2cf6b440cba6c0db5399be2ba2194ca12530c311c6c5a8028614164af45b850061e7d22cbec33458ceff7757f1b104c722228dc2d02cae0a
-EBUILD stapler-1.0.0_p20220330-r1.ebuild 789 BLAKE2B 67d0481ed64f2028f1e94eed482dff68b43d1346d93dac81595e564258f5ee955f7f4e34e0f3d33aec9cee8835adc8472c7580cfc51f2fd7e18b06103b6f746e SHA512 1758c5026604ff8d27877ef98bf1bfc261b598a035f05e150e2fd1a36d3df21042ae92d842e7b6865d187f9ae5bcd1bb0523f729e8d6cf5beb5fd252418ef5a7
-EBUILD stapler-1.0.0_p20220330-r2.ebuild 871 BLAKE2B 9f9c86f3b5bd4ee5a09bae1f69c31822e6ea5ad0366fd021a6c8801764f2ef46b8a9fb5b1aa54c800aece35b27fff4a08fe9648310898ee0506a8c07ebeeab7f SHA512 66b70df1e85f172762069dd384ea22853617e9d89b782fe3b7761f52ec62c608cb5ddbe5af6fce54564f577b4c99380ebb76067e05dfd004df12ce1cd85ee6fc
 EBUILD stapler-1.0.0_p20220330-r3.ebuild 895 BLAKE2B ddf7c80e30d9fe3e1070f066ace02c0f784b5361e3186d9326bf656e2a1e40dc9e968f8f14cd41f5511f2f259b61a9d18cd49323c5c4854ffe9165ddf570f714 SHA512 dc8bb604693b9b480f2d4c3a9f7704c5f2cbf7515cf84120218937fcac3da795239bcbf0131352096de1109540d2e12339100389942ab738223b35fc4fbc96f5
 MISC metadata.xml 398 BLAKE2B 3c566702150e77dd0ba58f667336f57c0347422496edeb4fdd53e0f131cb966d15781a5d5b5e13211b2385e410a1d12c064c3ffe66056395b6eeeccdcca1cc72 SHA512 802c118d28a07f7fba6558aaa8f60aef0ebf137395af566e273ba1d218712d1835c74f82c5160f12d120d8776cbaf4fe7d09827a84c1a5e234fef307e0835a18
diff --git a/dev-python/stapler/stapler-1.0.0_p20220330-r1.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330-r1.ebuild
deleted file mode 100644
index 9ff1ae39edd3..000000000000
--- a/dev-python/stapler/stapler-1.0.0_p20220330-r1.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
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1
-
-COMMIT="382f1edc62296e071093a5419811a2fca9d78d93"
-
-DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
-HOMEPAGE="https://github.com/hellerbarde/stapler"
-SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="test? ( <dev-python/PyPDF2-3[${PYTHON_USEDEP}] )"
-RDEPEND="<dev-python/PyPDF2-3[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	default
-	sed -i -e 's/^from PyPDF2.pdf/from PyPDF2/' staplelib/tests.py || die
-}
diff --git a/dev-python/stapler/stapler-1.0.0_p20220330-r2.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330-r2.ebuild
deleted file mode 100644
index 3ea538b11f62..000000000000
--- a/dev-python/stapler/stapler-1.0.0_p20220330-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1
-
-COMMIT="382f1edc62296e071093a5419811a2fca9d78d93"
-
-DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
-HOMEPAGE="https://github.com/hellerbarde/stapler"
-SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="test? ( >=dev-python/PyPDF2-3.0.0[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/PyPDF2-3.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-PATCHES=( "${FILESDIR}"/${P}-fix-tests-for-PyPDF2-2.x.patch
-	"${FILESDIR}"/${P}-port-to-PyPDF2-3.0.0.patch
-	"${FILESDIR}"/${P}-use-poetry-core-backend-for-PEP517.patch )
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index a7deb599d3c9..a73947ffb6b9 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,5 @@
 DIST websocket-client-1.4.2.tar.gz 49113 BLAKE2B d1d25d7066512ae5a8fa189b22ad320331b3d34e6ae953a29b7b5644065a9d60ffd6743bae6e769f356b7294374690fba103ee42ed59f5f9b213dfeda7f038af SHA512 4003a6b387096a738e9b9f76129b954bbc208b8b75c6ba9d6f0dade82078645109f985164ce25c1a600e630833f7187d51d6236997d6c72315d206e91f1aae7a
+DIST websocket-client-1.5.0.tar.gz 49931 BLAKE2B 03911ba7c147e19dab2fe3198ead34f1dc7d7ac970f33d20cb1eaa9ade0924be873c8ccc585326a8feb9ccf86443b1f5ee1482191cb14a50dddae5b5275b1f9e SHA512 678ab14a8c036e341134e6ae19d422a8888e64ec781983c2eff9d7897298a3b1899b65813351bb566319c931918c034cf0a730aa07c06e48ebac3ddb409a8dee
 EBUILD websocket-client-1.4.2.ebuild 815 BLAKE2B 4b56a084ca302a4b29d3e0e4865b2cc7d44f771a943131470a36d328bd24033ed1ac105f4ba3bcf6c6c50b63e224b116943f34ed56b256345dd4a7cd0185e501 SHA512 dccd228be3b31f4e30b019fcb1f3bc592a0e30591bbe636689cb27ba139975ba3f85e6062635905310ee2d1468ed2b85fe23f1be5d4651d12cc0430aaecc9fea
+EBUILD websocket-client-1.5.0.ebuild 823 BLAKE2B c812ec4d109623b5c0a884e53779867ed5864254b14f125a4267f83b77e735b36107924ca114678b9833b50062e3e96ec8eb9bb6f6688948f3c3bb5f9862cedd SHA512 eb9b50d3494f46932eed73b98a17af94f23cf26fefb0d3558a2bddbea4e26505c374d82ad23f3adcfbe1f0e4bedd9b7a4349b5c984f6a81da4a9f1a6b0b0d06b
 MISC metadata.xml 498 BLAKE2B de7c287e513c7e64b4bec29693e6eb9104ff963e0d4d942ed37402bf341739fb17b2ebdb1bf0aaa0081934bae34e16f025d0549f94c1a863be95d64a338eede4 SHA512 13dd8cf0f3e363a3fbf2b246bcc1ccd78a898d5ca830e30fb1606947ce129d99f2d8065c3668dc2c7749bbd4e24e39e5a7c483065737a580246a89dd4d41eaa7
diff --git a/dev-python/websocket-client/websocket-client-1.5.0.ebuild b/dev-python/websocket-client/websocket-client-1.5.0.ebuild
new file mode 100644
index 000000000000..4e70f6ad65d9
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="
+	https://github.com/websocket-client/websocket-client/
+	https://pypi.org/project/websocket-client/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/python-socks[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/www-authenticate/Manifest b/dev-python/www-authenticate/Manifest
deleted file mode 100644
index 05826ad30fec..000000000000
--- a/dev-python/www-authenticate/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST www-authenticate-0.9.2.tar.gz 2480 BLAKE2B 642640f29582983457134034d9d93ca20fb3d8992cbe3f5b3f9b35e3d95c154fb744dc8fbe35081d4af6b1b04ea37e27b35501bd783130d9e1bcf8aa6a0eeaba SHA512 5ee3ee733013d922bfef96981fd33b22947874c0a2a56c6d2dbfe11b0bc447a3ff6b6f294efaea2beaf2ff570cd3bf519a21bc71ce62fc0a8ce5edc5d68308f4
-EBUILD www-authenticate-0.9.2.ebuild 439 BLAKE2B 42ef8b0baeaddede435386e7116ac935e477d1f165f314995e35c9041a59e3cc95994b06cf69b2e2f958ee1b3b2187ed9a2975ae51b17872a34ffb487fd35ee7 SHA512 a260e55bb2d448450b978b1e0b5c41c7a5ebf291822698d0897c69c4f0ff96eb04a4424a15fdb115f1e9f34abce7a698745beb3436d6a82f3b9360039e7ba364
-MISC metadata.xml 388 BLAKE2B 0a19ae239d9adb65caa77caee6244c025a6f042c04536cbd2311eb1a2b8af851b23e0b43a61d64270e26b58cc6e2275373013de7adc96bd326c369485b601d1a SHA512 1969128d2f8845a87f81ce9e10d58814514dab40610b966fd8e6617829b7bfcabca8806a9fb8bffc044a762419aa6e83c7b09483089320e15385368f69bb4b49
diff --git a/dev-python/www-authenticate/metadata.xml b/dev-python/www-authenticate/metadata.xml
deleted file mode 100644
index d551a361b18f..000000000000
--- a/dev-python/www-authenticate/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">www-authenticate</remote-id>
-		<remote-id type="github">alexsdutton/www-authenticate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
deleted file mode 100644
index 0372f7a263fd..000000000000
--- a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="WWW-Authenticate header parser"
-HOMEPAGE="https://github.com/alexsdutton/www-authenticate"
-SRC_URI="https://github.com/alexsdutton/www-authenticate/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests nose
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index ffdc54e6ad9a..0f3c7833124b 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,7 +1,5 @@
-DIST xcffib-0.12.1.tar.gz 85272 BLAKE2B 6db2f19caf13d406297198c3829456cb45b5195e2d068b1f5ad01c25d4ed75e3187854da24156c3c5396a559b11c2d6949711b793c5bf5c83e18e9aa54307983 SHA512 6530fb53fa18a3905d7c9e8dd5d05ea084de4a5f392e32953a9786998dd194b2db55b54fa44dbc3e6b68e68ae00431de7432d6884f777734409d660dae325d6e
 DIST xcffib-1.1.2.tar.gz 87303 BLAKE2B 0727c1c4c49692d8daff79d77487cfd2780a4279fa2bd49b45d87f48186e9ba0ee3ea46841dc259e7a3b5e301caacdee764762efe96217e138e6f8cedb2a986f SHA512 21606034bd0be2e1cf87b20904b006f7eb6eecbd835eff778f064ecb2bc16d17f48a6acce0eb1a30ca9bd98d810b4b1674bdadc9f6e42c5effee777f7bd138aa
 DIST xcffib-1.2.0.tar.gz 88972 BLAKE2B a8d9be7c3149f696d06474aab85e9f7605d45e9861151192dbb7b51e48483f75adb721e17531432294d19d8d6498b66ba312702ea011e8470c3ac42ac0cd6e23 SHA512 7012833f2877edea92cdc15030543883e2a848264c034a81222626ad48a69fcdac8a88cec2e07e61a80102640baa7fbdf29bbf25e08e59fc896aada08533bb77
-EBUILD xcffib-0.12.1.ebuild 796 BLAKE2B fe839be5ebb472d0df21a19f36d3873e2bceca0a5e4dc0cdf23497e269b0f0c58dd5f39c5fb250aff222223a4fd8691556c1e8f3b6328a3d2b81004555db4860 SHA512 9ab12f6954417dfde34c8c08f19a6eacae34f6ab1789de3a1e428a73199d7e2b6bd9f17e71622b2618238268ea29eaef27b3e7f57c03eba16e041f1f4b68a63d
 EBUILD xcffib-1.1.2.ebuild 796 BLAKE2B fe839be5ebb472d0df21a19f36d3873e2bceca0a5e4dc0cdf23497e269b0f0c58dd5f39c5fb250aff222223a4fd8691556c1e8f3b6328a3d2b81004555db4860 SHA512 9ab12f6954417dfde34c8c08f19a6eacae34f6ab1789de3a1e428a73199d7e2b6bd9f17e71622b2618238268ea29eaef27b3e7f57c03eba16e041f1f4b68a63d
 EBUILD xcffib-1.2.0.ebuild 853 BLAKE2B 4b7de928b8efc570a2613613c8c215d9a30ba617982cfb4997541d742aab9223da73e739c78dd5e77bc61b2c0b2912e632ea3b669da656f1cc340219137204e6 SHA512 4ca5f1670ace1407c6fb027b99e42545c9f294b4a2e3879237584717fe5dc023d7ed2f0b5cbba740373ad122e1938d74eb747e8cef7a5740181934df0a6a56de
 MISC metadata.xml 374 BLAKE2B 7f2845d0839dff2568de08f86ce6b8387e76ff450467e14b5c291ad1f55256cb9eff1ff318973e54846ad394b56a3e1e6aa8574fcc0bc39a1c9f7d3b42a1109d SHA512 9403d3d706b5281d6abe2d2fca33b1a70983c7c205f8a5899ad0469fe9a1cd0ceb6c9b27916e1e152467d029d86fc9e6dc28f967bc108499ed901582ad1bbd00
diff --git a/dev-python/xcffib/xcffib-0.12.1.ebuild b/dev-python/xcffib/xcffib-0.12.1.ebuild
deleted file mode 100644
index def4be81f2b4..000000000000
--- a/dev-python/xcffib/xcffib-0.12.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
-HOMEPAGE="
-	https://github.com/tych0/xcffib/
-	https://pypi.org/project/xcffib/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="
-	x11-libs/libxcb
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
-	' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		x11-base/xorg-server[xvfb]
-		x11-apps/xeyes
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 31682602a019..44944a8b8940 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 00a1694b747e..cf984ec3a880 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,21 +1,15 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
-DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
-DIST rails-6.0.6.tgz 18611499 BLAKE2B 156ab379f1fed2380544127096490cfdab1264dc352db08e0b48c4cf3cde9a564f618c86650203c018597b6425d03f550103778f5255e5026e8d50e9a8adf5c9 SHA512 5754f3dda4f279daec397358b692bb53c191c335218a365eb7ea6d374af32c35bd3e5268dd2d71a7481855020b43726b77f0ce440cbcc73130df8b72565234c7
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
-DIST rails-6.1.7.1.tgz 11035161 BLAKE2B 16e5c6e323403c117443b10ef151ba94cf27cd6fffdb816655ccfe935e05cbeacf32cd9480dc7eb6de1bb8de6f61b7df25eba60c1b1412ebcab7b002de1e1072 SHA512 3f3a9ef366be606e9adefbcaea079a2603e5d4a298a2ad2c56e11b69c8e8817cf7c67c69c45f6797ff8bf574d0c2f5b47070de48efce4ada93b34e66da5e4e62
+DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
-DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
-DIST rails-7.0.4.1.tgz 11063201 BLAKE2B 9efdb43546d73cbff42297ac988604318e298fb06954cfc066861c63e6336797dca85e7ef40f1e3255fd9fab8fbc111ad1265023a6ced0a25fd1d1a416cb8da5 SHA512 551317bf1d837836eabf4f0de6be1f83916c57b5f828ce079288c37665bac636dd95c076a965d6d763c69f425aef3b5cc20d1fcfdd22eb638cf7175c891466a2
+DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD actioncable-5.2.8.1.ebuild 926 BLAKE2B d33be4c8d5fb7bcb529df64f77c61d042bfad9b54f15b3e382176c4f9e1d67f0292e0bdfccae3793f3b2214d56eb5c691b3e0a6be9da9404d4da2a803af872b7 SHA512 37df0a84305dda9c3df04e7480ef3b8eefe6469333847d48965c311a31ebe080fd067a12df5402b973101fe7a7aee079dab05dbbb41cb810e7a5e52c0fa2bc3f
 EBUILD actioncable-6.0.5.1.ebuild 935 BLAKE2B 80d94fcf7588e69360c2bbf9fda9b03f68e60d43e513920638f9995b10d8a404194be843a1a79f61d11ee33b30c80527c71f301a6fbf0156ba218d3241d587f3 SHA512 207ef3b5769761fe5319e8e70a2de0ddc90390c503283b67f5614fefff12c49c2213f3f4b4149001b30e4fb9c1d0d7b8698bacd28735b7f10e82f2bbc61378c1
-EBUILD actioncable-6.0.6.1.ebuild 928 BLAKE2B 24adcb17635a45cb2945465eccfa47d0a573eb62196b303d2be13a2c31cbae74a2d9eea4f0c039dd5064380934b9800c7927527e508215e37d9694153f84f44c SHA512 45a543befcd6e6822d35add12e246d75eb8db702561b1002891acf21a723be62a99d11da0ba2499705d52e423e2a29e51a9db7ecd0b90c88952f7b92b718dec4
-EBUILD actioncable-6.0.6.ebuild 928 BLAKE2B 36c8061a07fda079dc66c899aed34f388ab77f3ec0484b42559fe6604c53f37c08193063da00185a885189b285919021b26c54e2efc271f9f59b2cbebccbda20 SHA512 eed74234ec64746485dd72bd2bcaa2983dcfa417627524810c28adcd5d5dcdecce436d9afd6caa10fa6ab60183fbbf079b6c6e8d012c97a5ee4baab88399a309
 EBUILD actioncable-6.1.6.1.ebuild 968 BLAKE2B 402b75efadf53319e8a270fa9b900912a5275674357a9b1eea99ebb7134891a545ad7d50c736841c96cfd8b15942d01dd2e6a8b2516415348aea2c03b97a2f0c SHA512 a28a8d64f3aac01e68f94b79e460ea291104af233b18fa945866182fb0a79745c8a9032c193c51e79474aadddbd9ba2fc13b3fdd5e1cc5faf23eef33dc2abd98
-EBUILD actioncable-6.1.7.1.ebuild 975 BLAKE2B 2b9611b19e8ddfb4c271dfa4aebf26471e36799f7e7a844234bee80c348694c1e4f91e87484bebdb77f78996c8ce0c90ee65aef6ad8b3872ab2d084f6611b484 SHA512 7a7725909b9e16ff5512bbf85703037c13260d0097f6d884117b4a66628c88a1ccbb83be8af53a3a75e521d8fcf2f644b7676fea30534aeebbfb1110c46db880
+EBUILD actioncable-6.1.7.2.ebuild 975 BLAKE2B 2b9611b19e8ddfb4c271dfa4aebf26471e36799f7e7a844234bee80c348694c1e4f91e87484bebdb77f78996c8ce0c90ee65aef6ad8b3872ab2d084f6611b484 SHA512 7a7725909b9e16ff5512bbf85703037c13260d0097f6d884117b4a66628c88a1ccbb83be8af53a3a75e521d8fcf2f644b7676fea30534aeebbfb1110c46db880
 EBUILD actioncable-6.1.7.ebuild 975 BLAKE2B beb9737ce2bd01dd0bea572125ff6b5b4828fc70d0e52d13364a965d019899aca1eaab33c7e7367ea03fc1e8e07136a72da4da7442c7c992dd594a44b9809f2e SHA512 a248f9dc760580da0af1bf9338aaa1fc641be3b632881ab1dc8d5dfddefa35f15bf463665ead89341b475b42badc241773ef593b9262c5568a43b73bf3fe7c21
-EBUILD actioncable-7.0.3.1.ebuild 956 BLAKE2B cf4741405761f6b1a459da877cfae0d87b649bcce4b39472400aaef685e37b9c5c228b786d22e9c6d49df70ad340910c32b53a4c972337ff08a7c7800cc739ff SHA512 aff75042078487a1ac9ad7598c9dba3565dfd6f592ca9a258d3886be7bad801a4c43a589c262ad8c625d6d0a4937121991e643ca8d07b4969f30ee12a04d1e75
-EBUILD actioncable-7.0.4.1.ebuild 970 BLAKE2B ce2fa133638a688ae2d16b9f1e468283a5d5f381d0aea549615759d8f4252bfb851631086ce6c1aca29ad21a33ccaa1a909b4a73cbc7de65e6565af5927c35fb SHA512 9c0cb825cfc911b4a46e9ebcb4940faed409db8ee3024d770d18dc7bdc6985b95d234fc9c4274632cbe414624c88a015ef05afe544305164a6315719ff0417f4
+EBUILD actioncable-7.0.4.2.ebuild 970 BLAKE2B ce2fa133638a688ae2d16b9f1e468283a5d5f381d0aea549615759d8f4252bfb851631086ce6c1aca29ad21a33ccaa1a909b4a73cbc7de65e6565af5927c35fb SHA512 9c0cb825cfc911b4a46e9ebcb4940faed409db8ee3024d770d18dc7bdc6985b95d234fc9c4274632cbe414624c88a015ef05afe544305164a6315719ff0417f4
 EBUILD actioncable-7.0.4.ebuild 970 BLAKE2B ce2fa133638a688ae2d16b9f1e468283a5d5f381d0aea549615759d8f4252bfb851631086ce6c1aca29ad21a33ccaa1a909b4a73cbc7de65e6565af5927c35fb SHA512 9c0cb825cfc911b4a46e9ebcb4940faed409db8ee3024d770d18dc7bdc6985b95d234fc9c4274632cbe414624c88a015ef05afe544305164a6315719ff0417f4
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actioncable/actioncable-6.0.6.1.ebuild b/dev-ruby/actioncable/actioncable-6.0.6.1.ebuild
deleted file mode 100644
index 330b6365db98..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.6.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=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.0.6.ebuild b/dev-ruby/actioncable/actioncable-6.0.6.ebuild
deleted file mode 100644
index fe1960633df9..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.1.7.1.ebuild b/dev-ruby/actioncable/actioncable-6.1.7.2.ebuild
index c59b8cc80841..c59b8cc80841 100644
--- a/dev-ruby/actioncable/actioncable-6.1.7.1.ebuild
+++ b/dev-ruby/actioncable/actioncable-6.1.7.2.ebuild
diff --git a/dev-ruby/actioncable/actioncable-7.0.3.1.ebuild b/dev-ruby/actioncable/actioncable-7.0.3.1.ebuild
deleted file mode 100644
index 09603fd0b491..000000000000
--- a/dev-ruby/actioncable/actioncable-7.0.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-7.0.4.1.ebuild b/dev-ruby/actioncable/actioncable-7.0.4.2.ebuild
index b2c27ae6e548..b2c27ae6e548 100644
--- a/dev-ruby/actioncable/actioncable-7.0.4.1.ebuild
+++ b/dev-ruby/actioncable/actioncable-7.0.4.2.ebuild
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index 7bf2fd5e2dea..617b852771bc 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,19 +1,13 @@
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
-DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
-DIST rails-6.0.6.tgz 18611499 BLAKE2B 156ab379f1fed2380544127096490cfdab1264dc352db08e0b48c4cf3cde9a564f618c86650203c018597b6425d03f550103778f5255e5026e8d50e9a8adf5c9 SHA512 5754f3dda4f279daec397358b692bb53c191c335218a365eb7ea6d374af32c35bd3e5268dd2d71a7481855020b43726b77f0ce440cbcc73130df8b72565234c7
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
-DIST rails-6.1.7.1.tgz 11035161 BLAKE2B 16e5c6e323403c117443b10ef151ba94cf27cd6fffdb816655ccfe935e05cbeacf32cd9480dc7eb6de1bb8de6f61b7df25eba60c1b1412ebcab7b002de1e1072 SHA512 3f3a9ef366be606e9adefbcaea079a2603e5d4a298a2ad2c56e11b69c8e8817cf7c67c69c45f6797ff8bf574d0c2f5b47070de48efce4ada93b34e66da5e4e62
+DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
-DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
-DIST rails-7.0.4.1.tgz 11063201 BLAKE2B 9efdb43546d73cbff42297ac988604318e298fb06954cfc066861c63e6336797dca85e7ef40f1e3255fd9fab8fbc111ad1265023a6ced0a25fd1d1a416cb8da5 SHA512 551317bf1d837836eabf4f0de6be1f83916c57b5f828ce079288c37665bac636dd95c076a965d6d763c69f425aef3b5cc20d1fcfdd22eb638cf7175c891466a2
+DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD actionmailbox-6.0.5.1.ebuild 1854 BLAKE2B f2e25c6e6ac862981574ed9c9a6092ec83bd913b0a8b332ed5e62fca81844c29a37e0d4a36a20eb33b3c237e114790e5e4c52e80d63ec9c9aa59b989ad3630f8 SHA512 d826c2749df4de1ebf63110bd980398484c91c5f731457b62a6ac172fb6956ec36f8ec2cfa126fe990217b899cbaed4ddcb7242f657af88328f167f3cf14bebc
-EBUILD actionmailbox-6.0.6.1.ebuild 1900 BLAKE2B 6533a9b8feb1d249ac2d6c349f974d4a3030534a745f6521af59d9ee5982f9916de0124272295dfbcdc0624c5a94cfa0de5f5760e2ecc11ded365cbf8f6ff122 SHA512 0e72526567e3f6f2816658bfcf4672910d85284db1afe0001ca20078cd52d8c83b5a6b0eb7fde4acefd896efd8f364ecc90052668d9b3a16d224cb26ab1304ef
-EBUILD actionmailbox-6.0.6.ebuild 1847 BLAKE2B e2ff9f0abee1159d2f4ab9ae5d170eeef73bfad2a6e4535f48b54d3937a1c25dfbfbf3fd8e1d0d581390ac7884882afde3d69247f06cb12b4d2ee2d424d4a6e0 SHA512 5d3e6f273e5f20d09b029740cba6fbc54e62d435949816fe79fea4e028c61f3109cce8f79c92c5d5449edb9e6f693b1894f5845ed23572205f5b2bc47f771f97
 EBUILD actionmailbox-6.1.6.1.ebuild 1885 BLAKE2B 08405d93c914d264baf641ee8e592aa308946770430564f3f45bbd3f4c54d279095b10eadc50aa9a95af02fcdeed24ee73ee149a318298c0da1e3b959f6255ff SHA512 1ba4ed9662b6225bb5dcbe3d5dd58979e7ce20feffb4aba7c9f06cbdda881aac58fd414412dd6dfd24143764fc6fd2dd10a8a84f147d0778b72edf04df9dfd0e
-EBUILD actionmailbox-6.1.7.1.ebuild 1937 BLAKE2B 858aff6ca2795abcae97efdf0eca7a26799c4a129dc94a51281cef963bfab21ddeeb86fa3ce80231e094a4559860f2ab4a8bed460d3339ccecb495a8652ec0c3 SHA512 213a069e323c0336f3c8af0355711491ecddf7ed5421c5f4d2026e421a0270d8bc7dfa616a9711b32ec70657909254f4ae6de2fe2d7c3a21d0e544093aa733ed
+EBUILD actionmailbox-6.1.7.2.ebuild 1937 BLAKE2B 858aff6ca2795abcae97efdf0eca7a26799c4a129dc94a51281cef963bfab21ddeeb86fa3ce80231e094a4559860f2ab4a8bed460d3339ccecb495a8652ec0c3 SHA512 213a069e323c0336f3c8af0355711491ecddf7ed5421c5f4d2026e421a0270d8bc7dfa616a9711b32ec70657909254f4ae6de2fe2d7c3a21d0e544093aa733ed
 EBUILD actionmailbox-6.1.7.ebuild 1885 BLAKE2B 2ed38cb35935b8e43140ccf584643bc5bc38b83e26aa48fd538601e1c4173b4a5b9ddeb992699dadbe928edb3659ee25ae9ca09b28a9b0f2d9b7aeec2fbb41bc SHA512 a88d36732045ad4da4aa4b8cac0fe4d8101d3e45750678885a9ce051678789dd2982df346888963c3fefd9e88113086018be1d7c8ef06a7a4c8098dd7194f8e7
-EBUILD actionmailbox-7.0.3.1.ebuild 1997 BLAKE2B 7895a26140ce7eed1d1ac28c2ffefb89f952a672a050f4f3332b0ee24be682e422444813970ed824cc6c8b5c223c5f2c6810f279ac87cb5248927b9a228ccc92 SHA512 cb9e57dac284f1b94c2b8a428a3323f86bdbb9739e1a716e2fde4ece0229a0ba6cdc025a780089f11a543d6d405ac5617c016d7e804409efd7a79846b2750d51
-EBUILD actionmailbox-7.0.4.1.ebuild 2056 BLAKE2B da080e80b15a63732642061ad501fbba821b5e889f2e5c734c7d89f059b22f999d44fbc2985c5c670265bbced19dfea69655c572e78dad88dd49fc2490bbabd2 SHA512 a2fc1fbba50892676cbb10e662fafa09936a3c20757bbf35103b0c4cb23e5d233e78f889342f39498cf8891d80df53921fbe64823e5834b3a2d0e999f68a899d
+EBUILD actionmailbox-7.0.4.2.ebuild 2056 BLAKE2B da080e80b15a63732642061ad501fbba821b5e889f2e5c734c7d89f059b22f999d44fbc2985c5c670265bbced19dfea69655c572e78dad88dd49fc2490bbabd2 SHA512 a2fc1fbba50892676cbb10e662fafa09936a3c20757bbf35103b0c4cb23e5d233e78f889342f39498cf8891d80df53921fbe64823e5834b3a2d0e999f68a899d
 EBUILD actionmailbox-7.0.4.ebuild 2004 BLAKE2B d37095b1dc2ccc41e10eaa745c2094fecae7cfbe04bae958fd20bf2ff6fb3073fb41d75581808b55792513f3dff5323e698cd0d6dfc5e88f7a2c81699d6ea544 SHA512 94d4aa98626accfe46122d35d54bb22f934b404cc885f1417dc0fe2175e678f07825438be1eec8d348f2927da46e6776b1994ff53469da80fc204fc7c4f5abc7
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.6.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.6.1.ebuild
deleted file mode 100644
index 7503a5d4c9d8..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	<dev-ruby/mail-2.8
-	dev-ruby/mocha
-
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
-		-e '/minitest/ s/5.15/5.16/' \
-		-e '10igem "mail", "< 2.8"' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.6.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.6.ebuild
deleted file mode 100644
index b2188abe1fad..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
-		-e '/minitest/ s/5.15/5.16/' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.7.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.7.2.ebuild
index 8098f4a54a1f..8098f4a54a1f 100644
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.7.1.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-6.1.7.2.ebuild
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.3.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.3.1.ebuild
deleted file mode 100644
index 2f345728b1fd..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-7.0.3.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-	dev-ruby/net-imap
-	dev-ruby/net-pop
-	dev-ruby/net-smtp
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-	dev-ruby/rexml
-	dev-ruby/sqlite3
-	dev-ruby/webmock
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.4.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.4.2.ebuild
index 6e15a4288416..6e15a4288416 100644
--- a/dev-ruby/actionmailbox/actionmailbox-7.0.4.1.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-7.0.4.2.ebuild
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index be4a0ef6acd2..ad93abc5b109 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,21 +1,15 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
-DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
-DIST rails-6.0.6.tgz 18611499 BLAKE2B 156ab379f1fed2380544127096490cfdab1264dc352db08e0b48c4cf3cde9a564f618c86650203c018597b6425d03f550103778f5255e5026e8d50e9a8adf5c9 SHA512 5754f3dda4f279daec397358b692bb53c191c335218a365eb7ea6d374af32c35bd3e5268dd2d71a7481855020b43726b77f0ce440cbcc73130df8b72565234c7
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
-DIST rails-6.1.7.1.tgz 11035161 BLAKE2B 16e5c6e323403c117443b10ef151ba94cf27cd6fffdb816655ccfe935e05cbeacf32cd9480dc7eb6de1bb8de6f61b7df25eba60c1b1412ebcab7b002de1e1072 SHA512 3f3a9ef366be606e9adefbcaea079a2603e5d4a298a2ad2c56e11b69c8e8817cf7c67c69c45f6797ff8bf574d0c2f5b47070de48efce4ada93b34e66da5e4e62
+DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
-DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
-DIST rails-7.0.4.1.tgz 11063201 BLAKE2B 9efdb43546d73cbff42297ac988604318e298fb06954cfc066861c63e6336797dca85e7ef40f1e3255fd9fab8fbc111ad1265023a6ced0a25fd1d1a416cb8da5 SHA512 551317bf1d837836eabf4f0de6be1f83916c57b5f828ce079288c37665bac636dd95c076a965d6d763c69f425aef3b5cc20d1fcfdd22eb638cf7175c891466a2
+DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD actionmailer-5.2.8.1.ebuild 1395 BLAKE2B 4df95c01ee09bda91acee92e1d2848784b48f4d9549b37304de0b42968ac6a67f180252d020a4cba07941cfb9398d3f58c790bc38e0dcba3c9076d6b09f1a3d2 SHA512 b2bd6db7daaeeb6c7c03fccb8993e0ad3ec1c2be4f404e190f66b39824f8372953e38966a793fc8973113fb42094b9cc638f0343470551673d57ddcd39e5225b
 EBUILD actionmailer-6.0.5.1.ebuild 1369 BLAKE2B a2e8d1f875a69560810a3800323d393c7aaa44137e8c50387fcff890ea8209fe56e9dd2c7f88eb51aaf7b693768bfd954bbeecf584f31fac568f7af53c87ca4b SHA512 48763a11f6a8b588e5afb55c1797c622eaa69d7eb6653a4dbab8f6f0c91318d570fbe82ba3beaf4d467f49111465d083912ba4e10458c58614c8cf441a20b246
-EBUILD actionmailer-6.0.6.1.ebuild 1362 BLAKE2B bbd54e3c052c4454aae547e19aa239c075fa2861dc006ce49d1a27e63f702ce58bc9f47730719d66c5e0b437f797f3bd9239c6574f7b593dee44a2067227e9ec SHA512 a4076b82ccf86989928c67fc7507da8b1d618a6ba6360ac0b5823df0a5b542fe7e24be30500d2c1d0389281266aa5f0891565e647644f94c2f4dd0941b3e2ef5
-EBUILD actionmailer-6.0.6.ebuild 1362 BLAKE2B 02e5b9ddcf0bd20d00da0d1cf791c621b1ee2fea031dbd970aad65cbb8dde315fe48b998d97ef1a0797ad5060df4a501563c00070cd8d6922d598ae6eee951d5 SHA512 785a5e4d5275026cc0bbb0000f500985488d7fd0c8595d1e90c7215045eed8ada2a8ac551fd9a381a7a53650397cdba540d439dd78235c5590d80e8e7cba8bb6
 EBUILD actionmailer-6.1.6.1.ebuild 1268 BLAKE2B ffe0b2a2319e50bf9b4e37bbc98e9a97ef0ea2177be520dc0ef4cc5df15946271ceceecef2a4f915aa22366de0f4cc556547c862ca77bfb35ec20db767b31ee0 SHA512 b23ef1349e8a199afe210a231365cd8601a3930d4360db399cea101dbf7fddfe59af0011a74d5da20804dec36aece892b8f831e2fbc7891a27e02a5cf7e1abb9
-EBUILD actionmailer-6.1.7.1.ebuild 1275 BLAKE2B 571f4dcd1a060a0699eef5a6c99b6a72bcc83a668b4fe3c623996868943a6a755c32430882472ba62f7e9c8e072485b2a3feb10a9b1823ebfb329fbbca1a2d2f SHA512 0dc139332b17bcfbe7ec37854fe1f1cb1fa726c02a513573f66e5a4c669954097731cfca139c0e9dae5033c095197564d97d428b671eff50e3a0a5e9c4580a75
+EBUILD actionmailer-6.1.7.2.ebuild 1275 BLAKE2B 571f4dcd1a060a0699eef5a6c99b6a72bcc83a668b4fe3c623996868943a6a755c32430882472ba62f7e9c8e072485b2a3feb10a9b1823ebfb329fbbca1a2d2f SHA512 0dc139332b17bcfbe7ec37854fe1f1cb1fa726c02a513573f66e5a4c669954097731cfca139c0e9dae5033c095197564d97d428b671eff50e3a0a5e9c4580a75
 EBUILD actionmailer-6.1.7.ebuild 1275 BLAKE2B d8617ce24d1821381e6a79dd82c0c04f0d71babfd25b5522bcc495b1a3e8672a09472612a892b5799130485e690e4349fd131fcae6dddea9b7f7b686bed730c9 SHA512 5ecaccc9c0eda4da5a242f593143a4f96222e255ba1f56b754304da8346e376712b16479175788c605d368f48a27103e59623ec4ac2f7cab53575cc98c4ed8c1
-EBUILD actionmailer-7.0.3.1.ebuild 1256 BLAKE2B 689995cd34ae5410436b710153a4a34fd5f994b763fad99147e2d6a1e0a04c1e7a5140c179d1f9f3e0b979b34f5e49015b91d7d589b3ba55dd865d3e3e5a5000 SHA512 23d65d7c6d163ee01dbb162da76920b5b53b2010ca69c13021afe5217f382ab5e9722df8007be1d6310181058f92216ece94f58227ae886d9f71ce4d84c84c88
-EBUILD actionmailer-7.0.4.1.ebuild 1270 BLAKE2B badbb64b8eab2db7aa79b380f5cc990aca04fba19b3aec53668122201430070204401dc2e6a2562bdb1489863a740cf2edfce38085e4435f28561213bd5732ed SHA512 2ec5b6897a9c30b7d9a79b914b0bbb49c9d719cfdda1a2521cad03e840d53416d249f46360cd1e67d223b8e173e60a3a3e3cbed6135706582ece72e69bbc03d5
+EBUILD actionmailer-7.0.4.2.ebuild 1270 BLAKE2B badbb64b8eab2db7aa79b380f5cc990aca04fba19b3aec53668122201430070204401dc2e6a2562bdb1489863a740cf2edfce38085e4435f28561213bd5732ed SHA512 2ec5b6897a9c30b7d9a79b914b0bbb49c9d719cfdda1a2521cad03e840d53416d249f46360cd1e67d223b8e173e60a3a3e3cbed6135706582ece72e69bbc03d5
 EBUILD actionmailer-7.0.4.ebuild 1270 BLAKE2B badbb64b8eab2db7aa79b380f5cc990aca04fba19b3aec53668122201430070204401dc2e6a2562bdb1489863a740cf2edfce38085e4435f28561213bd5732ed SHA512 2ec5b6897a9c30b7d9a79b914b0bbb49c9d719cfdda1a2521cad03e840d53416d249f46360cd1e67d223b8e173e60a3a3e3cbed6135706582ece72e69bbc03d5
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.6.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.6.1.ebuild
deleted file mode 100644
index 640e870059e8..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.6.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.6.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.6.ebuild
deleted file mode 100644
index e0353b3ad647..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.7.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.7.2.ebuild
index fd3ed9d165b5..fd3ed9d165b5 100644
--- a/dev-ruby/actionmailer/actionmailer-6.1.7.1.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-6.1.7.2.ebuild
diff --git a/dev-ruby/actionmailer/actionmailer-7.0.3.1.ebuild b/dev-ruby/actionmailer/actionmailer-7.0.3.1.ebuild
deleted file mode 100644
index 867075061b56..000000000000
--- a/dev-ruby/actionmailer/actionmailer-7.0.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-7.0.4.1.ebuild b/dev-ruby/actionmailer/actionmailer-7.0.4.2.ebuild
index e287b380286b..e287b380286b 100644
--- a/dev-ruby/actionmailer/actionmailer-7.0.4.1.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-7.0.4.2.ebuild
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 889a6ab6d410..0fa43f4a3a8b 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,22 +1,16 @@
 AUX actionpack-7.0.4-rack-test-2.patch 2619 BLAKE2B f31791347de3a683270ed6720a4c33c069d29529ea6eab6b2721cd248029cc1130502d8d6aa9f9fa3433769fa58069502b7c1f9ffc330cb46f5163744967d51b SHA512 ceac0b24692512a03029ce24a1cb86da31669a1e91ab50537981d7dd3fcee861fcece37536cc63b8a3b6f07709dc8b8f64a5c3213a4c7c997208c3d73089cfc9
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
-DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
-DIST rails-6.0.6.tgz 18611499 BLAKE2B 156ab379f1fed2380544127096490cfdab1264dc352db08e0b48c4cf3cde9a564f618c86650203c018597b6425d03f550103778f5255e5026e8d50e9a8adf5c9 SHA512 5754f3dda4f279daec397358b692bb53c191c335218a365eb7ea6d374af32c35bd3e5268dd2d71a7481855020b43726b77f0ce440cbcc73130df8b72565234c7
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
-DIST rails-6.1.7.1.tgz 11035161 BLAKE2B 16e5c6e323403c117443b10ef151ba94cf27cd6fffdb816655ccfe935e05cbeacf32cd9480dc7eb6de1bb8de6f61b7df25eba60c1b1412ebcab7b002de1e1072 SHA512 3f3a9ef366be606e9adefbcaea079a2603e5d4a298a2ad2c56e11b69c8e8817cf7c67c69c45f6797ff8bf574d0c2f5b47070de48efce4ada93b34e66da5e4e62
+DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
-DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
-DIST rails-7.0.4.1.tgz 11063201 BLAKE2B 9efdb43546d73cbff42297ac988604318e298fb06954cfc066861c63e6336797dca85e7ef40f1e3255fd9fab8fbc111ad1265023a6ced0a25fd1d1a416cb8da5 SHA512 551317bf1d837836eabf4f0de6be1f83916c57b5f828ce079288c37665bac636dd95c076a965d6d763c69f425aef3b5cc20d1fcfdd22eb638cf7175c891466a2
+DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD actionpack-5.2.8.1.ebuild 2262 BLAKE2B 82cba37da0060c73aa21e55ce9b87e462385d3beeca1f50421b8cbadb87c4e40f9045a694f4f0696b213cead836c986068e36558a689d18c2f69655bae4f6d46 SHA512 abaaccbcb2e1e100fb80faa8af7efab186f44fe47fc8551c4b67974bd7d75a029ad5ba4d89a717ef379be71083f8ed442b8e3c0144f1820bc5bd0180b68db831
 EBUILD actionpack-6.0.5.1.ebuild 2085 BLAKE2B 1115265732900203d12276e97d55ffcb6f71ec7f3219625bcc5e2ada64644d9366ec773febf7bddad8777b261082b99bbd66bf250fcd5366d1bd65c0c221a838 SHA512 fa4f5a17f4adffdecf547810d7ef95ff45f206178ef345e7689093210ac39a6d2451e23d451f08066b814ae4dbecc5c54beb61524d7f13a7477fa089fc38a0a7
-EBUILD actionpack-6.0.6.1.ebuild 2323 BLAKE2B 0719f1b59ee4caadd192e83e2ca3e73a738751bfc37df5d8860aca54d53763f3db7070250b0b4f4b2cbca98b078e0efd52ddd9598f22b0e9442ca93bd9c092d1 SHA512 0541b0d3d8145a616a6051af6685192b452768cadc27e24f84938d798d8e90e205337991205c73e3ed142f6bd04f4954d82cf48d7e5e12fcdf13793a513f720e
-EBUILD actionpack-6.0.6.ebuild 2137 BLAKE2B 27fb1cc503463e7ab7623c40ee8349409d298c6ab8763d1dad897e4b981ae52b3d6dfd8cc207d15ef94a7629b1d51f1bdd477a4db0b82e3a9e97b3cf6a4736a0 SHA512 cb76616b0daf093722924360bc7658d3560a34a8b1abee163bc586fe2660289ca5b6cb9e9f356e970cea91944a568170794398238742da915b40edef2b98d285
 EBUILD actionpack-6.1.6.1.ebuild 2142 BLAKE2B 4f1b92b673ada157372a3b3d6832caf4dc074748afab631a52ddd3d2db6a31c306def13079adf3c842173f9ead59e06e141830fe51a865140ecb01350b798f8d SHA512 82efa802a7c4bcf1998966a9ad9297b146d9bd9e7d0f6ee353316cd595514db1eb516eeae40bd895f24e9c9d3462696ae51880b4590b097d8770671b22c37dfb
-EBUILD actionpack-6.1.7.1.ebuild 2386 BLAKE2B 077959ed95a2e36586daf25b359cc48b4e9923f6a38ecb973f10f0b2204bc5965198ca97d83b86dbea0c887228e84aacc2c5aaa08f47acde0f12dd827b647fc3 SHA512 59faf7c8fe5287a8f304c3e665ff7a9f4cf64db5637e2de6c4e8c773dd719769973e94f73817b8e80598ed698b0b0e91a5a0a1cd6ad5719a5cd2db7b28d66815
+EBUILD actionpack-6.1.7.2.ebuild 2386 BLAKE2B 077959ed95a2e36586daf25b359cc48b4e9923f6a38ecb973f10f0b2204bc5965198ca97d83b86dbea0c887228e84aacc2c5aaa08f47acde0f12dd827b647fc3 SHA512 59faf7c8fe5287a8f304c3e665ff7a9f4cf64db5637e2de6c4e8c773dd719769973e94f73817b8e80598ed698b0b0e91a5a0a1cd6ad5719a5cd2db7b28d66815
 EBUILD actionpack-6.1.7.ebuild 2313 BLAKE2B 247883d8bceefbee5fad85fdf6f6ee95fd10f5b3dbba78c6ade03daa7e4dd4a58e3010d57dc77d67866021faa8ad57f086cce64e5ed8000a228337336a1dce89 SHA512 0c2a34522f94016b30d169a99e8a35140f8bd7e3686e4e0a1b6d867c07de09aadc34f82211f19163a03b2c99b6a98a5945ab33e6ac31f6486df2dfa85ab6e9a7
-EBUILD actionpack-7.0.3.1.ebuild 2045 BLAKE2B 0a7f633c04fbecbc23ea2183ca8f8a4a939a52cd9f55a4c761e170c5db85730cb15b06119d9d9489a14b7c16999f35b27fccfb6004c8d55933cb4de5f4d4ba25 SHA512 1c80a7aa6a890e2ed138f3b1f9371318f8ff4b5dd0ab07e7e482b90c1a4c0974b4b7cd0891ea3815814599ee59f5f1dd3e90616d349fe2fc54e00883c6f31e6f
-EBUILD actionpack-7.0.4.1.ebuild 2184 BLAKE2B 0d067d8230dc2565aadc572b4c9291cb4eafd053f4267170ee1463a07d91b937d2b10147494fe98a8d761d5a99a9774a4a6379da635c5a3f368191b93c3454db SHA512 82e8718bed1aa0d8b954f2740a4e0f53da827808ddadc5b53cad12b6a50bd438abff90eb98a97deab24db028752f4897c37da006ec85fd09cf207b3a479d031a
+EBUILD actionpack-7.0.4.2.ebuild 2184 BLAKE2B 0d067d8230dc2565aadc572b4c9291cb4eafd053f4267170ee1463a07d91b937d2b10147494fe98a8d761d5a99a9774a4a6379da635c5a3f368191b93c3454db SHA512 82e8718bed1aa0d8b954f2740a4e0f53da827808ddadc5b53cad12b6a50bd438abff90eb98a97deab24db028752f4897c37da006ec85fd09cf207b3a479d031a
 EBUILD actionpack-7.0.4.ebuild 2037 BLAKE2B 07d4cb8f0ce7f9f253a28191a15117a315cb1663989e03ef2865fb72760f7e912cf584499e15c1a8061c318272812547cfc7aa3f32b2129ef793d4bb5383d0d9 SHA512 6f5e554f1bfa252dc937c0d78fdbc106566021ba317d4ea15946a265c5d15b2d9f0cb6232b83abc7ce89d0ff1f45461f7f3030a837dcfae33a2cb94e856bbe8c
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionpack/actionpack-6.0.6.1.ebuild b/dev-ruby/actionpack/actionpack-6.0.6.1.ebuild
deleted file mode 100644
index 7f6f3fbba289..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.6.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-3.35.0
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-		<dev-ruby/minitest-5.16:5
-	)"
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}/actionpack-7.0.4-rack-test-2.patch"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid tests that depend on an old dependency
-	rm -f test/dispatch/system_testing/driver_test.rb
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-
-	# Avoid tests that fail with a fixed cgi.rb version
-	sed -i -e '/test_session_store_with_all_domains/askip "Fails with fixed cgi.rb"' test/dispatch/session/cookie_store_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.6.ebuild b/dev-ruby/actionpack/actionpack-6.0.6.ebuild
deleted file mode 100644
index 2f1d8b17d8c7..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-3.35.0
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-		<dev-ruby/minitest-5.16:5
-	)"
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}/actionpack-7.0.4-rack-test-2.patch"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid tests that depend on an old dependency
-	rm -f test/dispatch/system_testing/driver_test.rb
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.1.7.1.ebuild b/dev-ruby/actionpack/actionpack-6.1.7.2.ebuild
index 6a68dd1f5eda..6a68dd1f5eda 100644
--- a/dev-ruby/actionpack/actionpack-6.1.7.1.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.1.7.2.ebuild
diff --git a/dev-ruby/actionpack/actionpack-7.0.3.1.ebuild b/dev-ruby/actionpack/actionpack-7.0.3.1.ebuild
deleted file mode 100644
index 5057670ceafc..000000000000
--- a/dev-ruby/actionpack/actionpack-7.0.3.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		dev-ruby/selenium-webdriver:4
-		www-servers/puma
-		<dev-ruby/minitest-5.16:5
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid tests depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-7.0.4.1.ebuild b/dev-ruby/actionpack/actionpack-7.0.4.2.ebuild
index 9c4b458405f5..9c4b458405f5 100644
--- a/dev-ruby/actionpack/actionpack-7.0.4.1.ebuild
+++ b/dev-ruby/actionpack/actionpack-7.0.4.2.ebuild
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 968a4a9e59ac..53df1ab3eabd 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,19 +1,13 @@
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
-DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
-DIST rails-6.0.6.tgz 18611499 BLAKE2B 156ab379f1fed2380544127096490cfdab1264dc352db08e0b48c4cf3cde9a564f618c86650203c018597b6425d03f550103778f5255e5026e8d50e9a8adf5c9 SHA512 5754f3dda4f279daec397358b692bb53c191c335218a365eb7ea6d374af32c35bd3e5268dd2d71a7481855020b43726b77f0ce440cbcc73130df8b72565234c7
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
-DIST rails-6.1.7.1.tgz 11035161 BLAKE2B 16e5c6e323403c117443b10ef151ba94cf27cd6fffdb816655ccfe935e05cbeacf32cd9480dc7eb6de1bb8de6f61b7df25eba60c1b1412ebcab7b002de1e1072 SHA512 3f3a9ef366be606e9adefbcaea079a2603e5d4a298a2ad2c56e11b69c8e8817cf7c67c69c45f6797ff8bf574d0c2f5b47070de48efce4ada93b34e66da5e4e62
+DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
-DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
-DIST rails-7.0.4.1.tgz 11063201 BLAKE2B 9efdb43546d73cbff42297ac988604318e298fb06954cfc066861c63e6336797dca85e7ef40f1e3255fd9fab8fbc111ad1265023a6ced0a25fd1d1a416cb8da5 SHA512 551317bf1d837836eabf4f0de6be1f83916c57b5f828ce079288c37665bac636dd95c076a965d6d763c69f425aef3b5cc20d1fcfdd22eb638cf7175c891466a2
+DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD actiontext-6.0.5.1.ebuild 1769 BLAKE2B 58e600879c7b45bd8d4061f3dfff6e576ce7e60d8a1ddaec15df28b7154633e8b13a8a3c0289b8d7ed5811c47ca4b41e2ee7c7096da2f4b1d312f8c0b2c53c6b SHA512 edbb947aca857ebfad82e690738ff1a20f6094f483a2e4aceb17cb69cadea5d1ebc6a1d2442d7897cf7d535d177c9f0fb604a55cfe7e593c88df19a5ef9c98d3
-EBUILD actiontext-6.0.6.1.ebuild 1762 BLAKE2B 8776f80d2662396e92750b5ac0f28a3533f09be9f5e1f0d2678ddc8d448b631324cc0eca8eeaa265f8c11555ae22331eefb396fb5fb8a21f65f8b4dae66c9a0f SHA512 71e0e4a1b2409cc9bc7f25c6b9df8c0018371604ef7f024a9003b999df259df78e9dc8eadc3d4ce8b014356e4589dfebe9cd755be87a6c35470759804d0984a9
-EBUILD actiontext-6.0.6.ebuild 1762 BLAKE2B 23090f74076b5746442c1a2d6a7d9f0633849dbd087a90d038d900c02cd62802239463d134d7d9ab8c8a248753b0463b06b18a6b5a92b4821946266294a207d3 SHA512 7461c283e4fe44ed2bab6ad3fcbd5e6d8caa65507a701b2b981cd68b12f012febf1ce55489b18c9b92569110189504bee1821fa78013cfa8a8b212e24537274e
 EBUILD actiontext-6.1.6.1.ebuild 1792 BLAKE2B 26e4517697dae8e152cb45bcecd02c9993f478e162b01fb4395491f373434483dcb79cf69321bde6049f9d620d57582e15a2ea3ce9883186b73eedd2b5672910 SHA512 dbcf4d15c3006bd0cd967457b5fbfc665dad7b23e7007478a866dba239630a96604fc2734791fa02a58abd27b91f9de493b0bd1be89f1cafa605db414b7b2ab7
-EBUILD actiontext-6.1.7.1.ebuild 1792 BLAKE2B 138912b1271f54e86e4c69d031a4f28af012dc31c473480f496b391bb222eb45da881c45cef375e20792cf0336a3cadb29ac8ac345606b6000835d32e477fa19 SHA512 1774282c9f09ad0c356a302acc167fdd93b219089edb66b4b50a8a603e1b0cd609c1f0fe156adb38058b8e5e4988a20544e4802c68b1a87f8e2213e658dfdedb
+EBUILD actiontext-6.1.7.2.ebuild 1792 BLAKE2B 138912b1271f54e86e4c69d031a4f28af012dc31c473480f496b391bb222eb45da881c45cef375e20792cf0336a3cadb29ac8ac345606b6000835d32e477fa19 SHA512 1774282c9f09ad0c356a302acc167fdd93b219089edb66b4b50a8a603e1b0cd609c1f0fe156adb38058b8e5e4988a20544e4802c68b1a87f8e2213e658dfdedb
 EBUILD actiontext-6.1.7.ebuild 1792 BLAKE2B d04a3fa36b734400f76b6fca4040aea0c6e7532aaaa00cbc999b528f21002173c7dc3e71780286f6bbacfc26e1df05d4e482b7f1735ede55dcdff8484158fa74 SHA512 064970502f60c1cd17823f714f8c5ca7afd0f6ba9bfb8f1cccc65f2121ea77875e2b610cca5f1ed63513bb200754f20aed6b22efbf02588b40a653617fca6268
-EBUILD actiontext-7.0.3.1.ebuild 1875 BLAKE2B 1cbb4b8451a4334e35674c95c6f2f7b0775cf29219bbdb25adb7d3d6ea2c84150bf4db7758585e959454d67339b23b1ef19bf302dff3499f4b9f17ba4fe0082f SHA512 390d8999ad159ed5f7f2c39ac426daca0dd8c5b46f8cf101f15cd2cce4a573f79aac886a69405bba331461d7be51f9116d2850a74bd0457e064d54e78e3ae1c5
-EBUILD actiontext-7.0.4.1.ebuild 1882 BLAKE2B c143b5723082b3b7148f93bedc9a9f26e0315fb7a38a464bc9bab1b64975bfb5ccd21327692170a7a168dc9d75ca77a52880b396b4d97684cc703f22e2e0aca1 SHA512 7c4b9e112d44c2e5efe702bcf5557bc5ec72cb36032dd7facb42a6cd21256d6ddd5cf87172c5fc137f86809f802193ee12c34682cdb875a076587e6f6ee1e787
+EBUILD actiontext-7.0.4.2.ebuild 1882 BLAKE2B c143b5723082b3b7148f93bedc9a9f26e0315fb7a38a464bc9bab1b64975bfb5ccd21327692170a7a168dc9d75ca77a52880b396b4d97684cc703f22e2e0aca1 SHA512 7c4b9e112d44c2e5efe702bcf5557bc5ec72cb36032dd7facb42a6cd21256d6ddd5cf87172c5fc137f86809f802193ee12c34682cdb875a076587e6f6ee1e787
 EBUILD actiontext-7.0.4.ebuild 1882 BLAKE2B c143b5723082b3b7148f93bedc9a9f26e0315fb7a38a464bc9bab1b64975bfb5ccd21327692170a7a168dc9d75ca77a52880b396b4d97684cc703f22e2e0aca1 SHA512 7c4b9e112d44c2e5efe702bcf5557bc5ec72cb36032dd7facb42a6cd21256d6ddd5cf87172c5fc137f86809f802193ee12c34682cdb875a076587e6f6ee1e787
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actiontext/actiontext-6.0.6.1.ebuild b/dev-ruby/actiontext/actiontext-6.0.6.1.ebuild
deleted file mode 100644
index e8592dd35023..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.6.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
-		-e '/minitest/ s/5.15/5.16/' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.0.6.ebuild b/dev-ruby/actiontext/actiontext-6.0.6.ebuild
deleted file mode 100644
index d56f4d15147d..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
-		-e '/minitest/ s/5.15/5.16/' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.1.7.1.ebuild b/dev-ruby/actiontext/actiontext-6.1.7.2.ebuild
index 9e1a1218c361..9e1a1218c361 100644
--- a/dev-ruby/actiontext/actiontext-6.1.7.1.ebuild
+++ b/dev-ruby/actiontext/actiontext-6.1.7.2.ebuild
diff --git a/dev-ruby/actiontext/actiontext-7.0.3.1.ebuild b/dev-ruby/actiontext/actiontext-7.0.3.1.ebuild
deleted file mode 100644
index e1f5d0bc64fb..000000000000
--- a/dev-ruby/actiontext/actiontext-7.0.3.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.6.0
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-7.0.4.1.ebuild b/dev-ruby/actiontext/actiontext-7.0.4.2.ebuild
index c0eeb02f7a0f..c0eeb02f7a0f 100644
--- a/dev-ruby/actiontext/actiontext-7.0.4.1.ebuild
+++ b/dev-ruby/actiontext/actiontext-7.0.4.2.ebuild
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index a4c8c5e66a42..23d92add5c4a 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,21 +1,15 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
-DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
-DIST rails-6.0.6.tgz 18611499 BLAKE2B 156ab379f1fed2380544127096490cfdab1264dc352db08e0b48c4cf3cde9a564f618c86650203c018597b6425d03f550103778f5255e5026e8d50e9a8adf5c9 SHA512 5754f3dda4f279daec397358b692bb53c191c335218a365eb7ea6d374af32c35bd3e5268dd2d71a7481855020b43726b77f0ce440cbcc73130df8b72565234c7
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
-DIST rails-6.1.7.1.tgz 11035161 BLAKE2B 16e5c6e323403c117443b10ef151ba94cf27cd6fffdb816655ccfe935e05cbeacf32cd9480dc7eb6de1bb8de6f61b7df25eba60c1b1412ebcab7b002de1e1072 SHA512 3f3a9ef366be606e9adefbcaea079a2603e5d4a298a2ad2c56e11b69c8e8817cf7c67c69c45f6797ff8bf574d0c2f5b47070de48efce4ada93b34e66da5e4e62
+DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
-DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
-DIST rails-7.0.4.1.tgz 11063201 BLAKE2B 9efdb43546d73cbff42297ac988604318e298fb06954cfc066861c63e6336797dca85e7ef40f1e3255fd9fab8fbc111ad1265023a6ced0a25fd1d1a416cb8da5 SHA512 551317bf1d837836eabf4f0de6be1f83916c57b5f828ce079288c37665bac636dd95c076a965d6d763c69f425aef3b5cc20d1fcfdd22eb638cf7175c891466a2
+DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD actionview-5.2.8.1.ebuild 1966 BLAKE2B 0d4d8af0e0098210097fc7d5751adb4d1d1b7ef087e908244454c28a4e0164f96b118e1928ba6165b691e329a4e268e5746d24b47ce001185ccab17e06eeec05 SHA512 2a14063ff0999f8a2f797084696fb1748a421394033fb0a771855382c1e6ddc3ee425f33b35363486b0948df6579c131845fd6ab3e605056cbdd6639a4c44a50
 EBUILD actionview-6.0.5.1.ebuild 2299 BLAKE2B 0f6c5c60b9173c3ded259058597fe257004123a80267e1dcb30345d0abb7b8085c5d4d3b7dd757a36b1d4246a33c9273ca90f9da4c4de673f373a97011cbc04e SHA512 d97e0a4dab80a226d64da4ef57a87a359c39eb5e20bcc0f49c707d0d05eaebdf3db8c9d08f62f11f71c84ee44dec34f489692d8710f0edfbcd85ea5128e5b014
-EBUILD actionview-6.0.6.1.ebuild 2293 BLAKE2B a4541cd53cb83b124d4e981392d62f08b59242d685aeb59232ae907d1d40cfcfeda1df8094f3755895f48f118b75dc300287bc1a586faec7aef0f4a14a6f2bf4 SHA512 a026a24c06501e9c0fab1a667ac0ebbbdf16d78f157931ce6ada3a50b020bbd59cc981b8b0b8b83b945d99975785096463d6157f0a6575aaf31eb584ad1863fe
-EBUILD actionview-6.0.6.ebuild 2293 BLAKE2B 6cf43f68e6b1c52b24aeb27d72773d0f2a61376f6d0a27229afebd602c74678e957eafca349f8d8c18dcc30e2f1f43057f61f24c6e47dae5f8e9794452f1cbb6 SHA512 59b746f5f15e1cb53eb0db18fefd414651fa21dc3dbdcfb53ddc8a6cdffb3710b99751e59b5c60141e6283f31dea2a41ac485e55fa48e0350843fd1b6baa02ff
 EBUILD actionview-6.1.6.1.ebuild 2101 BLAKE2B a01c6f37a018c9896f61e891ad82bf86a9c99e08f417f1cbfa08b22491c48f1e70ab97da777d51c1eab9c35f1aed23343cef297dbe902b6d80979e0351e133d2 SHA512 d4ea82778356f9feddf462588bfabc1e54164e4f042861f6c6805d0e5fda65e5470cc1ac5148a9c0f29f9fa36a2fb030acd49faf037db6c8d794bb388f92cdd1
-EBUILD actionview-6.1.7.1.ebuild 2101 BLAKE2B 06c618a95bb7735b9618a2c94f098a5bcf540c737d8e96b381781da47890829956e0036da17044d972c1847aa9ec1e66366e36a8db2113b7d65a50210019a295 SHA512 99aa943f8c493eddb9fd9522a6f20b23b304d0f35cfa6eb06d1a10d72c80cbd6299dbb07eda3bbad477ba90998960112ff75335d208c44c5b65c0cabe01d8173
+EBUILD actionview-6.1.7.2.ebuild 2101 BLAKE2B 06c618a95bb7735b9618a2c94f098a5bcf540c737d8e96b381781da47890829956e0036da17044d972c1847aa9ec1e66366e36a8db2113b7d65a50210019a295 SHA512 99aa943f8c493eddb9fd9522a6f20b23b304d0f35cfa6eb06d1a10d72c80cbd6299dbb07eda3bbad477ba90998960112ff75335d208c44c5b65c0cabe01d8173
 EBUILD actionview-6.1.7.ebuild 2101 BLAKE2B ee40d1979831b81c94337a35193f80d0b73bfa6682c7dc16bdd8e6fd27278f4fbc914d2feeddce1d81534264892702ef486dbf65d0450e2387ff71801e0b029a SHA512 91fa99e7bb588df61fa9768d9003ecb2c18e67cdb56a9ee790599f8815c53db3dce4cdbb0af74e7d57b46b9cf6f8f85857e8341b57dd1ae5c1c1f84c45892c9d
-EBUILD actionview-7.0.3.1.ebuild 2174 BLAKE2B ece7792056200db06a689fddd66e0d8d22b608256cd62e15b4742a5af6f9b2171caf5c7202533542def4202db0136bacfa2322d4b5970323fe456e6e1d4646a8 SHA512 ac3570332debe2b19a019ab84df7b1c1b94249dc474e65d199b9a8177b6d09d7bf66437cfd770b86fac0cc330e3931dfffeca9259d5063661a6fc8026cba8ac3
-EBUILD actionview-7.0.4.1.ebuild 2188 BLAKE2B 711ac4e2a541bf5e67eda0176d4a4f600b7410506dd2cf0d8cd855eccf92e218c27958f1368cdf3a2f13180cab006d633d460d7f70da0a6820bd178403698206 SHA512 2feef54ade5b08921979a6a999d6e66e6e72427d438bc3fc9bc7fd6ca236229fad5cb131039090a870a7d4c45ee042b4338872867eaf1c1c610d2ef4cacafb0b
+EBUILD actionview-7.0.4.2.ebuild 2188 BLAKE2B 711ac4e2a541bf5e67eda0176d4a4f600b7410506dd2cf0d8cd855eccf92e218c27958f1368cdf3a2f13180cab006d633d460d7f70da0a6820bd178403698206 SHA512 2feef54ade5b08921979a6a999d6e66e6e72427d438bc3fc9bc7fd6ca236229fad5cb131039090a870a7d4c45ee042b4338872867eaf1c1c610d2ef4cacafb0b
 EBUILD actionview-7.0.4.ebuild 2188 BLAKE2B 711ac4e2a541bf5e67eda0176d4a4f600b7410506dd2cf0d8cd855eccf92e218c27958f1368cdf3a2f13180cab006d633d460d7f70da0a6820bd178403698206 SHA512 2feef54ade5b08921979a6a999d6e66e6e72427d438bc3fc9bc7fd6ca236229fad5cb131039090a870a7d4c45ee042b4338872867eaf1c1c610d2ef4cacafb0b
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionview/actionview-6.0.6.1.ebuild b/dev-ruby/actionview/actionview-6.0.6.1.ebuild
deleted file mode 100644
index 106e7d307084..000000000000
--- a/dev-ruby/actionview/actionview-6.0.6.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-		<dev-ruby/minitest-5.16:5
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.6.ebuild b/dev-ruby/actionview/actionview-6.0.6.ebuild
deleted file mode 100644
index 24b27128c4f2..000000000000
--- a/dev-ruby/actionview/actionview-6.0.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-		<dev-ruby/minitest-5.16:5
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.1.7.1.ebuild b/dev-ruby/actionview/actionview-6.1.7.2.ebuild
index a265b5bacdaa..a265b5bacdaa 100644
--- a/dev-ruby/actionview/actionview-6.1.7.1.ebuild
+++ b/dev-ruby/actionview/actionview-6.1.7.2.ebuild
diff --git a/dev-ruby/actionview/actionview-7.0.3.1.ebuild b/dev-ruby/actionview/actionview-7.0.3.1.ebuild
deleted file mode 100644
index ef2d71540ff4..000000000000
--- a/dev-ruby/actionview/actionview-7.0.3.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-		<dev-ruby/minitest-5.16:5
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-7.0.4.1.ebuild b/dev-ruby/actionview/actionview-7.0.4.2.ebuild
index e97a678233fa..e97a678233fa 100644
--- a/dev-ruby/actionview/actionview-7.0.4.1.ebuild
+++ b/dev-ruby/actionview/actionview-7.0.4.2.ebuild
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 8a5a030173c4..3febec409569 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,21 +1,15 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
-DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
-DIST rails-6.0.6.tgz 18611499 BLAKE2B 156ab379f1fed2380544127096490cfdab1264dc352db08e0b48c4cf3cde9a564f618c86650203c018597b6425d03f550103778f5255e5026e8d50e9a8adf5c9 SHA512 5754f3dda4f279daec397358b692bb53c191c335218a365eb7ea6d374af32c35bd3e5268dd2d71a7481855020b43726b77f0ce440cbcc73130df8b72565234c7
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
-DIST rails-6.1.7.1.tgz 11035161 BLAKE2B 16e5c6e323403c117443b10ef151ba94cf27cd6fffdb816655ccfe935e05cbeacf32cd9480dc7eb6de1bb8de6f61b7df25eba60c1b1412ebcab7b002de1e1072 SHA512 3f3a9ef366be606e9adefbcaea079a2603e5d4a298a2ad2c56e11b69c8e8817cf7c67c69c45f6797ff8bf574d0c2f5b47070de48efce4ada93b34e66da5e4e62
+DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
-DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
-DIST rails-7.0.4.1.tgz 11063201 BLAKE2B 9efdb43546d73cbff42297ac988604318e298fb06954cfc066861c63e6336797dca85e7ef40f1e3255fd9fab8fbc111ad1265023a6ced0a25fd1d1a416cb8da5 SHA512 551317bf1d837836eabf4f0de6be1f83916c57b5f828ce079288c37665bac636dd95c076a965d6d763c69f425aef3b5cc20d1fcfdd22eb638cf7175c891466a2
+DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD activejob-5.2.8.1.ebuild 1184 BLAKE2B 27f1fefe1b1372b73d643b6bba5cf3f2408180137914b16e6db0d3a60c83fcb4d8d741de4516bb678f38160fd95b08a3cd840fc693ed95d9cfb03b9f84bfc7d7 SHA512 c718d64ff414fcf0723a889e185a98cd79d4f3a6ae79cdb3c39183e1f04bd654c8df1679fa3341e9859be8d6feb6d469bd98c748edb77306c5fda1b9f0898e4e
 EBUILD activejob-6.0.5.1.ebuild 1213 BLAKE2B b904ee16e2944ad44bdb21524f938c906faca07af3c971cde7f9fd7042faa68d843b8dc987fc597e2382eaed2ae985092e23b02f9c8602039da2a3145b308a92 SHA512 ded1b373c90fb875c603b70538ef6456876c8ca5605259a779441bb0ad29cc4b57835a5867abe29318442f0a767bdacfa792938263cd378ce41a35b8ed2a305d
-EBUILD activejob-6.0.6.1.ebuild 1206 BLAKE2B 40e6ffeb1cbb33b5fcd86c27cb070689e1b4e4deb661c04381e288362ceef0289d85c78b6d01c7029ac4226b68246948bca935a2bcb6c114aa6813a32f26d3aa SHA512 49e96282394a6575ba01ccc92cc300d5820da36ca056c6b042f28f79bf3f3761e56b17b88d4e2a1cc4b9fa2d2e39d755601b205143aea86f9af88ff8032d79fc
-EBUILD activejob-6.0.6.ebuild 1206 BLAKE2B 6583630f432e6bc7ca2694e0a548bf7b0831ad93145401601a234966574a1d10cad6ea93fe9f23bb3d0dbd41f0c32bc057dd0a596d9ba1313a8140ae771c6824 SHA512 88c5864676410b8609a54d1c0fa0ab2d60601ac744521f860a7e7e92070b0f2650a788ffad6f2577b78d3806c296fa47576d65f4bfdf9abd65433dd253ad1451
 EBUILD activejob-6.1.6.1.ebuild 1148 BLAKE2B 1cd19b58ff45a7105e949c07769124d6bea3491b58f1afbd94b0c291acc427a4eb99afb88c55e974f52d17022d24dd202fa809c137b7c8de63987060a8500143 SHA512 3835f9d122b46b1234276186c905dda71fa2b643c973cfd103bdc33848b3d737f1321ccdb34e3285dcf8e9c4e229f97612064977263a09b506d27357fb9c0a9d
-EBUILD activejob-6.1.7.1.ebuild 1155 BLAKE2B adbcff19fbd8d42b161a3f88a929864d2cbcc0ef8fb177ddf0d4829b9ad71a346f1235268ebae1ad43fe30d7c0be4bdc28fc0aaa2d6a3c305307c381bcf53ed2 SHA512 c584d3d48a7b2626d71ac0e6973dfc4584adc3e5b4981f4006c8dd193b56fb85980e9ae6a487f3a837debe6c6974b4ecd6450e17c1c7e663d54ed6f312f5a177
+EBUILD activejob-6.1.7.2.ebuild 1155 BLAKE2B adbcff19fbd8d42b161a3f88a929864d2cbcc0ef8fb177ddf0d4829b9ad71a346f1235268ebae1ad43fe30d7c0be4bdc28fc0aaa2d6a3c305307c381bcf53ed2 SHA512 c584d3d48a7b2626d71ac0e6973dfc4584adc3e5b4981f4006c8dd193b56fb85980e9ae6a487f3a837debe6c6974b4ecd6450e17c1c7e663d54ed6f312f5a177
 EBUILD activejob-6.1.7.ebuild 1155 BLAKE2B af67f312316340e9014714f0834af45a093c2a205cd4d9d44affdb0330f25e4776c52a967847af7a1dff1b9cc189ffa1555a3cbaf7c296380dbebc8972fc9986 SHA512 147dc2ef63d7c79d1424186feae541b6d340ae3d26c4fc82729c58d646c9e723802b0cb3558cdcd079dc1d55bdbfbcda4ead04e85ca848b26722760a5a70f91a
-EBUILD activejob-7.0.3.1.ebuild 1202 BLAKE2B 17e9de3d3672f4f0a08c98b5407360264d54b7845cada6a04d0bcb11924c5e08f1e5c3becffdfa9e1969710d3303090bd188397cca0a06f3d945a461dc080992 SHA512 dfdd8e03aad90a80b0a48d35602fae62948929bb1264028285732c12e2e1f8dd9292c169fb1fe6fcfda56725e281a56759485cf1fe4baf3f2354cd1a9515e2b7
-EBUILD activejob-7.0.4.1.ebuild 1204 BLAKE2B e5d60c3a017196275010b20d08d3b4de66303e32f0a50c3e221f017135420c829d7a040ac3e323d5212f927ddb51362aa767fc96dd987c8b9da8ce10cfc35277 SHA512 064f310d7fabd0f0c579610d5130969962394b46f5376f295bce5b520eec0bda19c460e4f41fdbf0314b9bd32b29702b009da6ecc5e9c8a99b65c2cd139c7f1e
+EBUILD activejob-7.0.4.2.ebuild 1204 BLAKE2B e5d60c3a017196275010b20d08d3b4de66303e32f0a50c3e221f017135420c829d7a040ac3e323d5212f927ddb51362aa767fc96dd987c8b9da8ce10cfc35277 SHA512 064f310d7fabd0f0c579610d5130969962394b46f5376f295bce5b520eec0bda19c460e4f41fdbf0314b9bd32b29702b009da6ecc5e9c8a99b65c2cd139c7f1e
 EBUILD activejob-7.0.4.ebuild 1204 BLAKE2B e5d60c3a017196275010b20d08d3b4de66303e32f0a50c3e221f017135420c829d7a040ac3e323d5212f927ddb51362aa767fc96dd987c8b9da8ce10cfc35277 SHA512 064f310d7fabd0f0c579610d5130969962394b46f5376f295bce5b520eec0bda19c460e4f41fdbf0314b9bd32b29702b009da6ecc5e9c8a99b65c2cd139c7f1e
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activejob/activejob-6.0.6.1.ebuild b/dev-ruby/activejob/activejob-6.0.6.1.ebuild
deleted file mode 100644
index 80d3057ccb00..000000000000
--- a/dev-ruby/activejob/activejob-6.0.6.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-	sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.0.6.ebuild b/dev-ruby/activejob/activejob-6.0.6.ebuild
deleted file mode 100644
index 363725f7d849..000000000000
--- a/dev-ruby/activejob/activejob-6.0.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-	sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.1.7.1.ebuild b/dev-ruby/activejob/activejob-6.1.7.2.ebuild
index 897c76f82394..897c76f82394 100644
--- a/dev-ruby/activejob/activejob-6.1.7.1.ebuild
+++ b/dev-ruby/activejob/activejob-6.1.7.2.ebuild
diff --git a/dev-ruby/activejob/activejob-7.0.3.1.ebuild b/dev-ruby/activejob/activejob-7.0.3.1.ebuild
deleted file mode 100644
index 28b40f53fd8f..000000000000
--- a/dev-ruby/activejob/activejob-7.0.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-	rm -f test/cases/delayed_job_adapter_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-7.0.4.1.ebuild b/dev-ruby/activejob/activejob-7.0.4.2.ebuild
index 63a8f7a47df8..63a8f7a47df8 100644
--- a/dev-ruby/activejob/activejob-7.0.4.1.ebuild
+++ b/dev-ruby/activejob/activejob-7.0.4.2.ebuild
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 3ce1f41a0814..c588150f3e01 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,21 +1,15 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
-DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
-DIST rails-6.0.6.tgz 18611499 BLAKE2B 156ab379f1fed2380544127096490cfdab1264dc352db08e0b48c4cf3cde9a564f618c86650203c018597b6425d03f550103778f5255e5026e8d50e9a8adf5c9 SHA512 5754f3dda4f279daec397358b692bb53c191c335218a365eb7ea6d374af32c35bd3e5268dd2d71a7481855020b43726b77f0ce440cbcc73130df8b72565234c7
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
-DIST rails-6.1.7.1.tgz 11035161 BLAKE2B 16e5c6e323403c117443b10ef151ba94cf27cd6fffdb816655ccfe935e05cbeacf32cd9480dc7eb6de1bb8de6f61b7df25eba60c1b1412ebcab7b002de1e1072 SHA512 3f3a9ef366be606e9adefbcaea079a2603e5d4a298a2ad2c56e11b69c8e8817cf7c67c69c45f6797ff8bf574d0c2f5b47070de48efce4ada93b34e66da5e4e62
+DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
-DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
-DIST rails-7.0.4.1.tgz 11063201 BLAKE2B 9efdb43546d73cbff42297ac988604318e298fb06954cfc066861c63e6336797dca85e7ef40f1e3255fd9fab8fbc111ad1265023a6ced0a25fd1d1a416cb8da5 SHA512 551317bf1d837836eabf4f0de6be1f83916c57b5f828ce079288c37665bac636dd95c076a965d6d763c69f425aef3b5cc20d1fcfdd22eb638cf7175c891466a2
+DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD activemodel-5.2.8.1.ebuild 1137 BLAKE2B 3a0cc9e460af74699bce6c2b46105afef177fc695c0cb038e6a656482dcbe2b056b4fc588c2f8bc4808c603656ba0c0709750f7f3f836c3a58776c7a14c2b915 SHA512 af89de3e7168717264d26c0b82539ac32bf29eedaa584ca892ef8058c2cbfba15a3cf96d12da795133bb211bc9b21eae3954acc54fe5e3cfda4a12a31f78af40
 EBUILD activemodel-6.0.5.1.ebuild 1014 BLAKE2B f2866a358065f4f75b8aa6b507ddfe2667a1eb0d60ef7ff1893b28419a4770016785e15515b6409eb4b328414367fdfe3a8ecd672d4a2d277935f0f54bc91599 SHA512 ccca178b67ca58a9c71f5300b225085a49c99e478c20e238e575a339b729185b2482ed42ca988e3b1db5b05218bd38ce44f8e0064ccd32f13f5a625cbb59f995
-EBUILD activemodel-6.0.6.1.ebuild 1008 BLAKE2B 33342f1e9db37502ca83fcf28e18ea6f33e3d679679d36c91ef8bed92565f3bf54f66529b281c571d911fc186fe3041d86e6c9443f910b6b219b690ec8835ec3 SHA512 5e4d893704268abf200a2fef69fd0866aff63c6e1f6b31fd4b4d4aa74656623119f8c2c24203ca4fbf2e3a2891db32c65047db9d3a1ac7dd0c8fb284ae86c99a
-EBUILD activemodel-6.0.6.ebuild 1008 BLAKE2B f9ba64e88d99bec9a25bee3eb1974a07b374a46e81613b0de821115b6aea395b4172edb0134e74204fec9ee769dc898979ae4a16701ed2fb4242f12747a2f132 SHA512 71413686576ffb3019fc97858c9e521b496ce7474a1280b4086f91cd6a52482850eb5f1510c3d3c623e2fad804b55eaaa9518a2daacde76bce74de843f861ebf
 EBUILD activemodel-6.1.6.1.ebuild 1005 BLAKE2B f0a4e3b0705368b255501b977051d2011639c60c18b0cdf01586e06756800281a68e1c580325b32d7b7b2add5f14d40299bec454986f29ba4447b84d66122673 SHA512 522b125447de7befe761a7540b09d57fc51f0c31f82c25826ae98ffdd0b165273eb0160a7bcd974f244b445cb4d66bac4c23902ca8adbb27bb09bacb8f560388
-EBUILD activemodel-6.1.7.1.ebuild 1005 BLAKE2B 7eae973b238b4ce8dc8d72f8108b85e86b1429bb611c29c5883d0e18ff5d5e1d26af24086b67789e865231f63a4ff295499dde2a25c58413eefbc7af8ebaf279 SHA512 4ecc010546040af21824667834a89ac9767f631fb1b2b8f36c5b0047be910c449950e4cce4e4769c8cf21153574d4cf8c3a8bcb8d887afbefd01bca476d30b9f
+EBUILD activemodel-6.1.7.2.ebuild 1005 BLAKE2B 7eae973b238b4ce8dc8d72f8108b85e86b1429bb611c29c5883d0e18ff5d5e1d26af24086b67789e865231f63a4ff295499dde2a25c58413eefbc7af8ebaf279 SHA512 4ecc010546040af21824667834a89ac9767f631fb1b2b8f36c5b0047be910c449950e4cce4e4769c8cf21153574d4cf8c3a8bcb8d887afbefd01bca476d30b9f
 EBUILD activemodel-6.1.7.ebuild 1005 BLAKE2B bb71bf9f6a18b3888e9680931f036328f635cc6b7c6081f1fab015a8910f63cd2a66c4f7998a3121554d2fe85692e6d005ac58e608b37767ccb5c002b36c5cb5 SHA512 819c637ad16afd6c6f245987eb4deae630faeab33b125b3803b894572ec7e16b6e7bee63c57ae7f215bd65e568d13a2f0e52c5442e14146b660aadbbb445485f
-EBUILD activemodel-7.0.3.1.ebuild 986 BLAKE2B bea10023caad02d1591eddd28a1fe3dd7ed94a8ecee599f965aefee7f5291b5abb38dd910983aef5e8e35cf8857fddf9a6b65541aaf86be398ac04601d25f861 SHA512 dba361ab4a6a9c7fbf0fd8cad9d4979496f3ac135a4b5bc3e9b363129b51f608123df4c560f807949bb87f6024a4493f213def5b46cab5eaee160ce676990251
-EBUILD activemodel-7.0.4.1.ebuild 1000 BLAKE2B fb98c0866a8f0d0dde0bb25e0371282ffe7366456d2a083dd2fb88bbb27838713b2638f0d6915f1f7d3c98ea043b9c58e057c91554e0413ddfc525dbf0cad046 SHA512 cf9940fc53b13204a05e3224134add4e73016476f650aae456d801c2b3ca84b81aa8d7f3981db2580c75140968a88c889c97a90af0efb13f8069ede4e1b5f382
+EBUILD activemodel-7.0.4.2.ebuild 1000 BLAKE2B fb98c0866a8f0d0dde0bb25e0371282ffe7366456d2a083dd2fb88bbb27838713b2638f0d6915f1f7d3c98ea043b9c58e057c91554e0413ddfc525dbf0cad046 SHA512 cf9940fc53b13204a05e3224134add4e73016476f650aae456d801c2b3ca84b81aa8d7f3981db2580c75140968a88c889c97a90af0efb13f8069ede4e1b5f382
 EBUILD activemodel-7.0.4.ebuild 1000 BLAKE2B fb98c0866a8f0d0dde0bb25e0371282ffe7366456d2a083dd2fb88bbb27838713b2638f0d6915f1f7d3c98ea043b9c58e057c91554e0413ddfc525dbf0cad046 SHA512 cf9940fc53b13204a05e3224134add4e73016476f650aae456d801c2b3ca84b81aa8d7f3981db2580c75140968a88c889c97a90af0efb13f8069ede4e1b5f382
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activemodel/activemodel-6.0.6.1.ebuild b/dev-ruby/activemodel/activemodel-6.0.6.1.ebuild
deleted file mode 100644
index 89b9c99b344e..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-		<dev-ruby/minitest-5.16:5
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '3igem "psych", "~> 3.0"' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.6.ebuild b/dev-ruby/activemodel/activemodel-6.0.6.ebuild
deleted file mode 100644
index 2396b304d6fd..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-		<dev-ruby/minitest-5.16:5
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '3igem "psych", "~> 3.0"' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.1.7.1.ebuild b/dev-ruby/activemodel/activemodel-6.1.7.2.ebuild
index e0f56aff974c..e0f56aff974c 100644
--- a/dev-ruby/activemodel/activemodel-6.1.7.1.ebuild
+++ b/dev-ruby/activemodel/activemodel-6.1.7.2.ebuild
diff --git a/dev-ruby/activemodel/activemodel-7.0.3.1.ebuild b/dev-ruby/activemodel/activemodel-7.0.3.1.ebuild
deleted file mode 100644
index 9d4e46079388..000000000000
--- a/dev-ruby/activemodel/activemodel-7.0.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-		<dev-ruby/minitest-5.16:5
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-7.0.4.1.ebuild b/dev-ruby/activemodel/activemodel-7.0.4.2.ebuild
index dc9eb1610888..dc9eb1610888 100644
--- a/dev-ruby/activemodel/activemodel-7.0.4.1.ebuild
+++ b/dev-ruby/activemodel/activemodel-7.0.4.2.ebuild
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index db5e6045f459..ba3dd922a57d 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,21 +1,15 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
-DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
-DIST rails-6.0.6.tgz 18611499 BLAKE2B 156ab379f1fed2380544127096490cfdab1264dc352db08e0b48c4cf3cde9a564f618c86650203c018597b6425d03f550103778f5255e5026e8d50e9a8adf5c9 SHA512 5754f3dda4f279daec397358b692bb53c191c335218a365eb7ea6d374af32c35bd3e5268dd2d71a7481855020b43726b77f0ce440cbcc73130df8b72565234c7
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
-DIST rails-6.1.7.1.tgz 11035161 BLAKE2B 16e5c6e323403c117443b10ef151ba94cf27cd6fffdb816655ccfe935e05cbeacf32cd9480dc7eb6de1bb8de6f61b7df25eba60c1b1412ebcab7b002de1e1072 SHA512 3f3a9ef366be606e9adefbcaea079a2603e5d4a298a2ad2c56e11b69c8e8817cf7c67c69c45f6797ff8bf574d0c2f5b47070de48efce4ada93b34e66da5e4e62
+DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
-DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
-DIST rails-7.0.4.1.tgz 11063201 BLAKE2B 9efdb43546d73cbff42297ac988604318e298fb06954cfc066861c63e6336797dca85e7ef40f1e3255fd9fab8fbc111ad1265023a6ced0a25fd1d1a416cb8da5 SHA512 551317bf1d837836eabf4f0de6be1f83916c57b5f828ce079288c37665bac636dd95c076a965d6d763c69f425aef3b5cc20d1fcfdd22eb638cf7175c891466a2
+DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD activerecord-5.2.8.1.ebuild 3218 BLAKE2B 8319a07ccfbf2d707afe9139db5473e0a9189d807543e8c2fab2d545b8307ab08f3bd55c0a969d409d7d14b1f383da5fd79decdec57adecb235aa015d2d00750 SHA512 e86b995c5b732f4ec884b1ed15456ac54068b3a8618096dcde15008a873dc7f076daf7fc9240108878c3415dbb2b9d3d986f85dcc5d38d1e6832b9d5a82b7c64
 EBUILD activerecord-6.0.5.1.ebuild 3318 BLAKE2B 0798ebd749cbef6ec4d6c64382f7e76b916af1912a9799186bd5e898f0e378ea6881aaca7a198a846ee469a6e8ddef297fce7702de91fe0ade04fc9f160258c9 SHA512 97ee97729019094c9d659421bf391eabb71963d5d4273bc28a1a04041aebfee9f449340bcd9f271e879454f4e2f18585b726291bcd1be63280c840e0dd3f27e8
-EBUILD activerecord-6.0.6.1.ebuild 3312 BLAKE2B 0ad906650a1fef15358b0ebe5a20eab714ad00bc0f98c58c10479ac52793f024b027ce10a4d3c97874d3e3b5c416e54df6a64a177444a3d922a842ce17ef1e47 SHA512 f61b130d97f057bb5378a2be4ced56b1687d2c9edbe0599a189ee15ad3d027347e9800971cdfecd6ba7313f11e19f27c4c9b9b8098b871479859a0086affa765
-EBUILD activerecord-6.0.6.ebuild 3312 BLAKE2B 7b9a6b07a36f8b6ebf4b670471f28a28b291d2ab4a8323ad7f7bb4f13e239a5be0e9d7f49f26a7b216f581c0a39b123783f872dec22fc1981bad826ec24b0179 SHA512 eaa3ea798cf2c5b4493f754d6834563dde2353e693843c60380f0c59595d10551e8976e5be8f59fd9f96915c1904b6352ac52b10df230076886fbf7e9b74143d
 EBUILD activerecord-6.1.6.1.ebuild 3409 BLAKE2B e868b31253db8d57cce78ffff8586cc050fde06e1f6c96bacca64b48aaac6d30b7a36a66a7866d421a6ffb9a9f37cd217feabf2c34af33811db8190eb80b91cc SHA512 8cec7b303f2d23f0ef6d83d048b3b3d72ffb44a183f8b66676ba02e4363563d3f7a47a3895d898535a0b2f5274da4e002c99b0ed00e921e9a9ebec4685de0f5f
-EBUILD activerecord-6.1.7.1.ebuild 3409 BLAKE2B 7b0a00cb780745420f5d52d9bd5bbefb4414b67db75233854696c79153fec64c7a3798c22eae98c4d046a29c573c6df0b654d0d36d78c3b8da7c904e056ec521 SHA512 a705acf004ee38ab4e12a70b9223342ae7dbd3f01f0b8ddda7d8a9d1f4395eb0a7912ac14263dd541453b950b9864368a220dfa3bb2533ab8ecf7fa16ceb3b03
+EBUILD activerecord-6.1.7.2.ebuild 3409 BLAKE2B 7b0a00cb780745420f5d52d9bd5bbefb4414b67db75233854696c79153fec64c7a3798c22eae98c4d046a29c573c6df0b654d0d36d78c3b8da7c904e056ec521 SHA512 a705acf004ee38ab4e12a70b9223342ae7dbd3f01f0b8ddda7d8a9d1f4395eb0a7912ac14263dd541453b950b9864368a220dfa3bb2533ab8ecf7fa16ceb3b03
 EBUILD activerecord-6.1.7.ebuild 3409 BLAKE2B 322bc88a8496459292748f7e5cc9acaad5a318dbc556fa679874533917380c42b1624f4d89674cdb9a357e9b6a8bb701a9ecb7dc1458f254ced6a18cc49455aa SHA512 6ba855254f90feea10f43b014a61b9c907464a625f656d0880ad8bea7d003ff7834769b7e440dc07ac34b23cfc84fb73b954774fecbaa8c390c750b8ba536b41
-EBUILD activerecord-7.0.3.1.ebuild 2990 BLAKE2B 6940896aaf30a9442cd1a50b97ee828515784499b102762b29ebd19ee47dc9cf47ab2139f454ab4e28c7a78804976a9d8e9c9ba15fb99ac8ef6f9a0e3e5a9c1d SHA512 86042bd64195bdf13ee02cd503f86ccd82bb071465cff7c30c66b2532f440c6c0c52027566c3701dd895f9bbe5fbef3becba5968423a02cb6c5cb605150d05cd
-EBUILD activerecord-7.0.4.1.ebuild 3065 BLAKE2B 53dc2bccc89ea62ea055147cf538c6cba477bed23af147d6025db3e42e89483ad9a4219049049c5359ff99c3e7dc0fa207c7d4111fb0b26af5ad0b6395163a79 SHA512 13357962c1348ce89def7627cf1b9b030050a9df4ec009b67f7021905d3bbc9df23609ba382bfb9050964394760ad8f31e8dd22efe5083c5eb8df5b0c404db65
+EBUILD activerecord-7.0.4.2.ebuild 3065 BLAKE2B 53dc2bccc89ea62ea055147cf538c6cba477bed23af147d6025db3e42e89483ad9a4219049049c5359ff99c3e7dc0fa207c7d4111fb0b26af5ad0b6395163a79 SHA512 13357962c1348ce89def7627cf1b9b030050a9df4ec009b67f7021905d3bbc9df23609ba382bfb9050964394760ad8f31e8dd22efe5083c5eb8df5b0c404db65
 EBUILD activerecord-7.0.4.ebuild 3004 BLAKE2B 748242fff8024357bc7eeceefc0d7085ac02511c85b58ee328be3be7d5bbcf359e0621458de68a84b9b3021fb20547639d6c8e2f11054f5f016e064df01c50dd SHA512 b12646362cad75ba97e0b6fec4cc6725e9ced6d04ce000e9a6ba63e667077407b6bfb706b3210d3d6a42a304fc0ad6f138a1903af379eba0d613bda8942adee8
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activerecord/activerecord-6.0.6.1.ebuild b/dev-ruby/activerecord/activerecord-6.0.6.1.ebuild
deleted file mode 100644
index 008739fda762..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.6.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( dev-ruby/pg:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		<dev-ruby/minitest-5.16:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems activation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-
-	# Avoid test failing due to sqlite EXPLAIN changes
-	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.6.ebuild b/dev-ruby/activerecord/activerecord-6.0.6.ebuild
deleted file mode 100644
index a29dc0ebf31c..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( dev-ruby/pg:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		<dev-ruby/minitest-5.16:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems activation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-
-	# Avoid test failing due to sqlite EXPLAIN changes
-	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.1.7.1.ebuild b/dev-ruby/activerecord/activerecord-6.1.7.2.ebuild
index 4e1ebb61eee9..4e1ebb61eee9 100644
--- a/dev-ruby/activerecord/activerecord-6.1.7.1.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.1.7.2.ebuild
diff --git a/dev-ruby/activerecord/activerecord-7.0.3.1.ebuild b/dev-ruby/activerecord/activerecord-7.0.3.1.ebuild
deleted file mode 100644
index 23080658a57a..000000000000
--- a/dev-ruby/activerecord/activerecord-7.0.3.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( >=dev-ruby/pg-1.1:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/benchmark-ips
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		<dev-ruby/minitest-5.16:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-7.0.4.1.ebuild b/dev-ruby/activerecord/activerecord-7.0.4.2.ebuild
index e1e7f04ae70d..e1e7f04ae70d 100644
--- a/dev-ruby/activerecord/activerecord-7.0.4.1.ebuild
+++ b/dev-ruby/activerecord/activerecord-7.0.4.2.ebuild
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 3e8a7d8beba9..4b2fd9c44029 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,21 +1,15 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
-DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
-DIST rails-6.0.6.tgz 18611499 BLAKE2B 156ab379f1fed2380544127096490cfdab1264dc352db08e0b48c4cf3cde9a564f618c86650203c018597b6425d03f550103778f5255e5026e8d50e9a8adf5c9 SHA512 5754f3dda4f279daec397358b692bb53c191c335218a365eb7ea6d374af32c35bd3e5268dd2d71a7481855020b43726b77f0ce440cbcc73130df8b72565234c7
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
-DIST rails-6.1.7.1.tgz 11035161 BLAKE2B 16e5c6e323403c117443b10ef151ba94cf27cd6fffdb816655ccfe935e05cbeacf32cd9480dc7eb6de1bb8de6f61b7df25eba60c1b1412ebcab7b002de1e1072 SHA512 3f3a9ef366be606e9adefbcaea079a2603e5d4a298a2ad2c56e11b69c8e8817cf7c67c69c45f6797ff8bf574d0c2f5b47070de48efce4ada93b34e66da5e4e62
+DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
-DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
-DIST rails-7.0.4.1.tgz 11063201 BLAKE2B 9efdb43546d73cbff42297ac988604318e298fb06954cfc066861c63e6336797dca85e7ef40f1e3255fd9fab8fbc111ad1265023a6ced0a25fd1d1a416cb8da5 SHA512 551317bf1d837836eabf4f0de6be1f83916c57b5f828ce079288c37665bac636dd95c076a965d6d763c69f425aef3b5cc20d1fcfdd22eb638cf7175c891466a2
+DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD activestorage-5.2.8.1.ebuild 1921 BLAKE2B 8eaa5d630fd84db3f7388dbe998465cf23daded42dd31fbb15fa970ec80304315260736a78cc8ff947a33a218c3f125410307450e43e72bb8350c325aba27ec2 SHA512 486fa7c874480a34b11d8a073e9625dd3d7892b3d82dd4bafd9378171a28af1df7780502abd8c61c31250cb5b1400e8b5921b622f6a41c9e80feef0f5037fcff
 EBUILD activestorage-6.0.5.1.ebuild 2173 BLAKE2B b21ede1afcfcf3973dcecceee7cc2fb7cf7308fd14bcdbab90434b1401ca9c7a56a1b4b2b08650daa88230c4403beda95f2059eed3a6b6bdae6d78ee6ff4104a SHA512 febb37553ac718c845c9e2f071133c2fa6f8fe8467b2ac98143e502ca9bc30c7a3a64a1975a47946fe876f1a980c413aa19cf3592596eed1c782003f617af384
-EBUILD activestorage-6.0.6.1.ebuild 2164 BLAKE2B ec7189875e94cbad819aabee6599f66a5d9f330f53b945c2a5739f274c292dd8b4b48b63d9a3ea7d1e7011e86eeb5ba2e215c1bdf89a19b825cca39fe7b1693b SHA512 535974a277f0f8e57a490f48d4053f9c32dd0653348fd0d14c2852825f9bd25f828e5e5aa5b53a1d788d3283a5df6a596cd3d2feda30cd2197bf9c48f1dcb030
-EBUILD activestorage-6.0.6.ebuild 2164 BLAKE2B 435b30f0aacf82daec4832385cb33aa6bdf2b0964cb952fa38608c45af7cf7f8e465fb997c54dbd1e8d71ffe30dc3e5bc6c1bb5eecf7efc76844accf303c3893 SHA512 f0df5409c822751d18b8212f6e415b1a179166de47f55e5a6e52c54e59a162992668532ddff8249dd2d6aeee5c7639492669fc4fda8b19a5ac8e87ed5d802740
 EBUILD activestorage-6.1.6.1.ebuild 2049 BLAKE2B 843e293c3ebbfa45f11bb1f8e5119b956466e8f1dc37dca62dde9cb0c8510117d6ede7e93df63040e1e1fcced5085f66018e818582b27f94f8aaa7a3085d507c SHA512 302a8e5c7d516b83795b2fe19f91d74d32d334ae2897e93d6d88a6150b1909886e0d530dd5306ef749cbd22456b3457619b7eff1047a6f4c43b346615915a8e0
-EBUILD activestorage-6.1.7.1.ebuild 2047 BLAKE2B 793523981ee5659b5b0e041147e6008cf33ea750bb01f574f6a90bcb3720eb584f2b720d5e096bcbe0092f276c6ed1f0f1464e2fbcbd6c5f913f3d71e4eda51f SHA512 48fa06a3c6ab3911476b659e04ecdbbbc5e2ab37c23fb1cc008b32f1909ca535eebae4c7ca7719fd7542732f7a3c41cb8dffb13cf442ab67dd6ba55bacebdd45
+EBUILD activestorage-6.1.7.2.ebuild 2047 BLAKE2B 793523981ee5659b5b0e041147e6008cf33ea750bb01f574f6a90bcb3720eb584f2b720d5e096bcbe0092f276c6ed1f0f1464e2fbcbd6c5f913f3d71e4eda51f SHA512 48fa06a3c6ab3911476b659e04ecdbbbc5e2ab37c23fb1cc008b32f1909ca535eebae4c7ca7719fd7542732f7a3c41cb8dffb13cf442ab67dd6ba55bacebdd45
 EBUILD activestorage-6.1.7.ebuild 2047 BLAKE2B 0fe7eefccbc225ce2154e4a7bd0e3e289daaf1866d31368be4a588ac80335fd8825e73e4870e7f7912f7907d676a5dde7249105862218b4abf2096fb3ab8ae4b SHA512 62265bc9a3b47828b68ac16da3261dea8739b8d9cb28d2cdabea2b6c6c7eb1442a35cffaf655fbc6851c65aa9690f31fb125f1dcc34909dd8109dac8ed23621f
-EBUILD activestorage-7.0.3.1.ebuild 2480 BLAKE2B 439b264b9d073070d1bc63873adfdd8561b018b71ca261918cbb52939c5c3a00cb2aed181f05234d45df05c9fc0fd3e355cb84e0267d74ff577faece5b4cb17e SHA512 3ecd06f35d8d9a12ea7193ac898f1542f18c15d844a757d2a5a1a6744f96c758f93ee731fd24017adbd38624bba5fc09b32c603e702b0f773a3f9c4021211a0c
-EBUILD activestorage-7.0.4.1.ebuild 2487 BLAKE2B 69a928a6063caff1e2828a376fdf9730012cb6429a040db0ef5a3d6b35c76651dde406cb8be8efa07f4bd2423037f947b7f8b5d80bac3f7573286454040a7bd8 SHA512 0ba9b2579c3952cd0d5c2afd5132e32d0c0736560e3d3776c29c9222c8d8c3e04e996fb79ef29a1d08eb647dcebdb05fac2ab866c50f083054a9c4c7c024a2f8
+EBUILD activestorage-7.0.4.2.ebuild 2505 BLAKE2B 319129ecd7d3113202a709d6f5c9cbf67269b5657ef08384f91adb2061ec87d9c5cd297d56bd3b9d16a07617320698dcb5fcb04182cc67ece3403509a497e8b1 SHA512 38b284c6ff56faea98b92f9e0f05725a3b18007dd726a8fee465f285f8ce1442e9ef041b29c8c4473ce802f3c7688d455d56d634afde82670157673eae6d09d8
 EBUILD activestorage-7.0.4.ebuild 2487 BLAKE2B 69a928a6063caff1e2828a376fdf9730012cb6429a040db0ef5a3d6b35c76651dde406cb8be8efa07f4bd2423037f947b7f8b5d80bac3f7573286454040a7bd8 SHA512 0ba9b2579c3952cd0d5c2afd5132e32d0c0736560e3d3776c29c9222c8d8c3e04e996fb79ef29a1d08eb647dcebdb05fac2ab866c50f083054a9c4c7c024a2f8
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activestorage/activestorage-6.0.6.1.ebuild b/dev-ruby/activestorage/activestorage-6.0.6.1.ebuild
deleted file mode 100644
index cd37f3bbe21b..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.6.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-		# Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Skip test that has already been updated in later versions upstream
-		sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.6.ebuild b/dev-ruby/activestorage/activestorage-6.0.6.ebuild
deleted file mode 100644
index 4ae781bf3475..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-		# Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Skip test that has already been updated in later versions upstream
-		sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.7.1.ebuild b/dev-ruby/activestorage/activestorage-6.1.7.2.ebuild
index 785e63cace65..785e63cace65 100644
--- a/dev-ruby/activestorage/activestorage-6.1.7.1.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.1.7.2.ebuild
diff --git a/dev-ruby/activestorage/activestorage-7.0.3.1.ebuild b/dev-ruby/activestorage/activestorage-7.0.3.1.ebuild
deleted file mode 100644
index 9c124f9b63be..000000000000
--- a/dev-ruby/activestorage/activestorage-7.0.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activejob-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/marcel:1.0
-	>=dev-ruby/mini_mime-1.1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		=dev-ruby/minitest-5.15*:5
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sprockets-rails
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-		# Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\|propshaft\|sprockets-export\)/ s:^:#:" \
-			-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-			-i ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Use mini_magick since vips is not packaged on Gentoo
-		sed -i -e '/mini_magick/aActiveStorage.variant_processor = :mini_magick' test/test_helper.rb || die
-		# Avoid vips-specific tests
-		sed -i -e '/\(resized and monochrome variation of JPEG blob\|monochrome with default variant_processor\|disabled variation of JPEG blob\)/askip "No vips support"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-7.0.4.1.ebuild b/dev-ruby/activestorage/activestorage-7.0.4.2.ebuild
index 57a87eb25da8..8d521ec0f57a 100644
--- a/dev-ruby/activestorage/activestorage-7.0.4.1.ebuild
+++ b/dev-ruby/activestorage/activestorage-7.0.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
@@ -54,7 +54,7 @@ ruby_add_bdepend "
 all_ruby_prepare() {
 		# Remove items from the common Gemfile that we don't need for this
 		# test run. This also requires handling some gemspecs.
-		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\|propshaft\|sprockets-export\)/ s:^:#:" \
+		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\|propshaft\|sprockets-export\|rack-test\)/ s:^:#:" \
 			-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
 			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
 			-i ../Gemfile || die
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 96374612fc4f..4a885f21fd52 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,21 +1,15 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
-DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
-DIST rails-6.0.6.tgz 18611499 BLAKE2B 156ab379f1fed2380544127096490cfdab1264dc352db08e0b48c4cf3cde9a564f618c86650203c018597b6425d03f550103778f5255e5026e8d50e9a8adf5c9 SHA512 5754f3dda4f279daec397358b692bb53c191c335218a365eb7ea6d374af32c35bd3e5268dd2d71a7481855020b43726b77f0ce440cbcc73130df8b72565234c7
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
-DIST rails-6.1.7.1.tgz 11035161 BLAKE2B 16e5c6e323403c117443b10ef151ba94cf27cd6fffdb816655ccfe935e05cbeacf32cd9480dc7eb6de1bb8de6f61b7df25eba60c1b1412ebcab7b002de1e1072 SHA512 3f3a9ef366be606e9adefbcaea079a2603e5d4a298a2ad2c56e11b69c8e8817cf7c67c69c45f6797ff8bf574d0c2f5b47070de48efce4ada93b34e66da5e4e62
+DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
-DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
-DIST rails-7.0.4.1.tgz 11063201 BLAKE2B 9efdb43546d73cbff42297ac988604318e298fb06954cfc066861c63e6336797dca85e7ef40f1e3255fd9fab8fbc111ad1265023a6ced0a25fd1d1a416cb8da5 SHA512 551317bf1d837836eabf4f0de6be1f83916c57b5f828ce079288c37665bac636dd95c076a965d6d763c69f425aef3b5cc20d1fcfdd22eb638cf7175c891466a2
+DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD activesupport-5.2.8.1.ebuild 2582 BLAKE2B 0ab916d197d17be5586fba966a2601d6b20a2ecd273d17a0f9a3d093b19065be76493872600dbd7f60f8e0a2214ca60451793d63a6fc2f656931bc319d1f5a68 SHA512 e028a4745d4c7b48b71ae7da6edf2db84da135359b08f41be6861df63fc50b11981102a56672b232862822d1ad6a3c3368eeec5f7e9acd1ed9dbed00dc647856
 EBUILD activesupport-6.0.5.1.ebuild 2627 BLAKE2B 41e6acb1208c70eb0c15ab6f575812f6c30020bdb29fccf8ef8ef1e7789b52ebb3030fa738ca2773dbf20dfa681cf67874337ed808b714347b4ec7be2e408cc8 SHA512 61937e128074d61ea82e8e1f5a05d95f3c583813648786c5d3678148f07b0860723cfca8a627485ecaca2d2c7b9183047c547d57e4c802f6b8a315d95e611f5d
-EBUILD activesupport-6.0.6.1.ebuild 2622 BLAKE2B b2512e35e767b8e0e84fa0b25e441fc4bfafb20ac9004df825c7c8a7e8102b3880d2f31104d75ae30b85311c4c40eadaf4b3943dee846dfb129b4a2906e8e6c4 SHA512 1e751fbc08dba1ff3bff1d2c8b696b5c1bcbdbc24f0fdc65725876d2be2f46988df5a495105df7b9d2707a4b9ad5a1699b7970a20c434be56a6cdeecbda39a8c
-EBUILD activesupport-6.0.6.ebuild 2622 BLAKE2B ab8fc65bae0a04e66952a75b425b8d8271a347fbdc8cbec29e189e55e9a18aebd3dd0c712d31e7027173b72ef29c4e48eed05632c6b0bb12d67d7d968fed6148 SHA512 8ca4f203a60179c61b907039eb86c7f2fc340c1a93c09b39c6266bba316aeaec62ec679eaa035a81fff357687e080db42c271f47bc6ce42e377a299df7ec2e9e
 EBUILD activesupport-6.1.6.1.ebuild 2718 BLAKE2B 446df7ba590041a230f89eebc5d4d2171a9ae7c8b62177b27c9ef87b81dfe6d1394d87f85166af824fa1f3020da24e8d9d53cf9f3c2055b8aae66823fd99fc8a SHA512 ed45d5464657af5e1082065d07e45aa4ead1d4cb52b74b6171ac3c48ef6379cdb41ffe39aa43f64fd8265f2c74cbbbef37f1da76017e254d3dbba809b6e28917
-EBUILD activesupport-6.1.7.1.ebuild 2724 BLAKE2B 78926ed6ef74d5a04c57ffb3a637d36876017090ba52627b3a17889c9ad4d1f1d657b9e60e0cdb0e0c8aa647ca125dd704a4f757c409a29e1e3c04b9351070b1 SHA512 f42787e46c2104c263dc4a6cc2cb32933661573ab8107868dae3644881634bd42da9203e5990afc4d51d0717bc87e6dd479f1912c4065d881a9d3ba961a06a08
+EBUILD activesupport-6.1.7.2.ebuild 2724 BLAKE2B 78926ed6ef74d5a04c57ffb3a637d36876017090ba52627b3a17889c9ad4d1f1d657b9e60e0cdb0e0c8aa647ca125dd704a4f757c409a29e1e3c04b9351070b1 SHA512 f42787e46c2104c263dc4a6cc2cb32933661573ab8107868dae3644881634bd42da9203e5990afc4d51d0717bc87e6dd479f1912c4065d881a9d3ba961a06a08
 EBUILD activesupport-6.1.7.ebuild 2724 BLAKE2B cfad7a5105d623d128a230498ecc05fb4bd4defb3cbed0b5895aaccb75d3ae69c950af42ee86c03f2e198e30750d2c62b7ce816ecac7d8dcb7c0584dd156e5d4 SHA512 d19fc60954dc6a06214d7c4b2fb0a859d592e00e26092eff25ac0db20c8fa53abd9a6f0f5c352ed3ec44811e332f71966d1ec2812c053fc91e52e16ab53d4ad8
-EBUILD activesupport-7.0.3.1.ebuild 2688 BLAKE2B 455289571360bc0a2201bd0a5f75462e7c8b0f800c5af887bbb9b9845b3add97551b366c308623861f938be6b54abd521cd9ec0eb181254e6256c2fd01a58b62 SHA512 373d79a9a00bf6c871ea241643d4a3468d96e75d28881cf50fa5dbe66d6168eb5a09e82882048b755560837ecd9596c2bdc7b3d0ddd357b3b80e758635f4210d
-EBUILD activesupport-7.0.4.1.ebuild 2707 BLAKE2B b2b4472d0a2f7b10ca5a01c9d980cb4a6145ba27dd412815c77aa28f5f511d8ae74dfd26a7a9b2f839e96e013357a7bbd35a9d7d5a28fa635a864ecbfd8cd96f SHA512 249226805703584d7732fc1963893317076f5f02fa5d9b619f69dc42b4b6866617bdedcc9e0ca3a474835ccd67c6ec7d832c3434004e532bcbfe8ea4fcd86121
+EBUILD activesupport-7.0.4.2.ebuild 2707 BLAKE2B b2b4472d0a2f7b10ca5a01c9d980cb4a6145ba27dd412815c77aa28f5f511d8ae74dfd26a7a9b2f839e96e013357a7bbd35a9d7d5a28fa635a864ecbfd8cd96f SHA512 249226805703584d7732fc1963893317076f5f02fa5d9b619f69dc42b4b6866617bdedcc9e0ca3a474835ccd67c6ec7d832c3434004e532bcbfe8ea4fcd86121
 EBUILD activesupport-7.0.4.ebuild 2707 BLAKE2B fd6fee9755e32bb11ea1267e1e13af3e789616f2219c3397349ac1cf8d6de39fa5ae4c01982245164e18657a82c761f7236a5ced0615be8c0452203894871acd SHA512 d495958407010a09dd4edffdb004e6aecdefe9b576bfa8eeb3d10ec0999cde57618b91c6a88d8d2ac18895e2372ac587dddc55133b3b0c2d788c71642785220d
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activesupport/activesupport-6.0.6.1.ebuild b/dev-ruby/activesupport/activesupport-6.0.6.1.ebuild
deleted file mode 100644
index 469c7ac0a8ce..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.6.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	<dev-ruby/minitest-5.16:5
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.6.ebuild b/dev-ruby/activesupport/activesupport-6.0.6.ebuild
deleted file mode 100644
index 2f3078f2aa58..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	<dev-ruby/minitest-5.16:5
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.1.7.1.ebuild b/dev-ruby/activesupport/activesupport-6.1.7.2.ebuild
index 019a5ee151fb..019a5ee151fb 100644
--- a/dev-ruby/activesupport/activesupport-6.1.7.1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.1.7.2.ebuild
diff --git a/dev-ruby/activesupport/activesupport-7.0.3.1.ebuild b/dev-ruby/activesupport/activesupport-7.0.3.1.ebuild
deleted file mode 100644
index 2b66a88d3806..000000000000
--- a/dev-ruby/activesupport/activesupport-7.0.3.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-3.0.1
-	dev-ruby/connection_pool
-	>=dev-ruby/nokogiri-1.8.1
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/rexml
-	dev-ruby/mocha
-	<dev-ruby/minitest-5.16:5
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-7.0.4.1.ebuild b/dev-ruby/activesupport/activesupport-7.0.4.2.ebuild
index f0801876283b..f0801876283b 100644
--- a/dev-ruby/activesupport/activesupport-7.0.4.1.ebuild
+++ b/dev-ruby/activesupport/activesupport-7.0.4.2.ebuild
diff --git a/dev-ruby/hiredis/Manifest b/dev-ruby/hiredis/Manifest
deleted file mode 100644
index ffbd02b8a7f7..000000000000
--- a/dev-ruby/hiredis/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX hiredis-0.6.1-unvendor-hiredis.patch 599 BLAKE2B 941d7f370c1dc85de07334b77e89180285fc57e604ffb904eb03fbb9c810d28c2c2e229f1589b98f58c80f68f3a21fa881ea78805361b67032a3006605428c1f SHA512 34d527c1182bd5bbc17e0a4e08b29bfeb15a55c02d1cfde75e5bb2b1589ee3dec622d87ed00cc3d7db390f4cb0ddc9c60e2344ef28c48b725eb37262cb349c55
-DIST hiredis-rb-0.6.3.tar.gz 19106 BLAKE2B 2892fd28bf7e7edfc3563a0c321fd781baeca9eb31a64dd559a6c828bb9c4fe37c995748782c5222db46b5b35a4d17f5b8b4d8e5306209a0e374ec7096d3cd4b SHA512 3e081d46aeb128789fa41fe9422186dd30e88c5a7a3c16dfcf1a92fe7faf99cced352ea39a885785fc12f0a974625be329d9ff2a5936a786febe8a2c81f5e139
-EBUILD hiredis-0.6.3-r1.ebuild 1034 BLAKE2B 1571d2d2e0640efae7f6ebf7fd3685a8b88908ff76f809ae9b504166c3a23a181cf376e06c40231201de53064c56136adf8a85daf9f0073a66ded76cc0c055db SHA512 cd908ec037c2cf3e20690d35103f88eab8ccbf2fea6c83fef4677c5f254a649c20e8fa9417e083bfb006a417329c5e05dbd4e8986b60cfc54612c21828afcc4b
-MISC metadata.xml 343 BLAKE2B 816ce03a7c4a846888ea2410f1def09d8c56b2f11e6637e0c74fd58eec1117c6ad363411bc4bca45a462320ebbae34785db0b56b9a7bb66de65d4bb316ea70bb SHA512 7cc1565a72c805d327fc2df68c813c5191e6e50dab1901dcc04a4c7f19145ede350dbad584a0bb37387d3a28d9ee0aa93b0918b20adc0d612c751c7730f3b813
diff --git a/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch b/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch
deleted file mode 100644
index 885d6d15819e..000000000000
--- a/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/ext/hiredis_ext/extconf.rb
-+++ b/ext/hiredis_ext/extconf.rb
-@@ -27,15 +27,8 @@
- end
- 
- if build_hiredis
--  # Make sure hiredis is built...
--  Dir.chdir(hiredis_dir) do
--    success = system("#{make_program} static")
--    raise "Building hiredis failed" if !success
--  end
--
--  # Statically link to hiredis (mkmf can't do this for us)
--  $CFLAGS << " -I#{hiredis_dir}"
--  $LDFLAGS << " #{hiredis_dir}/libhiredis.a"
-+  $CFLAGS << ' ' << `${PKG_CONFIG} hiredis --cflags-only-I`.chomp
-+  $LDFLAGS << ' -lhiredis'
- 
-   have_func("rb_thread_fd_select")
-   create_makefile('hiredis/ext/hiredis_ext')
diff --git a/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild b/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
deleted file mode 100644
index 9c657f2774af..000000000000
--- a/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-MY_P="hiredis-rb-${PV}"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/hiredis_ext/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/hiredis/ext"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrapper for hiredis (protocol serialization/deserialization and blocking I/O)"
-HOMEPAGE="https://github.com/redis/hiredis-rb"
-SRC_URI="https://github.com/redis/hiredis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND+=" =dev-libs/hiredis-0.14*:="
-DEPEND+=" dev-libs/hiredis:= test? ( dev-ruby/test-unit:2 )"
-DEPEND+=" virtual/pkgconfig"
-
-RUBY_S="${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.6.1-unvendor-hiredis.patch" )
-
-all_ruby_prepare() {
-	sed -i -e "s:/tmp/:${T}/:" test/connection_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/hiredis/metadata.xml b/dev-ruby/hiredis/metadata.xml
deleted file mode 100644
index 45ca92fb57f1..000000000000
--- a/dev-ruby/hiredis/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">redis/hiredis-rb</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 287330a1460f..2dc1f3398440 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,21 +1,15 @@
 DIST rails-5.2.8.1.gem 6656 BLAKE2B 43b8a7a684023dc3a08439ae35cc343a4024c68dc2d2c248cea703ce006ceee2dba5a98a8530f4173fd0e23116f0ebddfac86c0d5b507218af7fa7064eadb34c SHA512 556ac7f136d963f029253664dc4d4eb417e5892d33bf11d59ede67f7120b83a72c00e2516670fcbcd86ee28c90f5fc75c89a44e1294510b81e527155d8690279
 DIST rails-6.0.5.1.gem 6656 BLAKE2B 42a04f6fcf62a07d3f3727323ffb9ae5884561161e5e3424996e323cf637175f970e6a2f80559113034c6e70a1c718b1c5efe9eca2b880df1a2961a7a5311497 SHA512 881b5f0298fe2bb02ef52ce7f0df6bd0c7821f9a834957534d40ebc1603794b0b591b9ee326be328567f900946b26d46363c711fd3e4744ed351094bd477634b
-DIST rails-6.0.6.1.gem 6656 BLAKE2B 96e80633f3ea9856703cb6798833fb14b45caefa9699ca57954c4e6d72bf8a8bf9adcfe484100dc58ef26cf6ff9de503777edda9a2b6470e4d5244d5bf65d4c2 SHA512 7a656dae2490b9195f88db997f08ef70bec7df579b849acde017e58552f7dd30f71f69cfa5676d703f921a7f0fc5ba31e96586850ace33b5d9e5db9830b6f807
-DIST rails-6.0.6.gem 6656 BLAKE2B 2e3bd25fc7ca0b554c4a1f22fde8e4cddef36e805087e65b22508e51661890e3f173c07b0f089879676432982fcaae30d979bb71c29bdd3b1b44de01510a9ba8 SHA512 240d26a9e62fc9af8d3f7f17ff06fc8d7bf4fd50f085e5447a9da5b881ebd45cecbfbf24d68e92dea5c8d5ea6d2314c6bc8bcad51117bfc6082fd8cf167fa411
 DIST rails-6.1.6.1.gem 6656 BLAKE2B 10d7bfe4c92b4485de328d9b9806bdb79bd74f9bb23ef09cf9609362927b1474ca3ba35e54da6c8fd9745b0364f4f6a9390b4c1ad641a5ac437c222cadfa25bf SHA512 90ef98bbedd76feb4c1835062069cc5afd5bf5c191cd0858efe03dc5fa80194773ec7b21a3296a24089178faa14f1cd68f8e9d934f362b03ebeef81998a7f18c
-DIST rails-6.1.7.1.gem 6656 BLAKE2B 93cdd09519f1052210640dbcf7a81e2a66a97990c0404a2f7ad4eaa7e1c246e6b9a117210adcef63c073f0241959bfac2221d4b2aeddb7faed22cdc075c90e0f SHA512 286d4a3376d10245ad34d737344ea107694452b1183fb54810465b9568ad9b9681d6697c42e116b847f79476a17949723d3d7543860314a966809a9052036d3e
+DIST rails-6.1.7.2.gem 6656 BLAKE2B 149fca7e8a48c952608cbbfd9a91e37e350dbc46f96c72e6306d3828e303084ff3e7be7a5495d90375f0ef9a15a86ee0d616301143b23e5e372d4205d593d0c0 SHA512 28ca21666905462d7663aa5fb0ea4e5b2058235b3243408ecf474073e48eb97473e94367323df5476b159912510d96262e92fb5b2791b995180c6a7adf59ea44
 DIST rails-6.1.7.gem 6656 BLAKE2B 269016aec41ab2a5fe334c626286095f83d3fc7c16a52491002624267d89ec7aa499c9a7e04d9f55e67e12a570c0b597c44ef6e07072c3e421e9b9a317da6c0c SHA512 e89151c39c62748983e83b11a4c092874489df30329e377097448802a76851d7c1c340180b19b056d3e3658c8157a076ca9b4e68c8cd6bc3819811509c3e80d5
-DIST rails-7.0.3.1.gem 6656 BLAKE2B 2935e847874de0ce1d691efed7097e3b203c9991e7778dcd28813628dd43b59e54862d4224367afd79db97aac4e7e76825936b78380616232fd93396d1a54039 SHA512 b15d6eb076c688676a747932122d73e47ca272c97fe4c41816de84e8f5699df48a7fa6b767acaddd422591572b87e8fe0180bae1578ace7d9f136ef739d4e891
-DIST rails-7.0.4.1.gem 6656 BLAKE2B 6b389a7996cac00d15ca1538d1f1abe38548fe01695f0263e78147d54c0292b69042f8209734df5a1086824e8fd9b9909cffadd98fcd6f10a387aab32c2d75d9 SHA512 265e77df4fafd3acf0d327497564a1db6331663b21693f67d2517465419f08b12596369de87bce6b6c4a464be4ff52466d9d27da0d41891472fd8b0379e9fe45
+DIST rails-7.0.4.2.gem 6656 BLAKE2B 583ab77986109dc3b1acd85b7ba6eb08915133968efc4d46facf8ec4ab464f5fca67230957fa75b6429d9b05e01e61d889ba63cf7b25e12c3a6d1fe64bb163cb SHA512 ed2808c0bef31694d8c4b8d52d991fe56efbb15571742d34e71d179bf9bd759e1143219dd3a2b992d36109a023608fe8cbef76312ba6dd48f4277534f1103f72
 DIST rails-7.0.4.gem 6656 BLAKE2B 52a5b9445c7ab4b43a9646b02c80c519f22e0f78e24eda4f3c7b7e27829e3edbaa7fa42bb93a2e1917469d54cf75f8c2e9fb50015cf7abe981da43131235a5fa SHA512 2df3363df5f380dc9d0cf8e19985f07f20bb2a5e1c50f776636b2d53e3415333490201ab5600a52bf878391de411344ff8c8d43c93a2aba243dd0be3ee1a3a05
 EBUILD rails-5.2.8.1.ebuild 1032 BLAKE2B 8a3511652bf0c8249a13bd33287bbc246eb0af18930c0430424763de9c38bf405ab95e54c13eaf7d7506f1311580c5f7bca869e887036cef6c47a6f288ccafa5 SHA512 8db82d8ed6ae72e02efb27762c58618ca7bf254488376341bd15dcf5867aca5c30e956a1a466bd8ea7e497ed5fa634ac27703f592d1b11016e025b45f325f244
 EBUILD rails-6.0.5.1.ebuild 860 BLAKE2B e0462dcd8b3816131df57017224384a1e9f6a809cf9bb7cdc5d13246fe684333dca349889d5a4dbed334cdbae017024e1b213243b61ea0c930da4292b779338b SHA512 32c2483e331a626074ac02c8ea71d4c16c902da110ce778dfb51cf5bd6c437084224f123bda1fd254d5882bd97fdb2d30a20d1e89dab2ac5fc1fd607043fb8f6
-EBUILD rails-6.0.6.1.ebuild 853 BLAKE2B daa78b2c9f36158c8d07e1cd203e100c5718bd518515dee69515248c7f0e9820e7a4f6952fbce3c5f5221e46f1816aff1882787eeeb385759dc035f490723991 SHA512 ecc27138d76b274296884b9d21e3508b594fa4b4c67cdfaba24899306e26645718fd0d76dffff55740b71c1bebe6888f38f7eeebb4eab096c4e666b6598687d8
-EBUILD rails-6.0.6.ebuild 853 BLAKE2B 8e3f8a7d2727c7fdc4678c479df19d3552a22212c0d6d4ca8305a7b00a6bd72b8718b7be5bfc9030ba209338a3caf3c241ef30d295cb41012a4c5fb304df6278 SHA512 73d0c859ad16d664993b4adeb156147eb456a6a3ffa308e87ef3f8339f8b612171eb3e761095506fa8ebf4682f6771f5f77f07bebeb4de1c6736a36dc732f4c7
 EBUILD rails-6.1.6.1.ebuild 863 BLAKE2B 90e111f998c2def3bb03a8031886c2b73bc770b620451dd3ad0b7bcba53b63aa7ec35390011d4a92ccfe31f38a7d9b7661d90ee36bd19076d0a18860fb390ff3 SHA512 539100848e74f7db636bc82f08713e5357de33056da990bbc6baf4d7e119d1bcca49a8e194341e03cd39508c0cda3905db8de6000b419e2983ca3df064508942
-EBUILD rails-6.1.7.1.ebuild 863 BLAKE2B 790fb5a7446471dc9638e2d32c8b68fb57636404604ea14d73e612f5a9e09048e470d22fed02fccda9fa78554e46db962db5241c8c9908cc9ad69396c79d96cf SHA512 44897eea393ab0f9208698f7131f34f937332b68e7e536f488f8126ae9f03831d4b71b91a91a477d4ba3137eaaa8d8367e962cccadfe24064fb89ed23f1b0d55
+EBUILD rails-6.1.7.2.ebuild 863 BLAKE2B 790fb5a7446471dc9638e2d32c8b68fb57636404604ea14d73e612f5a9e09048e470d22fed02fccda9fa78554e46db962db5241c8c9908cc9ad69396c79d96cf SHA512 44897eea393ab0f9208698f7131f34f937332b68e7e536f488f8126ae9f03831d4b71b91a91a477d4ba3137eaaa8d8367e962cccadfe24064fb89ed23f1b0d55
 EBUILD rails-6.1.7.ebuild 863 BLAKE2B 9d0aaf977dd91bf6e05a3fa068f6c7282db987f0934b652c2eac3dfb3f048a6e606998d571d2ef18d0bf72c5c2a9c606b13b1f50196f25e9a3d7d9e9bd2b2da8 SHA512 8aebdb01b464fbc672d27ba5de7459625a1c1fae9fc49b9db878ee6d30732de2ce77b582e3031c070178ace7793863fcdbc073063c7d16f393b76c85ddfab338
-EBUILD rails-7.0.3.1.ebuild 863 BLAKE2B 9d0aaf977dd91bf6e05a3fa068f6c7282db987f0934b652c2eac3dfb3f048a6e606998d571d2ef18d0bf72c5c2a9c606b13b1f50196f25e9a3d7d9e9bd2b2da8 SHA512 8aebdb01b464fbc672d27ba5de7459625a1c1fae9fc49b9db878ee6d30732de2ce77b582e3031c070178ace7793863fcdbc073063c7d16f393b76c85ddfab338
-EBUILD rails-7.0.4.1.ebuild 870 BLAKE2B 204d817fb4971c84b80fe6c25c2d4a3789fba42ce88a9ec91a4cac2c6d0f64617466dc1c4f737e6f0568afbeeaa14b40352cbe27ae64d07e308309d12fb7bd2a SHA512 3859774e6c163f4c66b748ac66653cd8f8325b3c9d6e4a6bf59b01267f1c2dd9897cb53316c6d813ffb4f0c5feb2f52ef510598b6ff49575c864773c0439f115
+EBUILD rails-7.0.4.2.ebuild 870 BLAKE2B 204d817fb4971c84b80fe6c25c2d4a3789fba42ce88a9ec91a4cac2c6d0f64617466dc1c4f737e6f0568afbeeaa14b40352cbe27ae64d07e308309d12fb7bd2a SHA512 3859774e6c163f4c66b748ac66653cd8f8325b3c9d6e4a6bf59b01267f1c2dd9897cb53316c6d813ffb4f0c5feb2f52ef510598b6ff49575c864773c0439f115
 EBUILD rails-7.0.4.ebuild 870 BLAKE2B 204d817fb4971c84b80fe6c25c2d4a3789fba42ce88a9ec91a4cac2c6d0f64617466dc1c4f737e6f0568afbeeaa14b40352cbe27ae64d07e308309d12fb7bd2a SHA512 3859774e6c163f4c66b748ac66653cd8f8325b3c9d6e4a6bf59b01267f1c2dd9897cb53316c6d813ffb4f0c5feb2f52ef510598b6ff49575c864773c0439f115
 MISC metadata.xml 492 BLAKE2B e1f39a222b68aa3fbe808220276df3f6b7aa633887a0a0dbf4624ba8c8aa6a179d32c856b71dcf04763dd0212d7dbd58a6bd734e382adda25b5e9e28a7dc121e SHA512 16b0cb56755b23acbe3635dd82e72e1fe8b313b43658a79e56a983da672b4eb2619941ca10ce8431192a5fa0201bb428a3ab96b7e67323b893fc22d0491f5f46
diff --git a/dev-ruby/rails/rails-6.0.6.1.ebuild b/dev-ruby/rails/rails-6.0.6.1.ebuild
deleted file mode 100644
index 3106331ae149..000000000000
--- a/dev-ruby/rails/rails-6.0.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.0.6.ebuild b/dev-ruby/rails/rails-6.0.6.ebuild
deleted file mode 100644
index 2bb574956705..000000000000
--- a/dev-ruby/rails/rails-6.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.1.7.1.ebuild b/dev-ruby/rails/rails-6.1.7.2.ebuild
index 6d28f2cf9491..6d28f2cf9491 100644
--- a/dev-ruby/rails/rails-6.1.7.1.ebuild
+++ b/dev-ruby/rails/rails-6.1.7.2.ebuild
diff --git a/dev-ruby/rails/rails-7.0.3.1.ebuild b/dev-ruby/rails/rails-7.0.3.1.ebuild
deleted file mode 100644
index b3f457ed6a56..000000000000
--- a/dev-ruby/rails/rails-7.0.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.15.0:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-7.0.4.1.ebuild b/dev-ruby/rails/rails-7.0.4.2.ebuild
index d2388f935a73..d2388f935a73 100644
--- a/dev-ruby/rails/rails-7.0.4.1.ebuild
+++ b/dev-ruby/rails/rails-7.0.4.2.ebuild
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 11153bf4024d..61f27f7ff10f 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,21 +1,15 @@
 DIST rails-5.2.8.1.tgz 8848345 BLAKE2B 6786359e6c519e98079dc6f87a1ad23a69e7b65d2e688e9f09bd446012a18e76173d2997c125dd0260ece78114be9462d8c3dfb3464c6428734377f793828a9f SHA512 05e3bd1fb50c87ba31d47d99748b2edafa2e58dbf4e0c4ee991b7c65e68abbbc794d8f385836fa1fddcd277f78edeb1f9c2d675c1c53403c1f230593a8bd2c71
 DIST rails-6.0.5.1.tgz 18607954 BLAKE2B 74f75399a287f1eae199a5764c952b75dd95a02c88899ade69d60acae00a7588b2f3a8ab3b9d2c9224d62f87305c596e16b196a5c32b19731d4415f17a29d38e SHA512 a65c3fab39eadba75e0107486c82a4da212e612ddb2350f77bb00ad887e0b52980edba08d42c02801c4e4fd71d750de3dbd78c820ef050016867737dccc06b36
-DIST rails-6.0.6.1.tgz 18608328 BLAKE2B 10e6cb2d23acb75c95c25e2e6cc62de05c9c89f249c6cb9abffdd3a6ed83eb1dca996e6ef56a92cf77dddd3f8f9373ad947690015fb7966ddc599c995cea1121 SHA512 6873354fe2f8b9bf8bc12c7e6affda4300c158ee825f996eea6032a70f9532009d8f626d2736af22a452c8a3b331d1252ff19666e021150bfae2a8d575890c27
-DIST rails-6.0.6.tgz 18611499 BLAKE2B 156ab379f1fed2380544127096490cfdab1264dc352db08e0b48c4cf3cde9a564f618c86650203c018597b6425d03f550103778f5255e5026e8d50e9a8adf5c9 SHA512 5754f3dda4f279daec397358b692bb53c191c335218a365eb7ea6d374af32c35bd3e5268dd2d71a7481855020b43726b77f0ce440cbcc73130df8b72565234c7
 DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
-DIST rails-6.1.7.1.tgz 11035161 BLAKE2B 16e5c6e323403c117443b10ef151ba94cf27cd6fffdb816655ccfe935e05cbeacf32cd9480dc7eb6de1bb8de6f61b7df25eba60c1b1412ebcab7b002de1e1072 SHA512 3f3a9ef366be606e9adefbcaea079a2603e5d4a298a2ad2c56e11b69c8e8817cf7c67c69c45f6797ff8bf574d0c2f5b47070de48efce4ada93b34e66da5e4e62
+DIST rails-6.1.7.2.tgz 11037081 BLAKE2B 0004f4bc8b2370119cbe0f6a9133278ae78b1d274f040f08d18edd06696e6fcc609154a042c68b77e11893fbef83ec8eabd9f1e2c28920269189ee1352a0695a SHA512 f667904b0d3ffda3579e5046da3b36c242581bacf140966bf1dc59fc7ea91f34f4affc76b0d6cfad4b80f0332aeec5fc8ab35fb793fc935f1d1b4fe6d18ce1de
 DIST rails-6.1.7.tgz 11038670 BLAKE2B fd25884a6f58f10387f1f89ffd39caad337d7a3af6902f9ccdcf4eb108f9355124b6e1004d8b8f2b625ac7d9cfcd8635e7668101a1cba5d866a5fbe1b691e6e2 SHA512 7d56f604fbc2fb83a2e3a4ee070f55fb285018a48584115e0bf19982553eb5b78a173a5adbf1879e88c0739bea9dccc66879646da5c0b141b24f1500e1bdcb5f
-DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
-DIST rails-7.0.4.1.tgz 11063201 BLAKE2B 9efdb43546d73cbff42297ac988604318e298fb06954cfc066861c63e6336797dca85e7ef40f1e3255fd9fab8fbc111ad1265023a6ced0a25fd1d1a416cb8da5 SHA512 551317bf1d837836eabf4f0de6be1f83916c57b5f828ce079288c37665bac636dd95c076a965d6d763c69f425aef3b5cc20d1fcfdd22eb638cf7175c891466a2
+DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e91481770118343c13fa00e40d57cd208ebea83e5adc0154927ef62b3f8461ded82c4e5097089fb1d872c2247feba44 SHA512 9fb80e9ec6e9edcf049635eb436c2fdb418cbdea47a6d82fefa7606e9bd14f2785b1c4445f08848692474db7ee3eb309ab26aabc5f3ba6847457d8dfd8802689
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD railties-5.2.8.1.ebuild 1621 BLAKE2B e20d64b61d6b2601799f2391ef0ba71dd78104de5006550b664c1e40c0e986df43ff43b499246b86422ba06f98fe07c0f5c56c47d400a4f525e873742f92ba76 SHA512 714e5d2cb813456b4634bb24e08d33c5afeaab73c538cf05b6c14395db5e6f3d7ba0cd83ab66e5617d19ca3e6ed960017498a405c37e0bd6afab12ea3b474ade
 EBUILD railties-6.0.5.1.ebuild 1624 BLAKE2B a30a65a7d84cb1135a0636b3233bffc378ca19800c3c846f78925e4049eb29ce5ff53166153dfc1585d6a3db215356c32a02088c3a2cd6afc9142a0195a8b151 SHA512 efabbfe5904631537e488d25b5b5413ecaac0f7c3135de088603bffee663d7d7eb88d3caa20e5325e61e7a29e5cf187eaefc9d8090646c4094ac83b02a202ddb
-EBUILD railties-6.0.6.1.ebuild 1618 BLAKE2B d3dbf0084ea96e8502cfed8038e63408efb0e5900a2f8f3195d3782689bd6724daa56579df96f30ad6a1d8453f57b7d7ed5e686741e528532a2f37593b56094d SHA512 0875d03523ae6fb729875a8c60265da548aa0d0b646b6d4ab77712e714484a1032678053211590999d5134374b35f536ec5e22176dbec2bf5da8a9089dd7747a
-EBUILD railties-6.0.6.ebuild 1618 BLAKE2B a169980e63351b7f7b8e95932e976cd0f9075840533f3a487fff7f3e5d08aed8415ec1247e2deb9a091dd7e5b304ca60ad0dbbe4af6ab8680f45ff63095e1409 SHA512 ca9308e8881ccfc6d27ca76746a6e7ec299806281a2ff35c9d28db8006db299902f58a1f0a33f86cfe853d9ba260ce19bc27e3057e732585c7d40ad07291e06c
 EBUILD railties-6.1.6.1.ebuild 1625 BLAKE2B 74e541aca3ac39dc655fea9e25a028908ae523610c6688455f58339d8ca384c58608b80b8d6f8c6ffeee8a84570438776f8504134193066920b3a8fe298528b5 SHA512 aad175c12c025b8d947a637772b4e0f1d89d702c683678b23bb20b40908b727ef4821b553afb4e586bcdfb8b28a9aba92755ee793c7d8667636cf23cf7c0de34
-EBUILD railties-6.1.7.1.ebuild 1625 BLAKE2B 6a5b3cb78bf686f0e8b6397d0aa60e1fd1e8d749ed8b70653cc311288caab014071a615c9184f38debaeab1d456a5f2fbf7f7c5125eb0d31d94a4fcb4d875780 SHA512 c2e3cb02a5b1df7eb335a8fb852fbabe94383d3b7892ab18aea8adca97e586fbd67afc89a5ec66b200a3bc0506ae04ecd23d5f855fd9f10865f49b2581f7d1f0
+EBUILD railties-6.1.7.2.ebuild 1625 BLAKE2B 6a5b3cb78bf686f0e8b6397d0aa60e1fd1e8d749ed8b70653cc311288caab014071a615c9184f38debaeab1d456a5f2fbf7f7c5125eb0d31d94a4fcb4d875780 SHA512 c2e3cb02a5b1df7eb335a8fb852fbabe94383d3b7892ab18aea8adca97e586fbd67afc89a5ec66b200a3bc0506ae04ecd23d5f855fd9f10865f49b2581f7d1f0
 EBUILD railties-6.1.7.ebuild 1625 BLAKE2B 206330aeccd482d3bd6f6bb86848cd682b54bbd545535c16cee31fd7ec8d23260f6e41c6fca2f76e9a4ed7be4895142dfab2ea4094d497b428c77c0b58a2ca19 SHA512 051bd726af1da8e6e636bc51be4c22094546f28b1221f8596100cbbdffb7b37929bc560dcb657079cf7d709aaf21bfadb205b0e844a413aae06145e2deafd146
-EBUILD railties-7.0.3.1.ebuild 1626 BLAKE2B 7f2d4e179f48374114fbb37639e9e2a533b75376cb975d6e7271dcde8c7757a1144018d72c4928fb5b27fcb37d3839c9812abf30742c28f996af947761b88603 SHA512 bbc840b9384c40fca3f4d985360f0b065e8f0eda40c502463fcb1b817c53d8c9d6904efdd7dda9e91cd34490612b6d685f4b21ea738a74f20582e65071bb2ef3
-EBUILD railties-7.0.4.1.ebuild 1640 BLAKE2B db7e8b71f17ba006e3852c35ea70b7522b58f9493629e6d8837f80c5ae725deeaf4b73281e740babfad82d58004dc7f2daae7c5c27472be7107380a8f8fdbe68 SHA512 26714ed64c242be9baa0bb0f5f24affcc3607f66000c0ab1c83352f0d9e99df6018bf7b22505b23104995576b09b934f53e471d0ecfd7fb23340ad940e405753
+EBUILD railties-7.0.4.2.ebuild 1640 BLAKE2B db7e8b71f17ba006e3852c35ea70b7522b58f9493629e6d8837f80c5ae725deeaf4b73281e740babfad82d58004dc7f2daae7c5c27472be7107380a8f8fdbe68 SHA512 26714ed64c242be9baa0bb0f5f24affcc3607f66000c0ab1c83352f0d9e99df6018bf7b22505b23104995576b09b934f53e471d0ecfd7fb23340ad940e405753
 EBUILD railties-7.0.4.ebuild 1640 BLAKE2B db7e8b71f17ba006e3852c35ea70b7522b58f9493629e6d8837f80c5ae725deeaf4b73281e740babfad82d58004dc7f2daae7c5c27472be7107380a8f8fdbe68 SHA512 26714ed64c242be9baa0bb0f5f24affcc3607f66000c0ab1c83352f0d9e99df6018bf7b22505b23104995576b09b934f53e471d0ecfd7fb23340ad940e405753
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/railties/railties-6.0.6.1.ebuild b/dev-ruby/railties/railties-6.0.6.1.ebuild
deleted file mode 100644
index 859c33db14de..000000000000
--- a/dev-ruby/railties/railties-6.0.6.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.0.6.ebuild b/dev-ruby/railties/railties-6.0.6.ebuild
deleted file mode 100644
index 254b00366179..000000000000
--- a/dev-ruby/railties/railties-6.0.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.1.7.1.ebuild b/dev-ruby/railties/railties-6.1.7.2.ebuild
index 50dfdf624a3c..50dfdf624a3c 100644
--- a/dev-ruby/railties/railties-6.1.7.1.ebuild
+++ b/dev-ruby/railties/railties-6.1.7.2.ebuild
diff --git a/dev-ruby/railties/railties-7.0.3.1.ebuild b/dev-ruby/railties/railties-7.0.3.1.ebuild
deleted file mode 100644
index d49f8cb3826e..000000000000
--- a/dev-ruby/railties/railties-7.0.3.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.25"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-12.2
-	dev-ruby/method_source
-	>=dev-ruby/zeitwerk-2.5:2
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-7.0.4.1.ebuild b/dev-ruby/railties/railties-7.0.4.2.ebuild
index e19f83f80d1b..e19f83f80d1b 100644
--- a/dev-ruby/railties/railties-7.0.4.1.ebuild
+++ b/dev-ruby/railties/railties-7.0.4.2.ebuild
diff --git a/dev-ruby/typeprof/Manifest b/dev-ruby/typeprof/Manifest
index e4ea8f63f4a3..9e26563a4982 100644
--- a/dev-ruby/typeprof/Manifest
+++ b/dev-ruby/typeprof/Manifest
@@ -1,7 +1,9 @@
 DIST typeprof-0.15.2.tar.gz 501984 BLAKE2B 4139de379539dce54c350fb1da09d87ca7251274738b81b9c098f27539f8cc20757aaf053efd4c089b88a7c08050a8e612ea6c1b71ad1a007c4c634ecd6e7564 SHA512 c94b74f0a0f8f87477f80615677a5c6479d3e326564f2d67c17e4e7f7e71ef5817fe6163d14fdd45fc9bb3de2420f8b09f68f0d031962fb5bafc478679cee331
 DIST typeprof-0.21.2.tar.gz 1073317 BLAKE2B fda97cf6535937deca51f922f39ad580383420e025f8c5a418e483108e82f5d38063064102698f2ef405f7a0bf2f83ebcbb7ac7fabc32ead320e3af9d74b7cfb SHA512 53e9657ee0c98e131e8ec70400cb775cf643910e8985767742b50fda99285f33f787d810bcad08d9d633265577731a95fcf9a4e7568e4d6b0b603f14a6c10828
 DIST typeprof-0.21.3.tar.gz 1073355 BLAKE2B e8fa905b69f30b8f9884bae6b9600f802d0f0055f61f4a619768bf37547049fba97b8670cad9cdaeec9aa44519ae28bb13b8b0f533ff4d89e892e1726b56f7ff SHA512 ac9f0be4025181b994568e946591ddca4d0e4bb1949ba84d1920d765ba4549212e3fc4c10904ed691ecdbb153cd1b494f51065fcfddc4cb3c72ff5b393aa7c62
+DIST typeprof-0.21.4.tar.gz 1036163 BLAKE2B 944661736f80e13737df2580af3bcea657f0a9d7c9b5189a0faf05e03fbdd24d645dbe94c123320326f6d22ea8013c61ab2d7415920e3570a913000428f63e0e SHA512 a472c65066df2e047240657df0d4f21778ff9759c484cfdb9393af3e0fc33d8987fc9a715009a6a9b428294cc776f5da80683b6e259c04a68a418a73917ac48c
 EBUILD typeprof-0.15.2.ebuild 978 BLAKE2B 17d3cf4ed9414f1661722965fe93464d7b2ce62f2153fac0351b1560f1e7dbc5781a95fbce566625a102d5a777618f38bf25da0a24a627835907b2b338314043 SHA512 231eb4f2865ef6b7b6877753abecbc0aeeae77d02b3201bca38fa6b495e84b382434870f9a69e1699712a033dd8e357fecdd206b3dd3e0c5c1075ffef10c6d0a
 EBUILD typeprof-0.21.2.ebuild 992 BLAKE2B b4f5985c2eddb8c277593b0a0f0e393fcd802aabfcc583e968c6f7569e9085a7465ceb718dd858f2980d11006a3cccb6a6e1d77a3002ee14b3e78ccebce6b98a SHA512 59508894babc03e7ca00809519e9b35991ae82c567c964dc3424adb0db24cff3bef5de0cc3c8a64b373ff9cde46e385d311b9618740293ac76962c772624bc52
 EBUILD typeprof-0.21.3.ebuild 999 BLAKE2B 88faba1dfbc1a8edbff197796cbc20ebdfe4d57129e560e3b3f96d3b8f9834060c941c7a6d4e8e3fbf96f2ae8d796cc95b0eac1eef109e87099002a31ad1b39d SHA512 7fa0dd4123ecce3fe4e43a3a5f4d7f7e306e3438c7d84aa1110d0c49e2fc7bb0f00451a246b34a829136769e69599b371ca63cefceda3ece231ac60467a11dc9
+EBUILD typeprof-0.21.4.ebuild 999 BLAKE2B b10f85e32166a712b8a01b746fec68761629faff8a31936bbd40d702c0bf674970d11f26691d00ed484c6e3609b3bc854ecc7135b48fcad6ec90529d7e5ac197 SHA512 0b88275c46e6cad996627ea3a4dd5d4264c96afdb48aaa8cbbd3dbf3ffef7b0e28172a5791b8ec955abf1cf090a034a4de27f2d15324a0a167b83fb3b36b6304
 MISC metadata.xml 340 BLAKE2B ef30979bde6019c1290d2f6038c0465b7bb23754da9a118d1493cf5f8ba404258a97b67b0e5098d1e02fba2aa0ee569a8d0217a2ba8f5467cfb9ae795a457a8f SHA512 2a38dc39885b6693d013c28591bde40dcad4c38d1c8195944104b501b40b49808594781cfb468de8f1982c172e5b98cacb8113a42e3e215493272bf65c691e19
diff --git a/dev-ruby/typeprof/typeprof-0.21.4.ebuild b/dev-ruby/typeprof/typeprof-0.21.4.ebuild
new file mode 100644
index 000000000000..f5fc0c182ca3
--- /dev/null
+++ b/dev-ruby/typeprof/typeprof-0.21.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
+HOMEPAGE="https://github.com/ruby/typeprof"
+SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/rbs-1.8.1"
+
+all_ruby_prepare() {
+	# Avoid tests that download live code using git
+	rm -r test/typeprof/{goodcheck,diff-lcs}_test.rb || die
+
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/webrick/Manifest b/dev-ruby/webrick/Manifest
index ceafa421c69d..6998a03b3836 100644
--- a/dev-ruby/webrick/Manifest
+++ b/dev-ruby/webrick/Manifest
@@ -1,4 +1,6 @@
 DIST webrick-1.7.0.tar.gz 114413 BLAKE2B ff0d09a3137edabde37392d4c8a5e1f37d9899c60db8e96e4034ef60626225c0508c6b2797281878bbb7a0c6db16e20bd46a83b61b3de2ed059cb95e80255a38 SHA512 785e8c6af6e2f8ac497bab6d0ad0e9383fa4c4ac8dee6ceee38e20c5e9b631b805ec3c8f5438ebea651ee4113698de1a370ae506927bdc04e512ea6cac433cd1
+DIST webrick-1.8.0.tar.gz 91072 BLAKE2B 9275458772048d68d5275e19e6c1e2c13bbedaf7acd40bf01c59af282b7cff70d57e99ac49327e091d864cd89ce385ecdff5a4b5d235cce7547da457711df3e4 SHA512 37befe53e9db0a94f99ac54f1243d12c09b9148933e1ad00a52e73e9ba792cdecf3132c1b8cd2a633deecc549a5d6903402ef02ebb67edb296dbd1c5e4bffe5f
 EBUILD webrick-1.7.0-r1.ebuild 770 BLAKE2B 78488e24187be0bc9ed296eda925e371bc4dc3b7a5b02bc41ecce276828d7f51ffc41d0842a624c79a055906b4fe11419c65369a5de9d502fb7d1a19864d7540 SHA512 bf6fe6372db6e91af513bb5b255dba9fab059798a1d3bfe00442aac7c32bd19a5205ffd4a74e10bbb599a0f009c294cd7fb47da52bc5bbd2072640bdf1e6c187
 EBUILD webrick-1.7.0.ebuild 755 BLAKE2B e0ea0a032e26ee51dea80db46f60df4ad19e82a30d0192e69bea26bd2704a496a89e8fbd9b1e197357c852b1423830a9b6a71ccf5cdbdc74fa1dd9d88cf0be32 SHA512 0ddbc1917d25e88e6b61bb3797269e22a076b1d27e5b2e068d6cb6f921146a8efafd264fafdd92bc637eeee5403453a8b2a14a95ffa013a6e49bffe9bd103815
+EBUILD webrick-1.8.0.ebuild 763 BLAKE2B 7ad3d1e2420871eae3f80ea58287e7e92118dd3eeb00ab5f5da359752964084021b6012555368c98650be0b98ea9ac4c8f0448c7c5ff928568c81c3ec2b8f806 SHA512 f4ea8d3fd29e76b422d274c345f3ed3f63ace84a3e78e31aecf119246a6b31266b01d24b7a987e1bdb80d3422fd8afc6d0e1b1b234d4df320e4f47a4cdfe949f
 MISC metadata.xml 339 BLAKE2B 818ee09423c4ed53677cff830ae592234879035757260fa554871e0180d47780056eb8c301678428928a841638059507ea2b170abd758f8c73546fcabd675b49 SHA512 4abab733deab5e4609430f0d51f7634fda1879be7694720e683b0d9972691f41dbfe7fe9e7d252cddb9ac5a449bdf521b0d3b10acdf510e02c3b3a8bad578b71
diff --git a/dev-ruby/webrick/webrick-1.8.0.ebuild b/dev-ruby/webrick/webrick-1.8.0.ebuild
new file mode 100644
index 000000000000..968dc189a545
--- /dev/null
+++ b/dev-ruby/webrick/webrick-1.8.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="webrick.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An HTTP server toolkit"
+HOMEPAGE="https://github.com/ruby/webrick"
+SRC_URI="https://github.com/ruby/webrick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 07048b7f2533..29bb9ef62bb1 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 1442daac1ba3..432ae6d95255 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -1,6 +1,8 @@
 AUX 50cscope-gentoo.el 1442 BLAKE2B 73a5542b5ac18dd6ffb34169764cae590cb009c3d04816cb09361d24ea16c3e2fdb2355cca2301e932108fbb333ff433783b75bb379ecf4ec8996f8e162f422a SHA512 63bb70766d69a85f78c43204e3539bcabaf5765f19703f6f8ad1dcc2bc076c1c20623a3120eeeaff89842fac9f17d5b3f17820780eab9844716cbcd6a138d384
 AUX cscope-15.7a-ocs-sysdir.patch 582 BLAKE2B f9144657cb8d584f4d504481b986f68322d1a08b408e4f623db0ed3e22474895f4f8464e297a90e635a3dd3e71cb06f79b092a82ab8876d0ed308b71fa0d2812 SHA512 aa296d8839da73b6838c450dfabc9782940a2f9c9cfba2f738993c777c1d4096688d79205ccec58dbf931b2faf45a4c3850ddbd894c7b7e616d18a0014cacfdb
+AUX cscope-15.9-emacs-27.patch 1083 BLAKE2B 0982fcd6a804e6b2a1c5d5b47f184ec6f74a38ebeef737aaf8164db183787d817f0927fe7757cd51a82f9eba1d7034d565d61a403f2ee4532ea08e730d87e68d SHA512 d3c6c90d2a1838945a68b2495b1771a37dd2837d77b16793955f3e021741ad9fa2244fee3b0ce6790c0704430508febecd09e59ce60c071872ed0e988eef9956
 AUX cscope-15.9-pkgconfig.patch 833 BLAKE2B 4f8869517758d4b8725d772c7b4252c4f7aec57b3d63ab36c3fd4a6df08c6374773b016901a0418327b76c04f9fce131b58845c074073e1bcdc3f319261c74a3 SHA512 98002268e01be238a4f918bd95d9f69957477e9bbd0bd7cd0be204efc421fec8daf2aac86cfad9310c7bbd1f6ef0b6234e11e6e9d5490787ae2011160080f731
 DIST cscope-15.9.tar.gz 613948 BLAKE2B 66c0c85d0db810e8cd5a286925eeb1026fa4a9e9c3a5a9decd1412188fca43f831949c231acca428b5eeb476662b7ce9f81defcda81759c18027655535b855be SHA512 f3b95da5eb5c036cd39215785990c7cce7ce7b8eda4b18e60792e70d01ffb63809ce32ace310a9aefd88e6761c1609039ccfab0e8e49f81730bc1630babbcb80
+EBUILD cscope-15.9-r1.ebuild 1649 BLAKE2B 3f80363685da55565eac0faa93a76812979f8ec288ea21411fc0ac7a787f3fbe11bbdcd7285ca202330e2de20572812d8f344acd983aeb9ea6a758fbeacd78a7 SHA512 60287e23693a253e310c7aee068a8af15bf61e1995d59bc880a37fd3c6dfbfd53bd432184ce947ab89d3aa47c96bb5617bd3991de4137ed6f375d73371517b1b
 EBUILD cscope-15.9.ebuild 1593 BLAKE2B c7457f0aebbd3b11d37057991c2f9f34f49aa941fe29078749186f4d6d7f8640b38d8e272fccfca9da4219735bae1cda7955cd9230b5cfcc1e71d9442a2624ea SHA512 efc09755079ae3e3d54b102692a3ce62414b2b64bc132fa5203370fdd3222bc6691e65db040737ebcb176f2def101af48e2340e94294167e88baf75905669a7e
 MISC metadata.xml 1087 BLAKE2B 2e4779a4e1d063adc26a16774898a6cca08788ddfbfa036d29ae751e547a74cbf3252645e2b6444c59ed106f6088acb0bb5490dde7e7f5b55c74b3c9f941ea1c SHA512 6db0a7194cf116f4f1a1b34de222729dd0521dfb21486ead4885b068e52c3191091bf98e52b31b2e9d4d564560cec9a184d8d7c2387262afcf8442d66507c60b
diff --git a/dev-util/cscope/cscope-15.9-r1.ebuild b/dev-util/cscope/cscope-15.9-r1.ebuild
new file mode 100644
index 000000000000..f0ca12cf9cfc
--- /dev/null
+++ b/dev-util/cscope/cscope-15.9-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common toolchain-funcs
+
+DESCRIPTION="Interactively examine a C program"
+HOMEPAGE="https://cscope.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs"
+
+RDEPEND=">=sys-libs/ncurses-5.2:0=
+	emacs? ( >=app-editors/emacs-23.1:* )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/flex
+	virtual/pkgconfig
+	app-alternatives/yacc"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
+	eapply "${FILESDIR}/${PN}-15.9-pkgconfig.patch"
+	eapply "${FILESDIR}/${PN}-15.9-emacs-27.patch"
+	eapply_user
+	mv configure.{in,ac} || die
+	eautoreconf		  # prevent maintainer mode later on
+}
+
+src_configure() {
+	econf --with-ncurses="${EPREFIX}"/usr
+}
+
+src_compile() {
+	emake CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+	if use emacs; then
+		cd "${S}"/contrib/xcscope || die
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	default
+
+	if use emacs; then
+		cd "${S}"/contrib/xcscope || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		dobin cscope-indexer
+	fi
+
+	cd "${S}"/contrib/webcscope || die
+	docinto webcscope
+	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c
+	docinto webcscope/icons
+	dodoc icons/*.gif
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cscope/files/cscope-15.9-emacs-27.patch b/dev-util/cscope/files/cscope-15.9-emacs-27.patch
new file mode 100644
index 000000000000..48cd7150176d
--- /dev/null
+++ b/dev-util/cscope/files/cscope-15.9-emacs-27.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/892071
+
+commit eaea31cb93ecddda69a373f83f632e1a450c3c90
+Author: Brock Zheng Techyauld Ltd <yzheng@techyauld.com>
+Date:   Tue Aug 25 20:28:11 2020 +0800
+
+    emacs plugin fixup: GNU/Emacs 27.1 removes function process-kill-without-query
+
+--- a/contrib/xcscope/xcscope.el
++++ b/contrib/xcscope/xcscope.el
+@@ -2006,7 +2006,7 @@
+ 	      (set-process-filter cscope-process cscope-filter-func)
+ 	      (set-process-sentinel cscope-process cscope-sentinel-func)
+ 	      (set-marker (process-mark cscope-process) (point))
+-	      (process-kill-without-query cscope-process)
++              (set-process-query-on-exit-flag cscope-process nil)
+ 	      (if cscope-running-in-xemacs
+ 		  (setq modeline-process ": Searching ..."))
+ 	      (setq buffer-read-only t)
+@@ -2139,7 +2139,7 @@
+ 		   cscope-indexing-script args))
+       (set-process-sentinel cscope-unix-index-process
+ 			    'cscope-unix-index-files-sentinel)
+-      (process-kill-without-query cscope-unix-index-process)
++      (set-process-query-on-exit-flag cscope-unix-index-process nil)
+       )
+     ))
+ 
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index c67dd58c00d6..6304f68dc6df 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-builder-43.4.tar.xz 10284936 BLAKE2B 50af653566b35525a751d1ab0698c42e205aa8ab3205b390d10625f67a984986f24e5c0a5512629d81c082265435d5f39380de2c675d64e9f0b6d47c2fc62451 SHA512 c8600aea7bd01fb8a75baf321d8670600aa0ac77f7a42cccc7107fd9d2addd0264f132a4e36c2ae66ad7dbd8dc94dfc52421655254eee93d0a3298aa2cc224db
-EBUILD gnome-builder-43.4.ebuild 8735 BLAKE2B 75bc929cbfd9cb233a05229774e7d1c13f3df2ae528a45c093a0ea7f619c538f89c58790491f2e545f0ac1bf11d70769dadfa4b73296bdc81a566778b546ee27 SHA512 5718ebcf0c8fe1a3ac3c5535f497a214d7ac0c69610a0a90582adb1f00bdb96e632b29b2bb29f95c631a3da272779b5b77932a1b79fd0465fbe2c91711836d9a
+EBUILD gnome-builder-43.4.ebuild 8733 BLAKE2B af7facf902f7d84accc297d52f4835723f33afa2ba1582047151e984f3a36a187318b2951c4aa49704fcec149c7e249e3d988a98026f359255265e72f2556f86 SHA512 3a32edf77f4eb16ca9a4ca0e4b451767d79a36c97910e3c775e8c54696d246383ba9d85d44fba15dd27f1fb3ead680d98f31ec5d02c686eb04a26b04d2825caf
 MISC metadata.xml 1095 BLAKE2B e32e4a52f11c192e37b0593106b2938b3d8ded0cbb60859b7f30e9195667ef46b6ddb9b180e3aaa4459d6560027b3a85cb04b92930e191031966635d0bce4f42 SHA512 468bee5867936afa6d47cf4b7fcc36cb807fc2ad1d5a54e63013a1c862a157da35d051f12980331fece8f473ad5696c7a1c24e8bd53e2c41dd057250017b36b2
diff --git a/dev-util/gnome-builder/gnome-builder-43.4.ebuild b/dev-util/gnome-builder/gnome-builder-43.4.ebuild
index 348c39c08c64..048939fab95b 100644
--- a/dev-util/gnome-builder/gnome-builder-43.4.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-43.4.ebuild
@@ -111,7 +111,7 @@ that are currently available with packages include:
   autocompletion support.
 * dev-util/valgrind for integration with valgrind.
 * dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo 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.
 '
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 0b66a3ad3b64..8663f218c91e 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,14 +1,11 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lldb-13.0.1.ebuild 2587 BLAKE2B e71ae0f087f5490352932e4ed8daed99377a7579f93fb325c01b39faebd3000ebe8c73e9875dc609dda168649d5ca6e092fa9cdad8e847cbf01b1ddf95d1be2e SHA512 9ed40d4927f116f6c18a8c2d38287fb386c280d0f8ec40514c886b1298b5f19fae5f4102f715284e00503401df96e0ecb6cc23378c23e91d2baa383a76488ee3
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 57d0c4810421eff9d3fab976f16d8ad92e67764aaa9c72154a793c7783d98e835789df2cdd2c64f44c035f85e29652e5e50b72ceb161d4dc0dc803983234c08f SHA512 54120a86d7655cc53bb0ee858561959e112f415e9f23e4d56cd0d7716147b2563bdcb3800005eebd8311c237659319f735176072547a7f2162fc9b4f641dfdf0
-EBUILD lldb-15.0.6.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-16.0.0_pre20230107.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
diff --git a/dev-util/lldb/lldb-15.0.6.ebuild b/dev-util/lldb/lldb-15.0.6.ebuild
deleted file mode 100644
index 37c23ed60fb5..000000000000
--- a/dev-util/lldb/lldb-15.0.6.ebuild
+++ /dev/null
@@ -1,116 +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 cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="debug +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	python? (
-		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_VERSION}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 07cfe7a5d91b..9ec9a6ed9f33 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,4 +1,7 @@
 DIST packer-1.7.10-deps.tar.xz 628140836 BLAKE2B 6cfb8409a9a9aef2130e58f2b70b1bb73b491aa9fb2d1f2b59b2c3c9e721465a51111f0e6357a58e9eed4d8b024a4fe9a0f20cf9a5b84e7d20f3a8d52ad55e4c SHA512 cd0af0f60029b7b3e887fbe4245e26e12d798fe5c3b650d63774ffeb2d5eab9609d8506a06c35d8ff4d499db1cab69d767b8b386d04136fd65ea43de3940df88
 DIST packer-1.7.10.tar.gz 2414352 BLAKE2B 7c48aaac8411dd81cae2201cf9b03eab0906b78dcc6aecf654f498b44884a0758f0d5fc10d03b9e526f7753d18db8754b74d8c2eef133b4170b872f41c8261f3 SHA512 12f032afef95be92be4f6e98cf2af5548189cb179c25d74b8f7943b4a6af0ab49c5a86523f27385e5eee05624d7e9de8d572fe19442305227c5bddd21a66f97a
+DIST packer-1.8.5-deps.tar.xz 385789132 BLAKE2B 680852f380bc6b2c74183bf0c32baf8e3c796b5eaee59fd8f395e2fa2765a3aa2ec36d30647ffd90965fad9b1cfe8ea00e4ad684c026cb60a6c4a9df4f5c8501 SHA512 a84b2d3287ccb618063ea960773a3ebe306ae8a36c708fd8ca057f6ce70b82ff7590922aa733c1fade93fbbca14f87b0c5ecda530413b573fab8bd981dd254fc
+DIST packer-1.8.5.tar.gz 2278013 BLAKE2B 0465356e78b62a67e71ef943a7dfb89b5f50b3b3cdb34c3ca41ac6d57e32fad8f40da1316ba8f54d93ae0c25b22627cc9f633f4e488ee9cc66fc6e6080b5769e SHA512 8ffd9e0a755e5e537c63a70454756a6df787d299cb5f3a8d6dea9c7e93dbea744017cd2f2c4fa9a8b6fbc052dedecb702dc6ac656b4c6c293ad5eab1f581872e
 EBUILD packer-1.7.10.ebuild 782 BLAKE2B d07c471c1ddd43a126dce74e3f877f10978f6b549fa251c6f947a9775f5a9ec4e4688eaef370cd2001c56086b43397facf9b6dfc6a2ae63029c748716c604457 SHA512 5fa4d8825455b08c39f6c69049d6452b569b10944e4fcac6aaabae9a4c93503c8a8815e11004ff54a562e8eaef1389e9f8a3f15e11d04b4446fc0daccb0ac2cb
+EBUILD packer-1.8.5.ebuild 782 BLAKE2B 81c1510edf376fb2119db7e14bceac85c4046765acd0e2c8759473f7b6ead8118dc0a9001705cccbcb6ffce793d592f242625ca7cc72b19e371057ca5be0953c SHA512 2184baea8a3cb822477356c72079f14fee5ce3061e7e56e40c6a4cc3d87c3168e4f1b936fd394563e3380b1fc3e8dfb94e927059de6680464c331216d998445e
 MISC metadata.xml 1408 BLAKE2B 04204c3ac4c45b58a23e611fbd34014423fd1839829101f7a30a188fc8b4588532f72b05c41a77f093170c6a6d9bd804c47bc831a8006ecbda5d3a30ccf6ade6 SHA512 2a45870ccadf85968c81c3129cfffa16184c3cc6ed135b716a84e545d9c80ed35064be231386b0bbfbe6fb7f9a12704c25d7fabc9383b3211d61720691c2ae9b
diff --git a/dev-util/packer/packer-1.8.5.ebuild b/dev-util/packer/packer-1.8.5.ebuild
new file mode 100644
index 000000000000..5d2c7f38d9d4
--- /dev/null
+++ b/dev-util/packer/packer-1.8.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gentoofiles.s3.eu-central-1.amazonaws.com/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+DOCS=( {README,CHANGELOG}.md )
+
+RESTRICT+=" test"
+
+src_compile() {
+	ego build \
+		-mod=readonly \
+		-ldflags "${go_ldflags}" \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/packer
+
+	einstalldocs
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh-completion/_packer
+}
diff --git a/dev-util/pwndbg/Manifest b/dev-util/pwndbg/Manifest
index 53788111f3ff..ce5297889ea0 100644
--- a/dev-util/pwndbg/Manifest
+++ b/dev-util/pwndbg/Manifest
@@ -3,6 +3,6 @@ DIST gdb-pt-dump-f25898adc61d60e5f30c6452b15700bbf1bd630c.tar.gz 385826 BLAKE2B
 DIST pwndbg-20220830.tar.gz 8302318 BLAKE2B fd6821d0846646927a3a7f0f352067360984f90156702bb8d2001b40651e20b11c8a33b07fa522f568f39ce6337f2503d930f745ab424d5ce6948a270e331c1f SHA512 be59544eb959ba05e6a662dbc629eb33a014c39d5ad5fceb44e9c6a9ccfa3ac6c133c082adfda1602002aff9eab3326d5b97aff7b6ce1357116a2d1fe6aa28fb
 DIST pwndbg-20221219.tar.gz 8344938 BLAKE2B 1ecda02573ef03b569f8a46c390f5388e6db9cfbb0df84410f245e4f043e89be16b6581d0e07fe840d50cab875943dd5a30dab1c2fc40fb93c5982cecc33e490 SHA512 1578ea834d7aa1d574e559844dae1991eddc9575c4e445ae02d05f0024900c550253293cba7277ed651df613cb2a2e2028486c2b8bc52adc0dedb9d9796c58d8
 EBUILD pwndbg-20220830.ebuild 2437 BLAKE2B 3fe7d16aeeae24d78d437006980bc31f3a4fed5c49a2fb560002710d21e9d8ef113e62369b33320f7a363c25a891f1100d5ed965c69a296d5d6a7077e5535b9a SHA512 f75cc09ec1b3ab84ed1fc0cafca1f97d4a0b6e14958408110341a91d7c539aca68c3da9a7568c4ba0e5db72446ea6371ae6408d9db6cc26358ada9a59d341d64
-EBUILD pwndbg-20221219-r1.ebuild 2367 BLAKE2B d1827935bc67787cc532cc559d3022f4cb9c14418ef96df137bf9c09ce7729a5348db7ba4b0455a2b11a46f08266ba1f2682201e08e9e5c0250e3ef8a642ad2b SHA512 49f3edbf9d7c8f9a28e8f4726293ac7d7677a23327d03862c818da91e40062d1cf7a5b01088e8cd01331b872cfad3f0c1348375008eb2adcd5de71f62318d4b5
+EBUILD pwndbg-20221219-r1.ebuild 2366 BLAKE2B 5ad3f881de127a195034ba355028fd81f442458c6fba4a64322309f6a07ec9fd98be2af0ac1b84e082d1916778af42247f2b3d173fdc498d638d406f23f61f38 SHA512 90e270d187ac34312a47c109052ba5179c62aa0a70e395ec59427739b9e91137538f9a11e1af43443203160e566ca7eb72c94ed296a23781cb2f375ccdc93cd1
 EBUILD pwndbg-99999999.ebuild 2368 BLAKE2B d60022004f9951e7aa16810e602ad66c158d4f89e79bfb66e46d7335ee4129355e47697ad5db0558b526a6690224f7e1d1c6e45bfe0ba9b67d8c3b9ff8e54252 SHA512 8c9a910929ece0d118fbdd282abcdc95b44aa56ca4f2394cb6c39e6726931d15cc0d443521433a3931109e12a19d408cef1d4611dab85cf52c8f837883ee0f2d
 MISC metadata.xml 692 BLAKE2B bb74dda183fe35e5873e7cbaa5886dec5beaf082968b16352bcda55f2e14dbdb78ee48d2e0195baa735b0f615b0469f8fd48429c47f4a81d2fc0391cafaade76 SHA512 8a6a9ec3aa03e597d8302a5b1001fbfd569e6efb08157445bedb58ec82b4d7812aad7a852ae3eb0d0f245cbf89c85a357e532855c19e6dbc9d438c16e0bd549d
diff --git a/dev-util/pwndbg/pwndbg-20221219-r1.ebuild b/dev-util/pwndbg/pwndbg-20221219-r1.ebuild
index a7bd8ceb8dcf..84259afcf501 100644
--- a/dev-util/pwndbg/pwndbg-20221219-r1.ebuild
+++ b/dev-util/pwndbg/pwndbg-20221219-r1.ebuild
@@ -20,7 +20,7 @@ else
 		https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> gdb-pt-dump-${GDB_PT_DUMP_COMMIT}.tar.gz
 	"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
index 108e10e63802..3fc688094598 100644
--- a/dev-util/rocm-smi/Manifest
+++ b/dev-util/rocm-smi/Manifest
@@ -1,8 +1,11 @@
 AUX rocm-smi-5.0.2-gcc12-memcpy.patch 605 BLAKE2B 8dcf4c74b9f1ccf832d71cc8b54d50aa1c7c2978bd70c359875548b753bcf52b54bfefe30b34aecc211499c9b46a9b0e62661ef8725c1c1ef3cde81da669b581 SHA512 7a39dcae0fd99fc82b92fca0a9080d42f9378065f120712132a42841ed67c056ff469e3b13760181f5d96861c1169fe8c6f0426e5351e5b67d6439605a11c41f
 AUX rocm-smi-5.1.3-detect-builtin-amdgpu.patch 983 BLAKE2B c1d926ce5ce1bef272f718f1f37869e5432993ca016ff7278cc14d7744d61efc813ee100e462bb9bb1bd61975fb620e82eaab37abe94bf415a9e40815919f59a SHA512 cd22af4b79ef366d10a36d663faf89c60a618aa9394fcac96d3521a9b9d1d270d20e216d918f18222930d883a8e2c72588ef97ab5a60086eed950a0ccfc7cddb
+AUX rocm-smi-5.4.2-detect-builtin-amdgpu.patch 1071 BLAKE2B 1957d49b0c3c1f9db24add59b8dd464c6ce8571ded2601cb259a0686938e4fb718b6affd99c366f6e8aa360f53034c0e7c231dd3518bcab84bb8d5a755c4ebb5 SHA512 a531b3ae4b73dcd03e6f3de3da4dbf1250e6a6d05ec052fa8ff412f65233b5fcd418a7128f9b913aa71e1bbf970ba5b74c7b407a0654e1030f695e7f13ebd5dc
 DIST rocm-smi-5.0.2.tar.gz 1677784 BLAKE2B 28e136a8b3c630ed7d5b514ad5bf985ff540df8e1fc2378b855032a6ebd2bcbcd4aab5e8a5a9e6462eacd2ac9ada0b8940aed582ce118d1066bded115af42e22 SHA512 bbad2bbebb81de42a15d8aa48e4751dbf9b8f9ee74633d16828f6977fadff35e9db0b7c9ee465a61c40a3e8f2f0f99b79cd5c5b142785cf61958d432f13d7f05
 DIST rocm-smi-5.1.3.tar.gz 1701386 BLAKE2B c5e779f5c33fec0b1b39b09c758dfadd3c24e28f15381593f2959e5c2fb9f49af3a7ca1f9ab7d6bf34c5af4fbe3f0c0ae20c6c049cbf9421a9184735bb4a64a2 SHA512 7bf7af2b42a035c298c2f9009b6123671af41f9ca1a50607cfa362f39dbd82ff88f8c13ece6c4edab585edadd9072ed096a400dd3850851e1beef3633a8eb14e
+DIST rocm-smi-5.4.2.tar.gz 1553259 BLAKE2B 0560e115028caafb1d5dd8892cfa677431b792714ecd8c75f31451fa7685d1c7070cbd687c894d7eefd112de5e2df9aa7895aa57821db207dffc4e8890898638 SHA512 0fd651593df0ebbcb2c2327d030d2674efacdb6e883daa5a8adf733db2bde3e5d16dc304856221f4bb07a3cd834944ffcc7ebd689624f7ba24ffd6c262ba74b8
 EBUILD rocm-smi-5.0.2.ebuild 1792 BLAKE2B 9a62e39ff01e7db4aa644d801d357685af916e70d3e9e9a2eb955277125bbad9ed80645a9398a2f666eafd5212de0b8705a2edc66e0994b15565710bf26e25ef SHA512 bee3dcc8be502c1e103aa17236144b2cc15dea47bc5764178978d41edd727c242c5a524142f6c2c1ab234d38d3551cdc57330e2a6a83fabce44835be55f65cc6
-EBUILD rocm-smi-5.1.3.ebuild 1847 BLAKE2B 90d7228651a4b654f7f3feb5d5a8d2df1a9ef50e77acf287a7cdff68bae007e4e6d4ddd8e9f9de75a78433d4e78c8ba52b60a6de556e2906f624794759b58d9f SHA512 3355d38aa70c761c99cbece2d1f3109d7b2f17d1a60327a891475899b25aee169970b4ccaf1b4236737127a5db49ec3469d495f3073b5c1ea3bce9a4be2364ee
-EBUILD rocm-smi-9999.ebuild 1705 BLAKE2B 82dc6c969a80f06b10e0175efa7fb0b28f7a1acece3d7b19b092cb78f06a2e376782f3fec0ac849421a974baf3c9e7fc9775a08d0ab3a173ca4e63c3f689b0c1 SHA512 07efc2a0abbdb8c884659ca86ef5efafd8610fced923ee9b36494d6ddd3839df9991f364ef22d5e80f66dcc656f4e13a194aad67cc5d49b53b255de63fa6e9f2
+EBUILD rocm-smi-5.1.3-r1.ebuild 1850 BLAKE2B ca355e03af98c2af6426ba44e7282d346a5b668c8b9139d2e574bc87e8c2e2641227be849398d956cc9fa12d094016d6c6979849a6ef1c4fa0379c5b8839b3e9 SHA512 b3617a2c4bbfe9287b399d9bbbca898ac0b2fd977fd624f5357e74212a30915c28c7b3b8d656b02743a197d9ec5541e684a6aef24cd84815d12651adc46cc4a4
+EBUILD rocm-smi-5.4.2.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e
+EBUILD rocm-smi-9999.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e
 MISC metadata.xml 661 BLAKE2B ed6ec563956132012b44907f348091135c7a463fc47a51ac0726e7749da9a4c33811df87442e576fb510799a50c14949cd20c8ca10a5850ee941a8794b70ef7d SHA512 c047963068b4ccefb73539ecd91b4c3310f0863a674acb15e9843dda7f0c917616dc8cbfe5f859e42d9ee25323bf1b66b1ce7fbe9a2e8292963ac38aa0bd72f3
diff --git a/dev-util/rocm-smi/files/rocm-smi-5.4.2-detect-builtin-amdgpu.patch b/dev-util/rocm-smi/files/rocm-smi-5.4.2-detect-builtin-amdgpu.patch
new file mode 100644
index 000000000000..1c406c7d042c
--- /dev/null
+++ b/dev-util/rocm-smi/files/rocm-smi-5.4.2-detect-builtin-amdgpu.patch
@@ -0,0 +1,26 @@
+Detect amdgpu module for amdgpu-builtin kernel
+From dc2a4b5b256692e1a6ecef45210682c316b961e0 Mon Sep 17 00:00:00 2001
+From: YiyangWu <xgreenlandforwyy@gmail.com>
+Date: Sat, 2 Apr 2022 16:40:11 +0800
+Subject: [PATCH] Check /sys/module/amdgpu for ROCk instead of lsmod
+
+Closes: #102
+
+Signed-off-by: YiyangWu <xgreenlandforwyy@gmail.com>
+---
+ python_smi_tools/rocm_smi.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: rocm_smi_lib-rocm-5.4.2/python_smi_tools/rocm_smi.py
+===================================================================
+--- rocm_smi_lib-rocm-5.4.2.orig/python_smi_tools/rocm_smi.py
++++ rocm_smi_lib-rocm-5.4.2/python_smi_tools/rocm_smi.py
+@@ -66,7 +66,7 @@ def driverInitialized():
+     """
+     driverInitialized = ''
+     try:
+-        driverInitialized = str(subprocess.check_output("cat /sys/module/amdgpu/initstate |grep live", shell=True))
++        driverInitialized = str(subprocess.check_output("test -d /sys/module/amdgpu", shell=True))
+     except subprocess.CalledProcessError:
+         pass
+     if len(driverInitialized) > 0:
diff --git a/dev-util/rocm-smi/rocm-smi-5.1.3.ebuild b/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild
index 90b2396a727d..f2b4fc660707 100644
--- a/dev-util/rocm-smi/rocm-smi-5.1.3.ebuild
+++ b/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild
@@ -57,6 +57,6 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	python_foreach_impl python_newexe python_smi_tools/rocm_smi.py rocm-smi
+	python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi
 	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
 }
diff --git a/dev-util/rocm-smi/rocm-smi-5.4.2.ebuild b/dev-util/rocm-smi/rocm-smi-5.4.2.ebuild
new file mode 100644
index 000000000000..bc4f8b802371
--- /dev/null
+++ b/dev-util/rocm-smi/rocm-smi-5.4.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-r1
+
+DESCRIPTION="ROCm System Management Interface Library"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm_smi_lib-rocm-${PV}"
+fi
+
+LICENSE="MIT NCSA-AMD"
+SLOT="0/$(ver_cut 1-2)"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.2-gcc12-memcpy.patch
+	"${FILESDIR}"/${PN}-5.4.2-detect-builtin-amdgpu.patch
+)
+
+src_prepare() {
+	sed -e "/LICENSE.txt/d" -i CMakeLists.txt || die
+	sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" \
+		-i python_smi_tools/rsmiBindings.py || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi
+	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
+}
diff --git a/dev-util/rocm-smi/rocm-smi-9999.ebuild b/dev-util/rocm-smi/rocm-smi-9999.ebuild
index 16c82ecdbbe5..bc4f8b802371 100644
--- a/dev-util/rocm-smi/rocm-smi-9999.ebuild
+++ b/dev-util/rocm-smi/rocm-smi-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit cmake multilib prefix python-r1
+inherit cmake python-r1
 
 DESCRIPTION="ROCm System Management Interface Library"
 HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib"
@@ -20,7 +20,7 @@ else
 	S="${WORKDIR}/rocm_smi_lib-rocm-${PV}"
 fi
 
-LICENSE="NCSA-AMD"
+LICENSE="MIT NCSA-AMD"
 SLOT="0/$(ver_cut 1-2)"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -29,28 +29,29 @@ DEPEND=""
 RDEPEND="${PYTHON_DEPS}"
 BDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.2-gcc12-memcpy.patch
+	"${FILESDIR}"/${PN}-5.4.2-detect-builtin-amdgpu.patch
+)
+
 src_prepare() {
-	sed -e "/DESTINATION/s,\${OAM_NAME}/lib,$(get_libdir)," \
-		-e "/DESTINATION/s,oam/include/oam,include/oam," -i oam/CMakeLists.txt || die
-	sed -e "/link DESTINATION/,+1d" \
-		-e "/DESTINATION/s,\${ROCM_SMI}/lib,$(get_libdir)," \
-		-e "/bindings_link/,+3d" \
-		-e "/rsmiBindings.py/,+1d" \
-		-e "/DESTINATION/s,rocm_smi/include/rocm_smi,include/rocm_smi," -i rocm_smi/CMakeLists.txt || die
-	sed -e "/LICENSE.txt/d" -e "s,\${ROCM_SMI}/lib/cmake,$(get_libdir)/cmake,g" -i CMakeLists.txt || die
-	sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" -i python_smi_tools/rsmiBindings.py || die
+	sed -e "/LICENSE.txt/d" -i CMakeLists.txt || die
+	sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" \
+		-i python_smi_tools/rsmiBindings.py || die
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
 	)
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
-	python_foreach_impl python_newexe python_smi_tools/rocm_smi.py rocm-smi
+	python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi
 	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
 }
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index e7d71564d93c..5573950067ab 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -8,6 +8,6 @@ EBUILD strace-5.17.ebuild 2448 BLAKE2B 99b2514d006878e750d31ea9711581fb5d1980f30
 EBUILD strace-5.18.ebuild 2344 BLAKE2B 2c55a36cfa70076014cbf0ae1c80768193367c71d3e8c123570707f7adbda59dec9fac4699e3c706c1b6a0ba993605434321b032b938c135b0030da5e64fb80d SHA512 dfdac81e07edb2e8ad236a92348fb68feb67a5fa644f7ea0f08aa0345eda737847d67249982595774c44b5934d00d86413630edf9371a604bb461f7bd4ef786f
 EBUILD strace-5.19.ebuild 2447 BLAKE2B 88535b5906a24d4b2ccf26777e4a9fddc382187721598b44a6092e6ca7087601e2895575ba0046bd78c1caeeeface1dc52883b7fb30e266129b40bb5ea19b8df SHA512 c29e74848ff20d686ff02acbec5e08a9ad55d5f1970bc30779fde8e609ba88688fee69d6a63e6607c1da32b53676995f29adea9e81498e3feeaeaa0bb7fe6b16
 EBUILD strace-6.0.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
-EBUILD strace-6.1.ebuild 2440 BLAKE2B 2b70019173164e4a594b46ca9ea429cc562d56726267405d44e80ffe09c8dbfd8746a822b0e50434c75ebadbde02ded8af12f9fc9d73485be471c55b78de670b SHA512 33bbc0b1560b1acf0d0c6ed681cfcf90bf104638ff2182176eabccfde252022b76e43cd1351b599cc7be4a7adad7c8e355707d3a340742b2c8580f4ce965e5b2
+EBUILD strace-6.1.ebuild 2436 BLAKE2B dfc6236fdbcecb91b5cb366b6a2de418670fd82c31cc402e157b5dda9c07181c9ac1cb39a7842ec8f171ff899aa046ca566e0f52c3b9d3d8f4e0c1d6d4d09e7a SHA512 82f3e8e5e3f5001bcb1cd45a9ddcfc0840944817f82d9d2754e0cfef1bc052bdaaaa05b8a5f7d516cd760b9f98dca753f18bd88bcb9f7770da12b7ac97258604
 EBUILD strace-9999.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
 MISC metadata.xml 779 BLAKE2B 89b4360e876fbb34a7a766a57ba9ca088a5e03e9ef66fdbe0a2b15df4cfb625daba11dc76920dec405b97cb87df49fd3c9edc0e184e73262b14b616af36fa4dd SHA512 88b2d94fd6efebaa617c8344bff3997f31c6262b9376cbce014bf7f6225f02bd8ee7bcaf98df4477435319bbb92addcdb6756e5d37a137a863f0bef1ecc5fced
diff --git a/dev-util/strace/strace-6.1.ebuild b/dev-util/strace/strace-6.1.ebuild
index 4f2c696b7282..92851213887d 100644
--- a/dev-util/strace/strace-6.1.ebuild
+++ b/dev-util/strace/strace-6.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 3d2de0a5e90e..5091d5511202 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -9,7 +9,7 @@ DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a3
 DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b
 DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 12642e4f85c7b17bdb892221f74d80ce919554ffde3cdfa79ca27f4c5f8b48dac699084b8296b5cea285b5af660a0bc51c42b108a725be60002b14f0fda7eac7 SHA512 70dd20f15b159ffbf016c118046ee42160dd867415f1c565a92995952b1720ec36fc48557f6b523d28e6f675d62df10a4022e900fa4a104626b9e6ed6fe9ad6d
 EBUILD valgrind-3.19.0.ebuild 3954 BLAKE2B d8d02f214a8c371c7636d9c39ad30e341926028cc77d983f7c99d576a47904499522808c70b03c374b98a19c0df9e4965e60594a52d61b17c01efd35f192df75 SHA512 ce5e9ae78091d0437149aabfe690f3ecd15c18f78318133c08256625846d20e577ba6ed68f5f2773e2bba8cb70e1674e4e22051abb1466d47116d674189da032
-EBUILD valgrind-3.20.0-r2.ebuild 4321 BLAKE2B 4637a8f0c0ce87bdcf4a737c3cd22c1baaaa3734d394043a562aa168d1c8b79d5c7d57fc3179c739c517b4cfcca82169490621e9214ca0fe4df8405524721bac SHA512 70883c072b620a776e3e598751cb770621c00ccf9ad8a317e597eace07077e7e622aa33a3178ee3773e73b36dde3cd878f10ca289beabed6cfdd508b84ae5cad
+EBUILD valgrind-3.20.0-r2.ebuild 4315 BLAKE2B eec52fec10cbb7e16111cc4bb166f91bcc29a81e4d0f23be8fcf09a04c127cf7da58a82880e65fb0d403d007886e7ce87a62ce57b238ca15c5be8c0915a50d8a SHA512 d1867e12e9196f2a493096d82eb01ba967970993e9d68c7dd31913d93d0ee5488eb240544bd4a8e841cb54bcac847846098dc66a0468d47bea573239fd26583c
 EBUILD valgrind-3.20.0.ebuild 3952 BLAKE2B d60d14a52fd07b3deef8cfb9b909919bc4d495b5adacbaf676f6ff31f847ca1389e1b7b9cc1735dc2a54386e592bc90f60edadc61953302db616bb459913ba9b SHA512 71e4d9fe16ebee33d03e10c2933cf9a3ce4a49178560ae4e2a252d49df526ebf9fadb6477331e1e104f4b77e2fef5b3b862fe376f804f401f75253180701da5d
 EBUILD valgrind-9999.ebuild 4230 BLAKE2B e371ed0bfedc19162d814b3939e270405ccc68b49f59e40d92e237d692cfaa2f2fded8d3985887150da212d7f8594453eee70b861b1c057a242550d62903a2e8 SHA512 4d49d8ae018ddc0c0cfab9d30a135554eb31f59f01c4aa0b3b344fd02fae9f9b1cd5576ffdfe084ba894d2ee9c5842f8d5c7b821d093833458914b030712eb07
 MISC metadata.xml 1150 BLAKE2B 05b2508ff61ac0659472f75ab074a5f0cc82a3ead6e9bd6e779984bf11c8257afcadd5734b0c34defa5739f1eb0dadeb2168a448c0482848d8d7bf8b598d5dff SHA512 80841b7058fee9293b9bddeb4ed2b1d2b53b4957d43973d9d748e9797c5a5a4b50f7377d9e6bdf31cc1a0c87702327e02568a15e3e354f1fa6cf280eb439b317
diff --git a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
index 380fc17ef55f..4c27c1d3c9b1 100644
--- a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
@@ -15,7 +15,7 @@ else
 	inherit verify-sig
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${P}.tar.bz2.asc )"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 81d77a9b0b5f..84f02e409554 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/kodi-platform/Manifest b/media-libs/kodi-platform/Manifest
deleted file mode 100644
index 2fb405d89e4d..000000000000
--- a/media-libs/kodi-platform/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD kodi-platform-9999.ebuild 623 BLAKE2B 345edc3e460bbe3c5d599f11c4664bc824790684b1e2823b2988ac15c4b914c5dbec5668d102eaef163d336699ca5949fc55a8cf69b387a419780257d9ce5fff SHA512 74b534e39d9b6a71e1304967fcd6cf4c05690afb1a191f75d183dc1d1f334107cb8ab235500ebe2a405d0dc6e6ce8c0da7602f4253e673f86f8add53681c14d7
-MISC metadata.xml 442 BLAKE2B c815f820f21a29614831efbd8c17dd5f6f4cd82b3e7ad96c410e06b95e3eda355f156bd43641bb930b968564a1d69ec684ccd2e3d9b491a421fb5ed98717c46c SHA512 d046ca27ed33dc77baf5ded89312f68ac0f0016d12e781f2f9562c0921a132c360a29a1d014858cf77294610cce85272dcb60dd483de9e3523c0d4dddfac6710
diff --git a/media-libs/kodi-platform/kodi-platform-9999.ebuild b/media-libs/kodi-platform/kodi-platform-9999.ebuild
deleted file mode 100644
index 915fc52b5e0e..000000000000
--- a/media-libs/kodi-platform/kodi-platform-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	GIT_COMMIT="c8188d8"
-	SRC_URI="https://github.com/xbmc/${PN}/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-	S="${WORKDIR}/xbmc-kodi-platform-${GIT_COMMIT}"
-fi
-
-DESCRIPTION="Kodi platform support library"
-HOMEPAGE="https://kodi.tv"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	~media-tv/kodi-9999
-	=dev-libs/libplatform-2*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="${DEPEND}"
diff --git a/media-libs/kodi-platform/metadata.xml b/media-libs/kodi-platform/metadata.xml
deleted file mode 100644
index b6984ece99e1..000000000000
--- a/media-libs/kodi-platform/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>fordfrog@gentoo.org</email>
-		<name>Miroslav Šulc</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>candrews@gentoo.org</email>
-		<name>Craig Andrews</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">xbmc/kodi-platform</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 042a6171c03d..4aa369b4af7e 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,6 +1,8 @@
 DIST libjxl-0.7.0.tar.gz 1505917 BLAKE2B fd60e8fb1d7082deaaaf413395ac09e6096bb164ac1b2765a836e0bd3b96a8ac604c2e7631dd17d3eb1d9421c9460de13cede63c5786a5b0689cb858d7f5ec59 SHA512 c73039606acf7b2cbc331c6787af5167d711fd1af22bc616e1f478c531b087da82c98f2cb7e88c4d1f8bcfdc4e053ae0dc99cc9a811545b7f9658041489ed04b
 DIST libjxl-0.7.0_pre20220825.tar.gz 1505499 BLAKE2B 67b1f33112c85c8ccf1187cc44441f1afd6b5f11139f5b066092abe3dd2304e7ff8a8179fb1ef2a08982d2700ac757113019580c99abf37b3d701310f70861bf SHA512 13132dbe93d1b55cf878653803b01547b77152687aedd8ea07c162562f78965f74b5d96b82a434d2982962ad817096253a9447743e620cc72af0f1906a284b1d
+DIST libjxl-0.8.0.tar.gz 1611824 BLAKE2B e16fb51c7938be22754cad70ccab1e0e965b218993aa2fe9646b6b8958887b2e868bdc9631a9d3ff5c24ca1b02f9e262c4d531238d78a7d80f23ed5911a95b1e SHA512 ef472ddc5e277f3d41491c2acc03ed0152ec3ea87efb9e3320cfd830ceb383728658318444b06a3e9f8662bc11c0014675966572ce33f49c8e5cb13c5ed48de1
 EBUILD libjxl-0.7.0.ebuild 1749 BLAKE2B 6a5e9c06203a8cd0aa98b67f733d6ed75257f58056c58f342fe64d6656f23325fa8ae58fb70469e85750e158818acbbe5b2fc05c196add3a61cfaf504ca018c4 SHA512 01d24038f235d52591165dd500ddcce1e6454f02f7136ab63182440744a613d708c92534e8a63bdb62eac668d3aa3b47ffb4502c29dda9b1f061a98de70e0f48
 EBUILD libjxl-0.7.0_pre20220825.ebuild 1837 BLAKE2B 904e32dfd030184606f0b9fdc04e9a49315390ccf98cdb0e03fd457d95ad38f622a3808681c9caf541ed032d3d4f780c1b8c097169730d7042063b742ad0ccab SHA512 7ec4d6c0ccfe235cfd69752f4ab60fa640dfd2bd6a2e237ebba49675c6a7392a00f199f3c8ec719ca7c8b593ce166db04fb35c50b7b50fceaf4daded459288cc
-EBUILD libjxl-9999.ebuild 1750 BLAKE2B 7a82432b1a82fa2c224062b1b91a2d1c3444d4039940024d0a892fc2dcc044b5832f46bcbf4972ff1b294f0289aa5c7c6212abc5b28ac59f255c3b80de77995c SHA512 b98d2ab562b1d46df6194e1b0c7240fa2e2ff7527134cc80c3a7d80f998a770ea64a29fa08d1ab2ed1af5770b1c89a8512f9671e2e166de8901625546f90b35d
-MISC metadata.xml 668 BLAKE2B b9cd4d0f146c6d44b619a88ba63b3aeff87415ee1717a80f809da7caea0d3d595f9238f80d33502fcd5b85e294f9af837075547ebeb947d0888a151875eb679b SHA512 c634f5a110fc31e0f7379c37b53656f3af6f3c8f49937164adeea3f2facd1c9519369fc5f28cfb969e00abeb830209e4a986938ca275a33e77945906f235fabf
+EBUILD libjxl-0.8.0.ebuild 1754 BLAKE2B 51baf198642196eed58caa82547aadacf1f9a151f6980fba23c8e7364cd981cfdbefd03115d09994691f18517e601b878ec194cf54fed5ca6ef142bd5bdc32ea SHA512 a2642409fd28ff4b135a86b7690a6e5155c42822dabb24ee9f8b798cb5bd05bbd420afdf352fbe434aa3fd5cccedd3a0f0b97126296b28a98474c796b1616c5f
+EBUILD libjxl-9999.ebuild 1754 BLAKE2B 70993b339f80a0b82383520cbb756bd2513369eee33f8edc5b9d96ed0ad4ee58defd341a2c08f56597c9b7c6fcdd513ae557b5ce3747b1dfe7204baaf6693ed0 SHA512 2d45a5762f3bd9ba1b708939aed91550b444bf262d41f1f3f10a94e5b497277d52aa4b4945f6108892aebd51bda65485d5ce103c76d6401c579413a239d70439
+MISC metadata.xml 750 BLAKE2B d8bb075dd5e1e50d69380d7d6a54efe23fcf82fa16126d46767075b4fb718f3dde77c013e25aafb12dd42dda9cc702c76839172706100bf77a5bf3ac23b84932 SHA512 cc19188dd77ba5e5a752d151ac0e64e1bc2e61283d4ba90607f8d5d3e3945a430c869141f6f504c1551daee2d65990306200862a99b86aa2ada7048e833c2b5a
diff --git a/media-libs/libjxl/libjxl-0.8.0.ebuild b/media-libs/libjxl/libjxl-0.8.0.ebuild
new file mode 100644
index 000000000000..6c5ced59bf36
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.8.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="JPEG XL image format reference implementation"
+HOMEPAGE="https://github.com/libjxl/libjxl"
+SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="openexr"
+
+DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
+	media-libs/giflib:=[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:=[${MULTILIB_USEDEP}]
+	>=x11-misc/shared-mime-info-2.2
+	openexr? ( media-libs/openexr:= )
+"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	filter-lto
+
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		-DJPEGXL_ENABLE_BENCHMARK=OFF
+		-DJPEGXL_ENABLE_COVERAGE=OFF
+		-DJPEGXL_ENABLE_FUZZERS=OFF
+		-DJPEGXL_ENABLE_SJPEG=OFF
+		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+		-DJPEGXL_ENABLE_SKCMS=OFF
+		-DJPEGXL_ENABLE_VIEWERS=OFF
+		-DJPEGXL_ENABLE_PLUGINS=OFF
+		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_HWY=ON
+		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+		-DJPEGXL_ENABLE_DOXYGEN=OFF
+		-DJPEGXL_ENABLE_MANPAGES=OFF
+		-DJPEGXL_ENABLE_JNI=OFF
+		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
+		-DJPEGXL_ENABLE_TCMALLOC=OFF
+		-DJPEGXL_ENABLE_EXAMPLES=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=ON
+			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+		)
+	else
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=OFF
+			-DJPEGXL_ENABLE_OPENEXR=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index f8c37689216e..30362a1f1147 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,9 +18,8 @@ IUSE="gdk-pixbuf openexr"
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
 	media-libs/giflib:=[${MULTILIB_USEDEP}]
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
 	>=x11-misc/shared-mime-info-2.2
 	gdk-pixbuf? (
 		dev-libs/glib:2
@@ -48,6 +47,7 @@ multilib_src_configure() {
 		-DJPEGXL_ENABLE_DOXYGEN=OFF
 		-DJPEGXL_ENABLE_MANPAGES=OFF
 		-DJPEGXL_ENABLE_JNI=OFF
+		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
 		-DJPEGXL_ENABLE_TCMALLOC=OFF
 		-DJPEGXL_ENABLE_EXAMPLES=OFF
 	)
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
index 8ac778195a7c..1e3f2d5931e2 100644
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -17,4 +17,7 @@
   <use>
     <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag>
   </use>
+  <upstream>
+    <remote-id type="github">libjxl/libjxl</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index 49e5b4ad1bde..37114fb00647 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -2,5 +2,5 @@ AUX pulseaudio-16.1-memfd-cleanup.patch 988 BLAKE2B cbb25ef86099e1c13bd07c33c871
 AUX pulseaudio-16.1-proplist-util-without-gdkx.patch 1486 BLAKE2B 74b6ed59dff2ab4c62bab9e218874ff4da1d651f8ff80d715965b7be61323d77436851f6f2ffb9f8667c9ee918d6eca315fea3f6fe2670798f1ef6ed58728a3c SHA512 a5b5ac40083237ea0cd916506eb490891937affc1d69f81399a6a1f8f0782ebe9654641463ab33931add749282880ab415dbf0f89bd1a1d6a0f88f2845886d13
 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
 EBUILD libpulse-16.1-r1.ebuild 5779 BLAKE2B 4477cae3655af8ea4d2e0917cfe3fa4821f824affbefe77ee23f4d560e5c68bc1a8ac15c2fc94682311d466301afd0d9fea6e22e2cf4bf2016a1e1c090e876a9 SHA512 c4b40281466a4284128b5143c7e27ac30c198b562c79f1efe6c828ba9571d73d5d76c1821eda47fe8b6c978a14e15eeef9e0c5abce1cf71a300ad772886d58f4
-EBUILD libpulse-16.1-r2.ebuild 5900 BLAKE2B dc13f3ff1283b028d669fe123b4dbd10b3dfcfad7fa72d13b07a01db7d1be1a443b0c420384d60b0eb03dbaa930a635047d15c3aa0dfc58a2e4a75d79eab8bdd SHA512 63ab8492e1982a096a3450df26af4fb74697d5a70a20cb767a6e41ea96b02eb2fb9eec765bdb2b668605aaa171f613f2a577bc0e361b8cfa802259f592eeac1d
+EBUILD libpulse-16.1-r2.ebuild 5899 BLAKE2B fea4eb8a65cf64d7fa9eaf2416434fa1d5c5eb372242c80b7c65dac67e28a2d8d497d8591d8039b0be2df276df3c0e85bdc1ea3288259fad7afc1377dd8b5a4a SHA512 e93f119cf47b505049a4010b793890a2ad2496a9ed87c7dcfb42bc49e558fdf560a9a406abf102090dae3fa56cee7a7a9ce731f6384e65106f759f58944d239b
 MISC metadata.xml 925 BLAKE2B 00eb044359e5cbbaa5fdd085a76be9582c1142dc7334ebcfca531975961bbe35bd4d7a3b1f06e760126b0422614103480c1199128a908567dbe477af017f5ae7 SHA512 9c244a9725fa5acf9d1c3e869cd794d0d70dbe29126af877ea5918adf12c9ebfe87576c074db8126d168368ca93bb0e5577912780eb467377ef58d4cf44895bb
diff --git a/media-libs/libpulse/libpulse-16.1-r2.ebuild b/media-libs/libpulse/libpulse-16.1-r2.ebuild
index dd44a1b76d8a..af07b6423020 100644
--- a/media-libs/libpulse/libpulse-16.1-r2.ebuild
+++ b/media-libs/libpulse/libpulse-16.1-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
 else
 	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 7f2c7b0ce541..fd3e28f8178d 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/kodi-game-libretro-fceumm/Manifest b/media-plugins/kodi-game-libretro-fceumm/Manifest
deleted file mode 100644
index 8e5f743e6953..000000000000
--- a/media-plugins/kodi-game-libretro-fceumm/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD kodi-game-libretro-fceumm-9999.ebuild 944 BLAKE2B 9f7acd81843ac562314f7d4b9b9c7fba233dd186bda211ab2ac4b6c580fe17efc887a09084688c03ddf3f47d22d29415dd313eca198fdc3cd7b3c9294c192557 SHA512 fcd36274c9988067c91c04db7e5af639e810f9e63aff02e8fa21fc9ca7f1ad69b0d228794834375133213e84238cf58609b232053c4c6e70069f840a3f7cdf9e
-MISC metadata.xml 374 BLAKE2B 5cfcedee20361bda70de1ae764e47ac6baa10342657b6b348f37ff73d690498f70a688239e9e034219529e0ba4cf9f5437e1433a2db1e7ecd80a9292e096a02a SHA512 fc27fc4169c236a782f4d90f9b45dc7265641d6e26fb14db20cbd499e0f862f4cadc7e82070c4de94ffeb4229d3325a590a8a5a25c02e71b21e9f77a3ac1dd5a
diff --git a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
deleted file mode 100644
index 15cdc8d1cdd1..000000000000
--- a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="FCEU-Next GameClient for Kodi"
-HOMEPAGE="https://github.com/kodi-game/game.libretro.fceumm"
-SRC_URI=""
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.fceumm.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/kodi-game/game.libretro.fceumm/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro.fceumm-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	~media-tv/kodi-9999
-	games-emulation/libretro-fceumm
-	"
-RDEPEND="
-	media-plugins/kodi-game-libretro
-	${DEPEND}
-	"
-src_prepare() {
-	echo 'find_library(FCEUMM_LIB NAMES fceumm_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-fceumm.cmake" || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-game-libretro-fceumm/metadata.xml b/media-plugins/kodi-game-libretro-fceumm/metadata.xml
deleted file mode 100644
index 4561ef25bf73..000000000000
--- a/media-plugins/kodi-game-libretro-fceumm/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>candrews@gentoo.org</email>
-        <name>Craig Andrews</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">kodi-game/game.libretro.fceumm</remote-id>
-    </upstream>
-</pkgmetadata>
diff --git a/media-plugins/kodi-peripheral-steamcontroller/Manifest b/media-plugins/kodi-peripheral-steamcontroller/Manifest
deleted file mode 100644
index be4829720da4..000000000000
--- a/media-plugins/kodi-peripheral-steamcontroller/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD kodi-peripheral-steamcontroller-9999.ebuild 719 BLAKE2B 183342b602c26a920b24c720d071b0cfc432cf176669e937a2d722f28c5408ea488a3e1ad913e4acba881582323ed38c39476b9ec7bb34cc3300aaad7cafe56f SHA512 b57a0956fac767c6aacb20e0a80609fc8bf3134292f297d852870add52edea3984d7daf696d6580d21e6586e7e6150e7245ed53e725242dc834f3a2c44e908b8
-MISC metadata.xml 380 BLAKE2B 4d0d371cc90c6d2aa558624a017a5237cfa5ca250db41b94540dba492e5974068650558d0579140b6d1593d4007baa5f5c2accb09511ba498e19a79d97ca10e1 SHA512 7cd2f05cc4a379cb239c71fce7208228eb5948409f79ada2cac1d4bc2ee97f2dba08eb8e276cfd53a216464193419401d5d3875852585d04c39726965aff43e6
diff --git a/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild b/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
deleted file mode 100644
index f2e187f4215c..000000000000
--- a/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Steam controller driver for Kodi"
-HOMEPAGE="https://github.com/kodi-game/peripheral.steamcontroller"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-game/peripheral.steamcontroller.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-game/peripheral.steamcontroller/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/peripheral.steamcontroller-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	~media-tv/kodi-9999
-	=dev-libs/libplatform-2*
-	virtual/libusb:1
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-peripheral-steamcontroller/metadata.xml b/media-plugins/kodi-peripheral-steamcontroller/metadata.xml
deleted file mode 100644
index c49e7d5e3699..000000000000
--- a/media-plugins/kodi-peripheral-steamcontroller/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>candrews@gentoo.org</email>
-        <name>Craig Andrews</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">kodi-game/peripheral.steamcontroller</remote-id>
-    </upstream>
-</pkgmetadata>
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 359e406787a7..3073649fa443 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index ad2b13de662a..4bf50bab15a8 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,7 +1,5 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-55-makefile.patch 564 BLAKE2B fb483ef0182b5bed5131a2915204c1a564ac31acef1faaa780804a46f3d23717d3af8222702b3d6846fdccf2a7370546d6f586add8a42a3fa2bff130b9c9b9f7 SHA512 e37d9bdec42df1abff6be2ffe80d4b46838d451e015a0d557f387922dddd54718733353e7f5cb198bf4d56b45754a933657a182b8420b81770fc5e2435719b6d
-DIST din-55.tar.gz 3711327 BLAKE2B 2c6ba4a877c512a950fb7c731f20d285019da1c7cd4ab5c7ff8d75e3c25eaa4ea08ca865b37e12fa1cefc1175baaa1c7ce27a44c7fa7c0b6c59b0ccbf6ab7a39 SHA512 432a53e71d1cf96c9ed62694fb23d1264d2e80b34620ebf0f1f33f3d4787cc7358c42038b2a45aa9d3ba9f59828eaaebd521a046fd5a51919a13f1bffad16a22
 DIST din-56.tar.gz 3716779 BLAKE2B 3fc2af445ef5cfa7a3ec56f841e62baf1832573a0ef085855f2f875961e8be24d43881c3394a39dbc5c3524a1d1c0033ac57ffa0b5487cadc1a189f9f49108b4 SHA512 2e3e985abec9f0f097d51fb4cff5e991c5f80091586c0a4c47533c623dc9c13bae6b7f8a3d18bed1fc150e6527482b4ae03a9d1d9c444ae92b88204892ce7e04
-EBUILD din-55.ebuild 1083 BLAKE2B 005a89e65bbcb9dfadd2cb706847700f3408741b72b19417d54d6c77876af4594994999d3a67be207231fac9362d1e68bc6d3f98a04a2325549bce3af81f6aa0 SHA512 ce85c7e29d1fa3d0d3d3fbd7e4410601faea27f7902fbe63abaf0c6983a7c1cae82b3514b17d91541d8d450a1894bbff377c9e9a3e48ecd41056d1bc504c6ca6
 EBUILD din-56.ebuild 1087 BLAKE2B 300260c74a6720e91dbadff855669dc4fa7325b6fd3a0d28ed528bba528b62fb69510ff11ede9b79d722330fdbf3037573401b7089fc5bb12655c1f0a12fc8b3 SHA512 3b397eca6e68d7948aa4b4d17efccb5f25790dded0605fb733545fc76afd93fb476824475b8816916d282d732098e1cb5c00f10a052e5fdb18bddc8d2eafffe3
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-55.ebuild b/media-sound/din/din-55.ebuild
deleted file mode 100644
index 13c24db52183..000000000000
--- a/media-sound/din/din-55.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools edos2unix xdg
-
-DESCRIPTION="a software musical instrument and audio synthesizer"
-HOMEPAGE="https://dinisnoise.org/"
-SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa jack"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	media-libs/libsdl:=
-	virtual/glu
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="|| ( alsa jack )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
-)
-
-src_prepare() {
-	default
-
-	edos2unix pixmaps/${PN}.desktop
-
-	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
-
-	eautoreconf
-}
-
-src_configure() {
-	# Jack takes over alsa.
-	local sound_engine
-
-	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
-
-	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
-}
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index c1debe92a05e..355e5f99bba5 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -1,3 +1,5 @@
 DIST wildmidi-0.4.4.tar.gz 197597 BLAKE2B 5f5b11bec70b24b4798ac39d4d30420916609f3d65497ef88b48ef292f41d0cc81cc8d9c8c47ffc68705d6297a9ce55ef5d7ebdf63f8c18b8b0f7982c1f60bfc SHA512 5b74ee83f1d7ce3b45d2f996aaa30ec6e7d7808eab294a3eaf6fcef77443523df1f54bb0fb1b3105edd0d72d75885fda1a2e97c68defb5bbd687bda5077d3454
+DIST wildmidi-0.4.5.tar.gz 197793 BLAKE2B a0b43e19b4e4ced6c4f536dd5e1ac313acd26ad0c3c9deed7068181666a175f4dfdf5cb522d70fdaf0636cc4b3b1af3cedfda54a6c048b05e828a4d1ad185b77 SHA512 0229914ecc60091b649b790a82ad5e755a2b9dfab7443fb3e3c19f4ae64b82817cafe74d78c27f05c68c3c8fb30092c96da732d27ff82fbd7dd7d577facc23d6
 EBUILD wildmidi-0.4.4.ebuild 1336 BLAKE2B d1b2d9392b262a951cb0b4a2dd6b280d36f15740ff7887a44325b81df1887b8de9986ce46fd1b68596f4fc1d512daed52e17c70346d067cb0f2e1ad8352ad056 SHA512 391ebda5d942f1d18f0d150ca8a2d9829c7c712ebd70b3aa50715a8a2d64bda85601758cf7f6c481dbfe47cb94de40e8f4d18d56cf586eeb7ac4eb53903d459d
+EBUILD wildmidi-0.4.5.ebuild 1341 BLAKE2B 9816644c2f59b23dc6bac760354897977462a0d9c512a225f6d299994bf3e86ba9ee557ac539eb57c7fc4a8858b5c6c936437ff81716710cf1db02bbf3ba63e1 SHA512 1279aa41ad17ce3cd8038687e4227ec2d8b775849ed85e35b5985d844d10a3ddace3f95566120ae116404aaddda62e23eb74147d5ab9f4752424f102f47bdf99
 MISC metadata.xml 615 BLAKE2B eb837a7dd6cf235acea9926300c47dd55fbca6d9b394f0cdac3736c06e355286e803d02545ebd56f39b54fbc2ecb4c9bf23b81d396f52501d3706d509d56857d SHA512 3ee62effc4b078da0f1bafde9dc70d10c237bf621f5ef74ad0ef5c50b302e5080cddd5b8fbdf2226e74dbb29686db21c584f1333d35621209c4c9b9d7acfbb47
diff --git a/media-sound/wildmidi/wildmidi-0.4.5.ebuild b/media-sound/wildmidi/wildmidi-0.4.5.ebuild
new file mode 100644
index 000000000000..a5a398d0f3c0
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.4.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake readme.gentoo-r1
+
+DESCRIPTION="MIDI processing library and player using the GUS patch set"
+HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
+SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+alsa openal oss +player"
+
+DEPEND="
+	player? (
+		alsa? ( media-libs/alsa-lib )
+		openal? ( media-libs/openal )
+	)
+"
+RDEPEND="${DEPEND}
+	media-sound/timidity-freepats
+"
+
+REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
+
+DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
+	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
+	For more information please read the ${PN}.cfg manpage."
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	cmake_src_prepare
+	# Fix location of media-sound/timidity-freepats
+	# See #749759
+	sed -i -e "s:midi/freepats:timidity/freepats:" cfg/wildmidi.cfg || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_OPENAL=$(usex openal)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PLAYER=$(usex player)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/${PN}/
+	doins cfg/wildmidi.cfg
+
+	readme.gentoo_create_doc
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ef03efc896a2..02584346b633 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d5d3e9423d76..d90ca006b5f5 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 27 Jan 2023 06:39:47 +0000
+Fri, 27 Jan 2023 12:39:49 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 6a2bc5f9fa9f..6c5a82af5ccc 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-01-27T06:39:52Z
+TIMESTAMP 2023-01-27T12:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPTcbhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPTxhhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA7AQ/8CCaueSIO4vyxW4+p0OdCbGmhG/FOqZycRKiecTPujykq8ruMXR+ZVPF3
-DPgcuMjZL1rtaNWw4w32rrMYBnfGbBlaUGYwE36LGntpPp5KwFGMkO8lJkhJOR7b
-YOV7DfJXQ5QTf9aFJq55AMisQvkSwnsmOvVxVyKNFYm3W1c+DR4W0LK5si7Ik50G
-PP3+69uraxS3f/Fo15G1dRwkq4Ee3xpGYqbTY+8H3m/ZHYPvsNY2pthLa0i6OqoY
-7jL5qMvWQ8NdqPLuYEMJysMFynnnM4zMnhgh4D2RNfNPhjht07VkiAVdxr4Jscne
-FNaI3JZFEed+BmGjgKLPjnOq47zfvVm+X6thNKWWLSM7sBqRJiXDK2APciYDio2x
-cIFkhEp3bTnF9TeneU/9h6aj8kZKemgol3ctlMHkR/yxwgQWFknPLtY/XztSREkE
-dAaLengruNsA7VhTf2Op/9G2TlZGG1haQ2MCB9vGCvxuKvzLzxv5ybGI63WXidiT
-ZmuBNQSeGv3IMHbVD2fijQF1Ituok0ufmkPT5PPNKvQvIDuQM3BzPPyC5aJ5Ug7+
-TNNJeNQFGspmDEqsrrXcbCVelK854vxSAjzexIawBackyZi3dhgQ9ap5QrNumNa9
-xjdx2KXoCZuTlG1ipWdDSyWLg8IRzhm40eR4n9FcR5mUi0mEcQ8=
-=dtf9
+klB6qxAAtSxaN+n998PMSY/Uk0yZue83aU+xFL0PxoQBoG3Rpvy1o7Dg9NfG2zRi
+MVCstG8Vij67RvB7qyw1qdT1N5dveurytjQQZjAOjbNzk5x5DRaqyZ6WzO6WkiFz
+z3NyziBFOYkT/2eiNmGoZDP0VPdmyH3Drq5zRVUgoWSWl9+ruNX1HHk4FfpYWL9e
+heBVgLMRZF1E0aJ3gbOpLklPPOI1FbJCvVAZhpurEUDWlYI6MpayVmTF9lUafpu4
+KEeMijcEbXR9haF+tIsFES3EVRpnM8PLCbJdogfOU6vIQFRZBRIA5dGM5DZzzJYB
+vvcuIc7+Cys6u6H5yoMY+ArqXuEBunYEs0bAtisbYOdKSIPbzFckhcfyJTG4IDHr
+NvmwDIhl7gXm201q2vskAD0UrM3DjPNhsfGl+9qXey7iU9QXeam7mgNgEKwKgt/s
+lDtRUoHP7g8oS9dm2BcJwUDzl/BS5wR43ZovTZaFxOkBlFtHKlFcWN9LOJCp1T3H
+TsSPt0RmdJmJiUfml1/Z3oxvp7vZdnin30Jx3LrzuUr3ftmTE5NZJiZpk3w9MoB8
+yjyZXqCDoeVJUJxJ65py5QRD7BZwHEg43UWDUmVE+zin31xURgNaajp8OuZvivWE
+jwpvYe01zcf6V61GDin1lSErVTyrlJqZtYTLbxJ5IGzhOSA8uKc=
+=wsc9
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e5570ab789ad..9393ddaa71f0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 27 Jan 2023 06:39:48 +0000
+Fri, 27 Jan 2023 12:39:50 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index aeb5facb930b..547948f11292 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 cecb72d5be93..e12f0c8cfd10 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/awscli-1.27.45 b/metadata/md5-cache/app-admin/awscli-1.27.45
deleted file mode 100644
index 0bc55aa505af..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.45
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.45[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.45[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.45.tar.gz -> aws-cli-1.27.45.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=54abcad61904cce6140192c167c33535
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.50 b/metadata/md5-cache/app-admin/awscli-1.27.50
index 41e6e49302e4..438366db954e 100644
--- a/metadata/md5-cache/app-admin/awscli-1.27.50
+++ b/metadata/md5-cache/app-admin/awscli-1.27.50
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
 INHERIT=bash-completion-r1 distutils-r1 multiprocessing
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.29.50[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.27.50.tar.gz -> aws-cli-1.27.50.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=49e74325243b7907e30dd121cb06f7f4
+_md5_=54abcad61904cce6140192c167c33535
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.52 b/metadata/md5-cache/app-admin/awscli-1.27.52
deleted file mode 100644
index 591ad84d6407..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.52
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.52[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.52[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.52.tar.gz -> aws-cli-1.27.52.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.53 b/metadata/md5-cache/app-admin/awscli-1.27.53
deleted file mode 100644
index 91249da79040..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.53
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.53[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.53[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.53.tar.gz -> aws-cli-1.27.53.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.55 b/metadata/md5-cache/app-admin/awscli-1.27.55
deleted file mode 100644
index 2b2565621dc0..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.55
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.55[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.55[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.55.tar.gz -> aws-cli-1.27.55.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.56 b/metadata/md5-cache/app-admin/awscli-1.27.58
index 7d0c9cf8adb3..589706ec5038 100644
--- a/metadata/md5-cache/app-admin/awscli-1.27.56
+++ b/metadata/md5-cache/app-admin/awscli-1.27.58
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.56[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.58[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Universal Command Line Environment for AWS
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=bash-completion-r1 distutils-r1 multiprocessing
 IUSE=test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.56[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+RDEPEND=>=dev-python/botocore-1.29.58[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.56.tar.gz -> aws-cli-1.27.56.gh.tar.gz
+SRC_URI=https://github.com/aws/aws-cli/archive/1.27.58.tar.gz -> aws-cli-1.27.58.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 8448ba7cbe5f..b1da2af689ac 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/ccid-1.5.0 b/metadata/md5-cache/app-crypt/ccid-1.5.0
index 26cf114ffd57..3bc23d06c19c 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.5.0
+++ b/metadata/md5-cache/app-crypt/ccid-1.5.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID
 INHERIT=toolchain-funcs udev
 IUSE=twinserial kobil-midentity +usb
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
 SLOT=0
 SRC_URI=https://ccid.apdu.fr/files/ccid-1.5.0.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b0c4a12a93f0aed06f6f49affd37e3b2
+_md5_=1e8ec6e2af961b4f0d266a19c3f3d6d5
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 9442b3f48362..42636ab61d07 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/kicad-doc-5.1.12 b/metadata/md5-cache/app-doc/kicad-doc-5.1.12
deleted file mode 100644
index 44b384cfa11b..000000000000
--- a/metadata/md5-cache/app-doc/kicad-doc-5.1.12
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-text/asciidoc-8.6.9 >=app-text/dblatex-0.3.10 >=app-text/po4a-0.45 >=sys-devel/gettext-0.18 dev-perl/Unicode-LineBreak dev-util/source-highlight l10n_ca? ( dev-texlive/texlive-langspanish ) l10n_de? ( dev-texlive/texlive-langgerman ) l10n_en? ( dev-texlive/texlive-langenglish ) l10n_es? ( dev-texlive/texlive-langspanish ) l10n_fr? ( dev-texlive/texlive-langfrench ) l10n_it? ( dev-texlive/texlive-langitalian ) l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic ) l10n_pl? ( dev-texlive/texlive-langpolish ) l10n_ru? ( dev-texlive/texlive-langcyrillic ) l10n_zh? ( dev-texlive/texlive-langchinese ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools manuals
-EAPI=7
-HOMEPAGE=https://docs.kicad.org/
-INHERIT=cmake
-IUSE=html +pdf l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
-REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh )
-SLOT=0
-SRC_URI=https://gitlab.com/kicad/services/kicad-doc/-/archive/5.1.12/kicad-doc-5.1.12.tar.bz2
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=82ca2b4dc0caa3be42560a50f67c0b1d
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index eda97564cd94..0d15421b97bc 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-awk-0.4 b/metadata/md5-cache/app-eselect/eselect-awk-0.4
deleted file mode 100644
index cd48aa895892..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-awk-0.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages the {,/usr}/bin/awk symlink
-EAPI=8
-HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-awk.git/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/eselect-awk.git/snapshot/eselect-awk-0.4.tar.bz2
-_md5_=eaeb7b8a42b9688b4c7bfd6c50669c86
diff --git a/metadata/md5-cache/app-eselect/eselect-sh-0.4.1 b/metadata/md5-cache/app-eselect/eselect-sh-0.4.1
deleted file mode 100644
index d96ebfbaee7d..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-sh-0.4.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages the /bin/sh (POSIX shell) symlink
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-eselect/eselect-lib-bin-symlink
-SLOT=0
-_md5_=6e349a66ae2cbda9173d84cc5a5a2b4f
diff --git a/metadata/md5-cache/app-eselect/eselect-sh-0.5.0 b/metadata/md5-cache/app-eselect/eselect-sh-0.5.0
deleted file mode 100644
index 77deb26c7739..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-sh-0.5.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages the /bin/sh (POSIX shell) symlink
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-eselect/eselect-lib-bin-symlink
-SLOT=0
-_md5_=e314d84ec4437c15a51257a80e47b0d2
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 711170255c26..8bbf8d0ab5d5 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/rdfind-1.5.0-r1 b/metadata/md5-cache/app-misc/rdfind-1.5.0-r1
new file mode 100644
index 000000000000..cd350a435e88
--- /dev/null
+++ b/metadata/md5-cache/app-misc/rdfind-1.5.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/autoconf-archive 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 test
+DEPEND=dev-libs/nettle:=
+DESCRIPTION=Find duplicate files based on their content
+EAPI=8
+HOMEPAGE=https://github.com/pauldreik/rdfind
+INHERIT=autotools
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=dev-libs/nettle:=
+SLOT=0
+SRC_URI=https://github.com/pauldreik/rdfind/archive/releases/1.5.0.tar.gz -> rdfind-1.5.0.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=978791e34e132a7bfa66d085ad653706
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 48c0adcbcfa6..b6c6f4a16f09 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/gander-0.0.1-r2 b/metadata/md5-cache/app-portage/gander-0.0.1-r2
deleted file mode 100644
index 7f853752bd30..000000000000
--- a/metadata/md5-cache/app-portage/gander-0.0.1-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/responses[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/portage[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Statistic submission client for Goose (anser.gentoo.org)
-EAPI=8
-HOMEPAGE=https://github.com/projg2/gander/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/portage[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/gander/archive/v0.0.1.tar.gz -> gander-0.0.1.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=928cd935b8d494e545c87e6cb6149239
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 67ab581bb6ce..b0442f43b5d0 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/dash-0.5.12 b/metadata/md5-cache/app-shells/dash-0.5.12
index 7f76a7f04bf1..cc116aed8fd5 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.12
+++ b/metadata/md5-cache/app-shells/dash-0.5.12
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=libedit static
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
 SLOT=0
 SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.12.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=45f68252bfe65b27b5b16eac6db79933
+_md5_=caa686888fae5aa1c9927591d9850361
diff --git a/metadata/md5-cache/app-shells/zsh-5.9-r3 b/metadata/md5-cache/app-shells/zsh-5.9-r3
index d0901494cd5d..d53ca301cb8b 100644
--- a/metadata/md5-cache/app-shells/zsh-5.9-r3
+++ b/metadata/md5-cache/app-shells/zsh-5.9-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.zsh.org/
 INHERIT=autotools flag-o-matic prefix
 IUSE=caps debug doc examples gdbm maildir pcre static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= static? ( sys-libs/gdbm:=[static-libs] ) )
 SLOT=0
 SRC_URI=https://www.zsh.org/pub/zsh-5.9.tar.xz https://www.zsh.org/pub/old/zsh-5.9.tar.xz mirror://sourceforge/zsh/zsh-5.9.tar.xz doc? ( https://www.zsh.org/pub/zsh-5.9-doc.tar.xz mirror://sourceforge/zsh/zsh-5.9-doc.tar.xz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7c348b8f84eaa333b098b8b68816dfb4
+_md5_=3d179e6de4148ef5942964cfebcb4733
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 01a6b4076233..9163f3756042 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r5 b/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r5
deleted file mode 100644
index 84d88d6e1a6a..000000000000
--- a/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/zlib:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:*[server] )
-DESCRIPTION=Benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL
-EAPI=8
-HOMEPAGE=http://vegan.net/tony/supersmack/
-INHERIT=autotools flag-o-matic
-IUSE=+mysql postgres
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:*[server] ) mysql? ( virtual/mysql )
-REQUIRED_USE=|| ( mysql postgres )
-SLOT=0
-SRC_URI=mirror://gentoo/super-smack-1.3.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=064d99e4d164f587424984abecabf365
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index ba4975dcc8eb..050a83f52fcc 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.3.1 b/metadata/md5-cache/dev-java/commons-daemon-1.3.1
deleted file mode 100644
index bd6b9884e21b..000000000000
--- a/metadata/md5-cache/dev-java/commons-daemon-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tools to allow Java programs to run as UNIX daemons
-EAPI=8
-HOMEPAGE=https://commons.apache.org/proper/commons-daemon/
-INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.3.1-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=db88c7c9f555aa3cdba26ce17daf383d
diff --git a/metadata/md5-cache/dev-java/felix-framework-7.0.5 b/metadata/md5-cache/dev-java/felix-framework-7.0.5-r1
index bdd4d1d9fb5e..b6ebaa1cb6d5 100644
--- a/metadata/md5-cache/dev-java/felix-framework-7.0.5
+++ b/metadata/md5-cache/dev-java/felix-framework-7.0.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* dev-java/animal-sniffer-annotations:0 dev-java/osgi-annotation:0 dev-java/felix-resolver:0 test? ( dev-java/asm:4 dev-java/easymock:2.5 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-11:* dev-java/animal-sniffer-annotations:0 dev-java/osgi-annotation:0 dev-java/felix-resolver:0 test? ( dev-java/asm:9 dev-java/easymock:2.5 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=Implementation of the OSGi R8 core framework specification
 EAPI=8
 HOMEPAGE=https://felix.apache.org/documentation/subprojects/apache-felix-framework.html
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz -> felix-framework-7.0.5.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=88ce9f14fb929912d79a3c6d7ffa8962
+_md5_=49595e311a7193698e526e1948b54bb9
diff --git a/metadata/md5-cache/dev-java/fontbox-2.0.26 b/metadata/md5-cache/dev-java/fontbox-2.0.26
deleted file mode 100644
index 10ef35605fe2..000000000000
--- a/metadata/md5-cache/dev-java/fontbox-2.0.26
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/commons-logging:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=An open source Java library for parsing font files
-EAPI=8
-HOMEPAGE=https://pdfbox.apache.org/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf https://issues.apache.org/jira/secure/attachment/13036376/NotoSansSC-Regular.otf http://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb )
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=b58b190b0f9b9bbe1a1796dfb832ea3f
diff --git a/metadata/md5-cache/dev-java/jol-core-0.16 b/metadata/md5-cache/dev-java/jol-core-0.16-r1
index 5f988f1163cc..be1e4ced022a 100644
--- a/metadata/md5-cache/dev-java/jol-core-0.16
+++ b/metadata/md5-cache/dev-java/jol-core-0.16-r1
@@ -1,8 +1,8 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/asm:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/asm:9 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=Java Object Layout: Core
 EAPI=8
-HOMEPAGE=https://openjdk.java.net/projects/code-tools/jol/
+HOMEPAGE=https://openjdk.org/projects/code-tools/jol/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
@@ -10,6 +10,6 @@ LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/openjdk/jol/archive/refs/tags/0.16.tar.gz -> jol-0.16.tar.gz
+SRC_URI=https://github.com/openjdk/jol/archive/0.16.tar.gz -> jol-0.16.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=f1293deef1eb2b45257a37d77a13a82b
+_md5_=44c3b43f7d481c5f616d3b26b4ea5dba
diff --git a/metadata/md5-cache/dev-java/log4j-12-api-2.18.0 b/metadata/md5-cache/dev-java/log4j-12-api-2.18.0
deleted file mode 100644
index 905f2832ab0a..000000000000
--- a/metadata/md5-cache/dev-java/log4j-12-api-2.18.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/log4j-api-2.18.0:2 ~dev-java/log4j-core-2.18.0:2 >=virtual/jdk-1.8:* dev-java/javax-jms-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=The Apache Log4j 1.x Compatibility API
-EAPI=8
-HOMEPAGE=https://logging.apache.org/log4j/2.x/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-java/log4j-api-2.18.0:2 ~dev-java/log4j-core-2.18.0:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=cdbc38627aeb835b6e7f80201a450121
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.18.0 b/metadata/md5-cache/dev-java/log4j-api-2.18.0
deleted file mode 100644
index 20e95d37f573..000000000000
--- a/metadata/md5-cache/dev-java/log4j-api-2.18.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=The Apache Log4j API
-EAPI=8
-HOMEPAGE=https://logging.apache.org/log4j/2.x/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=84d921652dad00e91d385178a8069a1b
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.18.0-r1 b/metadata/md5-cache/dev-java/log4j-core-2.18.0-r1
deleted file mode 100644
index b5e76088a55f..000000000000
--- a/metadata/md5-cache/dev-java/log4j-core-2.18.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:3 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.18.0:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 dev-java/jakarta-activation-api:1 dev-java/jakarta-mail-api:0 dev-java/javax-jms-api:0 dev-java/osgi-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=The Apache Log4j Implementation
-EAPI=8
-HOMEPAGE=https://logging.apache.org/log4j/2.x/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:3 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.18.0:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/logging/log4j/2.18.0/apache-log4j-2.18.0-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=6cfbc3a0d21783ff87d87f69827568b0
diff --git a/metadata/md5-cache/dev-java/pdfbox-2.0.26 b/metadata/md5-cache/dev-java/pdfbox-2.0.26
deleted file mode 100644
index 33bc10432d9f..000000000000
--- a/metadata/md5-cache/dev-java/pdfbox-2.0.26
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java/fontbox-2.0.26:0 >=virtual/jdk-1.8:* test? ( dev-java/jai-imageio-core:0 dev-java/jai-imageio-jpeg2000:0 dev-java/java-diff-utils:0 dev-java/jbig2-imageio:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Java library and utilities for working with PDF documents
-EAPI=8
-HOMEPAGE=https://pdfbox.apache.org/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=+tools doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=Apache-2.0
-PROPERTIES=test_network
-RDEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java/fontbox-2.0.26:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12481683/1.pdf -> PDFBOX-1031-1.pdf https://issues.apache.org/jira/secure/attachment/12481684/2.pdf -> PDFBOX-1031-2.pdf https://issues.apache.org/jira/secure/attachment/12486525/1_testfile1.pdf -> PDFBOX-1065-1.pdf https://issues.apache.org/jira/secure/attachment/12486526/2_testfile1.pdf -> PDFBOX-1065-2.pdf https://issues.apache.org/jira/secure/attachment/12490774/a.pdf -> PDFBOX-1100-1.pdf https://issues.apache.org/jira/secure/attachment/12490775/b.pdf -> PDFBOX-1100-2.pdf https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf -> PDFBOX-3656.pdf https://issues.apache.org/jira/secure/attachment/12852207/test.pdf -> PDFBOX-3682.pdf https://issues.apache.org/jira/secure/attachment/12888957/079977.pdf -> PDFBOX-3940-079977.pdf https://issues.apache.org/jira/secure/attachment/12867113/202097.pdf -> PDFBOX-3785-202097.pdf https://issues.apache.org/jira/secure/attachment/12890031/670064.pdf -> PDFBOX-3947-670064.pdf https://issues.apache.org/jira/secure/attachment/12890034/EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf -> PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf https://issues.apache.org/jira/secure/attachment/12890037/MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf -> PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf https://issues.apache.org/jira/secure/attachment/12890042/23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf -> PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf https://issues.apache.org/jira/secure/attachment/12890047/FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf -> PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf https://issues.apache.org/jira/secure/attachment/12892097/c687766d68ac766be3f02aaec5e0d713_2.pdf -> PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf https://issues.apache.org/jira/secure/attachment/12893582/63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf -> PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf https://issues.apache.org/jira/secure/attachment/12896905/GeneralForbearance.pdf -> PDFBOX-3999-GeneralForbearance.pdf https://issues.apache.org/jira/secure/attachment/12919726/sample.pdf -> PDFBOX-4197.pdf https://issues.apache.org/jira/secure/attachment/12938094/Quelldatei.pdf -> PDFBOX-4308.pdf https://issues.apache.org/jira/secure/attachment/12952086/form.pdf -> PDFBOX-4408.pdf https://issues.apache.org/jira/secure/attachment/12953423/000314.pdf -> PDFBOX-4418-000314.pdf https://issues.apache.org/jira/secure/attachment/12953421/000671.pdf -> PDFBOX-4418-000671.pdf https://issues.apache.org/jira/secure/attachment/12953866/000746.pdf -> PDFBOX-4423-000746.pdf https://issues.apache.org/jira/secure/attachment/12966453/cryptfilter.pdf -> PDFBOX-4517-cryptfilter.pdf https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf -> PDFBOX-4750.pdf https://issues.apache.org/jira/secure/attachment/12914331/WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf -> PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf https://issues.apache.org/jira/secure/attachment/12962991/NeS1078.pdf -> PDFBOX-4490.pdf https://issues.apache.org/jira/secure/attachment/12784025/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf https://issues.apache.org/jira/secure/attachment/12867102/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf https://issues.apache.org/jira/secure/attachment/12929821/16bit.png -> PDFBOX-4184-16bit.png https://issues.apache.org/jira/secure/attachment/12943502/ArrayIndexOutOfBoundsException%20COSParser -> PDFBOX-4338.pdf https://issues.apache.org/jira/secure/attachment/12943503/NullPointerException%20COSParser -> PDFBOX-4339.pdf https://issues.apache.org/jira/secure/attachment/12867433/genko_oc_shiryo1.pdf https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip https://moji.or.jp/wp-content/ipafont/IPAfont/ipagp00303.zip https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg https://issues.apache.org/jira/secure/attachment/13002695/13._Korona_szallo_vegzes_13.09.26.eredeti.pdf -> PDFBOX-4831.pdf )
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=3da08fe6e54ca567a52fc43ccf8a948f
diff --git a/metadata/md5-cache/dev-java/xmpbox-2.0.26 b/metadata/md5-cache/dev-java/xmpbox-2.0.26
deleted file mode 100644
index 0bcbdfd27eab..000000000000
--- a/metadata/md5-cache/dev-java/xmpbox-2.0.26
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jaxb-api:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=An open source Java tool that implements Adobe's XMP(TM) specification
-EAPI=8
-HOMEPAGE=https://pdfbox.apache.org
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jaxb-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/pdfbox/2.0.26/pdfbox-2.0.26-src.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=aa62712e703d5c934864b83d0df26de7
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4898ed337e22..1e3dc46dc913 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/crossguid-0.2.2_p20190529 b/metadata/md5-cache/dev-libs/crossguid-0.2.2_p20190529
new file mode 100644
index 000000000000..9cc835c6feda
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/crossguid-0.2.2_p20190529
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-apps/util-linux
+DESCRIPTION=Lightweight cross platform C++ GUID/UUID library
+EAPI=8
+HOMEPAGE=https://github.com/graeme-hill/crossguid
+INHERIT=edo cmake
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=sys-apps/util-linux
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/graeme-hill/crossguid/archive/ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz -> crossguid-0.2.2_p20190529.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b6a8d757c73c4b8ccaa349b196c28562
diff --git a/metadata/md5-cache/dev-libs/gmp-6.2.1-r5 b/metadata/md5-cache/dev-libs/gmp-6.2.1-r5
index a60112a17d81..05e79a13e035 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.2.1-r5
+++ b/metadata/md5-cache/dev-libs/gmp-6.2.1-r5
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gmplib.org/
 INHERIT=gnuconfig libtool multilib-minimal toolchain-funcs
 IUSE=+asm doc +cpudetection +cxx pic static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3+ GPL-2+ )
 REQUIRED_USE=cpudetection? ( asm )
 RESTRICT=!cpudetection? ( bindist )
 SLOT=0/10.4
 SRC_URI=https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz mirror://gnu/gmp/gmp-6.2.1.tar.xz doc? ( https://gmplib.org/gmp-man-6.2.1.pdf ) https://dev.gentoo.org/~sam/distfiles/dev-libs/gmp/gmp-6.2.1-arm64-darwin.patch.bz2
 _eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=2f65854d740cd82d271227a6197c40c8
+_md5_=977801bfc7f1a7eccb0e9e3daf1c6f83
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.6 b/metadata/md5-cache/dev-libs/libclc-15.0.6
deleted file mode 100644
index cae7d46244ec..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-15.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) || ( ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!sys-devel/llvm:0
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1d1c104375d7a3406edd39028898ffef
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.42 b/metadata/md5-cache/dev-libs/libpcre2-10.42
index df7b97482f66..764f2f937bb6 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.42
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.42
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.pcre.org/
 INHERIT=libtool multilib-minimal usr-ldscript verify-sig
 IUSE=bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:= ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0/3
 SRC_URI=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre2-10.42.tar.bz2 verify-sig? ( https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2.sig )
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	usr-ldscript	80677644cd5fa559d15743fb93dcbf5a	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=80504513fb9fca20f9ab2b8c5fe48a5c
+_md5_=fb6f85333f3919954c566eda5fb41dba
diff --git a/metadata/md5-cache/dev-libs/mpfr-4.2.0 b/metadata/md5-cache/dev-libs/mpfr-4.2.0
index 495f1259713b..9db953cf4139 100644
--- a/metadata/md5-cache/dev-libs/mpfr-4.2.0
+++ b/metadata/md5-cache/dev-libs/mpfr-4.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.mpfr.org/ https://gitlab.inria.fr/mpfr
 INHERIT=multilib-minimal verify-sig
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0/6
 SRC_URI=https://www.mpfr.org/mpfr-4.2.0/mpfr-4.2.0.tar.xz verify-sig? ( https://www.mpfr.org/mpfr-4.2.0/mpfr-4.2.0.tar.xz.asc )
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=e070bc4920df56ecaaf7abf76295d267
+_md5_=703398670a485cc1d93ba014b31ec3e0
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 03a854b051f6..fefd0f12f027 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.6 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.6
deleted file mode 100644
index 30db0ef1156b..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-15.0.6:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.6[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.6[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.6[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.6[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.6[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.6[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.6[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.6[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.6[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.6[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.6[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.6[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.6[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.6[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.6[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.6[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.6[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.6[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.6[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.6[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.6[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.6[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.6[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.6[llvm_targets_SPIRV] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV verify-sig
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-15.0.6:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.6[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.6[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.6[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.6[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.6[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.6[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.6[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.6[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.6[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.6[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.6[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.6[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.6[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.6[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.6[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.6[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.6[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.6[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.6[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.6[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.6[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.6[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.6[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.6[llvm_targets_SPIRV] )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
-RESTRICT=!test? ( test )
-SLOT=0/15.0.6
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=47ac9fc5ccf47d31fdeabf577e9b531c
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index dfe337a8e121..bfb228017285 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/phptal-1.3.1 b/metadata/md5-cache/dev-php/phptal-1.3.1
deleted file mode 100644
index 2dc0ea69675d..000000000000
--- a/metadata/md5-cache/dev-php/phptal-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-lang/php:* <dev-php/phpunit-6 )
-DESCRIPTION=A templating engine for PHP5 that implements Zope Page Templates syntax
-EAPI=6
-HOMEPAGE=https://phptal.org/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/php:*
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/phptal/PHPTAL/archive/v1.3.1.tar.gz -> phptal-1.3.1.tar.gz
-_md5_=c75fd597bf4e250fca08ad717d53d0bb
diff --git a/metadata/md5-cache/dev-python/Levenshtein-0.20.8 b/metadata/md5-cache/dev-python/Levenshtein-0.20.8
deleted file mode 100644
index 93ee1eb1f49a..000000000000
--- a/metadata/md5-cache/dev-python/Levenshtein-0.20.8
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( <dev-python/rapidfuzz-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-cpp/rapidfuzz-cpp-1.7.0
-DESCRIPTION=Functions for fast computation of Levenshtein distance, and edit operations
-EAPI=8
-HOMEPAGE=https://pypi.org/project/Levenshtein/ https://github.com/maxbachmann/Levenshtein/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2+
-RDEPEND=<dev-python/rapidfuzz-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/maxbachmann/Levenshtein/archive/v0.20.8.tar.gz -> Levenshtein-0.20.8.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=d5abd6d7373990fa0ebb91b5421b181c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c6a19196bdb4..c8acb41b4c9b 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/Nuitka-1.4 b/metadata/md5-cache/dev-python/Nuitka-1.4
new file mode 100644
index 000000000000..7ebdf4a0b98b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Nuitka-1.4
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/scons[python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
+INHERIT=distutils-r1 flag-o-matic optfeature
+IUSE=test python_targets_python3_10
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/N/Nuitka/Nuitka-1.4.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=11c617000ba799704d70bde5c4e71564
diff --git a/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1 b/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
deleted file mode 100644
index 754f640685ff..000000000000
--- a/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_python3_9? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Declare constraints on function parameters and return values
-EAPI=7
-HOMEPAGE=https://andreacensi.github.io/contracts/ https://pypi.org/project/PyContracts/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2
-RDEPEND=dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyContracts/PyContracts-1.8.14.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=aa4bb4d7eb4194d41ad6c240d2e28cf8
diff --git a/metadata/md5-cache/dev-python/PyPDF2-2.12.1 b/metadata/md5-cache/dev-python/PyPDF2-2.12.1
deleted file mode 100644
index 5faf3062782a..000000000000
--- a/metadata/md5-cache/dev-python/PyPDF2-2.12.1
+++ /dev/null
@@ -1,17 +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.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[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/PyPDF2/ https://github.com/py-pdf/PyPDF2/
-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
-PROPERTIES=test_network
-RDEPEND=python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/py-pdf/PyPDF2/archive/2.12.1.tar.gz -> PyPDF2-2.12.1.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/0fe84b30ed33ff3daa9293e44349b8618f135699.tar.gz -> PyPDF2-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz )
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=44377343d882adc5e5bb4605853a096a
diff --git a/metadata/md5-cache/dev-python/PyUtilib-6.0.0 b/metadata/md5-cache/dev-python/PyUtilib-6.0.0
deleted file mode 100644
index 917e5c23a2e2..000000000000
--- a/metadata/md5-cache/dev-python/PyUtilib-6.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/nose[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A collection of Python utilities
-EAPI=7
-HOMEPAGE=https://github.com/PyUtilib/pyutilib
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyUtilib/pyutilib/archive/6.0.0.tar.gz -> PyUtilib-6.0.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=3eeb13f40b83a0a734380c1c03253af1
diff --git a/metadata/md5-cache/dev-python/blessings-1.7-r1 b/metadata/md5-cache/dev-python/blessings-1.7-r1
deleted file mode 100644
index 7b8efcbf49ec..000000000000
--- a/metadata/md5-cache/dev-python/blessings-1.7-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.10-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A thin, practical wrapper around terminal coloring, styling, and positioning
-EAPI=7
-HOMEPAGE=https://github.com/erikrose/blessings https://pypi.org/project/blessings/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/erikrose/blessings/archive/1.7.tar.gz -> blessings-1.7.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=66ee325d1a98be21c06ab644fa889c70
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.45 b/metadata/md5-cache/dev-python/boto3-1.26.45
deleted file mode 100644
index 4053efe0a200..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.45
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.45[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.45[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.45.tar.gz -> boto3-1.26.45.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=5e1c7eb57959d37c37ed506a006bf1af
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.50 b/metadata/md5-cache/dev-python/boto3-1.26.50
index cecb675dfeee..3ab6173f13a3 100644
--- a/metadata/md5-cache/dev-python/boto3-1.26.50
+++ b/metadata/md5-cache/dev-python/boto3-1.26.50
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
 INHERIT=distutils-r1 multiprocessing
 IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.29.50[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.26.50.tar.gz -> boto3-1.26.50.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=20741eb584c21b80ecd8fce5662b3784
+_md5_=5e1c7eb57959d37c37ed506a006bf1af
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.52 b/metadata/md5-cache/dev-python/boto3-1.26.52
deleted file mode 100644
index 9f82036d33cf..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.52
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.52[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.52[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.52.tar.gz -> boto3-1.26.52.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.53 b/metadata/md5-cache/dev-python/boto3-1.26.53
deleted file mode 100644
index 916490acb9e2..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.53
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.53[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.53[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.53.tar.gz -> boto3-1.26.53.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.55 b/metadata/md5-cache/dev-python/boto3-1.26.55
deleted file mode 100644
index 9ee49632f36e..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.55
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.55[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.55[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.55.tar.gz -> boto3-1.26.55.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.56 b/metadata/md5-cache/dev-python/boto3-1.26.58
index 184d6405d0d2..bbfe2b6a433a 100644
--- a/metadata/md5-cache/dev-python/boto3-1.26.56
+++ b/metadata/md5-cache/dev-python/boto3-1.26.58
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.56[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.58[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The AWS SDK for Python
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 multiprocessing
 IUSE=doc test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.56[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+RDEPEND=>=dev-python/botocore-1.29.58[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.56.tar.gz -> boto3-1.26.56.gh.tar.gz
+SRC_URI=https://github.com/boto/boto3/archive/1.26.58.tar.gz -> boto3-1.26.58.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.45 b/metadata/md5-cache/dev-python/botocore-1.29.45
deleted file mode 100644
index 6c992930f5f4..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.45
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.45.tar.gz -> botocore-1.29.45.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c65aa179611aa2473a786bb3cef9a1f9
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.50 b/metadata/md5-cache/dev-python/botocore-1.29.50
index 359e6c8d0715..f614bf1c5f1b 100644
--- a/metadata/md5-cache/dev-python/botocore-1.29.50
+++ b/metadata/md5-cache/dev-python/botocore-1.29.50
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
 INHERIT=distutils-r1 multiprocessing
 IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/botocore/archive/1.29.50.tar.gz -> botocore-1.29.50.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
+_md5_=c65aa179611aa2473a786bb3cef9a1f9
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.52 b/metadata/md5-cache/dev-python/botocore-1.29.52
deleted file mode 100644
index 667319674c8a..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.52
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.52.tar.gz -> botocore-1.29.52.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.53 b/metadata/md5-cache/dev-python/botocore-1.29.53
deleted file mode 100644
index 30d11db71701..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.53
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.53.tar.gz -> botocore-1.29.53.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.55 b/metadata/md5-cache/dev-python/botocore-1.29.55
deleted file mode 100644
index 4c74124693df..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.55
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.55.tar.gz -> botocore-1.29.55.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.56 b/metadata/md5-cache/dev-python/botocore-1.29.58
index 44e36e10532b..c3b0828ef613 100644
--- a/metadata/md5-cache/dev-python/botocore-1.29.56
+++ b/metadata/md5-cache/dev-python/botocore-1.29.58
@@ -11,6 +11,6 @@ RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.56.tar.gz -> botocore-1.29.56.gh.tar.gz
+SRC_URI=https://github.com/boto/botocore/archive/1.29.58.tar.gz -> botocore-1.29.58.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/clang-python-15.0.6 b/metadata/md5-cache/dev-python/clang-python-15.0.6
deleted file mode 100644
index fe14864487ce..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-15.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) test? ( sys-devel/clang:15 ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-15.0.6:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
-DESCRIPTION=Python bindings for sys-devel/clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org python-r1
-IUSE=test verify-sig python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-15.0.6:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=af6077f776aa5a8c36aee6ad4acd5183
diff --git a/metadata/md5-cache/dev-python/errorhandler-2.0.1 b/metadata/md5-cache/dev-python/errorhandler-2.0.1
deleted file mode 100644
index 2eda79511b42..000000000000
--- a/metadata/md5-cache/dev-python/errorhandler-2.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( >=dev-python/nose-1.3.7_p20221026[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pkginfo[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Logging framework handler
-EAPI=7
-HOMEPAGE=https://pypi.org/project/errorhandler/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/e/errorhandler/errorhandler-2.0.1.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=372f79b62a8c6330bd5ee264a26c7638
diff --git a/metadata/md5-cache/dev-python/flask-restful-0.3.9 b/metadata/md5-cache/dev-python/flask-restful-0.3.9
deleted file mode 100644
index dbf34f1fc7bf..000000000000
--- a/metadata/md5-cache/dev-python/flask-restful-0.3.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( >=dev-python/aniso8601-0.82[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple framework for creating REST APIs
-EAPI=7
-HOMEPAGE=https://flask-restful.readthedocs.io/en/latest/ https://github.com/flask-restful/flask-restful/
-INHERIT=distutils-r1
-IUSE=examples doc test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/aniso8601-0.82[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/flask-restful/flask-restful/archive/v0.3.9.tar.gz -> flask-restful-0.3.9.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0cc14186a50db52710c501157cdaaeb2
diff --git a/metadata/md5-cache/dev-python/funcy-1.18 b/metadata/md5-cache/dev-python/funcy-1.18
new file mode 100644
index 000000000000..bedb05b36c7b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/funcy-1.18
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/whatever[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A collection of fancy functional tools focused on practicality
+EAPI=8
+HOMEPAGE=https://github.com/Suor/funcy/ https://pypi.org/project/funcy/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/funcy/funcy-1.18.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=a15a65ca3e3ba0354197bae57e996cf7
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.65.1 b/metadata/md5-cache/dev-python/hypothesis-6.65.1
new file mode 100644
index 000000000000..c952f0c64882
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.65.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.65.1.tar.gz -> hypothesis-6.65.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=990cdabf0a2222632a46e5fc0ed375f9
diff --git a/metadata/md5-cache/dev-python/imread-0.7.3-r3 b/metadata/md5-cache/dev-python/imread-0.7.3-r3
deleted file mode 100644
index 00aa9ae20d3f..000000000000
--- a/metadata/md5-cache/dev-python/imread-0.7.3-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/nose[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/libpng:= media-libs/libjpeg-turbo:= media-libs/libwebp:= media-libs/tiff:= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/libpng:= media-libs/libjpeg-turbo:= media-libs/libwebp:= media-libs/tiff:=
-DESCRIPTION=Read Image Files
-EAPI=8
-HOMEPAGE=http://luispedro.org/software/imread/ https://github.com/luispedro/imread
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/libpng:= media-libs/libjpeg-turbo:= media-libs/libwebp:= media-libs/tiff:= python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/luispedro/imread/archive/v0.7.3.tar.gz -> imread-0.7.3.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=3caeacc5066f95bec3b8bfc100a87944
diff --git a/metadata/md5-cache/dev-python/influxdb-5.3.0-r1 b/metadata/md5-cache/dev-python/influxdb-5.3.0-r1
deleted file mode 100644
index 9840439e4665..000000000000
--- a/metadata/md5-cache/dev-python/influxdb-5.3.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-db/influxdb dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/msgpack-0.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.17.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=InfluxDB client
-EAPI=7
-HOMEPAGE=https://github.com/influxdb/influxdb-python https://pypi.org/project/influxdb/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-python/msgpack-0.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.17.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/influxdb/influxdb-5.3.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=32eba0a786e1da3ee9ea7530a4f781f0
diff --git a/metadata/md5-cache/dev-python/jupyter_client-8.0.1 b/metadata/md5-cache/dev-python/jupyter_client-8.0.1
new file mode 100644
index 000000000000..2f78fa753719
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_client-8.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest_jupyter-0.4.1[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(-)?] ) test? ( >=dev-python/jupyter_core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Jupyter protocol implementation and client libraries
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/jupyter_client/ https://pypi.org/project/jupyter-client/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/jupyter_core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-8.0.1.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=4dd4e0487e1ca44b533c80fe12ec376b
diff --git a/metadata/md5-cache/dev-python/lit-15.0.6 b/metadata/md5-cache/dev-python/lit-15.0.6
deleted file mode 100644
index 818bfda9a1aa..000000000000
--- a/metadata/md5-cache/dev-python/lit-15.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A stand-alone install of the LLVM suite testing tool
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=distutils-r1 llvm.org
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=45d97da77128f8228ae4f1e1e46544ca
diff --git a/metadata/md5-cache/dev-python/nbclassic-0.5.1 b/metadata/md5-cache/dev-python/nbclassic-0.5.1
new file mode 100644
index 000000000000..24b4c7dcb587
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nbclassic-0.5.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest_jupyter[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(-)?] dev-python/requests-unixsocket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( virtual/pandoc ) test? ( dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[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-6.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_server-1.17.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook_shim-0.1.0[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/send2trash-1.8.0[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.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] dev-python/nbsphinx[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/myst_parser[python_targets_python3_11(-)] dev-python/ipython_genutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] dev-python/nbsphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/ipython_genutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/nbsphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=Jupyter Notebook as a Jupyter Server Extension
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbclassic/ https://pypi.org/project/nbclassic/
+INHERIT=distutils-r1 xdg-utils
+IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[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-6.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_server-1.17.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook_shim-0.1.0[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/send2trash-1.8.0[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.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/nbclassic/nbclassic-0.5.1.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6fb0ec737a83827065d7c086aef917c4
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
deleted file mode 100644
index 51e02904b084..000000000000
--- a/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( !!<dev-python/ndg-httpsclient-0.4.2-r1 dev-libs/openssl:0 ) test? ( dev-python/pyaes[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL
-EAPI=7
-HOMEPAGE=https://github.com/cedadev/ndg_httpsclient/ https://pypi.org/project/ndg-httpsclient/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~s390 sparc x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-python/pyaes[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/ndg-httpsclient/ndg_httpsclient-0.5.1.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=45dd12821c87af16bf103eafefb2b2b0
diff --git a/metadata/md5-cache/dev-python/nose-random-1.0.0 b/metadata/md5-cache/dev-python/nose-random-1.0.0
deleted file mode 100644
index 98c28a402332..000000000000
--- a/metadata/md5-cache/dev-python/nose-random-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Nose plugin to facilitate randomized unit testing
-EAPI=7
-HOMEPAGE=https://github.com/fzumstein/nose-random
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/nose[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/fzumstein/nose-random/archive/1.0.0.tar.gz -> nose-random-1.0.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=90558fc944ac0b6ddef9c580d7549762
diff --git a/metadata/md5-cache/dev-python/pilkit-2.0 b/metadata/md5-cache/dev-python/pilkit-2.0
deleted file mode 100644
index 3d8d0a77c1df..000000000000
--- a/metadata/md5-cache/dev-python/pilkit-2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,jpeg,zlib] ) test? ( dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A collection of utilities and processors for the Python Imaging Libary
-EAPI=7
-HOMEPAGE=https://github.com/matthewwithanm/pilkit
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/matthewwithanm/pilkit/archive/2.0.tar.gz -> pilkit-2.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c564efe1eb56fb4238eb9617276814a5
diff --git a/metadata/md5-cache/dev-python/pytest-toolbox-0.4-r1 b/metadata/md5-cache/dev-python/pytest-toolbox-0.4-r1
deleted file mode 100644
index e1edb11c4a0e..000000000000
--- a/metadata/md5-cache/dev-python/pytest-toolbox-0.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( dev-python/pydantic[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/pydantic[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/pydantic[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/pydantic[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Numerous useful plugins for pytest
-EAPI=8
-HOMEPAGE=https://github.com/samuelcolvin/pytest-toolbox/ https://pypi.org/project/pytest-toolbox/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/samuelcolvin/pytest-toolbox/archive/v0.4.tar.gz -> pytest-toolbox-0.4.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=65da390f0b2a27d79c266ba785e87d3c
diff --git a/metadata/md5-cache/dev-python/python-zipstream-1.1.4 b/metadata/md5-cache/dev-python/python-zipstream-1.1.4
deleted file mode 100644
index 6529a059897c..000000000000
--- a/metadata/md5-cache/dev-python/python-zipstream-1.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7_p20221026[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A zip archive generator
-EAPI=7
-HOMEPAGE=https://github.com/allanlei/python-zipstream
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/allanlei/python-zipstream/archive/v1.1.4.tar.gz -> python-zipstream-1.1.4.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1807c094466e1a5764d9f96f4bb56be8
diff --git a/metadata/md5-cache/dev-python/qiskit-terra-0.23.0 b/metadata/md5-cache/dev-python/qiskit-terra-0.23.0
new file mode 100644
index 000000000000..e9f9c118f188
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qiskit-terra-0.23.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/cython-0.27.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( app-text/poppler[png] >=dev-python/ddt-1.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-4.24.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/networkx-2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qiskit-aer[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/scikit-learn-0.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/rustworkx-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ply-3.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/psutil-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sympy-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dill-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-constraint-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/symengine-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tweedledum-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] visualization? ( >=dev-python/matplotlib-3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipywidgets-7.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pydot[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pylatexenc-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/seaborn-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=virtual/rust-1.53 python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Terra is the foundation on which Qiskit is built
+EAPI=8
+HOMEPAGE=https://github.com/Qiskit/qiskit-terra/ https://pypi.org/project/qiskit-terra/
+INHERIT=cargo distutils-r1 multiprocessing
+IUSE=+visualization test debug python_targets_python3_9 python_targets_python3_10
+LICENSE=Apache-2.0 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT Unicode-DFS-2016 || ( LGPL-3 MPL-2.0 )
+RDEPEND=>=dev-python/rustworkx-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ply-3.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/psutil-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sympy-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dill-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-constraint-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/symengine-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tweedledum-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] visualization? ( >=dev-python/matplotlib-3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipywidgets-7.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pydot[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pylatexenc-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/seaborn-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Qiskit/qiskit-terra/archive/0.23.0.tar.gz -> qiskit-terra-0.23.0.gh.tar.gz https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/ahash/0.8.0/download -> ahash-0.8.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.11/download -> crossbeam-epoch-0.9.11.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.12/download -> crossbeam-utils-0.8.12.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/fixedbitset/0.4.2/download -> fixedbitset-0.4.2.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/libm/0.2.5/download -> libm-0.2.5.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/matrixmultiply/0.3.2/download -> matrixmultiply-0.3.2.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/ndarray/0.15.6/download -> ndarray-0.15.6.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/numpy/0.18.0/download -> numpy-0.18.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/petgraph/0.6.2/download -> petgraph-0.6.2.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/priority-queue/1.2.0/download -> priority-queue-1.2.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/pyo3/0.18.0/download -> pyo3-0.18.0.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.0/download -> pyo3-build-config-0.18.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.0/download -> pyo3-ffi-0.18.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.0/download -> pyo3-macros-0.18.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.0/download -> pyo3-macros-backend-0.18.0.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rand_distr/0.4.3/download -> rand_distr-0.4.3.crate https://crates.io/api/v1/crates/rand_pcg/0.3.1/download -> rand_pcg-0.3.1.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.6.0/download -> rayon-1.6.0.crate https://crates.io/api/v1/crates/rayon-core/1.10.1/download -> rayon-core-1.10.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustworkx-core/0.12.1/download -> rustworkx-core-0.12.1.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.103/download -> syn-1.0.103.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate
+_eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=5f6b1d8c9a4a73ec51f79ae7090ce795
diff --git a/metadata/md5-cache/dev-python/socketio-client-0.7.2 b/metadata/md5-cache/dev-python/socketio-client-0.7.2
deleted file mode 100644
index d99cf494ac67..000000000000
--- a/metadata/md5-cache/dev-python/socketio-client-0.7.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/coverage[python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=A socket.io client library for Python
-EAPI=7
-HOMEPAGE=https://github.com/invisibleroads/socketIO-client/ https://pypi.org/project/socketIO-client/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/socketIO-client/socketIO-client-0.7.2.tar.gz -> socketio-client-0.7.2.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=95cf25fa2eb074724688d75f8990a79d
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-2.0.0 b/metadata/md5-cache/dev-python/sqlalchemy-2.0.0
new file mode 100644
index 000000000000..0c9dd11ab021
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-2.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] ) ) test? ( >=dev-python/typing-extensions-4.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite?] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+EAPI=8
+HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
+INHERIT=distutils-r1 optfeature
+IUSE=examples +sqlite 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/typing-extensions-4.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite?] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-2.0.0.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=afa3e1a214a49210a0dd27b913fd8529
diff --git a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r1 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r1
deleted file mode 100644
index 76d04f4ffaf4..000000000000
--- a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( <dev-python/PyPDF2-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( <dev-python/PyPDF2-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=Suite of tools for PDF files manipulation written in Python
-EAPI=8
-HOMEPAGE=https://github.com/hellerbarde/stapler
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=<dev-python/PyPDF2-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-382f1edc62296e071093a5419811a2fca9d78d93.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=e108a728a3ba7aa067a6eead7fe7c23b
diff --git a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r2 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r2
deleted file mode 100644
index c4e8dd8455da..000000000000
--- a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/PyPDF2-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/PyPDF2-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=Suite of tools for PDF files manipulation written in Python
-EAPI=8
-HOMEPAGE=https://github.com/hellerbarde/stapler
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/PyPDF2-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-382f1edc62296e071093a5419811a2fca9d78d93.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=dccd9876b161f55bec36b4aaf90b8627
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.5.0 b/metadata/md5-cache/dev-python/websocket-client-1.5.0
new file mode 100644
index 000000000000..c52432c668bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/websocket-client-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/python-socks[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=WebSocket client for python with hybi13 support
+EAPI=8
+HOMEPAGE=https://github.com/websocket-client/websocket-client/ https://pypi.org/project/websocket-client/
+INHERIT=distutils-r1
+IUSE=examples test python_targets_pypy3 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=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/w/websocket-client/websocket-client-1.5.0.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=e9ca3213c37ed61702b40880e6642aa4
diff --git a/metadata/md5-cache/dev-python/www-authenticate-0.9.2 b/metadata/md5-cache/dev-python/www-authenticate-0.9.2
deleted file mode 100644
index 96dad8370582..000000000000
--- a/metadata/md5-cache/dev-python/www-authenticate-0.9.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7_p20221026[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WWW-Authenticate header parser
-EAPI=7
-HOMEPAGE=https://github.com/alexsdutton/www-authenticate
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/alexsdutton/www-authenticate/archive/0.9.2.tar.gz -> www-authenticate-0.9.2.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b5c1b54a8891fee601e501436ddf7841
diff --git a/metadata/md5-cache/dev-python/xcffib-0.12.1 b/metadata/md5-cache/dev-python/xcffib-0.12.1
deleted file mode 100644
index 7981aa1b4fa7..000000000000
--- a/metadata/md5-cache/dev-python/xcffib-0.12.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xeyes ) test? ( python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/libxcb >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libxcb
-DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
-EAPI=8
-HOMEPAGE=https://github.com/tych0/xcffib/ https://pypi.org/project/xcffib/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/libxcb python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/x/xcffib/xcffib-0.12.1.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=407953201271fc6629dfcb57b6534d96
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 08bb5737ea1b..590ad157e8f1 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.6 b/metadata/md5-cache/dev-ruby/actioncable-6.0.6
deleted file mode 100644
index 40adea815348..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=test !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.tar.gz -> rails-6.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0551c5b11bf44af9b06e94c7435d2536
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.6.1 b/metadata/md5-cache/dev-ruby/actioncable-6.0.6.1
deleted file mode 100644
index 4dbf73118f21..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=test !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=e1a703defa9d2188dfe643566bfb76c1
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.7.1 b/metadata/md5-cache/dev-ruby/actioncable-6.1.7.2
index 21e8535dbb2f..16088bf93a08 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.7.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.1.7.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-6.1.7.1:*[ruby_targets_ruby31(-)] ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby31(-)] dev-ruby/nio4r:2[ruby_targets_ruby31(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] >=dev-ruby/mocha-0.14.0:0.14[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-6.1.7.2:*[ruby_targets_ruby31(-)] ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby31(-)] dev-ruby/nio4r:2[ruby_targets_ruby31(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] >=dev-ruby/mocha-0.14.0:0.14[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Integrated WebSockets for Rails
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-6.1.7.1:*[ruby_targets_ruby31(-)] ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby31(-)] dev-ruby/nio4r:2[ruby_targets_ruby31(-)] >=dev-ruby/websocket-driver-0.6.1:*[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-6.1.7.2:*[ruby_targets_ruby31(-)] ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby31(-)] dev-ruby/nio4r:2[ruby_targets_ruby31(-)] >=dev-ruby/websocket-driver-0.6.1:*[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.7.1.tar.gz -> rails-6.1.7.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=8034e65e304446464019fd4bc3c7931f
diff --git a/metadata/md5-cache/dev-ruby/actioncable-7.0.3.1 b/metadata/md5-cache/dev-ruby/actioncable-7.0.3.1
deleted file mode 100644
index b6f9f07c7a7c..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.3.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.3.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.3.1:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.3.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.3.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.3.1:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.3.1.tar.gz -> rails-7.0.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1c0d86314c6e3d7833734b1efae29b0c
diff --git a/metadata/md5-cache/dev-ruby/actioncable-7.0.4.1 b/metadata/md5-cache/dev-ruby/actioncable-7.0.4.2
index 06a7e4da69ce..eeef38b6e411 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-7.0.4.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-7.0.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-7.0.4.1:*[ruby_targets_ruby31(-)] ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby31(-)] dev-ruby/nio4r:2[ruby_targets_ruby31(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] >=dev-ruby/mocha-0.14.0:0.14[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-7.0.4.2:*[ruby_targets_ruby31(-)] ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby31(-)] dev-ruby/nio4r:2[ruby_targets_ruby31(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] >=dev-ruby/mocha-0.14.0:0.14[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Integrated WebSockets for Rails
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-7.0.4.1:*[ruby_targets_ruby31(-)] ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby31(-)] dev-ruby/nio4r:2[ruby_targets_ruby31(-)] >=dev-ruby/websocket-driver-0.6.1:*[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-7.0.4.2:*[ruby_targets_ruby31(-)] ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby31(-)] dev-ruby/nio4r:2[ruby_targets_ruby31(-)] >=dev-ruby/websocket-driver-0.6.1:*[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.4.1.tar.gz -> rails-7.0.4.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=bcb01adabf6c3601ce178e39e4ebbd5b
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6
deleted file mode 100644
index e16c67734a2d..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.tar.gz -> rails-6.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=a6f711b7ccae389dcdb19142f9903e40
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6.1 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6.1
deleted file mode 100644
index 180efbac3db9..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] <dev-ruby/mail-2.8[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] <dev-ruby/mail-2.8[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=561db1a4a773764d766f7ec2c09979e0
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.7.1 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.7.2
index d80e43618989..41711a312c10 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.7.1
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.7.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] <dev-ruby/mail-2.8[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] <dev-ruby/mail-2.8[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] <dev-ruby/mail-2.8[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] <dev-ruby/mail-2.8[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Framework for designing email-service layers
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.7.1.tar.gz -> rails-6.1.7.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=9353ef71c4c67c4879ac15987455d528
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.3.1 b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.3.1
deleted file mode 100644
index 8bcecc1f5b3f..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] dev-ruby/net-imap[ruby_targets_ruby30(-)] dev-ruby/net-pop[ruby_targets_ruby30(-)] dev-ruby/net-smtp[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/propshaft[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/propshaft[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] dev-ruby/net-imap[ruby_targets_ruby30(-)] dev-ruby/net-pop[ruby_targets_ruby30(-)] dev-ruby/net-smtp[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.3.1.tar.gz -> rails-7.0.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=4370b673bfa99d384cded93b339a28a0
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.4.1 b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.4.2
index 2314e69f0e2d..3b7b2952043c 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.4.1
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] dev-ruby/net-imap[ruby_targets_ruby30(-)] dev-ruby/net-pop[ruby_targets_ruby30(-)] dev-ruby/net-smtp[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] <dev-ruby/mail-2.8[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/propshaft[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] <dev-ruby/mail-2.8[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/propshaft[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] dev-ruby/net-imap[ruby_targets_ruby30(-)] dev-ruby/net-pop[ruby_targets_ruby30(-)] dev-ruby/net-smtp[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] <dev-ruby/mail-2.8[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/propshaft[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] <dev-ruby/mail-2.8[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/propshaft[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Framework for designing email-service layers
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
 KEYWORDS=~amd64 ~ppc64 ~riscv
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] dev-ruby/net-imap[ruby_targets_ruby30(-)] dev-ruby/net-pop[ruby_targets_ruby30(-)] dev-ruby/net-smtp[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] dev-ruby/net-imap[ruby_targets_ruby30(-)] dev-ruby/net-pop[ruby_targets_ruby30(-)] dev-ruby/net-smtp[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.4.1.tar.gz -> rails-7.0.4.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=a2f0c9d4242faf7278da65cfb0dc6af8
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.6 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.6
deleted file mode 100644
index f9462dfbebe3..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.tar.gz -> rails-6.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=95207eabb3d1a401368c466e8873a204
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.6.1 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.6.1
deleted file mode 100644
index 36ac9d1b91a8..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=e71ebdabca890dca10c6706de4abaa97
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.7.1 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.7.2
index 057012040596..c278c265f004 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.7.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.1.7.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby31(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby31(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby31(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby31(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Framework for designing email-service layers
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby31(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby31(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby31(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby31(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.7.1.tar.gz -> rails-6.1.7.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=b2a07c38a7a1704953d865deaa299c90
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-7.0.3.1 b/metadata/md5-cache/dev-ruby/actionmailer-7.0.3.1
deleted file mode 100644
index 1016d7e79919..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.3.1.tar.gz -> rails-7.0.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=d2cabff649c45209e0285cd2da5165ab
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-7.0.4.1 b/metadata/md5-cache/dev-ruby/actionmailer-7.0.4.2
index 61b837558709..556bd4a812a9 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-7.0.4.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-7.0.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby31(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby31(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby31(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby31(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Framework for designing email-service layers
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby31(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby31(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby31(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby31(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.4.1.tar.gz -> rails-7.0.4.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=dfda8986f13ae38bf0dcd2e015243d88
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.6 b/metadata/md5-cache/dev-ruby/actionpack-6.0.6
deleted file mode 100644
index 48888130c982..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-3.35.0[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/capybara-3.35.0[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.tar.gz -> rails-6.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6f0b235cc1142caac7f7d447119eab72
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.6.1 b/metadata/md5-cache/dev-ruby/actionpack-6.0.6.1
deleted file mode 100644
index 3bab2a356b96..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-3.35.0[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/capybara-3.35.0[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f16a78c751bf983bf06c20812c53df05
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.7.1 b/metadata/md5-cache/dev-ruby/actionpack-6.1.7.2
index 3e32d01feb0b..50f838c8eda9 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.7.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.1.7.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby31(-)] dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby31(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby31(-)] www-servers/puma[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby31(-)] dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby31(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby31(-)] www-servers/puma[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Eases web-request routing, handling, and response
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.7.1.tar.gz -> rails-6.1.7.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=2f32a20843387e5f72d71c4903e6bc5f
diff --git a/metadata/md5-cache/dev-ruby/actionpack-7.0.3.1 b/metadata/md5-cache/dev-ruby/actionpack-7.0.3.1
deleted file mode 100644
index 29e6334e7d14..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby30(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.3.1.tar.gz -> rails-7.0.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6b847160868d809fbd22496a9b52b057
diff --git a/metadata/md5-cache/dev-ruby/actionpack-7.0.4.1 b/metadata/md5-cache/dev-ruby/actionpack-7.0.4.2
index 52b4772e0bfc..60df382a1790 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-7.0.4.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-7.0.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby30(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby31(-)] dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby31(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby31(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby31(-)] www-servers/puma[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby30(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby31(-)] dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby31(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby31(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby31(-)] www-servers/puma[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Eases web-request routing, handling, and response
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby31(-)] dev-ruby/rack:2.2[ruby_targets_ruby31(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.4.1.tar.gz -> rails-7.0.4.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=ca87de65caf7e78d66d0ecf98aec1ce9
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.6 b/metadata/md5-cache/dev-ruby/actiontext-6.0.6
deleted file mode 100644
index 27a025965055..000000000000
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Edit and display rich text in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.tar.gz -> rails-6.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=180f54b1cd4d91d20d51020702301a64
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.6.1 b/metadata/md5-cache/dev-ruby/actiontext-6.0.6.1
deleted file mode 100644
index 66609af2ff44..000000000000
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Edit and display rich text in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=92cf1c38ecba64d4e370364c677b5595
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.7.1 b/metadata/md5-cache/dev-ruby/actiontext-6.1.7.2
index 2b99867f03f8..b2562ac79939 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.7.1
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.1.7.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Edit and display rich text in Rails applications
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.7.1.tar.gz -> rails-6.1.7.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=eadc21707e3765ecc25f4bab1d5bffcc
diff --git a/metadata/md5-cache/dev-ruby/actiontext-7.0.3.1 b/metadata/md5-cache/dev-ruby/actiontext-7.0.3.1
deleted file mode 100644
index 2746ad8ffb23..000000000000
--- a/metadata/md5-cache/dev-ruby/actiontext-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/propshaft[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/propshaft[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Edit and display rich text in Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.3.1.tar.gz -> rails-7.0.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=bcdf57ff4f61c0eacdf78918a4d98939
diff --git a/metadata/md5-cache/dev-ruby/actiontext-7.0.4.1 b/metadata/md5-cache/dev-ruby/actiontext-7.0.4.2
index bae6f719a913..2323282ef491 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-7.0.4.1
+++ b/metadata/md5-cache/dev-ruby/actiontext-7.0.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/propshaft[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/propshaft[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/propshaft[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/propshaft[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Edit and display rich text in Rails applications
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
 KEYWORDS=~amd64 ~ppc64 ~riscv
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.4.1.tar.gz -> rails-7.0.4.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=59b585e44638403ece41df9f0c495c0a
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.6 b/metadata/md5-cache/dev-ruby/actionview-6.0.6
deleted file mode 100644
index 31096e039610..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.tar.gz -> rails-6.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=e8909adc93d636255948bae0c475ffcf
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.6.1 b/metadata/md5-cache/dev-ruby/actionview-6.0.6.1
deleted file mode 100644
index 3502f09d87e2..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ac329389e3dac5c8a837a91551d92fed
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.7.1 b/metadata/md5-cache/dev-ruby/actionview-6.1.7.2
index 36894cba6dc4..cabd18605937 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.7.1
+++ b/metadata/md5-cache/dev-ruby/actionview-6.1.7.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby31(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby31(-)] dev-ruby/sqlite3[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby31(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby31(-)] dev-ruby/sqlite3[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Simple, battle-tested conventions and helpers for building web pages
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby31(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby31(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.7.1.tar.gz -> rails-6.1.7.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=6d231c1f68f94e34c8856cf3fcde6305
diff --git a/metadata/md5-cache/dev-ruby/actionview-7.0.3.1 b/metadata/md5-cache/dev-ruby/actionview-7.0.3.1
deleted file mode 100644
index 1d75def3a65a..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.3.1.tar.gz -> rails-7.0.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=cbd457db7c5d75f6a558ee3839217e31
diff --git a/metadata/md5-cache/dev-ruby/actionview-7.0.4.1 b/metadata/md5-cache/dev-ruby/actionview-7.0.4.2
index 432c4c921ffd..571a62f486ee 100644
--- a/metadata/md5-cache/dev-ruby/actionview-7.0.4.1
+++ b/metadata/md5-cache/dev-ruby/actionview-7.0.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby31(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby31(-)] dev-ruby/sqlite3[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby31(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby31(-)] dev-ruby/sqlite3[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Simple, battle-tested conventions and helpers for building web pages
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby31(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby31(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby31(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.4.1.tar.gz -> rails-7.0.4.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=1977a0d4f102641263713faede47059c
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.6 b/metadata/md5-cache/dev-ruby/activejob-6.0.6
deleted file mode 100644
index 7c1f1c2019da..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.tar.gz -> rails-6.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=60d05be6d6adf2ac9de837e361c0453d
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.6.1 b/metadata/md5-cache/dev-ruby/activejob-6.0.6.1
deleted file mode 100644
index f06174b562a4..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6ae0b697603404ae3fe213a46480577b
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.7.1 b/metadata/md5-cache/dev-ruby/activejob-6.1.7.2
index 53c20d3a1217..0a11c6e55455 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.7.1
+++ b/metadata/md5-cache/dev-ruby/activejob-6.1.7.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby31(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby31(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Job framework with pluggable queues
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby31(-)] >=dev-ruby/globalid-0.3.6[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby31(-)] >=dev-ruby/globalid-0.3.6[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.7.1.tar.gz -> rails-6.1.7.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=e0befe78db5b1c45eb9c7f12a74e5ec6
diff --git a/metadata/md5-cache/dev-ruby/activejob-7.0.3.1 b/metadata/md5-cache/dev-ruby/activejob-7.0.3.1
deleted file mode 100644
index a80326f3ca04..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.3.1.tar.gz -> rails-7.0.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=a4c715988a87b0310f58142c7cf302c5
diff --git a/metadata/md5-cache/dev-ruby/activejob-7.0.4.1 b/metadata/md5-cache/dev-ruby/activejob-7.0.4.2
index b105d954099b..6592a7dce364 100644
--- a/metadata/md5-cache/dev-ruby/activejob-7.0.4.1
+++ b/metadata/md5-cache/dev-ruby/activejob-7.0.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby31(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby31(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Job framework with pluggable queues
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby31(-)] >=dev-ruby/globalid-0.3.6[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby31(-)] >=dev-ruby/globalid-0.3.6[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.4.1.tar.gz -> rails-7.0.4.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=fe07a7228e4b47afcb6ef867dc096555
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.6 b/metadata/md5-cache/dev-ruby/activemodel-6.0.6
deleted file mode 100644
index 45b6b2db7911..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.0.6[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-6.0.6[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.tar.gz -> rails-6.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6a1d2ccdc2405c070ded2d89176c0a9d
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.6.1 b/metadata/md5-cache/dev-ruby/activemodel-6.0.6.1
deleted file mode 100644
index 0c6d44532507..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c61724c38b280141e190e4b294b9ae69
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.7.1 b/metadata/md5-cache/dev-ruby/activemodel-6.1.7.2
index d60e035c6961..7993d70dfbdb 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.7.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.1.7.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Toolkit for building modeling frameworks like Active Record and Active Resource
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.1:*[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.2:*[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.7.1.tar.gz -> rails-6.1.7.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=2cf1d97cf448918050746c437baf862e
diff --git a/metadata/md5-cache/dev-ruby/activemodel-7.0.3.1 b/metadata/md5-cache/dev-ruby/activemodel-7.0.3.1
deleted file mode 100644
index 00303035d578..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.3.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.3.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.3.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.3.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.3.1.tar.gz -> rails-7.0.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9f3705c39ba8c591e04a2ba761992276
diff --git a/metadata/md5-cache/dev-ruby/activemodel-7.0.4.1 b/metadata/md5-cache/dev-ruby/activemodel-7.0.4.2
index 37754772c881..5670f450b7fc 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-7.0.4.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-7.0.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Toolkit for building modeling frameworks like Active Record and Active Resource
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.1:*[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.2:*[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.4.1.tar.gz -> rails-7.0.4.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=df1f505996c0109c040db591fc344a6c
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.6 b/metadata/md5-cache/dev-ruby/activerecord-6.0.6
deleted file mode 100644
index 217594ca7e34..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby30(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=mysql postgres sqlite test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.tar.gz -> rails-6.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ecabd0f2f444216a9843f8f9288cf19d
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.6.1 b/metadata/md5-cache/dev-ruby/activerecord-6.0.6.1
deleted file mode 100644
index 1746ffe348ef..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby30(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=mysql postgres sqlite test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b3b4586eab45039fb3dd9a060a5e4b6f
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.7.1 b/metadata/md5-cache/dev-ruby/activerecord-6.1.7.2
index b948d37c7d9f..6c1994e9c88b 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.7.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.1.7.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby31(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby31(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby31(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby31(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby31(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby31(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby31(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby31(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby31(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby31(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) 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=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=mysql postgres sqlite test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby31(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby31(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby31(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby31(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby31(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby31(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.7.1.tar.gz -> rails-6.1.7.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=e974c74b827af4c618410d3e386cd227
diff --git a/metadata/md5-cache/dev-ruby/activerecord-7.0.3.1 b/metadata/md5-cache/dev-ruby/activerecord-7.0.3.1
deleted file mode 100644
index 5b1d587e8037..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.3.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.3.1[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/benchmark-ips[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/benchmark-ips[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=mysql postgres sqlite test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.3.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.3.1[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.3.1.tar.gz -> rails-7.0.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=117914d025558d94d2b0184f758eed90
diff --git a/metadata/md5-cache/dev-ruby/activerecord-7.0.4.1 b/metadata/md5-cache/dev-ruby/activerecord-7.0.4.2
index 2001ccdcd5ea..e26ab6fb8381 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-7.0.4.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-7.0.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby31(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby31(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby31(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby31(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/benchmark-ips[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/benchmark-ips[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/benchmark-ips[ruby_targets_ruby31(-)] dev-ruby/bundler[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby31(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby31(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby31(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby31(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby31(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/benchmark-ips[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/benchmark-ips[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/benchmark-ips[ruby_targets_ruby31(-)] dev-ruby/bundler[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby31(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) 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=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=mysql postgres sqlite test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby31(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby31(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby31(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby31(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby31(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby31(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.4.1.tar.gz -> rails-7.0.4.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=8cc1e59815c5855ded4553c6a6411cab
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.6 b/metadata/md5-cache/dev-ruby/activestorage-6.0.6
deleted file mode 100644
index e2c371fdac8f..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mini_magick[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.tar.gz -> rails-6.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c2f3482c2928c032d417fcfff22bc9fc
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.6.1 b/metadata/md5-cache/dev-ruby/activestorage-6.0.6.1
deleted file mode 100644
index c185d4596b4e..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mini_magick[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.0.6.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=10c620d31b899ff60f6249b6d69824e2
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.7.1 b/metadata/md5-cache/dev-ruby/activestorage-6.1.7.2
index 924b75ddc3d7..fd2f33657542 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.7.1
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.1.7.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mini_magick[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mini_magick[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Attach cloud and local files in Rails applications
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.1:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.7.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.7.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.2:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.7.1.tar.gz -> rails-6.1.7.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=460e972124802ee4d1456dc97974b601
diff --git a/metadata/md5-cache/dev-ruby/activestorage-7.0.3.1 b/metadata/md5-cache/dev-ruby/activestorage-7.0.3.1
deleted file mode 100644
index 3a66a06dd8c4..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.3.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.3.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.3.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.3.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.3.1:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] =dev-ruby/minitest-5.15*:5[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sprockets-rails[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby30(-)] =dev-ruby/minitest-5.15*:5[ruby_targets_ruby30(-)] dev-ruby/mini_magick[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/sprockets-rails[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.3.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.3.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.3.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.3.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.3.1:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.3.1.tar.gz -> rails-7.0.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=4f26d885aaa865c8f09002770761ffed
diff --git a/metadata/md5-cache/dev-ruby/activestorage-7.0.4.1 b/metadata/md5-cache/dev-ruby/activestorage-7.0.4.1
deleted file mode 100644
index ede48dae61f4..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-7.0.4.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] =dev-ruby/minitest-5.15*:5[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sprockets-rails[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby30(-)] =dev-ruby/minitest-5.15*:5[ruby_targets_ruby30(-)] dev-ruby/mini_magick[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/sprockets-rails[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.1:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.4.1.tar.gz -> rails-7.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=de578a1e7019389cd8c2557079c0823e
diff --git a/metadata/md5-cache/dev-ruby/activestorage-7.0.4.2 b/metadata/md5-cache/dev-ruby/activestorage-7.0.4.2
new file mode 100644
index 000000000000..4be9b5a0b384
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activestorage-7.0.4.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-7.0.4.2:*[ruby_targets_ruby31(-)] ~dev-ruby/activejob-7.0.4.2:*[ruby_targets_ruby31(-)] ~dev-ruby/activerecord-7.0.4.2:*[ruby_targets_ruby31(-)] ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby31(-)] dev-ruby/marcel:1.0[ruby_targets_ruby31(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] =dev-ruby/minitest-5.15*:5[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sprockets-rails[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby30(-)] =dev-ruby/minitest-5.15*:5[ruby_targets_ruby30(-)] dev-ruby/mini_magick[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/sprockets-rails[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby31(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby31(-)] =dev-ruby/minitest-5.15*:5[ruby_targets_ruby31(-)] dev-ruby/mini_magick[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] dev-ruby/rake[ruby_targets_ruby31(-)] dev-ruby/sprockets-rails[ruby_targets_ruby31(-)] dev-ruby/sqlite3[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) 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=Attach cloud and local files in Rails applications
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.4.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.4.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.2:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/actionpack-7.0.4.2:*[ruby_targets_ruby31(-)] ~dev-ruby/activejob-7.0.4.2:*[ruby_targets_ruby31(-)] ~dev-ruby/activerecord-7.0.4.2:*[ruby_targets_ruby31(-)] ~dev-ruby/activesupport-7.0.4.2:*[ruby_targets_ruby31(-)] dev-ruby/marcel:1.0[ruby_targets_ruby31(-)] >=dev-ruby/mini_mime-1.1.0[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=7.0
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=57e1f09066a36f323ad9a543fd3e222b
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.6 b/metadata/md5-cache/dev-ruby/activesupport-6.0.6
deleted file mode 100644
index 58663d9096fd..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] dev-ruby/i18n:1[ruby_targets_ruby30(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby30(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] dev-ruby/i18n:1[ruby_targets_ruby30(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.tar.gz -> rails-6.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=a433181f3eb4dd0235bcd68bd900d9fa
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1 b/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1
deleted file mode 100644
index 07fd1957108b..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] dev-ruby/i18n:1[ruby_targets_ruby30(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby30(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] dev-ruby/i18n:1[ruby_targets_ruby30(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=28fa4c364da4ba21f6188c2b317532b5
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.7.1 b/metadata/md5-cache/dev-ruby/activesupport-6.1.7.2
index 1d0a61612de7..786225c5d792 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.7.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.1.7.2
@@ -12,6 +12,6 @@ RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.7.1.tar.gz -> rails-6.1.7.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=55f5211fe3ec8ec175b0491747503948
diff --git a/metadata/md5-cache/dev-ruby/activesupport-7.0.3.1 b/metadata/md5-cache/dev-ruby/activesupport-7.0.3.1
deleted file mode 100644
index c47288fafac1..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby31(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby31(-)] dev-ruby/tzinfo:2[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby27(-)] dev-ruby/connection_pool[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby30(-)] dev-ruby/connection_pool[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby30(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby31(-)] dev-ruby/connection_pool[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby31(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby31(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] dev-ruby/rexml[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:5[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/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Utility Classes and Extension to the Standard Library
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby31(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby31(-)] dev-ruby/tzinfo:2[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.1:5[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.3.1.tar.gz -> rails-7.0.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0caf69562949eca0b8cba2f999ba5764
diff --git a/metadata/md5-cache/dev-ruby/activesupport-7.0.4.1 b/metadata/md5-cache/dev-ruby/activesupport-7.0.4.2
index fc0b23954a94..025d9ac68530 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-7.0.4.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-7.0.4.2
@@ -12,6 +12,6 @@ RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.4.1.tar.gz -> rails-7.0.4.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=27d51ef3689fa2e5a532db67175e6c70
diff --git a/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1 b/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
deleted file mode 100644
index 16c049c95a74..000000000000
--- a/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/hiredis:= test? ( dev-ruby/test-unit:2 ) virtual/pkgconfig ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Wrapper for hiredis (protocol serialization/deserialization and blocking I/O)
-EAPI=8
-HOMEPAGE=https://github.com/redis/hiredis-rb
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND==dev-libs/hiredis-0.14*:= ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/redis/hiredis-rb/archive/v0.6.3.tar.gz -> hiredis-rb-0.6.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=be8c47a3de392ae330a06d4b83421479
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.6 b/metadata/md5-cache/dev-ruby/rails-6.0.6
deleted file mode 100644
index e965d0e0a27d..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=7
-HOMEPAGE=https://rubyonrails.org
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://rubygems.org/gems/rails-6.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=2bb946a4a6795c774decffadf144c92e
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.6.1 b/metadata/md5-cache/dev-ruby/rails-6.0.6.1
deleted file mode 100644
index 4a25de43d39c..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=7
-HOMEPAGE=https://rubyonrails.org
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.0.6.1[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://rubygems.org/gems/rails-6.0.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=5e4e59905abd2ae6a27dc8ee5459812e
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.7.1 b/metadata/md5-cache/dev-ruby/rails-6.1.7.1
deleted file mode 100644
index 4688c29424ef..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-6.1.7.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=8
-HOMEPAGE=https://rubyonrails.org
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.7.1[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://rubygems.org/gems/rails-6.1.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=41a7835663cbd84417ebfc869976e0fe
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.7.2 b/metadata/md5-cache/dev-ruby/rails-6.1.7.2
new file mode 100644
index 000000000000..3ceff15fbc0f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rails-6.1.7.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=ruby on rails is a web-application and persistance framework
+EAPI=8
+HOMEPAGE=https://rubyonrails.org
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.7.2[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://rubygems.org/gems/rails-6.1.7.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=41a7835663cbd84417ebfc869976e0fe
diff --git a/metadata/md5-cache/dev-ruby/rails-7.0.3.1 b/metadata/md5-cache/dev-ruby/rails-7.0.3.1
deleted file mode 100644
index 17d48e69f0eb..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actioncable-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=8
-HOMEPAGE=https://rubyonrails.org
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actioncable-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.3.1[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://rubygems.org/gems/rails-7.0.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ce75910e521afaa212e47259255e86c9
diff --git a/metadata/md5-cache/dev-ruby/rails-7.0.4.1 b/metadata/md5-cache/dev-ruby/rails-7.0.4.1
deleted file mode 100644
index 06a9d044aee2..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-7.0.4.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actioncable-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=8
-HOMEPAGE=https://rubyonrails.org
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~amd64 ~ppc64 ~riscv
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actioncable-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.4.1[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://rubygems.org/gems/rails-7.0.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=5b091bfa95b1cd72d318134a844e3a29
diff --git a/metadata/md5-cache/dev-ruby/rails-7.0.4.2 b/metadata/md5-cache/dev-ruby/rails-7.0.4.2
new file mode 100644
index 000000000000..305b7c29a696
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rails-7.0.4.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actioncable-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=ruby on rails is a web-application and persistance framework
+EAPI=8
+HOMEPAGE=https://rubyonrails.org
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64 ~ppc64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actioncable-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.4.2[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=7.0
+SRC_URI=https://rubygems.org/gems/rails-7.0.4.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=5b091bfa95b1cd72d318134a844e3a29
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.6 b/metadata/md5-cache/dev-ruby/railties-6.0.6
deleted file mode 100644
index 3bd7bacba24d..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-6.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.0.6[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/actionview-6.0.6[ruby_targets_ruby30(-)] dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=test !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.tar.gz -> rails-6.0.6.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=d458cf57dfa821e7ff42969e0dd322c9
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.6.1 b/metadata/md5-cache/dev-ruby/railties-6.0.6.1
deleted file mode 100644
index b9800d2731f5..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-6.0.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/actionview-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.0.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.0.6.1[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=test !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ceccc29a612e3f1424836f8522ddb252
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.7.1 b/metadata/md5-cache/dev-ruby/railties-6.1.7.2
index 68fb4f0fe8f9..5795ebd5664b 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.1.7.1
+++ b/metadata/md5-cache/dev-ruby/railties-6.1.7.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby31(-)] dev-ruby/thor:1[ruby_targets_ruby31(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby31(-)] dev-ruby/method_source[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby30(-)] dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( ~dev-ruby/actionview-6.1.7.1[ruby_targets_ruby31(-)] dev-ruby/mocha:0.14[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby31(-)] dev-ruby/thor:1[ruby_targets_ruby31(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby31(-)] dev-ruby/method_source[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby30(-)] dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( ~dev-ruby/actionview-6.1.7.2[ruby_targets_ruby31(-)] dev-ruby/mocha:0.14[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install postinst postrm 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=Tools for creating, working with, and running Rails applications
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.25 ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.1[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-6.1.7.1[ruby_targets_ruby31(-)] dev-ruby/thor:1[ruby_targets_ruby31(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby31(-)] dev-ruby/method_source[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=>=app-eselect/eselect-rails-0.25 ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-6.1.7.2[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-6.1.7.2[ruby_targets_ruby31(-)] dev-ruby/thor:1[ruby_targets_ruby31(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby31(-)] dev-ruby/method_source[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.7.1.tar.gz -> rails-6.1.7.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=47c120c59e448798fcbd99a119a771a9
diff --git a/metadata/md5-cache/dev-ruby/railties-7.0.3.1 b/metadata/md5-cache/dev-ruby/railties-7.0.3.1
deleted file mode 100644
index 99b16d8b8c4d..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-7.0.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/actionview-7.0.3.1[ruby_targets_ruby30(-)] dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.25 ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.3.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.3.1[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.3.1.tar.gz -> rails-7.0.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=127e24521e3d4845bb8544c0f49ef8e8
diff --git a/metadata/md5-cache/dev-ruby/railties-7.0.4.1 b/metadata/md5-cache/dev-ruby/railties-7.0.4.2
index 6c35c392d0cc..cce8475e0601 100644
--- a/metadata/md5-cache/dev-ruby/railties-7.0.4.1
+++ b/metadata/md5-cache/dev-ruby/railties-7.0.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby31(-)] dev-ruby/thor:1[ruby_targets_ruby31(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby31(-)] dev-ruby/method_source[ruby_targets_ruby31(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby30(-)] dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( ~dev-ruby/actionview-7.0.4.1[ruby_targets_ruby31(-)] dev-ruby/mocha:0.14[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby31(-)] dev-ruby/thor:1[ruby_targets_ruby31(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby31(-)] dev-ruby/method_source[ruby_targets_ruby31(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby30(-)] dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( ~dev-ruby/actionview-7.0.4.2[ruby_targets_ruby31(-)] dev-ruby/mocha:0.14[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
 DEFINED_PHASES=compile configure install postinst postrm 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=Tools for creating, working with, and running Rails applications
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.25 ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.1[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-7.0.4.1[ruby_targets_ruby31(-)] dev-ruby/thor:1[ruby_targets_ruby31(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby31(-)] dev-ruby/method_source[ruby_targets_ruby31(-)] >=dev-ruby/zeitwerk-2.5:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=>=app-eselect/eselect-rails-0.25 ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/activesupport-7.0.4.2[ruby_targets_ruby31(-)] ~dev-ruby/actionpack-7.0.4.2[ruby_targets_ruby31(-)] dev-ruby/thor:1[ruby_targets_ruby31(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby31(-)] dev-ruby/method_source[ruby_targets_ruby31(-)] >=dev-ruby/zeitwerk-2.5:2[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.4.1.tar.gz -> rails-7.0.4.1.tgz
+SRC_URI=https://github.com/rails/rails/archive/v7.0.4.2.tar.gz -> rails-7.0.4.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
 _md5_=191dd9e26bebea3e62f0462ee88436cf
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.21.4 b/metadata/md5-cache/dev-ruby/typeprof-0.21.4
new file mode 100644
index 000000000000..ca1ff78143a2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.21.4
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/rbs-1.8.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rbs-1.8.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rbs-1.8.1[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? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=Performs a type analysis of non-annotated Ruby code
+EAPI=8
+HOMEPAGE=https://github.com/ruby/typeprof
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/rbs-1.8.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rbs-1.8.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rbs-1.8.1[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? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/typeprof/archive/v0.21.4.tar.gz -> typeprof-0.21.4.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6c02029f01bd0a026eef59c7f65b3902
diff --git a/metadata/md5-cache/dev-ruby/webrick-1.8.0 b/metadata/md5-cache/dev-ruby/webrick-1.8.0
new file mode 100644
index 000000000000..55005a0679b0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/webrick-1.8.0
@@ -0,0 +1,17 @@
+BDEPEND=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/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_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(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_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=An HTTP server toolkit
+EAPI=8
+HOMEPAGE=https://github.com/ruby/webrick
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby-BSD BSD-2 )
+RDEPEND=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(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/webrick/archive/v1.8.0.tar.gz -> webrick-1.8.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6ed5868f39a3e09a708b402511f46f6e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index f8c8f5c5564f..e767106a9a90 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/cscope-15.9-r1 b/metadata/md5-cache/dev-util/cscope-15.9-r1
new file mode 100644
index 000000000000..209fae8249ae
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cscope-15.9-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex virtual/pkgconfig app-alternatives/yacc 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
+DEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* )
+DESCRIPTION=Interactively examine a C program
+EAPI=7
+HOMEPAGE=https://cscope.sourceforge.net/
+INHERIT=autotools elisp-common toolchain-funcs
+IUSE=emacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD GPL-2+
+RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* )
+SLOT=0
+SRC_URI=mirror://sourceforge/cscope/cscope-15.9.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=a7cb03d462c9e8bbc9144207300dd9ce
diff --git a/metadata/md5-cache/dev-util/gnome-builder-43.4 b/metadata/md5-cache/dev-util/gnome-builder-43.4
index b934a69adb21..bce93f1c1af8 100644
--- a/metadata/md5-cache/dev-util/gnome-builder-43.4
+++ b/metadata/md5-cache/dev-util/gnome-builder-43.4
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/43/gnome-builder-43.4.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=814826ceb833a0b8e91e1c1c4c9344cf
+_md5_=6a020aa493ba12d9d31c5c098afd24e4
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.6 b/metadata/md5-cache/dev-util/lldb-15.0.6
deleted file mode 100644
index e4e3a6c19016..000000000000
--- a/metadata/md5-cache/dev-util/lldb-15.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( ~dev-python/lit-15.0.6[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-15.0.6[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-15.0.6[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-15.0.6 ~sys-devel/llvm-15.0.6 !!sys-devel/llvm:0
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-single-r1
-IUSE=debug +libedit lzma ncurses +python test +xml test verify-sig python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-15.0.6 ~sys-devel/llvm-15.0.6 python? ( python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0/15
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6f8c56176a914b9a0329aa2acd261b13
diff --git a/metadata/md5-cache/dev-util/packer-1.8.5 b/metadata/md5-cache/dev-util/packer-1.8.5
new file mode 100644
index 000000000000..6f9a14b9af1f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/packer-1.8.5
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=A tool to create identical machine images for multiple platforms
+EAPI=8
+HOMEPAGE=https://www.packer.io
+INHERIT=go-module
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/hashicorp/packer/archive/v1.8.5.tar.gz -> packer-1.8.5.tar.gz https://gentoofiles.s3.eu-central-1.amazonaws.com/packer-1.8.5-deps.tar.xz
+_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5
+_md5_=e18820f8f14c9e7bc51fd4b5ddf2d3e8
diff --git a/metadata/md5-cache/dev-util/pwndbg-20221219-r1 b/metadata/md5-cache/dev-util/pwndbg-20221219-r1
index ed472ab127c5..99af2c32d677 100644
--- a/metadata/md5-cache/dev-util/pwndbg-20221219-r1
+++ b/metadata/md5-cache/dev-util/pwndbg-20221219-r1
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://github.com/pwndbg/pwndbg
 INHERIT=python-single-r1 wrapper
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) sys-devel/gdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_9? ( dev-libs/capstone[python,python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pycparser[python_targets_python3_9(-)] dev-python/pyelftools[python_targets_python3_9(-)] dev-python/python-ptrace[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-util/ROPgadget[python_targets_python3_9(-)] dev-util/unicorn[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/capstone[python,python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] dev-python/pycparser[python_targets_python3_10(-)] dev-python/pyelftools[python_targets_python3_10(-)] dev-python/python-ptrace[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-util/ROPgadget[python_targets_python3_10(-)] dev-util/unicorn[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/capstone[python,python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] dev-python/pycparser[python_targets_python3_11(-)] dev-python/pyelftools[python_targets_python3_11(-)] dev-python/python-ptrace[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] dev-util/ROPgadget[python_targets_python3_11(-)] dev-util/unicorn[python,python_targets_python3_11(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/pwndbg/pwndbg/archive/2022.12.19.tar.gz -> pwndbg-20221219.tar.gz https://github.com/martinradev/gdb-pt-dump/archive/ebdc24573a4bf075cf3ab6016add9db6baacf977.tar.gz -> gdb-pt-dump-ebdc24573a4bf075cf3ab6016add9db6baacf977.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2023b282e2b8c883a49d1f673f5c6876
+_md5_=17b912184ad349e50a99c1a311bdfeda
diff --git a/metadata/md5-cache/dev-util/rocm-smi-5.1.3 b/metadata/md5-cache/dev-util/rocm-smi-5.1.3-r1
index 05a826ae21db..bd06763e7660 100644
--- a/metadata/md5-cache/dev-util/rocm-smi-5.1.3
+++ b/metadata/md5-cache/dev-util/rocm-smi-5.1.3-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0/5.1
 SRC_URI=https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-5.1.3.tar.gz -> rocm-smi-5.1.3.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7af9458ce0fba0ed985491736f81310f
+_md5_=61ec61fd40afe24d09637afd8250fea7
diff --git a/metadata/md5-cache/dev-util/rocm-smi-5.4.2 b/metadata/md5-cache/dev-util/rocm-smi-5.4.2
new file mode 100644
index 000000000000..3060dd636bd1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rocm-smi-5.4.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=ROCm System Management Interface Library
+EAPI=8
+HOMEPAGE=https://github.com/RadeonOpenCompute/rocm_smi_lib
+INHERIT=cmake python-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT NCSA-AMD
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0/5.4
+SRC_URI=https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-5.4.2.tar.gz -> rocm-smi-5.4.2.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=892af046a45fa5fba755e58351de3ed2
diff --git a/metadata/md5-cache/dev-util/rocm-smi-9999 b/metadata/md5-cache/dev-util/rocm-smi-9999
index 6093fbab0084..464169211fcb 100644
--- a/metadata/md5-cache/dev-util/rocm-smi-9999
+++ b/metadata/md5-cache/dev-util/rocm-smi-9999
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=ROCm System Management Interface Library
 EAPI=8
 HOMEPAGE=https://github.com/RadeonOpenCompute/rocm_smi_lib
-INHERIT=cmake multilib prefix python-r1 git-r3
-IUSE=python_targets_python3_9 python_targets_python3_10
-LICENSE=NCSA-AMD
+INHERIT=cmake python-r1 git-r3
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+LICENSE=MIT NCSA-AMD
 PROPERTIES=live
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0/9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d479ec241b5ca8136940e900a4153b80
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=892af046a45fa5fba755e58351de3ed2
diff --git a/metadata/md5-cache/dev-util/strace-6.1 b/metadata/md5-cache/dev-util/strace-6.1
index 899025853eee..364b681bddd8 100644
--- a/metadata/md5-cache/dev-util/strace-6.1
+++ b/metadata/md5-cache/dev-util/strace-6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://strace.io/
 INHERIT=autotools edo flag-o-matic toolchain-funcs
 IUSE=aio perl selinux static unwind elfutils
-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=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) selinux? ( sys-libs/libselinux ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
 SRC_URI=https://github.com/strace/strace/releases/download/v6.1/strace-6.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1fe30af633451fc3d743f789a391f400
+_md5_=31f0fe696139db0793a7c8428a9ff8f5
diff --git a/metadata/md5-cache/dev-util/valgrind-3.20.0-r2 b/metadata/md5-cache/dev-util/valgrind-3.20.0-r2
index cf1d861bbdcf..bf2e921d6cce 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.20.0-r2
+++ b/metadata/md5-cache/dev-util/valgrind-3.20.0-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://valgrind.org
 INHERIT=autotools flag-o-matic toolchain-funcs multilib pax-utils verify-sig
 IUSE=mpi verify-sig
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2 verify-sig? ( https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=89d0aa49073854b5476d66fc33205981
+_md5_=37de8532c1bdf34b654ba62e43b7f35f
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 4956fab83cae..25bea3c66e0f 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/kodi-platform-9999 b/metadata/md5-cache/media-libs/kodi-platform-9999
deleted file mode 100644
index d9358f737429..000000000000
--- a/metadata/md5-cache/media-libs/kodi-platform-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml
-DESCRIPTION=Kodi platform support library
-EAPI=7
-HOMEPAGE=https://kodi.tv
-INHERIT=cmake git-r3
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml
-SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=515ee412ad742c5feb3921677f2823cf
diff --git a/metadata/md5-cache/media-libs/libjxl-0.8.0 b/metadata/md5-cache/media-libs/libjxl-0.8.0
new file mode 100644
index 000000000000..21656ea062fe
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libjxl-0.8.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 openexr? ( media-libs/openexr:= )
+DESCRIPTION=JPEG XL image format reference implementation
+EAPI=8
+HOMEPAGE=https://github.com/libjxl/libjxl
+INHERIT=cmake-multilib flag-o-matic
+IUSE=openexr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 openexr? ( media-libs/openexr:= )
+SLOT=0
+SRC_URI=https://github.com/libjxl/libjxl/archive/refs/tags/v0.8.0.tar.gz -> libjxl-0.8.0.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c9f2f503415cd271d739974266516099
diff --git a/metadata/md5-cache/media-libs/libjxl-9999 b/metadata/md5-cache/media-libs/libjxl-9999
index 76ad18f6d3f1..e0c68b237188 100644
--- a/metadata/md5-cache/media-libs/libjxl-9999
+++ b/metadata/md5-cache/media-libs/libjxl-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) openexr? ( media-libs/openexr:= )
+DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) openexr? ( media-libs/openexr:= )
 DESCRIPTION=JPEG XL image format reference implementation
 EAPI=8
 HOMEPAGE=https://github.com/libjxl/libjxl
@@ -8,7 +8,7 @@ INHERIT=cmake-multilib flag-o-matic git-r3
 IUSE=gdk-pixbuf openexr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) openexr? ( media-libs/openexr:= )
+RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) openexr? ( media-libs/openexr:= )
 SLOT=0
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=eb7ff5670c43b18b06f324b362d0b631
+_md5_=5dd55af96fcc30a7d745d9b12d5f71f3
diff --git a/metadata/md5-cache/media-libs/libpulse-16.1-r2 b/metadata/md5-cache/media-libs/libpulse-16.1-r2
index c7ade7db4466..4bbecbf54f67 100644
--- a/metadata/md5-cache/media-libs/libpulse-16.1-r2
+++ b/metadata/md5-cache/media-libs/libpulse-16.1-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 INHERIT=bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev
 IUSE=+asyncns dbus doc +glib gtk selinux systemd test valgrind X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=|| ( media-video/pipewire[sound-server(+)] media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )
 RDEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elibc_mingw? ( dev-libs/libpcre:3 ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-sound/pulseaudio-15.0-r100
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2f7e3bffd3548d133337f7d5694f4255
+_md5_=8003079666454dbad94adbfb9160ea87
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 166f105d0249..837e16a9b74e 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999
deleted file mode 100644
index 513fb8eae3f4..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 games-emulation/libretro-fceumm
-DESCRIPTION=FCEU-Next GameClient for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-game/game.libretro.fceumm
-INHERIT=cmake kodi-addon git-r3
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-fceumm
-SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	kodi-addon	239da09ac2a1d7b28ee496d94471026f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5d6a18ef4f0a6bed5428a1bc74d735a4
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999 b/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
deleted file mode 100644
index 48af4bfb8f08..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* virtual/libusb:1
-DESCRIPTION=Steam controller driver for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-game/peripheral.steamcontroller
-INHERIT=cmake kodi-addon git-r3
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* virtual/libusb:1
-SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	kodi-addon	239da09ac2a1d7b28ee496d94471026f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=028f2fe5c212f055fcb3d98171ca30d5
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index e3e31fe22a69..dc0a92e6c797 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/din-55 b/metadata/md5-cache/media-sound/din-55
deleted file mode 100644
index 57f72109024e..000000000000
--- a/metadata/md5-cache/media-sound/din-55
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) dev-libs/boost
-DESCRIPTION=a software musical instrument and audio synthesizer
-EAPI=8
-HOMEPAGE=https://dinisnoise.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools edos2unix xdg
-IUSE=+alsa jack
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
-REQUIRED_USE=|| ( alsa jack )
-SLOT=0
-SRC_URI=https://archive.org/download/dinisnoise_source_code/din-55.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=41c7271a258d878ed8c5053b23ad1446
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.4.5 b/metadata/md5-cache/media-sound/wildmidi-0.4.5
new file mode 100644
index 000000000000..12c7cb2cfb4d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/wildmidi-0.4.5
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) )
+DESCRIPTION=MIDI processing library and player using the GUS patch set
+EAPI=8
+HOMEPAGE=http://www.mindwerks.net/projects/wildmidi/
+INHERIT=cmake readme.gentoo-r1
+IUSE=+alsa openal oss +player
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+ LGPL-3+
+RDEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) ) media-sound/timidity-freepats
+REQUIRED_USE=player? ( ^^ ( alsa oss openal ) )
+SLOT=0
+SRC_URI=https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.4.5.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c7ab01b09382b67b14d5f53e9a2fc09d
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index d5021073c0cf..6fd50e280fb7 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.6.11 b/metadata/md5-cache/net-analyzer/wireshark-3.6.11
index 1f029f205273..7fe8f30edc5c 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.6.11
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.6.11
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.wireshark.org/
 IDEPEND=filecaps? ( sys-libs/libcap ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins qt5 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3.6.11
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.6.11.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bc12ee8687449d5531caa327bb024982
+_md5_=77952c169d8e40d6a399523cb5cb48a8
diff --git a/metadata/md5-cache/net-analyzer/wireshark-4.0.3 b/metadata/md5-cache/net-analyzer/wireshark-4.0.3
index a11425f94f78..8f186c80b86c 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-4.0.3
+++ b/metadata/md5-cache/net-analyzer/wireshark-4.0.3
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.wireshark.org/
 IDEPEND=filecaps? ( sys-libs/libcap ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.0.3
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-4.0.3.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1a17ccf454121771b178bc23d19187a7
+_md5_=527660ef57aaf3773c2570bf567ed332
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 4c6983c64ddf..956d85c3ca31 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.5.1-r100 b/metadata/md5-cache/net-dns/dnsdist-1.5.1-r100
deleted file mode 100644
index 8d427685870c..000000000000
--- a/metadata/md5-cache/net-dns/dnsdist-1.5.1-r100
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) remote-logging? ( >=dev-libs/protobuf-3:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
-DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
-EAPI=7
-HOMEPAGE=https://dnsdist.org
-INHERIT=flag-o-matic lua-single
-IUSE=dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) remote-logging? ( >=dev-libs/protobuf-3:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnscrypt? ( ssl ) gnutls? ( ssl ) doh? ( ssl !gnutls )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.5.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=58f8aa654b46cdf5eb01e215bc0447e7
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.5.1-r101 b/metadata/md5-cache/net-dns/dnsdist-1.5.1-r101
new file mode 100644
index 000000000000..1eb2d5dc064b
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnsdist-1.5.1-r101
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= dev-libs/libsodium:= dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) remote-logging? ( >=dev-libs/protobuf-3:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
+EAPI=7
+HOMEPAGE=https://dnsdist.org
+INHERIT=lua-single
+IUSE=dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= dev-libs/libsodium:= dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) remote-logging? ( >=dev-libs/protobuf-3:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnscrypt? ( ssl ) gnutls? ( ssl ) doh? ( ssl !gnutls )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.5.1.tar.bz2
+_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=8469cfb98984a114fc515c92a9bbcc37
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.6.0 b/metadata/md5-cache/net-dns/dnsdist-1.6.0
deleted file mode 100644
index 09694fe07f6e..000000000000
--- a/metadata/md5-cache/net-dns/dnsdist-1.6.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst setup
-DEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
-DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
-EAPI=7
-HOMEPAGE=https://dnsdist.org
-INHERIT=flag-o-matic lua-single
-IUSE=dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnscrypt? ( ssl ) gnutls? ( ssl ) doh? ( ssl !gnutls )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.6.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8b584a4623506cceadc89b3315f9cba1
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.6.1 b/metadata/md5-cache/net-dns/dnsdist-1.6.1
deleted file mode 100644
index 24f379927bd1..000000000000
--- a/metadata/md5-cache/net-dns/dnsdist-1.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst setup
-DEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
-DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
-EAPI=7
-HOMEPAGE=https://dnsdist.org
-INHERIT=flag-o-matic lua-single
-IUSE=dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnscrypt? ( ssl ) gnutls? ( ssl ) doh? ( ssl !gnutls )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.6.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=52042507d9a7fd68d26a86eacac600b7
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.6.1-r1 b/metadata/md5-cache/net-dns/dnsdist-1.6.1-r1
new file mode 100644
index 000000000000..730abf821083
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnsdist-1.6.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= dev-libs/libsodium:= >=dev-libs/protobuf-3:= dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
+EAPI=7
+HOMEPAGE=https://dnsdist.org
+INHERIT=lua-single
+IUSE=dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= dev-libs/libsodium:= >=dev-libs/protobuf-3:= dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnscrypt? ( ssl ) gnutls? ( ssl ) doh? ( ssl !gnutls )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.6.1.tar.bz2
+_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=9c5afc9a6598b8b4246b0102c20b794f
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.7.0 b/metadata/md5-cache/net-dns/dnsdist-1.7.0
deleted file mode 100644
index 7dabbffd3ae6..000000000000
--- a/metadata/md5-cache/net-dns/dnsdist-1.7.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst setup
-DEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) net-libs/nghttp2
-DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
-EAPI=7
-HOMEPAGE=https://dnsdist.org
-INHERIT=flag-o-matic lua-single
-IUSE=dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) net-libs/nghttp2
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnscrypt? ( ssl ) gnutls? ( ssl ) doh? ( ssl !gnutls )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.7.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9414191602641dcf42e8c28eb61cb4be
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.7.1 b/metadata/md5-cache/net-dns/dnsdist-1.7.1
deleted file mode 100644
index 07c74f95502a..000000000000
--- a/metadata/md5-cache/net-dns/dnsdist-1.7.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst setup
-DEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) net-libs/nghttp2
-DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
-EAPI=7
-HOMEPAGE=https://dnsdist.org
-INHERIT=flag-o-matic lua-single
-IUSE=dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) net-libs/nghttp2
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnscrypt? ( ssl ) gnutls? ( ssl ) doh? ( ssl !gnutls )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.7.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=704ef17ed329357d5d3bdbb80948ef09
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.7.2 b/metadata/md5-cache/net-dns/dnsdist-1.7.2
deleted file mode 100644
index d165c5156677..000000000000
--- a/metadata/md5-cache/net-dns/dnsdist-1.7.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst setup
-DEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) net-libs/nghttp2
-DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
-EAPI=7
-HOMEPAGE=https://dnsdist.org
-INHERIT=flag-o-matic lua-single
-IUSE=dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) net-libs/nghttp2
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnscrypt? ( ssl ) gnutls? ( ssl ) doh? ( ssl !gnutls )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.7.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=704ef17ed329357d5d3bdbb80948ef09
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.7.3 b/metadata/md5-cache/net-dns/dnsdist-1.7.3-r1
index 2c78b96764b0..b066326b0809 100644
--- a/metadata/md5-cache/net-dns/dnsdist-1.7.3
+++ b/metadata/md5-cache/net-dns/dnsdist-1.7.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install postinst setup
-DEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) net-libs/nghttp2
+DEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= dev-libs/libsodium:= >=dev-libs/protobuf-3:= dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) net-libs/nghttp2
 DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
 EAPI=7
 HOMEPAGE=https://dnsdist.org
@@ -8,10 +8,10 @@ INHERIT=flag-o-matic lua-single
 IUSE=dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) net-libs/nghttp2
+RDEPEND=acct-group/dnsdist acct-user/dnsdist dev-libs/boost:= dev-libs/libedit:= dev-libs/libsodium:= >=dev-libs/protobuf-3:= dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) net-libs/nghttp2
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnscrypt? ( ssl ) gnutls? ( ssl ) doh? ( ssl !gnutls )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.7.3.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=704ef17ed329357d5d3bdbb80948ef09
+_md5_=e826ee83d13ca2992e40cad121bfa681
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index be23377a7960..d11df02ac21e 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/ipset-7.17 b/metadata/md5-cache/net-firewall/ipset-7.17
index bc041e797839..00ee5b3e770f 100644
--- a/metadata/md5-cache/net-firewall/ipset-7.17
+++ b/metadata/md5-cache/net-firewall/ipset-7.17
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://ipset.netfilter.org/ https://git.netfilter.org/ipset/
 INHERIT=autotools bash-completion-r1 linux-info linux-mod systemd
 IUSE=dist-kernel modules
-KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl:= modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://ipset.netfilter.org/ipset-7.17.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	a138af023f7507b676b0aec9fe4b1e83	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=34639d437e6c2a9bab45f275fc69281d
+_md5_=96a02ad5e62495de1753a4f1f68c1ada
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 48be8f0b7978..da7e82003024 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/ldns-1.8.3 b/metadata/md5-cache/net-libs/ldns-1.8.3
index 3790d9034890..3a8f8c9640fd 100644
--- a/metadata/md5-cache/net-libs/ldns-1.8.3
+++ b/metadata/md5-cache/net-libs/ldns-1.8.3
@@ -1,10 +1,10 @@
-BDEPEND=python? ( dev-lang/swig ) doc? ( app-doc/doxygen )
+BDEPEND=python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) >=dev-libs/openssl-1.1.1l-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] examples? ( net-libs/libpcap )
 DESCRIPTION=A library with the aim to simplify DNS programming in C
 EAPI=8
 HOMEPAGE=https://www.nlnetlabs.nl/projects/ldns/
-INHERIT=python-single-r1 multilib-minimal
+INHERIT=autotools python-single-r1 multilib-minimal
 IUSE=doc examples python static-libs python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_
 RESTRICT=test
 SLOT=0/3
 SRC_URI=https://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.3.tar.gz
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=4ee8592317529b8e1cd8f913363b45f6
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=fda4a89415faac7c9242a48b3fcde55f
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index a49e034d13f4..c2dae97c2377 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/electrum-4.3.2 b/metadata/md5-cache/net-misc/electrum-4.3.2
deleted file mode 100644
index 4036f5f07ac5..000000000000
--- a/metadata/md5-cache/net-misc/electrum-4.3.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyaes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses] ) ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=8
-HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
-INHERIT=distutils-r1 xdg-utils
-IUSE=cli ncurses qrcode +qt5 test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] )
-REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.2.tar.gz -> electrum-4.3.2.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=09eb4934763143bed044056d4155960f
diff --git a/metadata/md5-cache/net-misc/electrum-4.3.2-r1 b/metadata/md5-cache/net-misc/electrum-4.3.2-r1
new file mode 100644
index 000000000000..c507ee64be51
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-4.3.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyaes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses] ) ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=User friendly Bitcoin client
+EAPI=8
+HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
+INHERIT=distutils-r1 xdg-utils
+IUSE=cli ncurses qrcode +qt5 test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] )
+REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.2.tar.gz -> electrum-4.3.2.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=84a9ba138f184afca63feb36dc466436
diff --git a/metadata/md5-cache/net-misc/electrum-4.3.3 b/metadata/md5-cache/net-misc/electrum-4.3.3
deleted file mode 100644
index b4e3839c0cd0..000000000000
--- a/metadata/md5-cache/net-misc/electrum-4.3.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyaes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses] ) ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=8
-HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
-INHERIT=distutils-r1 xdg-utils
-IUSE=cli ncurses qrcode +qt5 test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] )
-REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.3.tar.gz -> electrum-4.3.3.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ab729da3aff35dc1f12d1118597d789c
diff --git a/metadata/md5-cache/net-misc/electrum-4.3.3-r1 b/metadata/md5-cache/net-misc/electrum-4.3.3-r1
new file mode 100644
index 000000000000..6706be158415
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-4.3.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyaes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses] ) ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=User friendly Bitcoin client
+EAPI=8
+HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
+INHERIT=distutils-r1 xdg-utils
+IUSE=cli ncurses qrcode +qt5 test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] )
+REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.3.tar.gz -> electrum-4.3.3.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3379a939d49fd520e98774a1a5e40cc2
diff --git a/metadata/md5-cache/net-misc/electrum-4.3.4 b/metadata/md5-cache/net-misc/electrum-4.3.4
new file mode 100644
index 000000000000..65352d97d8b1
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-4.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyaes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses] ) ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=User friendly Bitcoin client
+EAPI=8
+HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
+INHERIT=distutils-r1 xdg-utils
+IUSE=cli ncurses qrcode +qt5 test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ncurses?] )
+REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.4.tar.gz -> electrum-4.3.4.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8795cea463a01e84bc9d5654e89a6222
diff --git a/metadata/md5-cache/net-misc/iputils-20221126 b/metadata/md5-cache/net-misc/iputils-20221126
index 483cd27e7bcf..96e23d52c18b 100644
--- a/metadata/md5-cache/net-misc/iputils-20221126
+++ b/metadata/md5-cache/net-misc/iputils-20221126
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.linuxfoundation.org/networking/iputils
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=fcaps meson plocale systemd toolchain-funcs
 IUSE=+arping caps clockdiff doc idn nls test tracepath +filecaps
-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=BSD arping? ( GPL-2+ ) clockdiff? ( BSD ) tracepath? ( GPL-2+ )
 RDEPEND=caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/20221126.tar.gz -> iputils-20221126.tar.gz https://dev.gentoo.org/~sam/distfiles/net-misc/iputils/iputils-20221126-docs.tar.xz
 _eclasses_=fcaps	da0130200e07aaecee121b85f4b9ea17	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9550999374438ec4f7c525aafb48ae2d
+_md5_=900a7a6ebec40e42b7f9ea1c8a622431
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p15-r4 b/metadata/md5-cache/net-misc/ntp-4.2.8_p15-r4
index f85d03869768..95deb2cce2d4 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p15-r4
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p15-r4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://www.ntp.org/
 INHERIT=autotools flag-o-matic systemd
 IUSE=caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
-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=HPND BSD ISC
 PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl:0= ) parse-clocks? ( net-misc/pps-tools ) acct-group/ntp acct-user/ntp selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p15.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p15-manpages.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6ef2727aa403321225f263c239030f97
+_md5_=46da23690777e9e2d45985ad94612c2d
diff --git a/metadata/md5-cache/net-misc/pps-tools-1.0.3 b/metadata/md5-cache/net-misc/pps-tools-1.0.3
index 8737ce9cdcb5..831480dd2011 100644
--- a/metadata/md5-cache/net-misc/pps-tools-1.0.3
+++ b/metadata/md5-cache/net-misc/pps-tools-1.0.3
@@ -3,9 +3,9 @@ DESCRIPTION=User-space tools for LinuxPPS
 EAPI=8
 HOMEPAGE=https://github.com/redlab-i/pps-tools
 INHERIT=toolchain-funcs
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/redlab-i/pps-tools/archive/v1.0.3.tar.gz -> pps-tools-1.0.3.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1e20b5f9edfefeba7293093720e82d9b
+_md5_=a83a448e68bd5c0a0ee127b3afc567f2
diff --git a/metadata/md5-cache/net-misc/valve-1.0-r1 b/metadata/md5-cache/net-misc/valve-1.0-r1
deleted file mode 100644
index f6fc6936927b..000000000000
--- a/metadata/md5-cache/net-misc/valve-1.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DESCRIPTION=Copy data while enforcing a specified maximum transfer rate
-EAPI=6
-HOMEPAGE=https://www.fourmilab.ch/webtools/valve/
-IUSE=test doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=public-domain
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.fourmilab.ch/webtools/valve/valve-1.0.tar.gz
-_md5_=379e4d5fbe0f889f61a7a8d41aca4d7c
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 3a9f05dde64e..42335bc0f02c 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/consed-29 b/metadata/md5-cache/sci-biology/consed-29
deleted file mode 100644
index d88cf895d51b..000000000000
--- a/metadata/md5-cache/sci-biology/consed-29
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/motif:0 sci-biology/samtools:0.1-legacy virtual/pkgconfig
-DESCRIPTION=A genome sequence finishing program
-EAPI=6
-HOMEPAGE=http://bozeman.mbt.washington.edu/consed/consed.html
-INHERIT=flag-o-matic toolchain-funcs
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=phrap
-RDEPEND=x11-libs/libX11 x11-libs/motif:0 sci-biology/samtools:0.1-legacy dev-lang/perl >=sci-biology/phred-071220-r1 >=sci-biology/phrap-1.080812-r2
-RESTRICT=fetch
-SLOT=0
-SRC_URI=consed-29-sources.tar.gz consed-29-linux.tar.gz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1e30f1827727dab34c75c8c026745369
diff --git a/metadata/md5-cache/sci-biology/phrap-1.080812-r2 b/metadata/md5-cache/sci-biology/phrap-1.080812-r2
deleted file mode 100644
index 6a864d8c370d..000000000000
--- a/metadata/md5-cache/sci-biology/phrap-1.080812-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install nofetch
-DESCRIPTION=Shotgun assembly and alignment utilities
-EAPI=6
-HOMEPAGE=http://www.phrap.org/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=phrap
-RDEPEND=dev-lang/perl dev-perl/Tk
-RESTRICT=fetch
-SLOT=0
-SRC_URI=phrap-1.080812-distrib.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=8f5aa73e6a49ffbd5804d4ddea05b2b8
diff --git a/metadata/md5-cache/sci-biology/phred-071220-r2 b/metadata/md5-cache/sci-biology/phred-071220-r2
deleted file mode 100644
index f8034453c71a..000000000000
--- a/metadata/md5-cache/sci-biology/phred-071220-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install nofetch
-DESCRIPTION=A base caller for Sanger DNA sequencing
-EAPI=8
-HOMEPAGE=http://phrap.org/phredphrapconsed.html
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=phrap
-RESTRICT=fetch
-SLOT=0
-SRC_URI=phred-dist-071220.b-acd.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0b391faf1bbb559536c0722250656707
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 4bc56984865a..be190f3a7a0e 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-1.6.4 b/metadata/md5-cache/sci-chemistry/votca-csg-1.6.4
deleted file mode 100644
index 4507ba2df308..000000000000
--- a/metadata/md5-cache/sci-chemistry/votca-csg-1.6.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-text/txt2tags-2.5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-1.6.4 gromacs? ( sci-chemistry/gromacs:=[gmxapi-legacy(+)] ) hdf5? ( sci-libs/hdf5 )
-DESCRIPTION=Votca coarse-graining engine
-EAPI=7
-HOMEPAGE=https://www.votca.org/
-INHERIT=bash-completion-r1 cmake
-IUSE=doc examples extras +gromacs hdf5
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=Apache-2.0
-PDEPEND=extras? ( ~sci-chemistry/votca-csgapps-1.6.4 )
-RDEPEND=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-1.6.4 gromacs? ( sci-chemistry/gromacs:=[gmxapi-legacy(+)] ) hdf5? ( sci-libs/hdf5 )
-SLOT=0
-SRC_URI=https://github.com/votca/csg/archive/v1.6.4.tar.gz -> votca-csg-1.6.4.tar.gz doc? ( https://github.com/votca/csg-manual/releases/download/v1.6.4/votca-csg-manual-1.6.4.pdf ) examples? ( https://github.com/votca/csg-tutorials/archive/v1.6.4.tar.gz -> votca-csg-tutorials-1.6.4.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2f329cc3dd7168728e805eec9f7a32bf
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-2021.2 b/metadata/md5-cache/sci-chemistry/votca-csg-2021.2
deleted file mode 100644
index cbac90cfb23f..000000000000
--- a/metadata/md5-cache/sci-chemistry/votca-csg-2021.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-text/txt2tags-2.5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-2021.2 gromacs? ( sci-chemistry/gromacs:=[gmxapi-legacy(+)] ) hdf5? ( sci-libs/hdf5 )
-DESCRIPTION=Votca coarse-graining engine
-EAPI=7
-HOMEPAGE=https://www.votca.org/
-INHERIT=bash-completion-r1 cmake
-IUSE=examples extras +gromacs hdf5 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=app-shells/bash:* >=dev-cpp/eigen-3.3 dev-lang/perl ~sci-libs/votca-tools-2021.2 gromacs? ( sci-chemistry/gromacs:=[gmxapi-legacy(+)] ) hdf5? ( sci-libs/hdf5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/votca/csg/archive/v2021.2.tar.gz -> votca-csg-2021.2.tar.gz examples? ( https://github.com/votca/csg-tutorials/archive/v2021.2.tar.gz -> votca-csg-tutorials-2021.2.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=aa61163ebdebfc006a4183a3cbae6c68
diff --git a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6.4 b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6.4
deleted file mode 100644
index 0900e9ae0f4c..000000000000
--- a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-1.6.4
-DESCRIPTION=Extra applications for votca-csg
-EAPI=7
-HOMEPAGE=https://www.votca.org/
-INHERIT=cmake
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-1.6.4
-SLOT=0
-SRC_URI=https://github.com/votca/csgapps/archive/v1.6.4.tar.gz -> votca-csgapps-1.6.4.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=05cbd3b8f122302c77953bfa3452c293
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.4 b/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.4
deleted file mode 100644
index c92efb7fb686..000000000000
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-1.6.4 sci-libs/hdf5[cxx] sci-libs/libxc ~sci-libs/votca-tools-1.6.4
-DESCRIPTION=Votca excitation and charge properties module
-EAPI=7
-HOMEPAGE=https://www.votca.org/
-INHERIT=bash-completion-r1 cmake
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-1.6.4 sci-libs/hdf5[cxx] sci-libs/libxc ~sci-libs/votca-tools-1.6.4
-SLOT=0
-SRC_URI=https://github.com/votca/xtp/archive/v1.6.4.tar.gz -> votca-xtp-1.6.4.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2748df7df0e3b59bd0a842fe11ca3f68
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-2021.2 b/metadata/md5-cache/sci-chemistry/votca-xtp-2021.2
deleted file mode 100644
index 93a3b240ec4d..000000000000
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-2021.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-2021.2 sci-libs/hdf5[cxx] sci-libs/libxc sci-libs/libint:2 ~sci-libs/votca-tools-2021.2
-DESCRIPTION=Votca excitation and charge properties module
-EAPI=7
-HOMEPAGE=https://www.votca.org/
-INHERIT=bash-completion-r1 cmake
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-2021.2 sci-libs/hdf5[cxx] sci-libs/libxc sci-libs/libint:2 ~sci-libs/votca-tools-2021.2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/votca/xtp/archive/v2021.2.tar.gz -> votca-xtp-2021.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8263546cfc693f6fe224a55c0a16dafd
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 70a69dd5b027..30426013c393 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.12-r3 b/metadata/md5-cache/sci-electronics/kicad-5.1.12-r3
deleted file mode 100644
index 649b8ac9ca26..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.12-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( <sci-libs/opencascade-7.5.3:0=[vtk(+)] ) python? ( python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) ) python? ( >=dev-lang/swig-3.0:0 )
-DESCRIPTION=Electronic Schematic and PCB design tools
-EAPI=8
-HOMEPAGE=https://www.kicad.org
-INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
-IUSE=doc examples github ngspice +occ openmp +python +python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( <sci-libs/opencascade-7.5.3:0=[vtk(+)] ) python? ( python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) ) sci-electronics/electronics-menu
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/5.1.12/kicad-5.1.12.tar.bz2
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ee0305d30d387eea735261a82a96441e
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.12 b/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.12
deleted file mode 100644
index a77f90ab048c..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.12
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
-EAPI=8
-HOMEPAGE=https://kicad.github.io/footprints/
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.1.0
-SLOT=0
-SRC_URI=https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/5.1.12/kicad-footprints-5.1.12.tar.bz2
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=94deb842c1e48a94460af38466b748d6
diff --git a/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.12 b/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.12
deleted file mode 100644
index 0ef07da81093..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.12
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gettext >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools GUI translations
-EAPI=8
-HOMEPAGE=https://gitlab.com/kicad/code/kicad-i18n
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.1.6
-SLOT=0
-SRC_URI=https://gitlab.com/kicad/code/kicad-i18n/-/archive/5.1.12/kicad-i18n-5.1.12.tar.bz2
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3b295563f661821d90182aa392334954
diff --git a/metadata/md5-cache/sci-electronics/kicad-meta-5.1.12 b/metadata/md5-cache/sci-electronics/kicad-meta-5.1.12
deleted file mode 100644
index dec2097820d1..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-meta-5.1.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Electronic Schematic and PCB design tools (meta package)
-EAPI=8
-HOMEPAGE=http://www.kicad.org
-IUSE=doc minimal nls
-KEYWORDS=~amd64 ~arm64
-LICENSE=metapackage
-RDEPEND=>=sci-electronics/kicad-5.1.12 >=sci-electronics/kicad-symbols-5.1.12 >=sci-electronics/kicad-footprints-5.1.12 doc? ( >=app-doc/kicad-doc-5.1.12 ) !minimal? ( >=sci-electronics/kicad-packages3d-5.1.12 >=sci-electronics/kicad-templates-5.1.12 ) nls? ( >=sci-electronics/kicad-i18n-5.1.12 )
-SLOT=0
-_md5_=edcb9fcc3d5cd7b6583bb6eeac57e956
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.12-r1 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.12-r1
deleted file mode 100644
index 1320d14336de..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.12-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
-EAPI=8
-HOMEPAGE=https://kicad.github.io/packages3d/
-INHERIT=check-reqs cmake
-IUSE=+occ
-KEYWORDS=~amd64 ~arm64
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.1.0[occ=]
-SLOT=0
-SRC_URI=https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/5.1.12/kicad-packages3D-5.1.12.tar.bz2 -> kicad-packages3d-5.1.12.tar.bz2
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c4fff30a5cc10c57c755ffa33ee33197
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.12 b/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.12
deleted file mode 100644
index 41b0f8e73b0c..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.12
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
-EAPI=8
-HOMEPAGE=https://kicad.github.io/symbols/
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.1.0
-SLOT=0
-SRC_URI=https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/5.1.12/kicad-symbols-5.1.12.tar.bz2
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1c0a04e12ef678ee242263e64da98afe
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-5.1.12 b/metadata/md5-cache/sci-electronics/kicad-templates-5.1.12
deleted file mode 100644
index 95b0e209e931..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-templates-5.1.12
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools project templates
-EAPI=8
-HOMEPAGE=https://github.com/kicad/kicad-templates
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.1.0
-SLOT=0
-SRC_URI=https://gitlab.com/kicad/libraries/kicad-templates/-/archive/5.1.12/kicad-templates-5.1.12.tar.bz2
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bd348cb9408fc96b3bc014e16273de6f
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index a47e949fefbc..fbadfff47cf4 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/libgenome-1.3-r1 b/metadata/md5-cache/sci-libs/libgenome-1.3-r1
deleted file mode 100644
index 5b56e362dcb7..000000000000
--- a/metadata/md5-cache/sci-libs/libgenome-1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DESCRIPTION=Library for sci-biology/mauve
-EAPI=6
-HOMEPAGE=http://gel.ahabs.wisc.edu/mauve/
-INHERIT=autotools
-IUSE=doc static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/libgenome-1.3-r1.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2e518b4cfdb07b921e0b143950a89ad1
diff --git a/metadata/md5-cache/sci-libs/libmems-1.6_p1-r3 b/metadata/md5-cache/sci-libs/libmems-1.6_p1-r3
deleted file mode 100644
index 45154d4b39ac..000000000000
--- a/metadata/md5-cache/sci-libs/libmems-1.6_p1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/boost:= sci-libs/libgenome sci-libs/libmuscle doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DESCRIPTION=Library for sci-biology/mauve
-EAPI=6
-HOMEPAGE=http://gel.ahabs.wisc.edu/mauve/
-INHERIT=autotools
-IUSE=doc static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= sci-libs/libgenome sci-libs/libmuscle
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/libmems-1.6_p1.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2e444dc0b1572176e9c24048911c66e3
diff --git a/metadata/md5-cache/sci-libs/libmems-9999 b/metadata/md5-cache/sci-libs/libmems-9999
deleted file mode 100644
index 4fd44b85fdbe..000000000000
--- a/metadata/md5-cache/sci-libs/libmems-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=preinst prepare unpack
-DEPEND=dev-libs/boost sci-libs/libgenome sci-libs/libmuscle doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 dev-vcs/subversion[http(+)] net-misc/rsync
-DESCRIPTION=Library for sci-biology/mauve
-EAPI=6
-HOMEPAGE=http://gel.ahabs.wisc.edu/mauve/
-INHERIT=autotools subversion
-IUSE=doc
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=dev-libs/boost sci-libs/libgenome sci-libs/libmuscle
-SLOT=0
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7fb38f7786d73595785b70922483d09d
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.5.2-r6 b/metadata/md5-cache/sci-libs/opencascade-7.5.2-r6
deleted file mode 100644
index bb4a5807c2bd..000000000000
--- a/metadata/md5-cache/sci-libs/opencascade-7.5.2-r6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-cpp/eigen dev-libs/rapidjson doc? ( app-doc/doxygen ) examples? ( dev-qt/linguist-tools:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( media-video/ffmpeg:= ) freeimage? ( media-libs/freeimage ) tbb? ( <dev-cpp/tbb-2021.4.0 ) vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
-DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
-EAPI=7
-HOMEPAGE=https://www.opencascade.com
-INHERIT=cmake flag-o-matic
-IUSE=debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
-RDEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( media-video/ffmpeg:= ) freeimage? ( media-libs/freeimage ) tbb? ( <dev-cpp/tbb-2021.4.0 ) vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
-REQUIRED_USE=?? ( optimize tbb )
-RESTRICT=test
-SLOT=0/7.5
-SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_5_2;sf=tgz -> opencascade-7.5.2.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=09280e8ebaeeb13168abd7a1f49b1c92
diff --git a/metadata/md5-cache/sci-libs/votca-tools-1.6.4 b/metadata/md5-cache/sci-libs/votca-tools-1.6.4
deleted file mode 100644
index 78a0bd088b92..000000000000
--- a/metadata/md5-cache/sci-libs/votca-tools-1.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-text/txt2tags-2.5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat sci-libs/fftw:3.0=
-DESCRIPTION=Votca tools library
-EAPI=7
-HOMEPAGE=https://www.votca.org/
-INHERIT=cmake
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat sci-libs/fftw:3.0=
-SLOT=0
-SRC_URI=https://github.com/votca/tools/archive/v1.6.4.tar.gz -> votca-tools-1.6.4.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bf31380afa4b3d681d391d2d1cdfa095
diff --git a/metadata/md5-cache/sci-libs/votca-tools-2021.2 b/metadata/md5-cache/sci-libs/votca-tools-2021.2
deleted file mode 100644
index 83f373cf2a55..000000000000
--- a/metadata/md5-cache/sci-libs/votca-tools-2021.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat sci-libs/fftw:3.0=
-DESCRIPTION=Votca tools library
-EAPI=7
-HOMEPAGE=https://www.votca.org/
-INHERIT=cmake
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat sci-libs/fftw:3.0=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/votca/tools/archive/v2021.2.tar.gz -> votca-tools-2021.2.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e2aff4c5560c697ca4cf6f895c72d32b
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index b9b13c3c4c5e..e7d847d79ec5 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/flashdot-1.1.4-r1 b/metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
deleted file mode 100644
index 818ee9d38473..000000000000
--- a/metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] dev-ml/gsl-ocaml:= dev-ml/lablgl:=[glut] dev-ml/ocamlsdl:=[opengl] x11-apps/xdpyinfo
-DESCRIPTION=Generator for psychophysical experiments
-EAPI=6
-HOMEPAGE=http://www.flashdot.info/
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] dev-ml/gsl-ocaml:= dev-ml/lablgl:=[glut] dev-ml/ocamlsdl:=[opengl] x11-apps/xdpyinfo
-SLOT=0
-SRC_URI=mirror://gentoo/flashdot-1.1.4.tar.bz2 https://dev.gentoo.org/~tomka/files/flashdot-1.1.4.tar.bz2
-_md5_=404dad1684b4971e09e2cb929154a040
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index ad493b0c6a0b..3ea6f9a49668 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-valgrind-20230124 b/metadata/md5-cache/sec-keys/openpgp-keys-valgrind-20230124
index a930cbbd3374..c803905c83ee 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-valgrind-20230124
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-valgrind-20230124
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP key used to sign Valgrind releases
 EAPI=8
 HOMEPAGE=https://valgrind.org/downloads/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://www.sourceware.org/pub/bzip2/gpgkey-5C1D1AA44BE649DE760A.gpg -> openpgp-keys-valgrind-20230124-gpgkey-5C1D1AA44BE649DE760A.gpg
-_md5_=28e13e8933a656300a3de691dde61814
+_md5_=692f025738968bb6eb95b033dbaf82b3
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-vincentlefevre-20221213 b/metadata/md5-cache/sec-keys/openpgp-keys-vincentlefevre-20221213
index e1892d42910e..fc5b4e3e2190 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-vincentlefevre-20221213
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-vincentlefevre-20221213
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP keys used by Vincent Lefèvre
 EAPI=8
 HOMEPAGE=https://www.vinc17.net/pgp.html
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://www.vinc17.net/key.asc
-_md5_=ce04f0809428b061225af30e846d0fdc
+_md5_=333a513c3b3c31795f841e99c699027c
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index afa7dcd32735..be87443aea71 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/grep-3.8-r1 b/metadata/md5-cache/sys-apps/grep-3.8-r1
index 644402bf7ef1..7a17eb34c782 100644
--- a/metadata/md5-cache/sys-apps/grep-3.8-r1
+++ b/metadata/md5-cache/sys-apps/grep-3.8-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/grep/
 INHERIT=flag-o-matic verify-sig
 IUSE=+egrep-fgrep nls pcre static verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv
 REQUIRED_USE=static? ( !sparc )
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.8.tar.xz verify-sig? ( mirror://gnu/grep/grep-3.8.tar.xz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=48a187f7ef5902b498f98b388d4834c2
+_md5_=6ff3bd53704e462b4bac2d9ac2008d74
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 1e41e21db795..66e1c3cd71be 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/pam_fprint-0.2-r2 b/metadata/md5-cache/sys-auth/pam_fprint-0.2-r2
deleted file mode 100644
index ac9fa8e68575..000000000000
--- a/metadata/md5-cache/sys-auth/pam_fprint-0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-auth/libfprint:0 sys-libs/pam
-DESCRIPTION=a simple PAM module which uses libfprint's functionality for authentication
-EAPI=7
-HOMEPAGE=http://www.reactivated.net/fprint/wiki/Pam_fprint
-INHERIT=pam
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-auth/libfprint:0 sys-libs/pam
-SLOT=0
-SRC_URI=mirror://sourceforge/fprint/pam_fprint-0.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=37f66b57cde4b9d69b0428de46741870
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index a6e977194f90..d0c0d32a83ea 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.6-r1 b/metadata/md5-cache/sys-devel/clang-15.0.6-r1
deleted file mode 100644
index 3233c1c846df..000000000000
--- a/metadata/md5-cache/sys-devel/clang-15.0.6-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_9? ( dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-15.0.6:15=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.6[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.6[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.6[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.6[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.6[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.6[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.6[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.6[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.6[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.6[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.6[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.6[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.6[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.6[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.6[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.6[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.6[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.6[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.6[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.6[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.6[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.6[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.6[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.6[llvm_targets_SPIRV] ) !!sys-devel/llvm:0
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs
-IUSE=debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=sys-devel/clang-toolchain-symlinks:15 ~sys-devel/clang-runtime-15.0.6
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ~sys-devel/llvm-15.0.6:15=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-15.0.6 llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.6[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.6[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.6[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.6[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.6[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.6[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.6[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.6[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.6[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.6[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.6[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.6[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.6[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.6[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.6[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.6[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.6[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.6[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.6[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.6[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.6[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.6[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.6[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.6[llvm_targets_SPIRV] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=15/15
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.6-r1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b2a1fbdd6b64656dd5827eb4e75a860f
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.6 b/metadata/md5-cache/sys-devel/clang-common-15.0.6
deleted file mode 100644
index 8ffa661708b4..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=install preinst prepare pretend unpack
-DESCRIPTION=Common files shared between multiple slots of clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
-INHERIT=bash-completion-r1 llvm.org
-IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind stricter verify-sig
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.6 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=540503f9a371b876a1359c2135afc22a
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.6-r1 b/metadata/md5-cache/sys-devel/clang-common-15.0.6-r1
deleted file mode 100644
index 9de3dfe3b191..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=install preinst prepare pretend unpack
-DESCRIPTION=Common files shared between multiple slots of clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
-INHERIT=bash-completion-r1 llvm.org
-IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind hardened stricter verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.6 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=afb8260030d9be9078d6b4786babd361
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-15.0.6 b/metadata/md5-cache/sys-devel/clang-runtime-15.0.6
deleted file mode 100644
index f173c6cdb11c..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-15.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-15.0.6:15.0.6[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-15.0.6:15.0.6[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-15.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-15.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=15.0.6
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=84951cb4bde111ec59900c38b6777b9e
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230126 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230126
new file mode 100644
index 000000000000..28df347b7587
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230126
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20230126/gcc-10-20230126.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=9bf9b26ef2351007989c31761f3f1167
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.7-r1 b/metadata/md5-cache/sys-devel/libtool-2.4.7-r1
index 64190e90e197..e8197ee25b1f 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.7-r1
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.7-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libtool/
 INHERIT=autotools prefix
 IUSE=vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69:* >=sys-devel/automake-1.13:* >=dev-libs/libltdl-2.4.7
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.7.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7ccfca8183a5585092d05334ef73d424
+_md5_=09b60278d5d372e80b900a93932021aa
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.6 b/metadata/md5-cache/sys-devel/lld-15.0.6
deleted file mode 100644
index 5094f90d52b9..000000000000
--- a/metadata/md5-cache/sys-devel/lld-15.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-15.0.6[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-15.0.6[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-15.0.6[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-15.0.6 sys-libs/zlib:= !!sys-devel/llvm:0
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1
-IUSE=debug test test verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-15-r2:15
-RDEPEND=~sys-devel/llvm-15.0.6 sys-libs/zlib:= !sys-devel/lld:0
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=15/15
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f406f13a9ffb6273afe34e860eaf9283
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.6-r1 b/metadata/md5-cache/sys-devel/llvm-15.0.6-r1
deleted file mode 100644
index 9d96d3e74f22..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-15.0.6-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-15.0.6.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ) ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
-DESCRIPTION=Low Level Virtual Machine
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
-IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
-PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:15 binutils-plugin? ( >=sys-devel/llvmgold-15 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
-RESTRICT=!test? ( test )
-SLOT=15/15
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.6-r1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=692f135b146487b0e4441f75efffcf31
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.6 b/metadata/md5-cache/sys-devel/llvm-common-15.0.6
deleted file mode 100644
index 23ae2a10d848..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org
-IUSE=verify-sig
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	12d27b4e19e005f9ddba29e8c408758c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=29f96569e5107a0ca343c8accaa2d360
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6-r5 b/metadata/md5-cache/sys-devel/patch-2.7.6-r5
index 0510ab283865..062d8671bf20 100644
--- a/metadata/md5-cache/sys-devel/patch-2.7.6-r5
+++ b/metadata/md5-cache/sys-devel/patch-2.7.6-r5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/patch/patch.html
 INHERIT=flag-o-matic verify-sig
 IUSE=static test xattr verify-sig
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=xattr? ( sys-apps/attr )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz verify-sig? ( mirror://gnu/patch/patch-2.7.6.tar.xz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=5395697ab58deee62bfbbce1d207b94c
+_md5_=ec3066550058fc7c6fb32413d1b160b6
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index a50eff632c14..422941bf50d0 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.6
deleted file mode 100644
index 42bdd75ae4c3..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-15.0.6*:15 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:15 !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test verify-sig
-KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=15.0.6
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.6.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=53e39020c8d23997da8e61e17fdb8a19
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.6
deleted file mode 100644
index de4f7a9471c6..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !!<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-15.0.6*:15 sys-libs/compiler-rt:15.0.6 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:15 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test verify-sig
-KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
-RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
-SLOT=15.0.6
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.6.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4a6c28dfb8b0a1aa66ce2850011b96dd
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.6 b/metadata/md5-cache/sys-libs/libcxx-15.0.6
deleted file mode 100644
index 3a8e6683fc4e..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:15 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.6[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:15 !!sys-devel/llvm:0
-DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=8
-HOMEPAGE=https://libcxx.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 arm arm64 ~riscv sparc x86 ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.6[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7f5a8fba7d5d2d43189bfb259f861a89
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1 b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
index 0223720100c3..f23b24fad5e4 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://libcxx.llvm.org/
 INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm arm64 ~riscv ~sparc x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.7[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r1.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b7314dafc4760edc84c9672522bb8542
+_md5_=ec12a0f6e108c8b13319626ed8ce9939
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.6
deleted file mode 100644
index 5d2a7fb57b66..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:15 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:15 !!sys-devel/llvm:0
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 arm arm64 ~riscv sparc x86 ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!<sys-libs/libcxx-15
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=462e3f649f8df58db11379d6fa9c34ff
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.6 b/metadata/md5-cache/sys-libs/libomp-15.0.6
deleted file mode 100644
index cbdbec43eb1e..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-15.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) sys-devel/clang ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-15.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !!sys-devel/llvm:0
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-any-r1
-IUSE=debug hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-15.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/15
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=570eb673181badef2bc4aef19404143e
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.6 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.6
deleted file mode 100644
index 4e7e3e423a44..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:15 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:15 !!sys-devel/llvm:0
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!sys-libs/libunwind
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/llvm-project-15.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0304c4cd124df43254ba42ff0fa5e262
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 46df271f17c0..8257bc410d22 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.2.3 b/metadata/md5-cache/x11-misc/menulibre-2.2.3
index 5d3fe0b1fa2c..64783d2a9252 100644
--- a/metadata/md5-cache/x11-misc/menulibre-2.2.3
+++ b/metadata/md5-cache/x11-misc/menulibre-2.2.3
@@ -1,16 +1,16 @@
-BDEPEND=python_single_target_python3_9? ( dev-python/python-distutils-extra[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-distutils-extra[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] )
+BDEPEND=python_single_target_python3_9? ( dev-python/python-distutils-extra[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-distutils-extra[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/python-distutils-extra[python_targets_python3_11(-)] ) dev-util/intltool python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_11(-)] >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DESCRIPTION=Advanced freedesktop.org compliant menu editor
 EAPI=8
 HOMEPAGE=https://bluesabre.org/projects/menulibre
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 xdg
-IUSE=python_single_target_python3_9 python_single_target_python3_10
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psutil[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) gnome-base/gnome-menus:3[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-themes/hicolor-icon-theme python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psutil[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/psutil[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) gnome-base/gnome-menus:3[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-themes/hicolor-icon-theme python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/bluesabre/menulibre/releases/download/menulibre-2.2.3/menulibre-2.2.3.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2a2481cfecb6eb8cb196a8b1bf577585
+_md5_=df72ebaf205763a4b4da42527e7f06c1
diff --git a/metadata/md5-cache/x11-misc/xowl-9999 b/metadata/md5-cache/x11-misc/xowl-9999
deleted file mode 100644
index 1c4270c06f4a..000000000000
--- a/metadata/md5-cache/x11-misc/xowl-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=X11 Obstinate Window Lister
-EAPI=6
-HOMEPAGE=https://github.com/seanpringle/xowl
-INHERIT=flag-o-matic git-r3 savedconfig toolchain-funcs
-IUSE=savedconfig
-LICENSE=MIT
-PROPERTIES=live
-RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
-SLOT=0
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	portability	58227860123d3e8da23290064ce3373e	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8726a85410c680b66868b6e9e42cf092
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 310d9a422e29..dfdb8631a025 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/xoat-9999 b/metadata/md5-cache/x11-wm/xoat-9999
deleted file mode 100644
index cf4889352b6a..000000000000
--- a/metadata/md5-cache/x11-wm/xoat-9999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
-DESCRIPTION=X Obstinate Asymmetric Tiler
-EAPI=7
-HOMEPAGE=https://github.com/seanpringle/xoat
-INHERIT=git-r3 savedconfig toolchain-funcs
-IUSE=savedconfig
-LICENSE=MIT
-PROPERTIES=live
-RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama !savedconfig? ( x11-misc/dmenu )
-SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=e1d927fa9d1edc75a70f7d20c3b8feac
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 1c96e00af3ea..ea73ba462b90 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14966 BLAKE2B 687a7b166f711e4c3c75d588b8febb4831fac9bee694b4222597007a9b433fee3a5aa6e187f1fc35937c84f642d144e511d63be549688dfd15f1839a5369d701 SHA512 bd9169c0f73f3e95819cf527d7df79adcfc029e6bfc752f29b75c7be14518984914e4ae2cb94e42a6398dc1af3b2a3e52070736093238502bb4eced7f5775b16
-TIMESTAMP 2023-01-27T06:39:52Z
+TIMESTAMP 2023-01-27T12:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPTcbhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPTxhhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klByqRAApq7ISrHJsGT8xnK3Cjp8JPtUt/W83n8rAb5Vvn5451TiPTXA3IpH5z+r
-jT7mW46A3KzUq+JC1qMfo5ZKIKQ0lPl0tqcyNFCYJNldYFH6sSsOjKqfVQjnldFp
-cYe+jJAvD/UAn3s4hvr7Sr44wOEAWUlQI0eJjOA6uyJ/k91yKDWmHr13srvA+qeN
-LbrH5QJbfrc9jDshgb6T3itxXV5t+Uq03sjIhIQDmAiQlkS8FjiFrrsCpk27jwe6
-injSwWmS+rU18W0KBfvf0JcPqA/JYcWHSC48B7i/wPtgMr6E1xFK7BdAcdUvBrgv
-T/LMEhuqkXmKMwqJ9+M7OzxwAnHEw5F3+cq2DetrNpsPScMEo6Wn4m+rVDh41tn3
-IIcQvlsAE/DFo7Wd5/Pd9cpfMUtYJZRQUVbipsoz2qEpQofMY0eQtq5YPf1Psax/
-0L50fiBDkVfnDtzqv1Py4ozyPX9AgvuDDuuiyY9N4y1bxbbfrhRLEJE44drE63Q/
-oM7hZ6kSNwRkOztNpBe3yg/6rZX94s38YUyzH6igH+AhnNuqkxmFjx7k2PdZxZsT
-1pnPXZ8aoCQAn7c4XzFlgEfZvIeYpoj5I/9+MVqT7OUBn3NI4RV/U5JV0Fa7H/7F
-e7k+SNejcxtoFqfX+6GaFnTTF4VCrmAaMlIScFM2siNV74Zifzg=
-=PrrA
+klCoiA//Unbaiyg4UjyjQoEubHA2KuGcGHyygaPDfrsJOYPxGcf7aiOAzaV+hyqR
+u1Sx2xQr0HCYV+oP0osesQx3NkORVq/nGWWDR4f+irUV+w7uSSFWMJgVI6ZOohSC
+NwxWmEJkTmx1Grg1+0NOXw5+CSL1uoKM3kwmZzcO4j0kDVeDfeNvoTvlK+ainaJ1
+7dZ1qw7cxGpDjzg5G0TO1fBQSxXk0Ei6Y6CfgdVGtwKq5CEirYJDHKFc0pBoSxsT
+1mDDWzFWXiIdkokIG5SIwht1dXi1NSZFL/lwT+T97gIAL3ZtenGR5Yjxsn3bWWMc
+98eUGqxM7MxFegNKpZsjN8c3yG8tfvOlOFrLUEC7g1GkD5FTPxp1hLoFdcbqYzSw
+x+or5ts6WuLIe4GGEH1gqcs2Mf3JQ5ybhIR9OiFhwmR0BXaNxNQhT4awOtOVWeco
++uy2Zk6cBBI2Yl9t3mwBqnedKTzD+OBxX2crIPlspQz6ZANHBoq6FoJLrKmPKtPY
+k420pb1ioLOy3vSwHM5GTLkmmJ63w6rsFEBQ4VN/2zBvRPD35RRal8d1RhxMifut
+ERxIHPsjK3xOj6S9JRZOYqgYQ331kTS16RN0q9UUhFUHYa7Ju4b48o5JkHP25d/I
+weswEOr2EiMW+W2NPjhYCCv9GUuck9q5avT+Uv3nnZ7aoTFjL6E=
+=cBj+
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e5570ab789ad..9393ddaa71f0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 27 Jan 2023 06:39:48 +0000
+Fri, 27 Jan 2023 12:39:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 8a9b03c5730a..dfd331a9fdd3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jan 27 06:39:47 AM UTC 2023
+Fri Jan 27 12:39:49 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 28bd6dff9ab3..183532cbaf99 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 27 Jan 2023 06:45:01 +0000
+Fri, 27 Jan 2023 12:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index d297c8599e4d..d84f93134479 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f9d7aa8dfc17b96eb1aebf2ea931ac7be9f4908f 1674801142 2023-01-27T06:32:22+00:00
+64c90bb3c3859458725bf91a9676bf2ad09a68b5 1674822000 2023-01-27T12:20:00+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ae2e3d86cede..dbe83985f204 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1674801601 Fri 27 Jan 2023 06:40:01 AM UTC
+1674823202 Fri 27 Jan 2023 12:40:02 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d5d3e9423d76..d90ca006b5f5 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 27 Jan 2023 06:39:47 +0000
+Fri, 27 Jan 2023 12:39:49 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index a4f5b4b12fca..35462eb3e64d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2c75fcc8976a..46d793bdcb1f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,9 +6,9 @@ DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B 8660e57fc1c9667ecd17bbd35918da7d61f
 DIST wireshark-4.0.2.tar.xz 41296132 BLAKE2B 3ca64c5d561fc3262af821a2fed559efc39f9c194d1c03211d27b8154d87fe78c26d390504fc33f80fefbec06aa07d5b4fe27b253a3fc32641ec52292bc0557b SHA512 0f401f639add6483799131dd853a4f4bcf8977fd987915074d0301f553fca9f6cd6e0b7cc47358699c1f4e65872760135dea9889fb34dbb70b917768b6f37ff5
 DIST wireshark-4.0.3.tar.xz 41383164 BLAKE2B 85271a1f52b383db07fdf51f500ae0d6dd9b6f6624176889a88ff51e85e1eb578a7ba43a80018e60cb84ff486aedce850b2b82e127fcabb7f049d479e1d0c3cb SHA512 ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c
 EBUILD wireshark-3.6.10.ebuild 7327 BLAKE2B 1ba81dd79715c51f0d6bcedb321a1e65dcb33850c99ce415feb4d0fa387f825fb2f2bc45ef64ab3adcf07f14a2e44e30a5f0194623ed1552cad18f681dbbf657 SHA512 c6d7900f342f8aef0999ab75e1a14721d4b03bb4f5882169fec91826df226fde9cb6ea5ced313ce6bf8b6477beda3c0e18c74acf6a459218c3729955aed335ae
-EBUILD wireshark-3.6.11.ebuild 7331 BLAKE2B 8ad90125b9d86188a5f6a92ab219636bf6637da69cf541fd376e1b361f5ef17bdf76cd87b450d3b9af64e68094a3a72ddf73e5d1b6d866f11aca1482f4f48544 SHA512 f80871af45b7589e5f8255b03ebcf873631762f5fac1291a769d921a3fee7f2fbc2ab171b05d13777118c23a30050b6d8876819b27cd9e78276bf74cd9b767c4
+EBUILD wireshark-3.6.11.ebuild 7328 BLAKE2B 3ad5726ed68c4bcb90a86941bf2b7817a63041438d30ddf8f36baf6f95e8129a7c3cce052a9e547cc8f89ea5d6d18ad78fac65804c34ae6b2ca68a8884f7fb7d SHA512 78fad85e48bd3304f8ea4499c579bd0025c5960550775db5f3ce5656e4f5595282cd2b4b6a8bf545063e5842a099ed028d2f6f90df7d6a0ad1f2ffee9c5d4c1a
 EBUILD wireshark-3.6.9.ebuild 7326 BLAKE2B 1e703734bd8ea26253acf1b914fd6d7b21dd7f28b8aad3fec2e1fe2804096a40fa668230e329793d0237fd3a0f2896d3fdd1623b329ea57057b56fd1eddfbb46 SHA512 f3a1f993c3c992b075da00335c00e700f453dbe8a43ebe88c66979593ba98d9161800c9ee82999e697f73e536ef010c3cbed6bfd85e1da5778916ccc12c76225
 EBUILD wireshark-4.0.2.ebuild 7993 BLAKE2B af39863733e8e53ed24b90631266b7396419298f9b5d5f9cc12d035a89927936b0e1fdcaec02b6b92fca08d73d89427c12243b2c84f44c118936665ae0425bf4 SHA512 13c0149235117f443c834d85c3f9b02ba332bb602e369f383ddc13e105620c1146c3819f2374b9ffa4a6e96ecef70e70c33172439dd9162edbdbae186eb69c1e
-EBUILD wireshark-4.0.3.ebuild 7992 BLAKE2B 08d8cd3136320f39def11a3cf0a282662df13be60824c313bbf781ce76240133a6fe731a1b1e8810c7d1929e541a549d8ea044e402b870967ef1d46d6600d45c SHA512 18ca83389987a3999f9df028facdb830a5f022f2676ba44bbaf18d42d5b3c62d942fb027c030b1a1b793a52ebafb7d56baf08293f0797684850bd16db37cd1eb
+EBUILD wireshark-4.0.3.ebuild 7990 BLAKE2B 1e1566d743e8a67293c959b5e4b7417b3a0875e0f6d715df1deae06f41a8f68d57a13d8a7294969723e5efbed84ed8cf8d9cfab28096a821d226adbd284799db SHA512 3b09d951f09c4a3eb2f33e7aaaeac35ba27a90fa88bd39db51335520be3b215502e6ec337d3fa9174b7bf083894b48a3b1adefe942f4ff2a2bff46cf804a9cb3
 EBUILD wireshark-9999.ebuild 7993 BLAKE2B af39863733e8e53ed24b90631266b7396419298f9b5d5f9cc12d035a89927936b0e1fdcaec02b6b92fca08d73d89427c12243b2c84f44c118936665ae0425bf4 SHA512 13c0149235117f443c834d85c3f9b02ba332bb602e369f383ddc13e105620c1146c3819f2374b9ffa4a6e96ecef70e70c33172439dd9162edbdbae186eb69c1e
 MISC metadata.xml 5488 BLAKE2B d3d216dbc02421c620a6c7fcb04caede1ce604ad134fb9332dfb6f96ee3a7d39d3c2b14dfbd2e0be757f558ad5cd98f2440a415a9d74668fe482a7c18629e199 SHA512 e31157a17c7907f380248fe530114fea29be570f0bc6f2a15a7a898ace88534dd5b9d15ee8cf22920f8330910a629d035ca9afdde06a6b631479b2843c1d30ba
diff --git a/net-analyzer/wireshark/wireshark-3.6.11.ebuild b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
index a71b92ecc0f9..cfd76089522d 100644
--- a/net-analyzer/wireshark/wireshark-3.6.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.11.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/wireshark/wireshark-4.0.3.ebuild b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
index d807f0bd1401..38a3ce5e8814 100644
--- a/net-analyzer/wireshark/wireshark-4.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.3.ebuild
@@ -19,7 +19,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+		KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
 	fi
 fi
 
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 6a67d99338b2..b9e207f73e71 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index f24ee2ccd3c0..aa5e5e833d90 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,19 +1,10 @@
-AUX dnsdist-1.6.0-gcc11-missing-include.patch 687 BLAKE2B 451ff9444ddedfd819b9a138a16ff9a9813fbeb9f26d4d624b8d0614b9460a05b529dd1f8393cf11c340bd48324ee63f8f3ea0dd78cf3c8497dc8f7108aaab9c SHA512 696be859ab657f66ea17eb6e6cca642e1e33f42d218d99556e4c7edfa6ddc2f7050c4d53e782bbdec7cb49580df290f124c9159d931c47eabf84ed3e3f8f63d8
 AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d587765ea5d432f02694b1a8583340c2e14e191bbdf5ddd5b921274cb2336c3520839d7cfe6f399a4d6c26 SHA512 385bee5725d927feb50fc0f40cd48cd365a495e39c0d947aa53dc454d84b7fe3806cd1d206056c96d111e7251db2cda27570ff8154c70bed145d37bc7d1db01d
 AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
 AUX dnsdist.initd 1337 BLAKE2B e2619182674439be6942a0a936208326c12cfc2839bba4fd6a2ca3653ac6083458ebf2b644d2db63c187ed33ba2bef3437680714bb76dfc7632e1b62149a6f6a SHA512 99e38a58c97dd206ea82ffc783102feaa28f74bec5e03c1790e2db0f428f8228eec43617b2c951f22320e10dbd42ddfbf40650fed28608428f9c48eec3640a8d
 DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204fcdd2f65efd26a5293cc9c17d904e0937b51ba33d2dc01ecc8044f491ba2c6c8720c0816587fa5082da73108783e SHA512 68fe5f55fd081ed80a620933af9f8310be0e21c86ba449a9c557975b5c83f4b64e3002e6032dc002582d081e70e1ec2ff080c5d8389fd46a9896bdafd5a41f9f
-DIST dnsdist-1.6.0.tar.bz2 1328707 BLAKE2B d093142875882cacaa456d76d42e703e45577c32a0e5d5024fb372180d2bdd4ff0c82546142f6c2c01904bdd15407f0a39dc1d658e04e171cffe386cfc1e943d SHA512 f6a1676c431d5622af075bc184c9f82b4ea0bb40ec84797a8fe835804f91bc0a93a745495f193bb52f3a5204ec0e98ed41bc206c997d1f5b13e872bb31747b0f
 DIST dnsdist-1.6.1.tar.bz2 1328069 BLAKE2B a9e9c0cb35ebc2ecd93d7fa0d6d3961b02d711da2df56240335786a5d2e529d4a7e8716f578b6e935edd3bc79dfed767d358b9feaff32dd9cd65993ef0b97b71 SHA512 68e114eeb1a7ae8a4ce52a7de31095c46d0ba8f572676a8ef1e858b97da199c04ec88656c7642160ba07b7db325cc2a49cd91794da8dd2e81a5301d089c34f90
-DIST dnsdist-1.7.0.tar.bz2 1392585 BLAKE2B 3766da5f63df6390f555307d665efcbb2ad1462abae3af44503479d4c6ae6453e43527d2bcac718fabeb8b60ec989f264860532b480c465afc440405f9efac74 SHA512 abaed7aaa18f4acaf220dc938da6896e521373b1da3b6b9c4114467dd5d8b0e6cd9809534edbc6ba5b789ed8387fb47317c47bd4e00e66a6ccb035f6dd6068af
-DIST dnsdist-1.7.1.tar.bz2 1392179 BLAKE2B 48189da6bceb1723b19bab7c42ec8cd834f3ef6d822b5da23fe2f4e02ec825d1566bce472f522fa9ac0b027d36f3089ce7c0c7eb1c7e1161c050dc50305dfdb6 SHA512 eee44a9994c6cab84977cad58539ca59882149d6898dfeed9e4190f06ddbc280b836bf426d22e6980d8acae1437290bddcc5166af165b6eb48c77c669281a310
-DIST dnsdist-1.7.2.tar.bz2 1391588 BLAKE2B cf2a9853be4c896b3909f871fad771d4298eb2586702a8a85eff2c612d275214cdad82e93961f4cfd58300f5629f06569c51a2c4f15de58188a69116bd5275de SHA512 2048ac0f861547fb103da1a128fd39a35ed689ccbf3c080232a3bd0550c9e7c7e01c95864d61e065e341a9f4111c974d2db2aba73eb8f7cba9bf8273da39b8a6
 DIST dnsdist-1.7.3.tar.bz2 1379011 BLAKE2B e7d1cb9dba3d3ad1dd696d324697ffac60863112eae83307237639bea339f7ed1c3f320002d3467a44ab38a9ea60ade95fff43645c889d29465760f7f467b996 SHA512 2a39096709db5b41cf3bd21170689bc85ad2cd550896d02ddd85eff7410780ea59d6cf8e08b0a08962ee93b49b7f3228dfa649275453215e23c25098aca40e1a
-EBUILD dnsdist-1.5.1-r100.ebuild 2287 BLAKE2B 00970eb165699157b0ee1b3b938032ffdba26d6577d88528b7f9e5bfe0d6cff161e32ae131a5e922e738a70964c70886858219099051a4a31239a45ea3f51caa SHA512 6599df1eadc72982ffc8c170ea5dda844b2e9c3b3a1a45cfc176479585f671ec9234ff9cb9efff6deb1d1ab5939fe377ad8dc1eda5ab6f7a7604f91602faef26
-EBUILD dnsdist-1.6.0.ebuild 2262 BLAKE2B a8920a3c38b601347747c0a80ba0e58e5693b647278fa359046baea6c48e5b9a51937b8c991a4a9b22689ec21fbed18fc58fff66fdac5cdadaf10b3e12dda810 SHA512 85a943c0a1c75196753a69e1fa33a22b181ca61e1fbe8497e0ac3fe88023ee4f6bdfc56cc8d4ae2721a69c34194ecf7f02d62a923da351ee9236b7b4c225cae4
-EBUILD dnsdist-1.6.1.ebuild 2194 BLAKE2B d7e8cf476715eaa4f6f41a2fa497fcc3fb28a9728215aa9a70d0e2c23a6017a1a7b7921ddd6313b6ed15c2b835801c5efd01b147ca3d5edc4c693e19ff40af57 SHA512 aa0c9619c008d6929d765275964b541afbf1af6bc062ca3777dc701730bdf5369bc3116a0aa8420c631d21705fc1c5a9691ac66cf0f85a50665b5e59935b2748
-EBUILD dnsdist-1.7.0.ebuild 2212 BLAKE2B af548f60da81fefd8f72cd64c10af8a0a017155c3d894e8c23274efe6f822d12e4cf8ff2f04689f8bb0e7b7acfb1d6b943947b47c60af1402b097fadc72bbe27 SHA512 4f1d8f71ca2bce61f112bfbcf9195c74ef8a6f491413ebfcb0108d60cae70f75c49045b473187c58e1809a79bb35205833fb8279186a3b94532b6cef3550f1d7
-EBUILD dnsdist-1.7.1.ebuild 2251 BLAKE2B c252affa8e0e3a6b07300816a929ef687c15404bd313a382b873ff3bf3e9e5eb76f927a8f5d78c012fd151cac58226b0457a6e819028bf4f83d1a4220d78b950 SHA512 df023680c7b1dfd0b9715b5658a39eca340da40d72e473e8be25b2ef9212182cf63c7d9cd733d7d21fa9f691c2ddf2fdde85382935e7f8b90f725ab59d453c6c
-EBUILD dnsdist-1.7.2.ebuild 2251 BLAKE2B c252affa8e0e3a6b07300816a929ef687c15404bd313a382b873ff3bf3e9e5eb76f927a8f5d78c012fd151cac58226b0457a6e819028bf4f83d1a4220d78b950 SHA512 df023680c7b1dfd0b9715b5658a39eca340da40d72e473e8be25b2ef9212182cf63c7d9cd733d7d21fa9f691c2ddf2fdde85382935e7f8b90f725ab59d453c6c
-EBUILD dnsdist-1.7.3.ebuild 2251 BLAKE2B c252affa8e0e3a6b07300816a929ef687c15404bd313a382b873ff3bf3e9e5eb76f927a8f5d78c012fd151cac58226b0457a6e819028bf4f83d1a4220d78b950 SHA512 df023680c7b1dfd0b9715b5658a39eca340da40d72e473e8be25b2ef9212182cf63c7d9cd733d7d21fa9f691c2ddf2fdde85382935e7f8b90f725ab59d453c6c
+EBUILD dnsdist-1.5.1-r101.ebuild 2260 BLAKE2B 6684dd21b7ffa954bce051a28d657aee28e230ac44193bb0b158a4739723ab430636b9d399e2de887a84a15eaee9ea9806272b547f1c15ff6ce3f7630060c81f SHA512 60eddcd719cadb629dc20737b33fc0cd4b0dbc1bb25203120ec2924618049d5b650eade36837db550fa82a6b5e78999f16c472b811e0943c6c2c8b20e9c4a03f
+EBUILD dnsdist-1.6.1-r1.ebuild 2167 BLAKE2B a61d12aef81bd6bb5f31b6d1cba4cec51befea7dbd07e163266595d48049e5aacb7cc57aef5f4518baab737f7535b25ea19c7d7cb5e0cb88d39c27a3919c5a95 SHA512 73a1d09809e21cd47779c7e8ca60fcabab48d4b26562ce08fd4a305365e421a2f27e9cc0c13123d9a036d3b9aa129d473e9958c776c1a0e8904237ff18424230
+EBUILD dnsdist-1.7.3-r1.ebuild 2237 BLAKE2B 0ceb0e09c542ebd775c93d1adbcd4630ee82f64f90318a6764e54a80eaac0ccc28702bd9bf581064ac64c7cf1debfe25e4565e6357d33aa42d543e49045b557f SHA512 6d531a84be771b5e1913bba6daa2acba9dc8af28196d70b2446efee85d9fcf10e5da43b38d867af2c93eb7fd12dbd3573a774b46529f76b970b622a4964fc486
 MISC metadata.xml 1131 BLAKE2B 6e5955ebbb27298cc8e1be2afdec0a04cd29c99196586937c0fb518f0bfaf87d0a0cd369bd4fcb3c6815cd4fb7fad306b1c9982fb85df7f36d2f6220355a74e7 SHA512 3cca5ac1fa28c0efa56372a58271c6f8cb491e47dc16926e786b4174edfc14116ee0ea83e338f82fd01e58222e998e1d105e37763f4d7c1c4a8313503d7da085
diff --git a/net-dns/dnsdist/dnsdist-1.5.1-r100.ebuild b/net-dns/dnsdist/dnsdist-1.5.1-r101.ebuild
index 2b055db7ffc6..ce95d87da335 100644
--- a/net-dns/dnsdist/dnsdist-1.5.1-r100.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.5.1-r101.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit flag-o-matic lua-single
+inherit lua-single
 
 DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
 HOMEPAGE="https://dnsdist.org"
@@ -26,7 +26,7 @@ RDEPEND="acct-group/dnsdist
 	acct-user/dnsdist
 	dev-libs/boost:=
 	dev-libs/libedit:=
-	dnscrypt? ( dev-libs/libsodium:= )
+	dev-libs/libsodium:=
 	dnstap? ( dev-libs/fstrm:= )
 	doh? ( www-servers/h2o:=[libh2o] )
 	lmdb? ( dev-db/lmdb:= )
diff --git a/net-dns/dnsdist/dnsdist-1.6.0.ebuild b/net-dns/dnsdist/dnsdist-1.6.0.ebuild
deleted file mode 100644
index f323eee2a756..000000000000
--- a/net-dns/dnsdist/dnsdist-1.6.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	>=dev-libs/protobuf-3:=
-	dnscrypt? ( dev-libs/libsodium:= )
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-gcc11-missing-include.patch
-)
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}
diff --git a/net-dns/dnsdist/dnsdist-1.6.1.ebuild b/net-dns/dnsdist/dnsdist-1.6.1-r1.ebuild
index 450026f8becd..cf37eb114b6d 100644
--- a/net-dns/dnsdist/dnsdist-1.6.1.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.6.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit flag-o-matic lua-single
+inherit lua-single
 
 DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
 HOMEPAGE="https://dnsdist.org"
@@ -26,8 +26,8 @@ RDEPEND="acct-group/dnsdist
 	acct-user/dnsdist
 	dev-libs/boost:=
 	dev-libs/libedit:=
+	dev-libs/libsodium:=
 	>=dev-libs/protobuf-3:=
-	dnscrypt? ( dev-libs/libsodium:= )
 	dnstap? ( dev-libs/fstrm:= )
 	doh? ( www-servers/h2o:=[libh2o] )
 	lmdb? ( dev-db/lmdb:= )
diff --git a/net-dns/dnsdist/dnsdist-1.7.0.ebuild b/net-dns/dnsdist/dnsdist-1.7.0.ebuild
deleted file mode 100644
index f3402a4021cb..000000000000
--- a/net-dns/dnsdist/dnsdist-1.7.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	>=dev-libs/protobuf-3:=
-	dnscrypt? ( dev-libs/libsodium:= )
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-	net-libs/nghttp2
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}
diff --git a/net-dns/dnsdist/dnsdist-1.7.2.ebuild b/net-dns/dnsdist/dnsdist-1.7.2.ebuild
deleted file mode 100644
index e68e3726babb..000000000000
--- a/net-dns/dnsdist/dnsdist-1.7.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	>=dev-libs/protobuf-3:=
-	dnscrypt? ( dev-libs/libsodium:= )
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-	net-libs/nghttp2
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}
diff --git a/net-dns/dnsdist/dnsdist-1.7.1.ebuild b/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
index e68e3726babb..c0ec5088ac0e 100644
--- a/net-dns/dnsdist/dnsdist-1.7.1.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,8 +26,8 @@ RDEPEND="acct-group/dnsdist
 	acct-user/dnsdist
 	dev-libs/boost:=
 	dev-libs/libedit:=
+	dev-libs/libsodium:=
 	>=dev-libs/protobuf-3:=
-	dnscrypt? ( dev-libs/libsodium:= )
 	dnstap? ( dev-libs/fstrm:= )
 	doh? ( www-servers/h2o:=[libh2o] )
 	lmdb? ( dev-db/lmdb:= )
diff --git a/net-dns/dnsdist/dnsdist-1.7.3.ebuild b/net-dns/dnsdist/dnsdist-1.7.3.ebuild
deleted file mode 100644
index e68e3726babb..000000000000
--- a/net-dns/dnsdist/dnsdist-1.7.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	>=dev-libs/protobuf-3:=
-	dnscrypt? ( dev-libs/libsodium:= )
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-	net-libs/nghttp2
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# bug #822855
-	append-lfs-flags
-
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with snmp net-snmp) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}
diff --git a/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch b/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch
deleted file mode 100644
index 6e549b2450ee..000000000000
--- a/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/790719
-https://github.com/hhoffstaette/portage/blob/master/net-dns/dnsdist/files/dnsdist-1.6.0-add-missing-include.patch
-
-From: Kees Monshouwer <mind04@monshouwer.org>
-Date: Tue, 11 May 2021 10:27:01 +0200
-Subject: [PATCH] add missing includes (Fedora 34, gcc 11.1 / clang 12)
-
-[HH: reduced to necessary patch for dnsdist]
----
- lock.hh      | 1 +
- 1 file changed, 1 insertions(+)
-
-diff --git a/lock.hh b/lock.hh
-index 09299d7979d..0644502f871 100644
---- a/lock.hh
-+++ b/lock.hh
-@@ -20,6 +20,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- #pragma once
-+#include <mutex>
- #include <shared_mutex>
- 
- class ReadWriteLock
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 00e5a417e7d9..29115b17cfe2 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 060d358069e0..cb7c9d7d9847 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -9,5 +9,5 @@ DIST ipset-7.16.tar.bz2 684512 BLAKE2B c2c58bd6250bab41c3c5cb2ed6a39b1cd5e47a60e
 DIST ipset-7.17.tar.bz2 684983 BLAKE2B 43b74ab7caf5a963787184aa75b6c071388c8d28997681444b72118aba68b843e961b50418c3fa70b451b4cb090ec62940b770abac2156910442115edbf90d41 SHA512 e308a0d7707ccf7d0cb06a32cf9a822f97862e007abdbab8a91a5a0d5bfbd9f2fb9a3f5e8f36b250ec0d565438c8648a31e8e5b45d8205a76558e90f46e6e597
 EBUILD ipset-7.15.ebuild 3448 BLAKE2B 2c850a8eb40653629905320c3f5bc6ee153bd33fb1c88b0865efdfd80b6a431a5b56a5af0879fac96b00aefe43d3036f8ee9e102808fd14712594d35649a9fe0 SHA512 49d89f3e53330c38dfac993633eb00bca2f65eb37ba60725d2bc57a36df6a2e466e654623bc52f8ccc4b9112087a4022b21452cba4d94867874ebf10463e978a
 EBUILD ipset-7.16-r1.ebuild 3477 BLAKE2B 3b7ff407bac706ab41197e5829d90d046488605737bf7657bc16630419523e6de8effc6a9f9cd5ced17727bd5694b65e6c8098be4f877dded84c2e1352f4a563 SHA512 1a6eae6a95579b6ef43ff02302de90a1f12a7032cc8ff8621ccccf085aed7d0c86b424396e43e3535859e2d621533a460506beefea958cd65e25ddcd4aa17505
-EBUILD ipset-7.17.ebuild 3512 BLAKE2B af23bb09a9da847df49e2c00ae144c38641c0aee63a9e2d9939161e652b3ebe804cb24c295977666f03ca6a67f5f54d8a52ba491c14a61bc42ba269851d78d59 SHA512 feba48e34e4da1dece250d54119b7990226d306507107d99cf4099801b124feb7d83dd04663d486f049fef7eee8327d44616be39d5bbd9a52e5414966d50a949
+EBUILD ipset-7.17.ebuild 3509 BLAKE2B 3f28ed6eceafa7251827f4f4369ff3c2dc7b1f21a03f71ea32a00b5ba819c29b2e56d08e7a349f661507777cc6a4ea3fae49a818c0412f9bfd3d84d4438f95ca SHA512 cfc08b8c7860c83a872b3349c951cd3d0276fd0a8162e839006115a2930a33567d1c494299d9ce7f62cdd605eb83d1d3d883cb34600bce0e6f285acaf5ab970f
 MISC metadata.xml 369 BLAKE2B f41c3bdbd41f5cd6ae9451f00d80d3ca0e17343f45c37f88ab6e34dda8fce78e4d9b4d670385b3f8d9025f6065f1911d1815b610bbbbbfeb364942b8512ccc7b SHA512 f359ed08f769da53de8c31350f48b7fd0504c863fb29664ce40eac4e56f2cca842d9dc8de350fd4790a3a143ed4db6ed3df3419cc9daad4403078039ced52d3e
diff --git a/net-firewall/ipset/ipset-7.17.ebuild b/net-firewall/ipset/ipset-7.17.ebuild
index ff391fab36ee..209eb354279a 100644
--- a/net-firewall/ipset/ipset-7.17.ebuild
+++ b/net-firewall/ipset/ipset-7.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=net-firewall/iptables-1.4.7
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 1333cb2131c8..d7342c9ad1b4 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 94fddd0185b5..34976ee45afb 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,8 +1,10 @@
 AUX ldns-1.8.1-pkgconfig.patch 273 BLAKE2B 8605665fa76e2493efa4d773742e84a7b1df81cec4b8695a00c3eb4e10b915b4fd4d483f40fa61d14f7303d7f344e3602daecad42491c4de81a9bb0a03e4f896 SHA512 017e0ba07ab348a809852f567ad6c9fc5c0dd3ede9fcc24c53da96d2bfaa2e8e5662eb566818813c19ee19799c4ad6b11e8f5007d1f1fac8b5eb3b05424ec5a0
+AUX ldns-1.8.3-configure-strict.patch 3873 BLAKE2B bf4ae24f786a34e43833d1ce1b7650db32f49ce272340c26887d920b20a5a951a5e4ee1a1d8e8efea96e60ae1e009f7261402fc59a6283dba893182782c0fd14 SHA512 a6bd3fc5a38ad7d0cd95cea36f61ff3e40978c953aa723f769442e43aa829ca8787f33ad086254af391b1b68a99402a61dcbcb3f9e86c8c17357a88ce0f082f5
+AUX ldns-1.8.3-docs.patch 3940 BLAKE2B bf0823b32dcf5935fdccee131aa52f597a229c8df9575e3018cc733eba050c56ebc79049d064775fc599ca28e92ee5da67d784209faf8a9d30ebd72586cc1b7e SHA512 88ea628be7bd188e7ed95a5d41f8ca39d1e8d576bfd5ea59cdb3f1f4319fbb435889e50aa150a50ef8ee4a4e572d2352432aab50832769b6729ad588e7b67c86
 DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1 SHA512 54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6
 DIST ldns-1.8.1.tar.gz 1284971 BLAKE2B ae01ef32571fe3996ddd41f911815239abb704ea1dee479fa612bfd701ca369222ab709923f014662248988cb4452a75bc5debad47d2b0386dc59169b353e6a3 SHA512 600f8e221716742caf439a425008827aef1814fc1d9e751f8f492d0235ff45ca48df90abba17979bac9f4485947bb9fe8102924d9cebe6cb56d5b788e1c4bd14
 DIST ldns-1.8.3.tar.gz 1299856 BLAKE2B 2250445da3beec76c96fbb5cbc00f8d6a5bb6ed5867da7f23511d46ac73d6101303eb6ad85def426b7f9287f6a629a95117bcfa6eb46b775d07ed84048162c7f SHA512 c318747bd975ade389d048680b80495fb083b46507d8dcea7d4d42c75823f56a35b438dcc5320803d39583e5a1e515a51686f7f9010c061a6e8199e1a5505ae9
 EBUILD ldns-1.8.0-r4.ebuild 2970 BLAKE2B daf7f3e9d06f4d45861278b75951e5eb1792f8d721229dbb343d2c6e41fe7ba28a21bea5f46a456fb94edab312a7b35a620dd115e02ecdfd59c8755a8cf23885 SHA512 05c6fdfad9784b3bd38d52bb6ac2f09617a109ddd3c24ce99ac57f5c52270da6ce229b9c1d2bb886b9109dc112a7596bb24355ced8b3f9cfb2983bd24b672f8e
 EBUILD ldns-1.8.1.ebuild 1842 BLAKE2B 8ec37b4adba589508ad5ebaa4fee0c6326c6d6ee7659e46a4d41f25a69549b3ee460e78ffe24dd9e4b5c763b773100d3d871e169c0c64b08c3f2359d5e7df1d0 SHA512 c551fafcf95fbced99f02d5ae81ac5596038f51fa2dbaafedc6001369ec2d50a197e2b345ec500488b3a11f3058d3586d759b32f122cc9f8b4638fa55a23c926
-EBUILD ldns-1.8.3.ebuild 1842 BLAKE2B 8ec37b4adba589508ad5ebaa4fee0c6326c6d6ee7659e46a4d41f25a69549b3ee460e78ffe24dd9e4b5c763b773100d3d871e169c0c64b08c3f2359d5e7df1d0 SHA512 c551fafcf95fbced99f02d5ae81ac5596038f51fa2dbaafedc6001369ec2d50a197e2b345ec500488b3a11f3058d3586d759b32f122cc9f8b4638fa55a23c926
+EBUILD ldns-1.8.3.ebuild 1949 BLAKE2B e250146286fab7c4b498288c769cbdbb7391d56aad00a1854bd73a2e35827dbd6935de52584fbf22292c878327e5eb0df7bbeef3e611ff1482b1d9d1ccd33c62 SHA512 4c6b2b302918f9ab4ed8ab6a8f5eb31feb73f153e95543fced9669836e73bc93575dc650602069594f02a45e2c50b46d098b0a7ccfd386ba486a5d4de35e6e2a
 MISC metadata.xml 933 BLAKE2B 4382e8d75f379211e781a0309b483105cbdba740cbd473b29d6b892351d3a5d270487c759ba7a1f5bcad448222cb1c24ef8257cd089c54ce9df0523ff708888a SHA512 395c02c568874e3d22434431f5e72dd98a647455ec0587723cb447c4d5a2fb468256bb35aff2c74b8255203d21f4d844f5a4ad426037eeb907d67ffedeb6d74e
diff --git a/net-libs/ldns/files/ldns-1.8.3-configure-strict.patch b/net-libs/ldns/files/ldns-1.8.3-configure-strict.patch
new file mode 100644
index 000000000000..37b809585a9b
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.8.3-configure-strict.patch
@@ -0,0 +1,139 @@
+https://github.com/NLnetLabs/ldns/commit/59af7359ed744327aaf0deb2e6ac90fe9e191ba6
+
+From 59af7359ed744327aaf0deb2e6ac90fe9e191ba6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 19 Nov 2022 01:31:57 +0000
+Subject: [PATCH] acx_nlnetlabs.m4: fix -Wstrict-prototypes
+
+Fix -Wstrict-prototypes as it's easy to do and avoids future warnings. Noticed
+when doing Clang 16 / GCC 14 / C23 work.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
+or the (new) c-std-porting mailing list [3].
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://wiki.gentoo.org/wiki/Modern_C_porting
+[3] hosted at lists.linux.dev.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/acx_nlnetlabs.m4
++++ b/acx_nlnetlabs.m4
+@@ -183,7 +183,7 @@ dnl cache=`echo $1 | sed 'y%.=/+- %___p__%'`
+ AC_CACHE_VAL(cv_prog_cc_flag_needed_$cache,
+ [
+ echo '$2' > conftest.c
+-echo 'void f(){}' >>conftest.c
++echo 'void f(void){}' >>conftest.c
+ if test -z "`$CC $CPPFLAGS $CFLAGS $ERRFLAG -c conftest.c 2>&1`"; then
+ eval "cv_prog_cc_flag_needed_$cache=no"
+ else
+@@ -229,7 +229,7 @@ dnl DEPFLAG: set to flag that generates dependencies.
+ AC_DEFUN([ACX_DEPFLAG],
+ [
+ AC_MSG_CHECKING([$CC dependency flag])
+-echo 'void f(){}' >conftest.c
++echo 'void f(void){}' >conftest.c
+ if test "`$CC -MM conftest.c 2>&1`" = "conftest.o: conftest.c"; then
+ 	DEPFLAG="-MM"
+ else 
+@@ -268,7 +268,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG -D__EXTENSIONS__ -D_BSD_SOURCE -D_DEFAUL
+ #include <getopt.h>
+ #endif
+ 
+-int test() {
++int test(void) {
+ 	int a;
+ 	char **opts = NULL;
+ 	struct timeval tv;
+@@ -305,7 +305,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG -D__EXTENSIONS__ -D_BSD_SOURCE -D_DEFAUL
+ #include <getopt.h>
+ #endif
+ 
+-int test() {
++int test(void) {
+ 	int a;
+ 	char **opts = NULL;
+ 	struct timeval tv;
+@@ -331,7 +331,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG,
+ [
+ #include <stdbool.h>
+ #include <ctype.h>
+-int test() {
++int test(void) {
+         int a = 0;
+         return a;
+ }
+@@ -341,7 +341,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_BSD_SOURCE -D_DEFAULT_SOURCE,
+ [
+ #include <ctype.h>
+ 
+-int test() {
++int test(void) {
+         int a;
+         a = isascii(32);
+         return a;
+@@ -352,7 +352,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_GNU_SOURCE,
+ [
+ #include <netinet/in.h>
+ 
+-int test() {
++int test(void) {
+         struct in6_pktinfo inf;
+ 	int a = (int)sizeof(inf);
+         return a;
+@@ -366,7 +366,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_GNU_SOURCE -D_FRSRESGID,
+ [
+ #include <unistd.h>
+ 
+-int test() {
++int test(void) {
+ 	int a = setresgid(0,0,0);
+ 	a = setresuid(0,0,0);
+         return a;
+@@ -381,7 +381,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_POSIX_C_SOURCE=200112,
+ #endif
+ #include <netdb.h>
+ 
+-int test() {
++int test(void) {
+         int a = 0;
+         char *t;
+         time_t time = 0;
+@@ -409,7 +409,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D__EXTENSIONS__,
+ #include <getopt.h>
+ #endif
+ 
+-int test() {
++int test(void) {
+         int a;
+         char **opts = NULL;
+         struct timeval tv;
+@@ -809,7 +809,7 @@ dnl try to see if an additional _LARGEFILE_SOURCE 1 is needed to get fseeko
+ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_LARGEFILE_SOURCE=1,
+ [
+ #include <stdio.h>
+-int test() {
++int test(void) {
+         int a = fseeko(stdin, 0, 0);
+         return a;
+ }
+@@ -834,7 +834,7 @@ char* (*f) () = getaddrinfo;
+ #ifdef __cplusplus
+ }
+ #endif
+-int main() {
++int main(void) {
+         ;
+         return 0;
+ }
+@@ -898,7 +898,7 @@ cache=`echo $1 | sed 'y%.=/+-%___p_%'`
+ AC_CACHE_VAL(cv_cc_deprecated_$cache,
+ [
+ echo '$3' >conftest.c
+-echo 'void f(){ $2 }' >>conftest.c
++echo 'void f(void){ $2 }' >>conftest.c
+ if test -z "`$CC $CPPFLAGS $CFLAGS -c conftest.c 2>&1 | grep -e deprecated -e unavailable`"; then
+ eval "cv_cc_deprecated_$cache=no"
+ else
+
diff --git a/net-libs/ldns/files/ldns-1.8.3-docs.patch b/net-libs/ldns/files/ldns-1.8.3-docs.patch
new file mode 100644
index 000000000000..6b4e7582a441
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.8.3-docs.patch
@@ -0,0 +1,95 @@
+https://bugs.gentoo.org/892065
+https://github.com/NLnetLabs/ldns/commit/5d5c95a947d98dd292ba81e95ca90ba6aeccb1d0
+
+From 5d5c95a947d98dd292ba81e95ca90ba6aeccb1d0 Mon Sep 17 00:00:00 2001
+From: Willem Toorop <willem@nlnetlabs.nl>
+Date: Mon, 5 Sep 2022 10:01:18 +0200
+Subject: [PATCH] Fix building documentation in build directory.
+
+Thanks Michael Tokarev
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -270,7 +270,7 @@ doxygen:
+ 	@if test ! -e doc/header.html ; then \
+ 		$(INSTALL) -c -m 644 $(srcdir)/doc/header.html doc/ ; \
+ 	fi ;
+-	$(doxygen) $(srcdir)/libdns.doxygen
++	$(doxygen) libdns.doxygen
+ 
+ doc: manpages $(doxygen)
+ 	@$(INSTALL) -d doc
+--- a/ldns/net.h.in
++++ b/ldns/net.h.in
+@@ -91,13 +91,12 @@ int ldns_tcp_bgsend(ldns_buffer *qbin, const struct sockaddr_storage *to, sockle
+ 
+ /**
+  * Sends a buffer to an ip using tcp and return the response as a ldns_pkt
+- * \param[in] qbin the ldns_buffer to be send
++ * \param[out] result packet with the answer
+  * \param[in] qbin the ldns_buffer to be send
+  * \param[in] to the ip addr to send to
+  * \param[in] tolen length of the ip addr
+  * \param[in] timeout the timeout value for the network
+  * \param[out] answersize size of the packet
+- * \param[out] result packet with the answer
+  * \return status
+  */
+ ldns_status ldns_tcp_send(uint8_t **result, ldns_buffer *qbin, const struct sockaddr_storage *to, socklen_t tolen, struct timeval timeout, size_t *answersize);
+--- a/libdns.doxygen.in
++++ b/libdns.doxygen.in
+@@ -51,7 +51,7 @@ PROJECT_BRIEF          =
+ # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+ # the logo to the output directory.
+ 
+-PROJECT_LOGO           = doc/images/LogoInGradientBar2-y100.png
++PROJECT_LOGO           = @srcdir@/doc/images/LogoInGradientBar2-y100.png
+ 
+ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+ # into which the generated documentation will be written. If a relative path is
+@@ -854,12 +854,12 @@ WARN_LOGFILE           =
+ # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+ # Note: If this tag is empty the current directory is searched.
+ 
+-INPUT                  = . \
+-                         ldns/ \
+-                         doc/ \
+-                         examples/ldns-mx.c \
+-                         examples/ldns-read-zone.c \
+-                         examples/ldns-signzone.c
++INPUT                  = ldns/ \
++                         @srcdir@/doc/ \
++                         @srcdir@/examples/ldns-mx.c \
++                         @srcdir@/examples/ldns-read-zone.c \
++                         @srcdir@/examples/ldns-signzone.c \
++                         @srcdir@
+ 
+ # This tag can be used to specify the character encoding of the source files
+ # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+@@ -936,7 +936,7 @@ EXCLUDE_SYMBOLS        =
+ # that contain example code fragments that are included (see the \include
+ # command).
+ 
+-EXAMPLE_PATH           = examples
++EXAMPLE_PATH           = @srcdir@/examples
+ 
+ # If the value of the EXAMPLE_PATH tag contains directories, you can use the
+ # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+@@ -956,7 +956,7 @@ EXAMPLE_RECURSIVE      = NO
+ # that contain images that are to be included in the documentation (see the
+ # \image command).
+ 
+-IMAGE_PATH             = doc/images
++IMAGE_PATH             = @srcdir@/doc/images
+ 
+ # The INPUT_FILTER tag can be used to specify a program that doxygen should
+ # invoke to filter for each input file. Doxygen will invoke the filter program
+@@ -1798,7 +1798,7 @@ COMPACT_LATEX          = NO
+ # The default value is: a4.
+ # This tag requires that the tag GENERATE_LATEX is set to YES.
+ 
+-PAPER_TYPE             = a4wide
++PAPER_TYPE             = a4
+ 
+ # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+ # that should be included in the LaTeX output. The package can be specified just
+
diff --git a/net-libs/ldns/ldns-1.8.3.ebuild b/net-libs/ldns/ldns-1.8.3.ebuild
index 310606f4c952..04665c7bc53b 100644
--- a/net-libs/ldns/ldns-1.8.3.ebuild
+++ b/net-libs/ldns/ldns-1.8.3.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 PYTHON_COMPAT=( python3_{9,10} )
-inherit python-single-r1 multilib-minimal
+inherit autotools python-single-r1 multilib-minimal
 
 DESCRIPTION="A library with the aim to simplify DNS programming in C"
 HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/"
@@ -13,10 +14,8 @@ LICENSE="BSD"
 SLOT="0/3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples python static-libs"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test" # missing test directory
 
 BDEPEND="
 	python? ( dev-lang/swig )
@@ -27,30 +26,34 @@ DEPEND="
 	>=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP},static-libs?]
 	examples? ( net-libs/libpcap )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	!<net-dns/ldns-utils-1.8.0-r2
 "
 
-RESTRICT="test" # missing test directory
-
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/ldns-config
 )
 
+PATCHES=(
+	"${FILESDIR}/ldns-1.8.1-pkgconfig.patch"
+	"${FILESDIR}/${P}-docs.patch"
+	"${FILESDIR}/${P}-configure-strict.patch"
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/ldns-1.8.1-pkgconfig.patch"
-	)
 	default
+
+	# Drop after 1.8.3
+	eautoreconf
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable static-libs static) \
 		$(multilib_native_use_with python pyldns) \
 		$(multilib_native_use_with python pyldnsx) \
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 665699f387fb..db4bba5125ca 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 4f7c80bd0404..cd7d707496a0 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,5 +1,7 @@
 DIST electrum-4.3.2.gh.tar.gz 5460546 BLAKE2B b2367116aef2a2a76dca30a635188bcd99f0fdd46ce6e8c5a2d6608fbb8f0a58e88b8352c5db92b7c8709f7bbc420fc1860204aca1efc2f2c4be2c788bfa1909 SHA512 dfb137e01ca6e511fb5ac70c34dcb01f36bdb209d7d290bd53c8fa5f95783f346898478d6e58435b241928dfe05ff46455e2e587520d47892c66b3198ab89c82
 DIST electrum-4.3.3.gh.tar.gz 5511225 BLAKE2B dd7700d185ad1d8d58c609a3b388fc4764eca68eb20bb2254046daa5faa5e790fe31a61536ab086a6f632f42346cf22121a3b85b85ae1d45ab8f59ad49e66455 SHA512 33e357d49a0839b269bf8eb5a617b9a866a85a4953a109a382930718ce204a36a93638be1d9111ca9a5349f0aed496e86f5f2b43ffa8b1ce6683c50a8b76ec6c
-EBUILD electrum-4.3.2.ebuild 2196 BLAKE2B 989ed65fc3d8fd1a03b958ff4e37fc217eb6dce2f1367b3bb6df70e7baf10bb6f462eebe4d0f5134db455462883a01482d6f734d42efaa9e1e1cacf62235dd09 SHA512 35e631b0bb3fe00623dcc76bf71d272b36d10a8e2d18df3a8c2380eca6672b9979e28819e9c871de8500b27013c013dc45299385feff441475c7ca1d0ed5fe14
-EBUILD electrum-4.3.3.ebuild 2198 BLAKE2B b43e6de51cd56570ec62908ee0a3af9320f4e774fee7c2dba4c85055e7bc5a831f56a981797669dfe4d0f50ea59fbf810459e4451f5bae45f37ac51c82fce030 SHA512 b37800556096849ff609daa15d07ccdabc89ecbb7abc30d67dad720f96e03d019da18a0364661ee1541c26d6e3a143f5ee9fed8c95b83c1a45bf03bf83ca52c5
+DIST electrum-4.3.4.gh.tar.gz 5512701 BLAKE2B a57e3ffddacfd5c63dc7f5cb59bbfe06323e7c8ab708d49e1301356fdcc0204e8126894c3c4b6dd790bd8e64cabc84a410592ea94b361cc553d4dcaa5921f50e SHA512 dc821cbda2e95853627b141292da5a07d8a672cfaabb0b160c67b3020442416593136984b42bf021f815e22671fbded67e6d2dee95e4e46f63e5c9a8fe01ebc9
+EBUILD electrum-4.3.2-r1.ebuild 2201 BLAKE2B 9bc29a9211f8b40705773c73171100f22eb15bcda782de906c2a96bbbce7f6ee1ef94989e9cae497d545cb4e99f3bb10b84e9c3c4bcc2508af754a2701f5588d SHA512 02b4bef98a04a8b3241bb215497419514dff37337d37f264fa15221abd5df98dd00625c8a8ea77846e0c975da3a37503da52f12b9ea94e61de5969d57f4a4221
+EBUILD electrum-4.3.3-r1.ebuild 2203 BLAKE2B 0bd9463b4fdbf597b84cf7db14abb3c80f69dbf222f356d1ea739e6328602a90290af0e5c827f56d52491bd69fc0af9e9e23826e50735a30ec736d8c87694838 SHA512 e007ec263357681c50efcac76389371e0de386e07da03ef4bdd941a44f9ba60d88a4a335b194677d0f1a67c1ab031cdafea122f6d60f89f4ab3d4dda262076ea
+EBUILD electrum-4.3.4.ebuild 2792 BLAKE2B 6e8a000a7ed4c94b8767f8d140a2c1426b5b2991f89a49220a36ce9333f6f93ed7ec7daa9b92ba1f0a5e8c0935a059264c2b7f5a9a7df03e51e8cd749a35a530 SHA512 6df0dc3c721f547a699f70ff82a5116311553a1736e4b7a68987c30c31a03d5fc0f6bdae7990a7f202a078028320ea429bbe392e1024d050991bd3ada0666031
 MISC metadata.xml 750 BLAKE2B 1e63e09759e679c5fb2f9a04c56e420085ec8d4531b92f0af0bfe999b9df5e2e4dd1b860428c0077214a32514c695f4aa46bfffa4f424db6736524629d84443f SHA512 d9422a8f176816e728c394a201bf8049ac8e9c45a1012e0fc26fcb03d7a6aa26e48255f3278120cac50d05554dc09182d86dcfa1a4e8b8955dde87c117395a46
diff --git a/net-misc/electrum/electrum-4.3.2.ebuild b/net-misc/electrum/electrum-4.3.2-r1.ebuild
index 1c171c339456..7dae01a5ebe4 100644
--- a/net-misc/electrum/electrum-4.3.2.ebuild
+++ b/net-misc/electrum/electrum-4.3.2-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="|| ( cli ncurses qt5 )"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/libsecp256k1
+	<dev-libs/libsecp256k1-0.2
 	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
 	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
diff --git a/net-misc/electrum/electrum-4.3.3.ebuild b/net-misc/electrum/electrum-4.3.3-r1.ebuild
index 3904438f56bc..b6b87e979a15 100644
--- a/net-misc/electrum/electrum-4.3.3.ebuild
+++ b/net-misc/electrum/electrum-4.3.3-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="|| ( cli ncurses qt5 )"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/libsecp256k1
+	<dev-libs/libsecp256k1-0.2
 	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
 	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
diff --git a/net-misc/electrum/electrum-4.3.4.ebuild b/net-misc/electrum/electrum-4.3.4.ebuild
new file mode 100644
index 000000000000..526eb9a1a6bd
--- /dev/null
+++ b/net-misc/electrum/electrum-4.3.4.ebuild
@@ -0,0 +1,109 @@
+# 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..10} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="
+	https://electrum.org/
+	https://github.com/spesmilo/electrum/
+"
+SRC_URI="
+	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	<dev-libs/libsecp256k1-0.2
+	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/bitstring[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+BDEPEND="
+	test? (
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# use backwards-compatible cryptodome API
+	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
+
+	# make qdarkstyle dep optional
+	sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test "${v}" -ge 4.3.4 && return
+	done
+
+	ewarn "If you are new to BitCoin, please be aware that:"
+	ewarn "1. Cryptocurrencies are volatile.  BTC has been subject to rapid"
+	ewarn "   changes of value in the past."
+	ewarn "2. Cryptocurrency ownership is determined solely by the access to"
+	ewarn "   the private key.  If the key is lost or stolen, BTC are unrevocably"
+	ewarn "   lost."
+	ewarn "3. Proof-of-work based cryptocurrencies have negative environmental"
+	ewarn "   impact.  BTC mining is consuming huge amounts of electricity."
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 0a539063ef38..255481d1a345 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -3,6 +3,6 @@ DIST iputils-20221126-docs.tar.xz 13000 BLAKE2B 8a9dae136f6555ed933f97d26be82a7d
 DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 SHA512 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f
 DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee
 EBUILD iputils-20211215.ebuild 4754 BLAKE2B f5e6b11dcf1642695fb3fe8be537a5df04359d397c28f7a86fff5b11c8dc37743597df22721d41bdd8c45f3f06f76325c236e3159602b15bc8cd1200d3389c41 SHA512 aa0565d5645f4acba4bfa3ca6d425e2538922ec9f3405ba1f4542941e7f21f5399e8709b71d76292a927109911226cdaa2be56ad63b62006e59a759556747bd5
-EBUILD iputils-20221126.ebuild 4436 BLAKE2B 8f8e895a0ecf93148436fa0155511aca72981080ef1827fb31fe50e774dbdd03be5a6100acebbfb0edb095d9b9b46a6083b3f8edbc7576d036ca3c13e0af255d SHA512 d6688699f557951c90c82c051eb82bc9e40e7350c472edaaf2c647d0bd4910c6be73fb4e97a260f36a3608bb3e77ceedee237e0fb99b5b239c5430e8ead9e322
+EBUILD iputils-20221126.ebuild 4432 BLAKE2B cc22c11caebdae3ac181f194fae9adae527ef25da633cd4e4622cb7daee24239298507f1c9ee3339148b6dbd80989dfc982bc5ab9ea559baf967f9e1ba177da4 SHA512 78aa066cad7348dfa747600063b84ca91ad2fe7a80cd06ac23b66075bc7ef83b34fbd828ba8c6940002a6282b24538646c1bc1622e0b2734e7a703db8bc161be
 EBUILD iputils-99999999.ebuild 4438 BLAKE2B b253fc86cf35107dbe8e164e2ef224ee07f1299c54d8ac8e38ede449e87214da2dd5eda26f3a73fcbade1a142bf457bf55bd253cf205be4bb9590264ab48fb01 SHA512 9f4f7ef308d09bdb1fb9f0e6733eeb2580864dcf4dc0b16f5843f8c49e6eabdcd4f6f33689d8401b16c9eb3397631651e87fd5d2478386237a158b0af830b737
 MISC metadata.xml 1034 BLAKE2B a1d9c98f71961b483d73229a2fbb8b272b2c1693f89fbe6921f657949da45c87fe7408aa8ce39059ba6ce3e79bb4621e4d303ed2302ab3363c5492e174fc2149 SHA512 8df2ddb2ea153af627c8c353af03675e70028017987c83e4d70ee9f1a97ae79c4fdfc8eb5987efaf8daeeb0955ef04a65315fe6033e71e9cb32e8059294716fd
diff --git a/net-misc/iputils/iputils-20221126.ebuild b/net-misc/iputils/iputils-20221126.ebuild
index 9124b2fec83a..3888fadab99b 100644
--- a/net-misc/iputils/iputils-20221126.ebuild
+++ b/net-misc/iputils/iputils-20221126.ebuild
@@ -22,7 +22,7 @@ else
 		https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-docs.tar.xz
 	"
-	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"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 2d056122ec02..6b01ed8d0348 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -23,6 +23,6 @@ AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be6
 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
 EBUILD ntp-4.2.8_p15-r1.ebuild 4449 BLAKE2B ac0f4d4ebc632237f68078e41644651f6f874e0d5c6809c5bcfd781550c414ca2fe7f68ed2e5f1b018d49faedd52daf70cd04e7bee69e73a52cd58a160a51136 SHA512 b377d9ed8095999240e5982f93a8492f91fc1ab372e487d455118f56d1048571dcf583343317c4a0b87b93c7fb09bb22286ca50d4684db6fd6ebf88b2c30c442
-EBUILD ntp-4.2.8_p15-r4.ebuild 4512 BLAKE2B c4a34f6772a262e9d8b339d28e5724a7ed1e6ed99d18d10b52369eae3d473a731dee01ebe63fd6a21e9bc60bbd59cc0a7e3948f9315f8741b197b8fa5ecc268d SHA512 1f2f22571ff97214b6197626821f372a120548db7590bdb6f87ff9006a0c3cfdbc616a7c29951b169e9c2e8fceba8ac9996303449c5d3fc5382c5982700e96a9
+EBUILD ntp-4.2.8_p15-r4.ebuild 4507 BLAKE2B 499d19cc71ff8da526ccd866bf9bd7e3bdb97d5ac72db64451fc45b4b454287385575171186535eadd4ea96a7947d2e40be2134a42c5053937c4740fa8d7a338 SHA512 ecfd7d281d89b5b328a2bb2c53b26dc83823fdd66c61bea487740e98904abbbf9c430900f36f29b1d8715d7b5cdddc4276b330b916e2971f1e1ba3909dd0b831
 EBUILD ntp-4.2.8_p15.ebuild 4442 BLAKE2B f6cfbc92981ced0abad90d0d20366949e4c41580236c0fe92b05dd0f79092ac136087bc95fd56a223d2dc6ff0d3ec81c244b380a5747bbc52ae8a43166f40e2a SHA512 0718ee4bea75e8f2d6378a0a882757adc75e49d67d62c265d2ff6414af73f7f0ee37b61205e0306aaa9f3bee5aaedaa3430ee34f4158dde3cd13e3339b08a6a9
 MISC metadata.xml 1023 BLAKE2B 58da2b7578162aa1650d5a0bba7f3384a36dcfcdb4c52003b2aa3fd2ee89a1d01239a4e462b874dfa96b0913597cf0384f78d4da79148ca1e52e8aca29b583c3 SHA512 510fbd0761a097d214225640c0a60da8c77b06af41cb77748cd73c7c04add5e4651dd07f0eef9f083343570a6fe5f0bdcf84b38b5b65df815abd8bbaea048791
diff --git a/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild
index 5bfcc0767728..038e0c0d1666 100644
--- a/net-misc/ntp/ntp-4.2.8_p15-r4.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15-r4.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
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 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="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest
index b3c3943241a6..60532cf2efd0 100644
--- a/net-misc/pps-tools/Manifest
+++ b/net-misc/pps-tools/Manifest
@@ -3,5 +3,5 @@ AUX pps-tools-1.0.2-build.patch 1217 BLAKE2B 68e2b0992cd782b66571b38ef5cd449892a
 DIST pps-tools-1.0.2.tar.gz 12701 BLAKE2B bc60a9ea94bb57bcc2b7870da433ef04fbbc30e5c4d880b719a8e7fcabba0bef2996c086e6993b879f2515cd0c685659bfed5371904401e35120ae1e9dc0891a SHA512 fa86455ece83700d5a1c522082f78ed324927fb9f53d3cf5f615a566a39e54938a41e82b6d4ae23d57c273fb923f96db4ca2d071199795d020952703afa53fcb
 DIST pps-tools-1.0.3.tar.gz 12949 BLAKE2B a57be9e7e3c9969a6bfd91bbdd618ab875c9c92cad3a2206653f2719896cf293e87ca941484d60d9af22ae1a64daa10689621504edc652a31b2bf6af8741eb64 SHA512 0906180a95346f315e784c7e28e1b5efc2a70a76b7489337a5fc215d174eac37ba58bdc1bc96fe2a0f9083334ed96b9b09ade2a252652095bab7ced5504deeea
 EBUILD pps-tools-1.0.2-r1.ebuild 554 BLAKE2B 97e97624269a09f944b5689be61357ddf6a9d71dd167efa1f102649360852bcefa755659b221a0ecb16117225d2448a9547ad283c6adfff9f313dfd858b04c78 SHA512 4f71ecdd9e677fb6609b42a73f5ba27f5c3118e9499e5694fd04be015d97443405722d1f02a1961046be4486e41b8ef45d04d29c4d4fb3eecc35e787506194aa
-EBUILD pps-tools-1.0.3.ebuild 467 BLAKE2B fd854ba69e9ff4af3735d7b58f3971b796d9b8a14b61c4db20b13878bcd420d6cbf9678099606e10f4b9ee710d0726f6cc6476f0bfb831511949a05c23f5c5af SHA512 6d86bafa21d8484649887bd5bedd44675c7638978513df63f60c50842314dbe30dceca2376db83164e7c46be7acee6b259fe0c040ecda4ea60d09a32b4b274a0
+EBUILD pps-tools-1.0.3.ebuild 465 BLAKE2B ca7b60e5bd91c2c3ed1f8b17a230aa3cd56b5d443a5982e0300900023774ad7a40d47ec195558e9831c040c1b6867d838933093105c94cf5afdb2cb7d7f038e5 SHA512 18a599be23f82762566dd493f6c354c84820925441e5afa1cc5d4d22312af18716c64672ec4c309a4dc7d5905402f39b4da4a84e949b58857e5975d705358cb9
 MISC metadata.xml 351 BLAKE2B b9e85befc52ef4031e516d0d62d477f25bf88e448ac854f9248704ec0dc6715ca3a952ef4c7cbbd020ed4bbe360e7805372aed3843fe79d58f8514ba1867cbf9 SHA512 6bfd529463b4bb0903676ad9b4eab3b1806c7909e2eef45a5be1534efbb3ea35b24b355179e64b2dfb8e64baf4f486b2010a339c362aa5eea04ea6a218041921
diff --git a/net-misc/pps-tools/pps-tools-1.0.3.ebuild b/net-misc/pps-tools/pps-tools-1.0.3.ebuild
index ef06268cfc12..5255a081f096 100644
--- a/net-misc/pps-tools/pps-tools-1.0.3.ebuild
+++ b/net-misc/pps-tools/pps-tools-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redlab-i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~ppc ppc64 ~riscv ~sparc x86"
 
 src_configure() {
 	tc-export CC
diff --git a/net-misc/valve/Manifest b/net-misc/valve/Manifest
deleted file mode 100644
index 1e785c7afa9b..000000000000
--- a/net-misc/valve/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST valve-1.0.tar.gz 272182 BLAKE2B bc2373569d2f55b5a4d69297b9fb58131bb15fc0d3be538572412267ca642db53e7a337ac44991f4659cb5459ea9f64ca55afee5aaf3e2d64efa871f522b9386 SHA512 116d3c6c400ad523c1c40cf592f56a43e0920ea0b0b2436d8f6185f4664adbc79c30e0cec63ccf922e5998357138a5b50a7e7bb2d9d0b77cbd054d8d1a5ffc12
-EBUILD valve-1.0-r1.ebuild 621 BLAKE2B 15b84363a9289acba2e2b7526eb066f012b5ac940664a1edfd25c7e293fd5ad55c4ae9caf4b09001b344d0b6863bc0da36946f994595598de57c4ea6e54e166b SHA512 baf88eeffef54d2af38f69090c3a4e5b841480ff82473d6ad2a93bb79523f4bbc2484baf544d0b5ea6ba10776437aa55abd0ffbbd81893b552aab6d5f55a973f
-MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/valve/metadata.xml b/net-misc/valve/metadata.xml
deleted file mode 100644
index aaab041e8885..000000000000
--- a/net-misc/valve/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/net-misc/valve/valve-1.0-r1.ebuild b/net-misc/valve/valve-1.0-r1.ebuild
deleted file mode 100644
index 5510f27b19f5..000000000000
--- a/net-misc/valve/valve-1.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Copy data while enforcing a specified maximum transfer rate"
-HOMEPAGE="https://www.fourmilab.ch/webtools/valve/"
-SRC_URI="https://www.fourmilab.ch/webtools/valve/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test doc"
-RESTRICT="!test? ( test )"
-
-DOCS=( README INSTALL valve.pdf )
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	dodir /usr/share/man/man1 /usr/bin
-	emake DESTDIR="${D}" install
-	use doc && local HTML_DOCS=( index.html logo.png )
-	einstalldocs
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 505fea02a80b..f82b717f9364 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index a1b161777fd4..f684c5de48a9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -379,7 +379,6 @@ www-servers/apache apache2_modules_lua
 dev-php/PEAR-Text_Wiki_Mediawiki test
 dev-php/PHP_CodeSniffer test
 dev-php/php-redmine-api test
-dev-php/phptal test
 dev-php/recaptcha test
 dev-php/symfony-config test
 dev-php/symfony-event-dispatcher test
diff --git a/profiles/package.mask b/profiles/package.mask
index 6551af4f652f..1e9d12a2172f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Florian Schmaus <flow@gentoo.org> (2013-01-27)
+# Previous dependencies of dev-lang/clojure, now part of the clojure
+# ebuild and no longer needed.
+# Removal on 2023-02-27.
+dev-java/core-specs-alpha
+dev-java/spec-alpha
+
 # Michał Górny <mgorny@gentoo.org> (2023-01-26)
 # Unmaintained.  Last release in 2003.  The package fails to install
 # since Aug 2021 and while a fix would be trivial, there does not seem
@@ -686,62 +693,11 @@ dev-scheme/scsh-lib
 net-p2p/vuze
 net-p2p/vuze-coreplugins
 
-# Marco Scardovi <mscardovi@icloud.com> (2022-12-27)
-# It builds only with a really old version of libfprint
-# and has never been updated to new one. No revdeps, no real usage
-# Removal on 2023-01-26. Bug #888665
-sys-auth/pam_fprint
-
-# Sam James <sam@gentoo.org> (2022-12-27)
-# Obsolete and incompatible with app-alternatives/* (see news item).
-# Removal on 2023-01-27. bug #886019 and bug #886021 respectively.
-app-eselect/eselect-awk
-app-eselect/eselect-sh
-
 # Sam James <sam@gentoo.org> (2022-12-27)
 # Regression in listing subvolumes (no UUIDs), bug #888549
 # https://github.com/kdave/btrfs-progs/issues/562
 =sys-fs/btrfs-progs-6.1
 
-# David Seifert <soap@gentoo.org> (2022-12-26)
-# Lots of K&R C, hidden behind an annoying authwall, fails with modern
-# GCC and Clang (-fcommon), license prohibits distributing, EAPI 6,
-# last release 8 years ago. Removal on 2023-01-25.
-sci-biology/consed
-sci-biology/phrap
-sci-biology/phred
-
-# David Seifert <soap@gentoo.org> (2022-12-26)
-# EAPI 6, cheesy build system, last release over 13 years ago, no other
-# distro packages this. Removal on 2023-01-25.
-sci-misc/flashdot
-
-# Michał Górny <mgorny@gentoo.org> (2022-12-25)
-# Broken with pytest-7.2.  Repository archived upstream.  No reverse
-# dependencies.
-# Removal on 2023-01-24.  Bug #888219.
-dev-python/pytest-toolbox
-
-# Michał Górny <mgorny@gentoo.org> (2022-12-25)
-# The project did not catch, with hardly any data submissions.
-# Removal on 2023-01-24.  Bug #843344.
-app-portage/gander
-
-# Hans de Graaff <graaff@gentoo.org> (2022-12-25)
-# Last release in 2018. Poor quality C extension code. Package
-# consistently segfaults on it tests with the latest ruby versions.
-# No reverse dependencies. Removal in 30 days.
-dev-ruby/hiredis
-
-# Marco Scardovi <mscardovi@icloud.com> (2022-12-22)
-# Per robbat2 request, I'm gonna treeclean it as we
-# are actually the only one maintaining it.
-# No update upstream, EAPI 6 and with a bug #687786
-# As replacement, it is possible to use pv --rate-limit
-# instead.
-# Removal on 2023-01-21
-net-misc/valve
-
 # Ionen Wolkens <ionen@gentoo.org> (2022-12-24)
 # Upstream dropped wxGTK support in >=games-emulation/pcsx2-1.7.3773,
 # and it now always requires Qt6. Masked given Qt6 is also masked in
@@ -751,87 +707,6 @@ net-misc/valve
 # and package.unmask the whole list alongside pcsx2.
 >=games-emulation/pcsx2-1.7.3773
 
-# Arthur Zamarin <arthurzam@gentoo.org> (2022-12-24)
-# Live only packages for 4 years! Upstream repositories are archived
-# or inactive.
-# Removal: 2023-01-23.  Bug #888175.
-media-libs/kodi-platform
-media-plugins/kodi-game-libretro-fceumm
-media-plugins/kodi-peripheral-steamcontroller
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2022-12-24)
-# EAPI=6 ebuilds, live only packages for 5.79 years!
-# maintainer-needed packages for a long time.
-# Removal: 2023-01-23.  Bug #888173.
-x11-misc/xowl
-x11-wm/xoat
-
-# Michał Górny <mgorny@gentoo.org> (2022-12-24)
-# Obsolete package with broken tests.  Last released in 2018, last
-# activity in 2021.  No reverse dependencies.
-# Removal on 2023-01-23.  Bug #888147.
-dev-python/ndg-httpsclient
-
-# Michał Górny <mgorny@gentoo.org> (2022-12-23)
-# Packages that still use dev-python/nose and have no revdeps.
-#
-# dev-python/blessings: EAPI 7, last rel. in 2018, git act. in 2020
-# dev-python/errorhandler: EAPI 7, last rel. in 2016, git act. in 2018
-# dev-python/flask-restful: EAPI 7, last rel. in 2021, git act. in Mar
-# dev-python/imread: non-PEP517, last rel. in 2020, uses pytest in git
-# dev-python/influxdb: EAPI 7, last rel. 2020, archived on GitHub
-# dev-python/nose-random: nose plugin
-# dev-python/pilkit: EAPI 7, last rel. in 2017, uses pytest in git
-# dev-python/PyContracts: EAPI 7, last rel. in 2019, git act. in 2020
-# dev-python/python-zipstream: EAPI 7, last rel. in 2016, git in 2018
-# dev-python/PyUtilib: EAPI 7, last rel. and git act. in 2020
-# dev-python/socketio-client: EAPI 7, last rel. in 2016, git in 2017
-# dev-python/www-authenticate: EAPI 7, last rel. in 2015, git in 2019
-#
-# Removal on 2023-01-22.  Bug #888087.
-dev-python/blessings
-dev-python/errorhandler
-dev-python/flask-restful
-dev-python/imread
-dev-python/influxdb
-dev-python/nose-random
-dev-python/pilkit
-dev-python/PyContracts
-dev-python/python-zipstream
-dev-python/PyUtilib
-dev-python/socketio-client
-dev-python/www-authenticate
-
-# Michał Górny <mgorny@gentoo.org> (2022-12-23)
-# sci-libs/votca-tools fail to build with GCC 12.  Pending version bump
-# since January 2022.
-# Removal on 2023-01-22.  Bug #841830.
-sci-chemistry/votca-csg
-sci-chemistry/votca-csgapps
-sci-chemistry/votca-xtp
-sci-libs/votca-tools
-
-# Michał Górny <mgorny@gentoo.org> (2022-12-21)
-# The mauve project is no longer maintained upstream, and the actual
-# program has been removed from Gentoo in 2016.  These are leftover
-# libraries with no reverse dependencies.  Last bumped in 2009.
-# Removal on 2023-01-20.  Bug #677558.
-sci-libs/libgenome
-sci-libs/libmems
-
-# Michał Górny <mgorny@gentoo.org> (2022-12-21)
-# Fails to build both against MySQL and PostgreSQL.  Homepage gone.
-# Last bumped in 2005.
-# Removal on 2023-01-20.  Bug #677528, #807835.
-dev-db/mysql-super-smack
-
-# Michał Górny <mgorny@gentoo.org> (2022-12-21)
-# Reported to be incompatible with PHP 7+.  Abandoned upstream.
-# No reverse dependencies.  There is a maintained fork, should anyone
-# want to revive it.
-# Removal on 2023-01-20.  Bug #737842.
-dev-php/phptal
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-12-19)
 # This version currently is not compatible with kernel build (yet)
 ~dev-util/bindgen-0.63.0
@@ -963,20 +838,6 @@ dev-qt/qtwebsockets:6
 # meaningless backtrace, debugging (flags, symbols) do not help
 >app-shells/scsh-0.6.9
 
-# Zoltan Puskas <zoltan@sinustrom.info> (2022-02-18)
-# Multiple vulnerabilities (CVE-2022-{23803,23804,23946,23947})
-# 5.X series is masked to avoid accidental use, but it's kept for
-# industrial users who are in the process of migrating to the new
-# format of the 6.X series.
-<sci-electronics/kicad-6.0.2
-<sci-electronics/kicad-footprints-6.0.2
-<sci-electronics/kicad-i18n-6.0.2
-<sci-electronics/kicad-meta-6.0.2
-<sci-electronics/kicad-packages3d-6.0.2
-<sci-electronics/kicad-symbols-6.0.2
-<sci-electronics/kicad-templates-6.0.2
-<app-doc/kicad-doc-6.0.2
-
 # Eray Aslan <eras@gentoo.org> (2022-01-24)
 # Mask experimental software
 =mail-mta/postfix-3.8*
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 243cb832ee3e..d9ca628cabe5 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7072,8 +7072,6 @@ sci-chemistry/vmd:msms - Add support for MSMS SES calcualtion tool
 sci-chemistry/vmd:povray - Add support for povray raytracer for HQ images
 sci-chemistry/vmd:tachyon - Add support for tachyon raytracer for HQ images
 sci-chemistry/votca:gromacs - Add support for gromacs file formats through sci-chemistry/gromacs
-sci-chemistry/votca-csg:extras - Pull in extra applications from sci-chemistry/votca-csgapps
-sci-chemistry/votca-csg:gromacs - Add support for gromacs file formats through sci-chemistry/gromacs
 sci-electronics/geda:stroke - enable mouse gesture support
 sci-electronics/gerbv:unit-mm - Set default unit for coordinates in status bar to mm
 sci-electronics/gspiceui:schematics - Use sci-electronics/geda for schematics editing
@@ -7082,11 +7080,9 @@ sci-electronics/gtkwave:fasttree - Enables experimental Fast SST Tree widget cod
 sci-electronics/gtkwave:fatlines - Renders lines as double width in gtkwave.
 sci-electronics/gtkwave:judy - Enables Judy array support.
 sci-electronics/gtkwave:packed - Enables '#pragma pack' for data arrays (saves memory, costs time).
-sci-electronics/kicad:github - Add github support into PCB editor
 sci-electronics/kicad:ngspice - Enable circuit simulation
 sci-electronics/kicad:occ - Enable viewing 3D rendering of designs via sci-libs/opencascade
 sci-electronics/kicad:pcm - Enable plugin content manager
-sci-electronics/kicad:python - Enable python scripting support
 sci-electronics/kicad-meta:minimal - Do not install extra data like 3D packages and templates.
 sci-electronics/kicad-packages3d:occ - Use sci-libs/opencascade for data exchange
 sci-electronics/ktechlab:gpsim - Enable support for Microchip PIC microcontrollers similation using dev-embedded/gpsim
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 07cf870e4b14..c69bcbc42b0f 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/consed/Manifest b/sci-biology/consed/Manifest
deleted file mode 100644
index c13741cade0d..000000000000
--- a/sci-biology/consed/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX consed-29-fix-build-system.patch 5614 BLAKE2B 2ec980906ee2f9c7b0cede7b3eabad78cdc3e9c3d95c58275dc849ff36ee4ef9fa53dd3b321729ae60c9f2d2fc1ca4cd0ee2448175410acca7ffe6266d66ac44 SHA512 92df40d6465685aec77d73db1f0eb7a79d4c26fbbf7d9764c4e0a83208e4ef97b45db1a8175239bd174bd56aeed7a5aa0111c7b99764910f7d6c0ac63aba187d
-AUX consed-29-fix-c++14.patch 9261 BLAKE2B ff70814b39780dbbabc70eb7555359e8aee2ef72b40b7e149e2f63ccaeedfe7e0dc8822cb2b5c79d57c33e621a59e0e1cd273e49a0976daef0bdeb52f4f46569 SHA512 be5cd76d36cf437c1113d09e540d98d0eb92b7e2e732f4a5a308066b8046b5628048203e791a0fa316e44a4cc127d027418a7f038406df22c3f60552f5b87789
-AUX consed-29-fix-perl-shebang.patch 17375 BLAKE2B e34a358569d594f4ab60fc3745a6a84cab781cbad860421f5ac322154df9635e13b2e2349c92f4271b0ca161eda87285ba89bf0801992954fecaa11575c8baf9 SHA512 4caed1ab7229e2b3e367f03a8d650cafed2974232fcd6daa08e62c90512d49e09caceb34c5bb65c67a588bab314165d72d8c1687393549d4107425df78e3218d
-AUX consed-29-fix-qa.patch 11639 BLAKE2B 3b80fd91b60c09e69cb9fa9b8deb88393fd89f02a3a650076db275567725aeb4636bfe1fcc35f44c72be33ed9494796fa6dab1b4da8b4b9444ecc73ea9b141fb SHA512 083b23d03ef9a473b41fae21ce433cdd5cdd0948819fa9dcc6dbed3022e93674aaa8769894b9be69b5bccf47dd6e67435bdf0549a719ecc4c5517f89010c3988
-DIST consed-29-linux.tar.gz 36172715 BLAKE2B 6706576b404c0bccb7ed28ab6fe2dec86fdac6f7651406d3f30e35caac3e49a66b4762edace2133d2dfb776bbeb730b74797c7323deb950f2648a46c4594fe98 SHA512 63a95d84cb58009045a9d898c8b1a94f98516bed9189f624a5930338cc8f51562504257f309d945fafcc07e0811ffeea122b640789f75fbd6c94535178dab4dd
-DIST consed-29-sources.tar.gz 3258845 BLAKE2B 508763ff2a240047cff0a43ba4b9b9a7f9302c0a023478c6b08f86bb77fb2c12a62a9b16165fe6257fe6c86af853dabe279bd9e05632c3e112e3fb7fad2c6bd3 SHA512 fd711a65a02ef1238cca12b90fe7fa9b67da6c37d43cd105f38c7b6475fbc073c1f4d7f99703dec9d3a0a7a2a9317cb14999a114bb6f52589cb9b6e34700eb93
-EBUILD consed-29.ebuild 2727 BLAKE2B 09c3d1619c7c751c1b084bcf1bc25bd87cfa23f4d83b0b6432b9229f7ecbd05c4a424522f6cc4117d571fa2ce34dbde805b4d0224a95db5af0f200e21688b1f3 SHA512 86160fe6b03dcfddc756c3f6a5c15bcbfe6a94b3002fe4deb39157adfc445a52ee557fa7732f07711a6859357c475bc31cfa535563cb91efee4511281fdef854
-MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/consed/consed-29.ebuild b/sci-biology/consed/consed-29.ebuild
deleted file mode 100644
index 32eba4cb16d0..000000000000
--- a/sci-biology/consed/consed-29.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A genome sequence finishing program"
-HOMEPAGE="http://bozeman.mbt.washington.edu/consed/consed.html"
-SRC_URI="
-	${P}-sources.tar.gz
-	${P}-linux.tar.gz"
-
-LICENSE="phrap"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-COMMON_DEPEND="
-	x11-libs/libX11
-	x11-libs/motif:0
-	sci-biology/samtools:0.1-legacy
-"
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	>=sci-biology/phred-071220-r1
-	>=sci-biology/phrap-1.080812-r2
-"
-
-S="${WORKDIR}"
-
-RESTRICT="fetch"
-PATCHES=(
-	"${FILESDIR}/${PN}-29-fix-build-system.patch"
-	"${FILESDIR}/${PN}-29-fix-c++14.patch"
-	"${FILESDIR}/${PN}-29-fix-qa.patch"
-	"${FILESDIR}/${PN}-29-fix-perl-shebang.patch"
-)
-
-pkg_nofetch() {
-	einfo "Please visit ${HOMEPAGE} and obtain the file"
-	einfo "\"sources.tar.gz\", then rename it to \"${P}-sources.tar.gz\""
-	einfo "and place it into your DISTDIR directory,"
-	einfo "obtain the file"
-	einfo "\"consed_linux.tar.gz\", then rename it to \"${P}-linux.tar.gz\""
-	einfo "and place it into your DISTDIR directory."
-}
-
-src_prepare() {
-	default
-
-	sed \
-		-e "s!\$szPhredParameterFile = .*!\$szPhredParameterFile = \$ENV{'PHRED_PARAMETER_FILE'} || \'"${EPREFIX}"/usr/share/phred/phredpar.dat\';!" \
-		-e "s:/usr/local/genome:${EPREFIX}/usr:" \
-		-e "s:niceExe = \"/bin/nice\":niceExe = \"${EPREFIX}/usr/bin/nice\":" \
-		-e "s:/wt1/gordon/genome:${EPREFIX}/usr/bin:" \
-		-i scripts/* contributions/* || die
-}
-
-src_configure() {
-	append-cflags -std=gnu99
-	append-lfs-flags
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		SAMTOOLS_CPPFLAGS="-I${EPREFIX}/usr/include/bam-0.1-legacy" \
-		LIBS="-L${EPREFIX}/usr/$(get_libdir)" \
-		X11_LIBS="$($(tc-getPKG_CONFIG) --libs x11)" \
-		SAMTOOLS_LIBS="-lbam-0.1-legacy"
-}
-
-src_install() {
-	dobin consed misc/{mktrace/mktrace,phd2fasta/phd2fasta,454/sff2scf} scripts/* contributions/*
-
-	insinto /usr/lib/screenLibs
-	doins misc/*.{fa*,seq}
-
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins -r \
-			standard polyphred autofinish assembly_view 454_newbler \
-			align454reads align454reads_answer solexa_example \
-			solexa_example_answer selectRegions selectRegionsAnswer
-	fi
-
-	cat > 99consed <<-_EOF_ || die
-	CONSED_HOME=${EPREFIX}/usr
-	CONSED_PARAMETERS=${EPREFIX}/etc/consedrc
-	_EOF_
-	doenvd 99consed
-
-	dodoc README.txt *_announcement.txt
-}
-
-pkg_postinst() {
-	einfo "Package documentation is available at"
-	einfo "http://www.phrap.org/consed/distributions/README.${PV}.0.txt"
-}
diff --git a/sci-biology/consed/files/consed-29-fix-build-system.patch b/sci-biology/consed/files/consed-29-fix-build-system.patch
deleted file mode 100644
index 30819f93ac80..000000000000
--- a/sci-biology/consed/files/consed-29-fix-build-system.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-Make build system semi-sane:
-* Respect CC, CXX, CFLAGS, CXXFLAGS, CPPFLAGS, LDFLAGS and LIBS
-* Remove default optimisation flags
-* Remove -fpermissive from DEFS (as source builds fine now)
-* Add large file support (LFS) via CPPFLAGS and not in Makefile
-
---- a/makefile
-+++ b/makefile
-@@ -47,23 +47,20 @@
- #
- # compilation
- #
--CXX= g++
--KRCC= gcc
--CC=gcc 
-+CXX ?= g++
-+CC ?= gcc 
- 
- #
- #
--CFLGS= -w -DINLINE_RWTPTRORDEREDVECTOR -DINLINE_RWTVALORDEREDVECTOR -DINLINE_MBTVALVECTOR -DLINUX_COMPILE -DSOCKLEN_T_DEFINED -D__BOOL_DEFINED -DANSI_C -DOFSTREAM_OPEN_WITHOUT_PERMISSIONS -fpermissive -DNO_POUND_POUND_MACROS -DUSE_USING_IN_PUBLIC_TEMPLATE_CLASSES -DINT_CHAR_OPERATOR -D_FILE_OFFSET_BITS=64 -DSAMTOOLS_AVAILABLE
-+DEFS = -DINLINE_RWTPTRORDEREDVECTOR -DINLINE_RWTVALORDEREDVECTOR -DINLINE_MBTVALVECTOR -DLINUX_COMPILE -DSOCKLEN_T_DEFINED -D__BOOL_DEFINED -DANSI_C -DOFSTREAM_OPEN_WITHOUT_PERMISSIONS -DNO_POUND_POUND_MACROS -DUSE_USING_IN_PUBLIC_TEMPLATE_CLASSES -DINT_CHAR_OPERATOR -DSAMTOOLS_AVAILABLE
- 
--OPT= -O
- #
- # Include directory for template classes must be included
- # in both compilation & link lines, even if .h file is
- # found in default path.  C front, gotta love it.
- #
--INC=  -I/usr/X11R6/include -I/me1/gordon/samtools/samtools-0.1.18
-+INCLUDES = $(SAMTOOLS_CPPFLAGS)
- 
--DEPENDENCIES=
- #
- #
- # Linking
-@@ -80,12 +77,9 @@
- #         /lib/ld-linux.so.2 (0x003ee000)
- # 
- # To fix cut/paste bug, I've made X11 always dynamic.
--CLIBS= -lX11
--LPATH= -L/usr/X11R6/lib
--ARCHIVES= /usr/X11R6/lib/libXm.a \
--/usr/X11R6/lib/libXt.a /usr/X11R6/lib/libSM.a \
--/usr/X11R6/lib/libICE.a /usr/X11R6/lib/libXext.a /usr/X11R6/lib/libXmu.a \
--/usr/X11R6/lib/libXp.a /usr/lib/libm.a /me1/gordon/samtools/samtools-0.1.18/libbam.a /me1/gordon/samtools/samtools-0.1.18/bcftools/libbcf.a /me1/gordon/zlib/zlib-1.2.5/libz.a
-+
-+MOTIF_LIBS ?= -lXm -lXt
-+ALL_LIBS = $(LIBS) $(MOTIF_LIBS) $(X11_LIBS) $(SAMTOOLS_LIBS)
- 
- 
- 
-@@ -94,7 +88,6 @@
- #
- #LDFLGS=	-g
- # static linking
--LDFLGS=	-g -rdynamic
- 
- # 
- # the subdirectory used by cfront compilers gets cleaned
-@@ -112,10 +105,10 @@
- # general compilation rules for .cpp, .cxx, .c  files
- #
- .cpp.o:		
--	$(CXX) $(CFLGS) $(OPT) $(INC) -c $<
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -c $<
-            
- .c.o:	   
--	$(CXX) $(CFLGS) $(OPT) $(INC) -c $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -c $<
- 
- #
- # targets file included in generated makefile
-@@ -593,17 +586,23 @@
-    writeToRewriteReferenceFile.o \
-    xsynchronize.o
- 
-+SUBDIRS := misc/454 misc/mktrace misc/phd2fasta
-+
-+all: consed $(SUBDIRS)
-+
-+$(SUBDIRS):
-+	$(MAKE) -C $@
-+
-+.PHONY: all $(SUBDIRS)
-+
- consed:	$(CONSED_OBJS) makefile checkLicenseKeyStub.o
--	$(CXX) $(INC) $(LDFLGS) -o consed $(CONSED_OBJS) checkLicenseKeyStub.o \
--		$(ARCHIVES) $(LPATH) $(WARNINGS) $(CLIBS) $(XLIBS)
-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o consed $(CONSED_OBJS) checkLicenseKeyStub.o $(ALL_LIBS)
- 
- trial_consed: 	$(CONSED_OBJS) makefile checkLicenseKey.o
--	$(CXX) $(INC) $(LDFLGS) -o trial_consed $(CONSED_OBJS) checkLicenseKey.o \
--		$(ARCHIVES) $(LPATH) $(WARNINGS) $(CLIBS) $(XLIBS)
-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o trial_consed $(CONSED_OBJS) checkLicenseKey.o $(ALL_LIBS)
- 
- pure:	$(CONSED_OBJS) makefile checkLicenseKeyStub.o
--	$(PURIFY) $(CXX) $(INC) $(LDFLGS) -o consed $(CONSED_OBJS) checkLicenseKeyStub.o \
--		$(ARCHIVES) $(LPATH) $(WARNINGS) $(CLIBS) $(XLIBS)
-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o consed $(CONSED_OBJS) checkLicenseKeyStub.o $(ALL_LIBS)
- 
- clean:	
- 	rm -rf *.o core $(TEMPLATE_DIR)
-@@ -613,15 +612,15 @@
- # the Solaris 5.x compiler cannot optimize the following
- 
- consedResources.o:
--	$(CXX) $(WARNINGS) $(CFLGS) $(INC) $(DEPENDENCIES) -c consedResources.cpp
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -c consedResources.cpp
- 
- consedResources2.o:
--	$(CXX) $(WARNINGS) $(CFLGS) $(INC) $(DEPENDENCIES) -c consedResources2.cpp
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -c consedResources2.cpp
- 
- # tlingit cannot optimize the following:
- 
- guiEditResources.o:
--	$(CXX) $(WARNINGS) $(CFLGS) $(INC) $(DEPENDENCIES) -c guiEditResources.cpp
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -c guiEditResources.cpp
- 
- guiEditResources.o : \
- 	 assemblyViewTagTypeAndLine.h assert.h bIsNumericDouble.h \
---- a/misc/454/Makefile
-+++ b/misc/454/Makefile
-@@ -0,0 +1,16 @@
-+CC ?= cc
-+LIBM = -lm
-+
-+DEFS = -DANSI_C
-+
-+OBJS= sff2scf.c
-+
-+sff2scf: $(OBJS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBM)
-+
-+.c.o:	   
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<
-+
-+clean:
-+	rm -f $(OBJS) sff2scf
-+
---- a/misc/mktrace/Makefile
-+++ b/misc/mktrace/Makefile
-@@ -1,13 +1,17 @@
--CC= cc
--CFLAGS= -g
--CLIB= -lm
-+CC ?= cc
-+LIBM = -lm
-+
-+DEFS = -DANSI_C
- 
- OBJS= mktrace.o readFASTA.o writeSCF.o synTrace.o \
-       freeTrace.o rwUtil.o writePhd.o getTime.o \
-       readQUAL.o
- 
- mktrace: $(OBJS)
--	$(CC) $(CFLAGS) -o mktrace $(OBJS) $(CLIB)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBM)
-+
-+.c.o:	   
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<
- 
- clean:
- 	rm -f $(OBJS) mktrace
---- a/misc/phd2fasta/Makefile
-+++ b/misc/phd2fasta/Makefile
-@@ -1,8 +1,9 @@
--CC=cc
--CFLAGS=-O -w
--CLIB=-lm
-+CC ?= cc
-+LIBM = -lm
- 
--OBJ= phd2fasta.o \
-+DEFS = -DANSI_C
-+
-+OBJS= phd2fasta.o \
-      readParam.o initParam.o checkParam.o \
-      freeParam.o helpParam.o \
-      readFOF.o readDIR.o readFOX.o \
-@@ -15,10 +16,11 @@
- 
- INC= phd2fasta.h
- 
--SRC = $(OBJ:.o=.c)
--
--phd2fasta: $(OBJ)
--	$(CC) $(CFLAGS) -o phd2fasta $(OBJ) $(CLIB)
-+phd2fasta: $(OBJS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBM)
-+           
-+.c.o:	   
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<
- 
- clean:
- 	rm -f $(OBJ) phd2fasta
diff --git a/sci-biology/consed/files/consed-29-fix-c++14.patch b/sci-biology/consed/files/consed-29-fix-c++14.patch
deleted file mode 100644
index 212b8d63d1e3..000000000000
--- a/sci-biology/consed/files/consed-29-fix-c++14.patch
+++ /dev/null
@@ -1,376 +0,0 @@
-Fix building with C++14:
-* Add 'noexcept(false)' to throwing destructors in C++11 mode
-* Properly guard C declarations with extern "C" scopes
-* Avoid erroneous overloaded suffix operator errors, due to missing spaces
-* Add explicit casts to avoid -Wnarrowing errors
-* Add 'this->' for dependent identifiers in derived class templates,
-  previously required -fpermissive
-
---- a/bvAlignedReads.cpp
-+++ b/bvAlignedReads.cpp
-@@ -126,7 +126,11 @@
- }
- 
- 
--bvAlignedReads :: ~bvAlignedReads() {
-+bvAlignedReads :: ~bvAlignedReads()
-+#if __cplusplus >= 201103L
-+   noexcept(false)
-+#endif
-+{
- 
- 
-    assert( pBamView_->aBVAlignedReads_.remove( this ) );
---- a/bvAlignedReads.h
-+++ b/bvAlignedReads.h
-@@ -81,7 +81,11 @@
-                    const FileName& filReferenceSequenceFile,
-                    bamView* pBamView );
- 
--   ~bvAlignedReads();
-+   ~bvAlignedReads()
-+#if __cplusplus >= 201103L
-+   noexcept(false)
-+#endif
-+   ;
- 
-    bool operator==( const bvAlignedReads& myBVAlignedReads ) const {
-       return( this == &myBVAlignedReads );
---- a/chromatData.h
-+++ b/chromatData.h
-@@ -58,6 +58,9 @@
- #ifndef CHROMATDATA_DEFINED
- #define CHROMATDATA_DEFINED
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- #ifndef FLOAT
- #define FLOAT		double
-@@ -131,4 +134,8 @@
- int freeChromatData();
- #endif
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
---- a/compareContigs.cpp
-+++ b/compareContigs.cpp
-@@ -126,6 +126,9 @@
- 
- 
- compareContigs :: ~compareContigs() 
-+#if __cplusplus >= 201103L
-+   noexcept(false)
-+#endif
- { 
- 
-    if ( !bCalledFromMakeJoins_ ) {
---- a/compareContigs.h
-+++ b/compareContigs.h
-@@ -137,7 +137,11 @@
-    compareContigs( ContigWin* pContigWin, const int nConsPos1);
-    compareContigs(); // for assemblyView
- 
--   ~compareContigs();
-+   ~compareContigs()
-+#if __cplusplus >= 201103L
-+   noexcept(false)
-+#endif
-+   ;
- 
-    // this makes RWTPtrOrderedVector in ConsEd happy
-    bool operator==( const compareContigs& compC ) const {
-
---- a/filePopupAndGetAceFilename.cpp
-+++ b/filePopupAndGetAceFilename.cpp
-@@ -317,7 +317,7 @@
-       struct tm* pTM = localtime( &( pAceFile->stat_.st_mtime ) );
-       
-       strftime( szDateTime, nDateTimeSize,  
--                quote(%H)":"quote(%M)":"quote(%S)" %e-%h-%Y",
-+                quote(%H) ":" quote(%M) ":" quote(%S) " %e-%h-%Y",
-                 pTM );
- 
-       RWCString soDescription = RWCString( szDateTime ) + "    " + (*pAceFile);
-@@ -620,7 +620,7 @@
-       struct tm* pTM = localtime( &( pAceFile->stat_.st_mtime ) );
-       
-       strftime( szDateTime, nDateTimeSize,  
--                quote(%H)":"quote(%M)":"quote(%S)" %e-%h-%Y",
-+                quote(%H) ":" quote(%M) ":" quote(%S) " %e-%h-%Y",
-                 pTM );
- 
-       RWCString soDescription = RWCString( szDateTime ) + "    " + (*pAceFile);
---- a/findTraceExtrema.h
-+++ b/findTraceExtrema.h
-@@ -44,8 +44,15 @@
- 
- #include    "chromatData.h"
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- int findTraceExtrema( ChromatData *chromatData );
- 
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif
- 
---- a/makeUpper.h
-+++ b/makeUpper.h
-@@ -42,6 +42,14 @@
- #ifndef MAKEUPPER_INCLUDED
- #define MAKEUPPER_INCLUDED
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- void makeUpper( char* szStringOfMixedCase );
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
---- a/nextPhredPipeline.cpp
-+++ b/nextPhredPipeline.cpp
-@@ -476,7 +476,7 @@
- void nextPhredPipeline :: openAndLockControlFile() {
- 
- 
--   nFDControlFile_ = open( filControlFile_.data(), O_CREAT |O_RDWR );
-+   nFDControlFile_ = open( filControlFile_.data(), O_CREAT |O_RDWR, 0600);
-    if ( nFDControlFile_ == -1 ) {
-       THROW_FILE_ERROR( filControlFile_ );
-    }
---- a/readABI.h
-+++ b/readABI.h
-@@ -56,10 +56,18 @@
- 
- #include    "chromatData.h"
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #ifdef ANSI_C
- ChromatData *readABI( char *fn, int *status );
- #else
- ChromatData *readABI();
- #endif
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
---- a/readData.h
-+++ b/readData.h
-@@ -44,6 +44,14 @@
- 
- #include    "chromatData.h"
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- ChromatData *readData( char *filename, int* status );
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
---- a/readESD.h
-+++ b/readESD.h
-@@ -53,6 +53,10 @@
- 
- #include "chromatData.h"
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- typedef unsigned int4           DWORD;
- typedef unsigned char           TCHAR;
- typedef char                    BYTE;
-@@ -187,5 +191,7 @@
- ChromatData *readESD();
- #endif
- 
--
-+#ifdef __cplusplus
-+}
-+#endif
- 
---- a/readSCF.h
-+++ b/readSCF.h
-@@ -56,6 +56,10 @@
- 
- #include    "chromatData.h"
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- /* ---- Constants ---- */
- #define SCF_MAGIC (((((int4)'.'<<8)+(int4)'s'<<8)+(int4)'c'<<8)+(int4)'f')
- #define scale(V,OLDMAX,NEWMAX) (int2)( (FLOAT) V * (FLOAT) NEWMAX / (FLOAT) OLDMAX )
-@@ -144,4 +148,8 @@
- int readSCF3();
- #endif
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
---- a/readsense_bitmaps.h
-+++ b/readsense_bitmaps.h
-@@ -56,10 +56,10 @@
- static const int forward_bitmap_height = 19;
- static char forward_bitmap_bits[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
--   0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x00,
--   0xf8, 0xff, 0x00, 0x00, 0xf8, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0xff, 0x07,
--   0xf8, 0xff, 0xff, 0x0f, 0xf8, 0xff, 0xff, 0x07, 0xf8, 0xff, 0x1f, 0x00,
--   0xf8, 0xff, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
-+   0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, (char)0xf8, 0x07, 0x00, 0x00,
-+   (char)0xf8, (char)0xff, 0x00, 0x00, (char)0xf8, (char)0xff, 0x3f, 0x00, (char)0xf8, (char)0xff, (char)0xff, 0x07,
-+   (char)0xf8, (char)0xff, (char)0xff, 0x0f, (char)0xf8, (char)0xff, (char)0xff, 0x07, (char)0xf8, (char)0xff, 0x1f, 0x00,
-+   (char)0xf8, (char)0xff, 0x00, 0x00, (char)0xf8, 0x07, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00};
- 
-@@ -67,10 +67,10 @@
- static const int reverse_bitmap_height = 19;
- static char reverse_bitmap_bits[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
--   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0xf8, 0x07,
--   0x00, 0xc0, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07,
--   0xfc, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07, 0x00, 0xfe, 0xff, 0x07,
--   0x00, 0xc0, 0xff, 0x07, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x07,
-+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, (char)0xf8, 0x07,
-+   0x00, (char)0xc0, (char)0xff, 0x07, 0x00, (char)0xff, (char)0xff, 0x07, (char)0xf8, (char)0xff, (char)0xff, 0x07,
-+   (char)0xfc, (char)0xff, (char)0xff, 0x07, (char)0xf8, (char)0xff, (char)0xff, 0x07, 0x00, (char)0xfe, (char)0xff, 0x07,
-+   0x00, (char)0xc0, (char)0xff, 0x07, 0x00, 0x00, (char)0xf8, 0x07, 0x00, 0x00, 0x00, 0x07,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00};
- 
---- a/readType.h
-+++ b/readType.h
-@@ -56,11 +56,19 @@
- 
- #include    "chromatData.h"
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #ifdef ANSI_C
- int readType( char *filename );
- #else
- int readType();
- #endif
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
- 
---- a/rwtptrsortedvector.h
-+++ b/rwtptrsortedvector.h
-@@ -57,7 +57,6 @@
- #ifdef USE_USING_IN_PUBLIC_TEMPLATE_CLASSES
-    using RWTPtrOrderedVector<TP>::nCurrentLength_;
-    using RWTPtrOrderedVector<TP>::isEmpty;
--   using RWTPtrOrderedVector<TP>::nCurrentLength_;
-    using RWTPtrOrderedVector<TP>::length;
-    using RWTPtrOrderedVector<TP>::ppArray_;
-    using RWTPtrOrderedVector<TP>::data;
-@@ -84,7 +83,7 @@
-       if ( nInsertBeforeIndex == RW_NPOS )
-          nInsertBeforeIndex = nCurrentLength_;
- 
--      insertAt( nInsertBeforeIndex, pVal );
-+      this->insertAt( nInsertBeforeIndex, pVal );
-    }
- 
-    // don't copy this.  copy mbtValOrderedVectorOfRWCString's method instead
---- a/rwtvalsortedvector.h
-+++ b/rwtvalsortedvector.h
-@@ -74,7 +74,7 @@
-       if ( nPos == RW_NPOS ) 
-          nPos = nCurrentLength_;
- 
--      insertAt( nPos, val );
-+      this->insertAt( nPos, val );
-    }
- 
- 
---- a/rwUtil.h
-+++ b/rwUtil.h
-@@ -51,6 +51,10 @@
- *|***************************************************************************|*
- */
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #ifdef ANSI_C
- int2  inSwpSint2( char *ptr );
- int4  inSwpSint4( char *ptr );
-@@ -97,3 +101,6 @@
- int writeUint4();
- #endif
- 
-+#ifdef __cplusplus
-+}
-+#endif
---- a/soGetDateTime.cpp
-+++ b/soGetDateTime.cpp
-@@ -62,13 +62,13 @@
-    else if ( nFormat == nDotInMiddle ) {
-       strftime( szDateTime, 
-                 nDateTimeSize,
--                "%y%m%d."quote(%H)quote(%M)quote(%S),
-+                "%y%m%d." quote(%H)quote(%M)quote(%S),
-                 localtime( &timee ) );
-    }
-    else {
-       strftime( szDateTime, 
-                 nDateTimeSize,
--                "%y%m%d:"quote(%H)quote(%M)quote(%S),
-+                "%y%m%d:" quote(%H)quote(%M)quote(%S),
-                 localtime( &timee ) );
-    }
-                 
---- a/szGetTime.h
-+++ b/szGetTime.h
-@@ -42,9 +42,15 @@
- #ifndef szGetTime_included
- #define szGetTime_included
- 
--char *szGetTime();
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
-+char *szGetTime();
- 
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif
- 
diff --git a/sci-biology/consed/files/consed-29-fix-perl-shebang.patch b/sci-biology/consed/files/consed-29-fix-perl-shebang.patch
deleted file mode 100644
index a27a3537a8d1..000000000000
--- a/sci-biology/consed/files/consed-29-fix-perl-shebang.patch
+++ /dev/null
@@ -1,701 +0,0 @@
-Make perl shebangs portable, such that the scripts can also be used on Gentoo Prefix.
-Rationale: https://blogs.gentoo.org/mgorny/2016/02/08/a-quick-note-on-portable-shebangs/
-
---- a/contributions/ace2fof
-+++ b/contributions/ace2fof
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # .-----------------------------------------------------------------------------------.
- # |                                                                                   |
-@@ -107,6 +107,7 @@
- # |                                                                                   |
- # `-----------------------------------------------------------------------------------'
- #Fixed this file for taking Aracne's Ace file by syang 05152002
-+use warnings;
- use strict;
- use POSIX qw(fmod);
- 
---- a/contributions/ace2OligosWithComments.perl
-+++ b/contributions/ace2OligosWithComments.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # ace2Oligos.perl
- #
-@@ -18,6 +18,8 @@
- # Rev: 020528 to print comments in oligo tags upon request (Peter Kos)
- #
- 
-+use warnings;
-+
- $szUsage = "\nUsage:  $0 (name of ace file) (name of oligo file) [Print|Comment|PrintComment]\n";
- 
- die "$szUsage" if  (( $#ARGV != 1 ) && ( $#ARGV != 2 ));
---- a/contributions/aceContigs2Phds.perl
-+++ b/contributions/aceContigs2Phds.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # aceContigs2Phd.perl
- #
-@@ -13,6 +13,8 @@
- # Acknowledgements: Borrowed as much as I could from determineReadTypes.Perl
- #                   and fasta2Phd.perl
- 
-+use warnings;
-+
- $szUsage = "Usage: aceContigs2Phds.perl [-s minimum-contig-size] <name of ace file>";
- $nContigLimit = 2000;
- 
---- a/contributions/acestatus.pl
-+++ b/contributions/acestatus.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # acestatus.pl
- # author: Cliff Wollam
-@@ -14,6 +14,7 @@
- # USAGE FROM THE COMMAND LINE:
- # acestatus.pl ace_filename
- 
-+use warnings;
- use strict;
- 
- if($#ARGV >= 0) {
---- a/contributions/cons.perl
-+++ b/contributions/cons.perl
-@@ -1,5 +1,6 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
- 
-+use warnings;
- use strict;
- use Cwd;
- 
---- a/contributions/mergeAces.perl
-+++ b/contributions/mergeAces.perl
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/perl -w
-+#!/usr/bin/env perl
- 
- # Bugs and complaints to Bill Gilliland, billg@ucdavis.edu.
- # mergeAces.perl v. 0.2 5/22/01
-@@ -9,6 +9,7 @@
- # project directory (if it doesn't already exist) with all the cgrams
- # and phd files of the original projects.
- 
-+use warnings;
- use Getopt::Long;
- use File::Copy;
- $pathRoot = $ENV{"PWD"};
---- a/contributions/phredPhrapWithPhdBalls
-+++ b/contributions/phredPhrapWithPhdBalls
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # phredPhrapWithPhdBalls
- #    modified from phredPhrap by Ben Allen at LANL
-@@ -73,6 +73,7 @@
- # Rev: 120312 to not duplicate consensus tags during miniassembly
- # Rev: 120717 Ben Allen (LANL) to use reads from phdballs as well as phd_dir
- 
-+use warnings;
- 
- $szVersion = "120312";
- 
---- a/contributions/recover_consensus_tags
-+++ b/contributions/recover_consensus_tags
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # Purpose:  Transfers all consensus tags from a set of old assemblies to
- #     a new assembly.  
-@@ -14,6 +14,7 @@
- #  rct ace_filename <only ace file to be transfer (optional)>
- # You must be in the edit_dir where the ace file is located
- 
-+use warnings;
- use strict;
- 
- 
---- a/contributions/revert_fof
-+++ b/contributions/revert_fof
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # PURPOSE:  If the user really screws up a read, to back out all changes.
- #           You must reassemble after using this.
-@@ -19,6 +19,8 @@
- # phd extensions.
- # revert_fof use file of files to give reads to revert 3/14/01 SL
- 
-+use warnings;
-+
- $szUsage = "Enter a file of files name, please!";
- 
- die $szUsage if ( $#ARGV != 0 );
---- a/contributions/sff2phd.perl
-+++ b/contributions/sff2phd.perl
-@@ -1,4 +1,5 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
-+use warnings;
- use strict;
-  #          SFF to PHD files converter, with 454 paired reads and MID support
-  #          Version 0.15 - 111229
---- a/contributions/sff2phd_Samborskyy
-+++ b/contributions/sff2phd_Samborskyy
-@@ -1,4 +1,5 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
-+use warnings;
- use strict;
-  #          SFF to PHD files converter, with 454 paired reads and MID support
-  #          Version 0.10 - 101110
---- a/scripts/ace2Fasta.perl
-+++ b/scripts/ace2Fasta.perl
-@@ -1,7 +1,9 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # Purpose:  makes a contigs file out of an ace file
- 
-+use warnings;
-+
- $szUsage = "Usage:  ace2Contigs.perl (ace file)";
- 
- 
---- a/scripts/ace2Oligos.perl
-+++ b/scripts/ace2Oligos.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # ace2Oligos.perl
- #
-@@ -16,6 +16,8 @@
- # Rev: 000330 to handle comments in oligo tags
- #
- 
-+use warnings;
-+
- $szUsage = "Usage:  ace2Oligos.perl (name of ace file) (name of oligo file)";
- 
- if ( $ARGV[0] eq "-V" || $ARGV[0] eq "-v" ) {
---- a/scripts/add454Reads.perl
-+++ b/scripts/add454Reads.perl
-@@ -1,11 +1,11 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # add454Reads.perl
- # part of Consed package
- # 
- # DG with help from Hao Wang to screen vector
- 
--
-+use warnings;
- use File::Basename;
- 
- 
---- a/scripts/addReads2Consed.perl
-+++ b/scripts/addReads2Consed.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- #   Purpose:  called by consed in order to add new reads to an
- #       existing assembly without reassemblying
-@@ -29,6 +29,7 @@
- #   Rev: 080320 (David Gordon) to use discrep_lists instead of alignments
- #   Rev: 130828 (David Gordon) to handle slashes (/) in read names
- 
-+use warnings;
- 
- $szVersion = "130828";
- if ( $#ARGV >= 0 ) {
---- a/scripts/addSangerReads.perl
-+++ b/scripts/addSangerReads.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # addSangerReads.perl
- 
-@@ -32,7 +32,7 @@
- # added is printed in a report ending with ".log".  The name of this
- # file is listed in auto.fof
- 
--
-+use warnings;
- 
- 
- $szVersion = "120717";
---- a/scripts/addSolexaReads.perl
-+++ b/scripts/addSolexaReads.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # addSolexaReads.perl
- 
-@@ -54,7 +54,7 @@
- 
- $szUsage = "addSolexaReads.perl -ace (ace file) -fastqfof (solexa files) -fasta (fasta file) -readsList (file of list of desired reads) where -readsList is optional";
- 
--
-+use warnings;
- use Getopt::Long;
- 
- GetOptions( "ace=s" => \$szAceFile,
---- a/scripts/alignRNA2Genomic.perl
-+++ b/scripts/alignRNA2Genomic.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # alignRNA2Genomic.perl
- 
-@@ -6,6 +6,8 @@
- # consed-ready ace and phd ball with the RNA aligned against the
- # genomic with introns being represented by large gaps
- 
-+use warnings;
-+
- $szVersion = "120717";
- 
- if ( $#ARGV == 0 ) {
---- a/scripts/alignSolexaReads2Refs.perl
-+++ b/scripts/alignSolexaReads2Refs.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # Input: a file where each line looks like this:
- #    (solexa seq file) (read prefix)
-@@ -10,6 +10,7 @@
- 
- # Output: a list of alignment files
- 
-+use warnings;
- 
- defined( $szConsedHome = $ENV{'CONSED_HOME'} ) ||
-     ( $szConsedHome = "/usr/local/genome" );
---- a/scripts/amplifyTranscripts.perl
-+++ b/scripts/amplifyTranscripts.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # PURPOSE: runs consed -autoPCRAmplify in order to pick pcr primers 
- #    for a large group of regions
-@@ -40,7 +40,7 @@
- #   That is, the left primers are given in top strand orientation, and
- #   the right primers are given in bottom strand orientation.
- 
--
-+use warnings;
- 
- defined( $szConsedHome = $ENV{'CONSED_HOME'} ) ||
-     ( $szConsedHome = "/usr/local/genome" );
---- a/scripts/autoPrimers.perl
-+++ b/scripts/autoPrimers.perl
-@@ -1,5 +1,6 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
-+use warnings;
- 
- $szUsage = "autoPrimers.perl (fasta file of targets)";
- $szVersion = "141226";
---- a/scripts/bam2Ace.perl
-+++ b/scripts/bam2Ace.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- 
- # Purpose:  runs:
-@@ -6,6 +6,7 @@
- #  2) consed -renameDuplicates
- #  3) consed -removeColumnsOfPads
- 
-+use warnings;
- 
- $szUsage = "usage: bam2Ace.perl -bamFile (bam file) -regionsFile (regions file) (see README.txt for format of the regions file) -exec (consed executable name) -newAceFile (new ace file name) where the -exec (exec) is optional";
- 
---- a/scripts/convertBedToBamScape.perl
-+++ b/scripts/convertBedToBamScape.perl
-@@ -1,4 +1,6 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
-+
-+use warnings;
- 
- $szUsage = "usage: convertBedToBamScape.perl (Bed file) (BamScape file) (fasta file of all sequences) (conversion of reference names--optional)";
- 
---- a/scripts/countEditedBases.perl
-+++ b/scripts/countEditedBases.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # countEditedBases.perl
- #
-@@ -11,6 +11,8 @@
- #
- #
- 
-+use warnings;
-+
- while(<>) {
- 	if ( /^CO / ) {
- 		@aWords = split;
---- a/scripts/determineReadTypes.perl
-+++ b/scripts/determineReadTypes.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #  determineReadTypes.perl
- #  
- #  Purpose:  to write into the phd file information about the template 
-@@ -173,6 +173,7 @@
- #
- ###############################################################
- 
-+use warnings;
- 
- # you can remove or comment out this line when you are satisfied with
- # your customized version of this file.
---- a/scripts/fasta2Ace.perl
-+++ b/scripts/fasta2Ace.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # manyFasta2Ace.perl
- #
-@@ -13,6 +13,7 @@
- #
- # NOTE:  you must run this in edit_dir 
- 
-+use warnings;
- use Getopt::Long;
- 
- $szRevision = "141212";
---- a/scripts/fasta2PhdBall.perl
-+++ b/scripts/fasta2PhdBall.perl
-@@ -1,4 +1,6 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
-+
-+use warnings;
- 
- $nQuality = 20;
- 
---- a/scripts/fasta2Phd.perl
-+++ b/scripts/fasta2Phd.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # fasta2Phd.perl
- #
-@@ -20,6 +20,7 @@
- #            June 2002, Bill Gilliland to allow the user to specify 
- #                the quality value
- 
-+use warnings;
- use Getopt::Long;
- GetOptions( "quality=i" => \$qualityValue);
-  
---- a/scripts/fastq2Phrap.perl
-+++ b/scripts/fastq2Phrap.perl
-@@ -1,4 +1,6 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
-+
-+use warnings;
- 
- $szUsage = "fastq2Phrap.perl (fastq) or for paired reads fastq2Phrap.perl (fastq1) (fastq2) where fastq1 and fastq2 have corresponding mate pairs--e.g., the 5th read in fastq1 is the mate of the 5th read in fastq2--these fastq files are assumed to be in ../solexa_dir--not the current directory\n";
- 
---- a/scripts/filter454Reads.perl
-+++ b/scripts/filter454Reads.perl
-@@ -1,6 +1,6 @@
--#!/usr/bin/perl -w
--
-+#!/usr/bin/env perl
- 
-+use warnings;
- use File::Basename;
- 
- 
---- a/scripts/findSequenceMatchesForConsed.perl
-+++ b/scripts/findSequenceMatchesForConsed.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # findSequenceMatchesForConsed.perl
- 
-@@ -16,6 +16,8 @@
- # REVISIONS: 021127 (DG) to write (project).(date).(time).fasta instead of
- #    (project).fasta.screen.ace.1.(date).(time).fasta
- 
-+use warnings;
-+
- $szVersion = "021127";
- 
- $szUsage = "Usage: findSequenceMatchesForConsed.perl (ace file) (crossmatch parameters, if any)";
---- a/scripts/fixContigEnd.perl
-+++ b/scripts/fixContigEnd.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # fixContigEnd.perl
- 
-@@ -7,6 +7,7 @@
- # consed -ace (acefile) -fixContigEnds
- #
- 
-+use warnings;
- 
- $szUsage = "fixContigEnd.perl (fasta file of reads for input) (fof for ace file, output)";
- 
---- a/scripts/lib2Phd.perl
-+++ b/scripts/lib2Phd.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # lib2Phd.perl
- #
-@@ -23,6 +23,8 @@
- #    accept fasta library files as input.  The output file is named 
- #    according to the first, non-space block of text on each fasta defline. 
- 
-+use warnings;
-+
- $nQuality = 20;
- 
- $szUsage = "Usage: lib2Phd.perl <name of file with fasta library>";
---- a/scripts/makePhdBall.perl
-+++ b/scripts/makePhdBall.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # PURPOSE: concatenate all phd file into a single phd.ball 
- #          for the purpose of fast startup of consed
-@@ -9,6 +9,7 @@
- #
- # February 2008, David Gordon
- 
-+use warnings;
- 
- if ( $#ARGV >= 0 ) {
-    if ( $ARGV[0] eq "-v" || $ARGV[0] eq "-V" ) {
---- a/scripts/makeRegionsFile.perl
-+++ b/scripts/makeRegionsFile.perl
-@@ -1,10 +1,12 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # makeRegionsFile.perl
- # To be used with consed -bam2Ace
- # Takes a fasta file of sequences and makes a regions file that
- # specifies the entire length of each sequence.
- 
-+use warnings;
-+
- $szUsage = "makeRegionsFile.perl (name of fasta file)";
- 
- $szVersion = "110914";
---- a/scripts/orderPrimerPairs.perl
-+++ b/scripts/orderPrimerPairs.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # PURPOSE: puts the primers in 96 well format for ordering.  
- #  creates a file that can be emailed to
-@@ -13,6 +13,8 @@
- #         2) a file of primer pairs, sorted by product size
- #         3) a fasta file of the primers, for your convenience for analysis
- 
-+use warnings;
-+
- $| = 1;
- 
- $szUsage = "orderPrimerPairs.perl";
---- a/scripts/phd2Ace.perl
-+++ b/scripts/phd2Ace.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # phd2Ace.perl
- #
-@@ -13,6 +13,8 @@
- # REV:  981002 (David Gordon) for new ace format
- #       981210 (DG) to eliminate warning message
- 
-+use warnings;
-+
- $szPhdDirPath = "../phd_dir";
- 
- $szUsage = "Usage: phd2Ace.perl <filename (without directory) of phd file>\nThe phd file is assumed to reside in $szPhdDirPath";
---- a/scripts/phredPhrap
-+++ b/scripts/phredPhrap
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # phredPhrap
- #
-@@ -70,6 +70,8 @@
- # Rev: 110609 to allow masking of vector sequence when doing miniassemblies
- # Rev: 120312 to not duplicate consensus tags during miniassembly
- 
-+use warnings;
-+
- $szVersion = "120312";
- 
- 
---- a/scripts/picard2Regions.perl
-+++ b/scripts/picard2Regions.perl
-@@ -1,10 +1,12 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # PURPOSE: takes a file of locations in the format for bamScape custom
- # navigation (Picard IntervalList format), adds 2000 bases of context
- # to each side of each location, and prints a region file in format to
- # be used by bam2Ace
- 
-+use warnings;
-+
- $szRevision = "140903"; # David Gordon
- 
- if ( defined( $ARGV[0] ) &&
---- a/scripts/removeReads
-+++ b/scripts/removeReads
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # PURPOSE:  removes a list of chromats from an assembly.  After running this,
- #   you must reassemble to create an ace file without the given phd files.
-@@ -16,6 +16,8 @@
- #        removeReads (name of fof's)
- #
- 
-+use warnings;
-+
- $szUsage = "Usage: removeReads listOfReads.fof";
- 
- die "$szUsage" if ( $#ARGV != 0 );
---- a/scripts/revertToUneditedRead
-+++ b/scripts/revertToUneditedRead
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # PURPOSE:  If the user really screws up a read, to back out all changes.
- #           You must reassemble after using this.
-@@ -16,6 +16,7 @@
- # REV:  7/24/98 (DG)
- # REV:  8/28/2013 (DG) to handle readnames with slashes (/)
- 
-+use warnings;
- 
- $szUsage = "Usage: revertToUneditedRead (read name without any .phd.# extension)";
- 
---- a/scripts/selectOneRegion.perl
-+++ b/scripts/selectOneRegion.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # selectOneRegion.perl
- # 
-@@ -11,6 +11,7 @@
- # and you will create an ace file chr15_51000000.ace  or chr15_51000000.ace.1 
- # (or higher extension)
- 
-+use warnings;
- use Getopt::Long;
- 
- 
---- a/scripts/selectRegions.perl
-+++ b/scripts/selectRegions.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- 
- # selectRegions.perl
- # 
-@@ -43,7 +43,7 @@
- # my_new_ace.ace says what the ace file should be called (the
- # extension may not start at 1 if there is already a .1
- 
--
-+use warnings;
- 
- $SIG{__WARN__} = dieWhenGetWarning;
- sub dieWhenGetWarning {
---- a/scripts/tagRepeats.perl
-+++ b/scripts/tagRepeats.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # PROGRAM:  tagRepeats.perl
- # PURPOSE:  to put consensus tags on any found ALU or any other 
-@@ -10,6 +10,7 @@
- # INPUTS:   The ace file.  You must also provide a fasta file of the 
- #           ALU or any other sequence you want to tag
- 
-+use warnings;
- 
- $szVersion = "090209";
- if ( $#ARGV >= 0 ) {
---- a/scripts/testSocket.perl
-+++ b/scripts/testSocket.perl
-@@ -1,7 +1,8 @@
--#! /usr/local/bin/perl -w
-+#!/usr/bin/env perl
-  
- # open a socket to consed
-- 
-+
-+use warnings;
- use IO::Socket;
-  
- # Consed makes a file which has nothing but the port number.
---- a/scripts/transferConsensusTags.perl
-+++ b/scripts/transferConsensusTags.perl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
- #
- # Purpose:  Transfers consensus tags from an old assembly to
- #     a new assembly.  
-@@ -44,6 +44,8 @@
- # Nov 2001, DG to handle cloneEnd tags which have orientation
- # Mar 2012, DG to prevent duplicating tags after miniassembly
- 
-+use warnings;
-+
- $szUsage = "Usage:  transferConsensusTags.perl (old ace file) (new ace file) (file of list of old contigs with consensus tags to be transferred)";
- 
- if ( $ARGV[0] eq "-V" || $ARGV[0] eq "-v" ) {
diff --git a/sci-biology/consed/files/consed-29-fix-qa.patch b/sci-biology/consed/files/consed-29-fix-qa.patch
deleted file mode 100644
index 90e180da0174..000000000000
--- a/sci-biology/consed/files/consed-29-fix-qa.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-Fix various QA violations, due to
-* implicit declarations
-* incorrect printf() format specifiers
-* incorrect function prototypes
-* remove unsafe gets() fucntion
-
---- a/misc/454/sff2scf.c
-+++ b/misc/454/sff2scf.c
-@@ -39,6 +39,7 @@
- void writeScfFile(char *filearg, char *outfile);
- void writeScfCommand(char *filearg, char *outfile);
- 
-+int sffinfo(int argc, char *argv[], FILE* pTempFile );
- 
- int main(int argc, char *argv[])
- {
---- a/misc/mktrace/mktrace.c
-+++ b/misc/mktrace/mktrace.c
-@@ -70,9 +70,9 @@
-   else
-   {
-     printf( "enter FASTA filename: " );
--    gets( ifnm );
-+    fgets( ifnm, sizeof(ifnm), stdin );
-     printf( "enter output filename: " );
--    gets( ofnm );
-+    fgets( ofnm, sizeof(ofnm), stdin );
-   }
- 
-   /*
-@@ -192,7 +192,7 @@
-   /*
-   ** Write phd file.
-   */
--  if( writePhd( ofnm, numBase, seq, qual, pos, numPoint, trace ) == ERROR )
-+  if( writePhd( ofnm, numBase, seq, qual, pos, numPoint ) == ERROR )
-   {
-     fprintf( stderr, "mktrace: error: bad status: writePhd\n" );
-     free( seq );
---- a/misc/mktrace/mktrace.h
-+++ b/misc/mktrace/mktrace.h
-@@ -37,8 +37,8 @@
- int writeSCF( char *filename, int numBase, char *seq, int numPoint, float **trace );
- int freeTrace( float **trace );
- char *readFASTA( char *filename, char *entryName, char *comments, int *len );
--int writePhd( char *ofnm, int numBase, char *seq, int *pos, int numPoint );
- int *readQUAL( char *filename, char *entryName, char *comments, int *len );
-+char *getTime( void );
- #else
- int writePhd();
- float **synTrace();
---- a/misc/phd2fasta/phd2fasta.h
-+++ b/misc/phd2fasta/phd2fasta.h
-@@ -276,6 +276,10 @@
-                 Comments *comments, Seq *seq, TagList *tagList, char *emsg );
- int checkIntString( char *string );
- int delimiterTest( char *string, unsigned int mask );
-+int checkParam( Option *option );
-+char* getVersion( void );
-+int showDoc( void );
-+char* getTime( void );
- #else
- Option *getOption();
- struct Tag *allocTag();
---- a/misc/phd2fasta/readStdTag.c
-+++ b/misc/phd2fasta/readStdTag.c
-@@ -699,11 +699,11 @@
-       if( fstat )
-       {
-         fprintf( stderr,
--                 "readStdTag: %s: line: %d: unexpected delimiter %s\n",
-+                 "readStdTag: %s: line: %p: unexpected delimiter %s\n",
-                   filename,
-                   nline,
-                   line );
--        sprintf( emsg, "%s: line: %d: unexpected delimiter %s\n",
-+        sprintf( emsg, "%s: line: %p: unexpected delimiter %s\n",
-                  filename,
-                  nline,
-                  line );
---- a/misc/phd2fasta/readWholeReadTag.c
-+++ b/misc/phd2fasta/readWholeReadTag.c
-@@ -393,11 +393,11 @@
-       if( fstat )
-       {
-         fprintf( stderr,
--                 "readWholeReadTag: %s: line: %d: unexpected delimiter %s\n",
-+                 "readWholeReadTag: %s: line: %p: unexpected delimiter %s\n",
-                   filename,
-                   nline,
-                   line );
--        sprintf( emsg, "%s: line: %d: unexpected delimiter %s\n",
-+        sprintf( emsg, "%s: line: %p: unexpected delimiter %s\n",
-                  filename,
-                  nline,
-                  line );
---- a/misc/phd2fasta/writeFasta.c
-+++ b/misc/phd2fasta/writeFasta.c
-@@ -39,7 +39,7 @@
- #include "phd2fasta.h"
- 
- #ifdef ANSI_C
--writeFasta( FILE *sfp, FILE *qfp, FILE *bfp,
-+int writeFasta( FILE *sfp, FILE *qfp, FILE *bfp,
-             int outBasePosOption,
-             Comments *comments, Seq *seq, TagList *tagList, char *emsg )
- #else
---- a/motifutils.cpp
-+++ b/motifutils.cpp
-@@ -202,13 +202,13 @@
- void printButtonEvent( XButtonEvent* pEvent ) {
- 
-    printf( "type = %d\n", pEvent->type );
--   printf( "serial = %d\n", pEvent->serial );
-+   printf( "serial = %lu\n", pEvent->serial );
-    printf( "send_event = %s\n", szPrintBool( pEvent->send_event ) );
--   printf( "*display = %x\n", pEvent->display );
--   printf( "window = %x\n", pEvent->window );
--   printf( "root = %x\n", pEvent->root );
--   printf( "subwindow = %x\n", pEvent->subwindow );
--   printf( "time = %d\n", pEvent->time );
-+   printf( "*display = %p\n", pEvent->display );
-+   printf( "window = %lu\n", pEvent->window );
-+   printf( "root = %lu\n", pEvent->root );
-+   printf( "subwindow = %lu\n", pEvent->subwindow );
-+   printf( "time = %lu\n", pEvent->time );
-    printf( "x = %d\n", pEvent->x );
-    printf( "y = %d\n", pEvent->y );
-    printf( "x_root = %d\n", pEvent->x_root );
---- a/parseAceFile.cpp
-+++ b/parseAceFile.cpp
-@@ -45,6 +45,7 @@
- using namespace std;
- #include    "basesegment.h"
- #include    <stdio.h>
-+#include    <stddef.h>
- #include    <string.h>
- #include    <sstream>
- #include    "mbt_errors.h"
-@@ -292,7 +293,7 @@
-    char* szPossibleComp = szReadName + nLength - nCOMP;
- 
-    if (memcmp( szPossibleComp, szCOMP, nCOMP ) == 0 ) {
--      szPossibleComp = '\0';
-+      szPossibleComp = NULL;
-       return( true );
-    }
-    else
---- a/phaster2PhdBall.cpp
-+++ b/phaster2PhdBall.cpp
-@@ -547,7 +547,7 @@
- 
-    int nTokens = 
-       sscanf( soLine_.data(), 
--              "%s %*s %d %d %lld %s %s %*s %d %d %lld %s %s\n",
-+              "%s %*s %d %d %ld %s %s %*s %d %d %ld %s %s\n",
-               soReadName_.data(),
-               &nRead1Left_,
-               &nRead1Right_,
---- a/printAutoFinishMiscInfo.cpp
-+++ b/printAutoFinishMiscInfo.cpp
-@@ -80,7 +80,7 @@
-    int nError = stat( (char*) soAceFileFullPathname.data(), &statBuffer );
-    
-    if (nError == 0 ) {
--      fprintf( pAO,"size: %d date: %s\n",
-+      fprintf( pAO,"size: %ld date: %s\n",
-                (long) statBuffer.st_size,
-                ctime( &( statBuffer.st_mtime )) );
- 
---- a/printAutoFinishParameters.cpp
-+++ b/printAutoFinishParameters.cpp
-@@ -206,7 +206,7 @@
-        pCP->nInexactSearchForStringMaxPerCentMismatch_ );
- 
-    fprintf( pAO, "! when using the inexact search for string, allow up to this\n");
--   fprintf( pAO, "! % mismatch:  the sum of the insertion, deletion, and substitution\n");
-+   fprintf( pAO, "! %% mismatch:  the sum of the insertion, deletion, and substitution\n");
-    fprintf( pAO, "! differences divided by the length of the query string\n");
-    fprintf( pAO, "! (YES)\n");
-    fprintf( pAO, "consed.onlyAllowOneReadWriteConsedAtATime: %s\n",
-@@ -825,7 +825,7 @@
-    fprintf( pAO, "! template will be 1500 bases from the forward read.  But if this template\n");
-    fprintf( pAO, "! has an insert that is shorter than average, the walk may walk into vector.\n");
-    fprintf( pAO, "! To be conservative, we may want to assume that the insert is somewhat \n");
--   fprintf( pAO, "! shorter than average.  By default, we assume that it is 90% as large as \n");
-+   fprintf( pAO, "! shorter than average.  By default, we assume that it is 90%% as large as \n");
-    fprintf( pAO, "! the average. This parameter gives that percentage.  This parameter\n");
-    fprintf( pAO, "! is used both by Consed and Autofinish.\n");
-    fprintf( pAO, "! (OK)\n");
-@@ -1249,9 +1249,9 @@
-        pCP->nAutoFinishConfidenceThatReadWillCoverSingleSubcloneRegion_ );
- 
-    fprintf( pAO, "! Autofinish computes the per cent of existing reads are aligned at\n");
--   fprintf( pAO, "! each base position.  Typically, this number starts at around 0% at\n");
--   fprintf( pAO, "! base position 1, rises to close to 100% at around base position 300,\n");
--   fprintf( pAO, "! and then drops again to 0% at base position 800 or so.  This number\n");
-+   fprintf( pAO, "! each base position.  Typically, this number starts at around 0%% at\n");
-+   fprintf( pAO, "! base position 1, rises to close to 100%% at around base position 300,\n");
-+   fprintf( pAO, "! and then drops again to 0%% at base position 800 or so.  This number\n");
-    fprintf( pAO, "! specifies how high the number must be for Autofinish to consider an\n");
-    fprintf( pAO, "! Autofinish read to cover a single subclone region.\n");
-    fprintf( pAO, "! (OK)\n");
-@@ -1295,7 +1295,7 @@
-      ( ( pCP->bCheckIfTooManyWalks_ ) ? "true" : "false" ) );
- 
-    fprintf( pAO, "! this just checks if the number of walks, pcr ends, and unknown reads\n");
--   fprintf( pAO, "! exceeds 20% of the total number of reads.  If this is exceeded, then \n");
-+   fprintf( pAO, "! exceeds 20%% of the total number of reads.  If this is exceeded, then \n");
-    fprintf( pAO, "! a warning message is given.  Typically, such a warning indicates\n");
-    fprintf( pAO, "! that you have incorrectly customized determineReadTypes.perl\n");
-    fprintf( pAO, "! (OK)\n");
-@@ -1446,7 +1446,7 @@
-      ( ( pCP->bProcessMatePairsAtStartup_ ) ? "true" : "false" ) );
- 
-    fprintf( pAO, "! This is necessary to show the mate pair flags, but it does add\n");
--   fprintf( pAO, "! around 15% to startup time.\n");
-+   fprintf( pAO, "! around 15%% to startup time.\n");
-    fprintf( pAO, "! (OK)\n");
-    fprintf( pAO, "consed.maximumNumberOfTracesShown: %d\n",
-        pCP->nMaximumNumberOfTracesShown_ );
-@@ -1796,7 +1796,7 @@
-        (char*)pCP->soStoreTracePeakPositions_.data() );
- 
-    fprintf( pAO, "! never, always or whenChromatAvailable\n");
--   fprintf( pAO, "! changing this to \"always\" increases memory usage by close to 100%,\n");
-+   fprintf( pAO, "! changing this to \"always\" increases memory usage by close to 100%%,\n");
-    fprintf( pAO, "! especially if the assembler is Newbler.  always means it will store\n");
-    fprintf( pAO, "! the positions if they are present in the phd file/ball.\n");
-    fprintf( pAO, "! \"whenChromatAvailable\" means it will store trace peak positions for\n");
---- a/readPrimerScreenSequences.cpp
-+++ b/readPrimerScreenSequences.cpp
-@@ -167,7 +167,7 @@
-         ++nSequenceNumber ) {
-       if ( pnLengthOfSequence[ nSequenceNumber ] !=
-            strlen( pszSequence[ nSequenceNumber ] ) ) {
--         sprintf( szErrorMessage, "inconsistency between pnLengthOfSequence %d and pszSequence %d for sequence number %d",
-+         sprintf( szErrorMessage, "inconsistency between pnLengthOfSequence %d and pszSequence %zu for sequence number %d",
-                  pnLengthOfSequence[ nSequenceNumber ],
-                  strlen( pszSequence[ nSequenceNumber ] ),
-                         nSequenceNumber );
---- a/rwcstring.cpp
-+++ b/rwcstring.cpp
-@@ -235,7 +235,7 @@
- 
-    nMaxLength_ = nDefaultLengthForConversions;
- 
--   nCurrentLength_ = sprintf( sz_, "%d", lNumberToConvert );
-+   nCurrentLength_ = sprintf( sz_, "%ld", lNumberToConvert );
- 
-    if ( nCurrentLength_ > nMaxLength_ ) {
-       // big trouble--might not even make it here--might segmentation fault
---- a/someOtherProgramSentACommandToConsed.cpp
-+++ b/someOtherProgramSentACommandToConsed.cpp
-@@ -89,7 +89,7 @@
- 
-    char szLine2[ nMaxLine ];
- 
--   sprintf( szLine2, "# of chars = %d %s", strlen( szLine ), szLine );
-+   sprintf( szLine2, "# of chars = %zu %s", strlen( szLine ), szLine );
- 
-    cout << szLine2 << endl;
- 
---- a/tag.cpp
-+++ b/tag.cpp
-@@ -466,7 +466,7 @@
-    fprintf( pPhdFile, "DATE: %s\n", soDate_.data() );
- 
-    if ( lID_ != nUndefinedTagID ) {
--      fprintf( pPhdFile, "ID: %d\n", lID_ );
-+      fprintf( pPhdFile, "ID: %ld\n", lID_ );
-    }
- 
- 
---- a/userDefinedTagField.cpp
-+++ b/userDefinedTagField.cpp
-@@ -64,7 +64,7 @@
- 
- void userDefinedIntegerTagField :: writeThyselfToAceFileOrPhdBall( FILE* pFile ) {
- 
--   fprintf( pFile, "%s %d\n",
-+   fprintf( pFile, "%s %ld\n",
-                       pUserDefinedTagFieldType_->soFieldName_.data(),
-                       l_ );
- }
-@@ -119,7 +119,7 @@
- 
- void userDefinedPointerTagField :: writeThyselfToAceFileOrPhdBall( FILE* pFile ) {
- 
--   fprintf( pFile, "%s %d\n",
-+   fprintf( pFile, "%s %ld\n",
-             pUserDefinedTagFieldType_->soFieldName_.data(),
-             lID_ );
-    
diff --git a/sci-biology/consed/metadata.xml b/sci-biology/consed/metadata.xml
deleted file mode 100644
index ccdff086e20b..000000000000
--- a/sci-biology/consed/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-biology@gentoo.org</email>
-    <name>Gentoo Biology Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-biology/phrap/Manifest b/sci-biology/phrap/Manifest
deleted file mode 100644
index 4fe85ddfb7b0..000000000000
--- a/sci-biology/phrap/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX phrap-1.080812-fix-build-system.patch 3600 BLAKE2B 29a7846cd6394d17b35e525220b8ead461a22ab0f1301ae5668da36605649c07f23040c4c134424802d4da6e0c3b48fbbb05ec5708de50b33f024e4ba702ac49 SHA512 536ad862b9b8ce0fbc7ab67bc48db597e7d4b8c66018a5abefe5a59f4fbc30a4a76c94f4c13f5af7d42a422a22f5181d8f015b797d37f175238c3d4170adf21c
-DIST phrap-1.080812-distrib.tar.gz 317350 BLAKE2B 9cc53d05184b4a55a9a80e6112498f91a622b98a853b255daedd57c892b7c2bb8ef3091ed3d141e297864c158b7e03d02313a272448d2e0fb80e1c51a906e00a SHA512 6b125b9a99b6180eb5de16bccfe068abefdb59237fd3295924c418749f2f2d6e39cdbcecc6786e42738846975334c4d8a645eae8fd0fcbda6b0e99241deb15ca
-EBUILD phrap-1.080812-r2.ebuild 962 BLAKE2B 42c56565cc83f792878f8dac26badf57a7307d63dae27684a7799c6607521b5e564d0b21f49a7669ed291e0facd502b9745aec1a643226e9ac9ec8e0031d9d76 SHA512 abbc494349976d3a6371a424b4a6bce60e30f7963db4d05976a59c88cf0def994b690f8746d34db683629eb171322ebbcb2aa9325e746adeec9afd575468bc92
-MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/phrap/files/phrap-1.080812-fix-build-system.patch b/sci-biology/phrap/files/phrap-1.080812-fix-build-system.patch
deleted file mode 100644
index 6d30c2ce326a..000000000000
--- a/sci-biology/phrap/files/phrap-1.080812-fix-build-system.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-* Fix perl shebang to be portable
-* Make build system honour LDFLAGS
-
---- a/makefile
-+++ b/makefile
-@@ -25,9 +25,8 @@
- # Makefile for swat, phrap, cross_match, phrapview; also swprobs (currently inactivated)
- #CC= icc
- #CFLAGS= -O2 -wd266,880
--CC= cc
--CFLAGS= -O2
--LFLAGS= -lm
-+CC ?= cc
-+LIBS = -lm
- 
- SWATOBJS= swat.o weibull.o
- 
-@@ -96,46 +95,46 @@
- 	chmod a+x phrapview
- 
- swat: makefile $(SWATOBJS) $(SWOBJS)
--	$(CC) $(CFLAGS) -o $@ $(SWATOBJS) $(SWOBJS) $(LFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(SWATOBJS) $(SWOBJS) $(LIBS)
- 	chmod o-r swat
- 
- alpha_swat: makefile $(ALPHOBJS) $(SWOBJS) 
--	$(CC) $(CFLAGS) -o $@ $(ALPHOBJS) $(SWOBJS) $(LFLAGS) 
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(ALPHOBJS) $(SWOBJS) $(LIBS) 
- 	chmod o-r alpha_swat
- 
- swat_counts: makefile $(COUNOBJS) $(SWOBJS) 
--	$(CC) $(CFLAGS) -o $@ $(COUNOBJS) $(SWOBJS) $(LFLAGS) 
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(COUNOBJS) $(SWOBJS) $(LIBS) 
- 	chmod o-r swat_counts
- 
- swprobs: makefile $(PROBOBJS)
--	$(CC) $(CFLAGS) -o $@ $(PROBOBJS) $(LFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(PROBOBJS) $(LIBS)
- 
- phrap: makefile phrap.o call_subs.o $(PHOBJS) $(SCANOBJS) $(SWOBJS)
--	$(CC) $(CFLAGS) -o $@ phrap.o call_subs.o $(PHOBJS) $(SCANOBJS) $(SWOBJS) $(LFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ phrap.o call_subs.o $(PHOBJS) $(SCANOBJS) $(SWOBJS) $(LIBS)
- 	chmod o-r phrap
- 
- gcphrap: makefile gcphrap.o gccall_subs.o $(PHOBJS) $(SCANOBJS) $(SWOBJS) $(JKBSWOBJS)
--	$(CC) $(CFLAGS) -o $@ gcphrap.o gccall_subs.o $(PHOBJS) $(SCANOBJS) $(SWOBJS) $(JKBSWOBJS) $(LFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ gcphrap.o gccall_subs.o $(PHOBJS) $(SCANOBJS) $(SWOBJS) $(JKBSWOBJS) $(LIBS)
- 	chmod o-r gcphrap
- 
- cross_match: makefile cross_match.o call_subs.o $(CROBJS) $(SCANOBJS) $(SWOBJS)
--	$(CC) $(CFLAGS) -o $@ cross_match.o call_subs.o $(CROBJS) $(SCANOBJS) $(SWOBJS) $(LFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ cross_match.o call_subs.o $(CROBJS) $(SCANOBJS) $(SWOBJS) $(LIBS)
- 	chmod o-r cross_match
- 
- gccross_match: makefile gccross_match.o gccall_subs.o $(CROBJS) $(SCANOBJS) $(SWOBJS) $(JKBSWOBJS)
--	$(CC) $(CFLAGS) -o $@ gccross_match.o gccall_subs.o $(CROBJS) $(SCANOBJS) $(SWOBJS) $(JKBSWOBJS) $(LFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ gccross_match.o gccall_subs.o $(CROBJS) $(SCANOBJS) $(SWOBJS) $(JKBSWOBJS) $(LIBS)
- 	chmod o-r gccross_match
- 
- cluster: makefile $(CLOBJS) call_subs.o $(SCANOBJS) $(SWOBJS)
--	$(CC) $(CFLAGS) -o $@ $(CLOBJS) call_subs.o $(SCANOBJS) $(SWOBJS) $(LFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(CLOBJS) call_subs.o $(SCANOBJS) $(SWOBJS) $(LIBS)
- 	chmod o-r cluster
- 
- loco: makefile $(LOCOOBJS) $(SWOBJS)
--	$(CC) $(CFLAGS) -o $@ $(LOCOOBJS) $(SWOBJS) $(LFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(LOCOOBJS) $(SWOBJS) $(LIBS)
- 	chmod o-r loco
- 
- erf_test: $(ERFOBJS)
--	$(CC) $(CFLAGS) -o $@ $(ERFOBJS) $(LFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(ERFOBJS) $(LIBS)
- 
- loco.o: swat.h
- 
-@@ -228,7 +227,7 @@
- anomalies.o: swat.h 
- 
- fast_smith_wat.s: fast_smith_wat.c
--	cc -S -machine_code -source_listing -O3 fast_smith_wat.c
-+	$(CC) $(CFLAGS) -S -machine_code -source_listing fast_smith_wat.c
- #N.B. fast_smith_wat.s MUST BE EDITTED BEFORE USE!!!
- 
- tig_node.o: swat.h
---- a/phrapview
-+++ b/phrapview
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/env perl
- 
- 
- #/*****************************************************************************
-@@ -25,6 +25,7 @@
- #                                                                         
- #*****************************************************************************/
- 
-+use warnings;
- use strict;
- use Tk;
- #phrapview version 0.960731
diff --git a/sci-biology/phrap/metadata.xml b/sci-biology/phrap/metadata.xml
deleted file mode 100644
index ccdff086e20b..000000000000
--- a/sci-biology/phrap/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-biology@gentoo.org</email>
-    <name>Gentoo Biology Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-biology/phrap/phrap-1.080812-r2.ebuild b/sci-biology/phrap/phrap-1.080812-r2.ebuild
deleted file mode 100644
index 08ea5a1fb71f..000000000000
--- a/sci-biology/phrap/phrap-1.080812-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Shotgun assembly and alignment utilities"
-HOMEPAGE="http://www.phrap.org/"
-SRC_URI="phrap-${PV}-distrib.tar.gz"
-
-LICENSE="phrap"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Tk"
-
-S="${WORKDIR}"
-
-RESTRICT="fetch"
-PATCHES=( "${FILESDIR}/${PN}-1.080812-fix-build-system.patch" )
-
-pkg_nofetch() {
-	einfo "Please visit http://www.phrap.org/phredphrapconsed.html and obtain the file"
-	einfo "\"distrib.tar.gz\", then rename it to \"phrap-${PV}-distrib.tar.gz\""
-	einfo "and put it into your DISTDIR directory."
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin cross_match loco phrap phrapview swat
-	newbin cluster cluster_phrap
-
-	local i
-	for i in {general,phrap,swat}.doc; do
-		newdoc ${i} ${i}.txt
-	done
-}
diff --git a/sci-biology/phred/Manifest b/sci-biology/phred/Manifest
deleted file mode 100644
index 4807ae1d7349..000000000000
--- a/sci-biology/phred/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX phred-071220-fix-build-system.patch 1981 BLAKE2B 0c9ae75ecf54eadd1d6cd3cfeed5d2f949f234b77d4f329133e2c176207410e93a35341c43636c5b2f742a2ee2d20825cf79bb65d5dac43ba28fc07f7c6bb69b SHA512 7647f6f6e9a1ae51cbf1aa3e39b337288e22fc26a95fdd88f92ce43fc6c0ef6ff59ec26919d14dfefff70be48e4a5604ddefef98bddf5d1d14d1e656665c878d
-AUX phred-071220-fix-qa.patch 787 BLAKE2B 79f687dc1e51dd51e9f97886e0ada9b515d7e4255dff0ec3e81dccb2103ba8b4bee691c8a5b9a321cbdde5576fe8d80dbadafdb740c2cdee81fe9748255084ab SHA512 27811a834358d0e1bf8281882e0420e0eb6bd9586871c8c72a4de79badc9539ea8e9258b9c3a3bf8ca1d3f6924d61abce2dcc0c0ed3b64e5fa53d4548109f5bc
-DIST phred-dist-071220.b-acd.tar.gz 357767 BLAKE2B ae1180f54eaa3631a4e32c2ffe388b35745302e3d014c8fa893119e7e488d4bb4316f7ee0588cd12db5cbbc23033f689f4a0a487cdc7fe42e8c7a67ceb3c43ae SHA512 0a6b0a733e6dcc0495eaab720b75f8e5815df494d0a773b8b8336d5208321c2ba475921084835a769367ec51aed156585ab97346a510100d4337e3215ec75276
-EBUILD phred-071220-r2.ebuild 941 BLAKE2B a2351e95dd63ab0655c6dc009dabffbc2bea88e2c4c45536094ca5b7e18c22e6040a44b2362b56a58cdb2ba002d2f5c3d9527b5775ba073c29ed70b6e0d25198 SHA512 5b0fc5afeb3847d9a8729b14addca1508add1a0cf6f857273c9a5671b65c82385b82c62e9545caa9b3a8f470b1852d9655ac8ca3ca33f745937a3101f7ebe084
-MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/phred/files/phred-071220-fix-build-system.patch b/sci-biology/phred/files/phred-071220-fix-build-system.patch
deleted file mode 100644
index 997f39941a07..000000000000
--- a/sci-biology/phred/files/phred-071220-fix-build-system.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-* Fix build system to honour CC, CFLAGS, CPPFLAGS and LDFLAGS
-* Specify a default target, in order to keep the ebuild slim
-
---- a/Makefile
-+++ b/Makefile
-@@ -12,9 +12,9 @@
- 
- # UNIX specific definitions (default)
- #
--CC= cc
--CFLAGS= -O -DANSI_C $(LXFLAGS)
--CLIB= -lm
-+CC ?= cc
-+CPPFLAGS += -DANSI_C $(LXFLAGS)
-+LIBS += -lm
- 
- # Windows 'nmake' specific definitions
- #
-@@ -133,9 +133,6 @@
-   $(objdir)writeSDF.o \
-   $(objdir)writeSeq.o
- 
--SRCS = $(OBJS:.o=.c)
--WOBJ = $(OBJS:.o=.obj)
--
- INCS = \
-   $(incdir)chromatData.h \
-   $(incdir)freeChromatData.h \
-@@ -179,48 +176,18 @@
- # UNIX make specific phred target
- # note: a horizontal tab character must precede `$(CC)'
- #
--phred: $(OBJS)
--	$(CC) $(CFLAGS) -o phred $(OBJS) $(CLIB)
- 
- 
--# Windows nmake specific phred target
--#
--forwindows: $(WOBJ)
--	$(CC) $(CFLAGS) /Fephred $(WOBJ)
--#	$(CC) $(CFLAGS) /Fedaev daev.c
-+.PHONY: all
-+all: phred daev
- 
- 
--# test CC: refuse to compile if
--#
--#   o  SunOS
--#
--#   AND
--#
--#   o  using /usr/ucb/cc compiler
--#
--#   NOTE: this compiler causes problems: see PHRED.DOC
--#
--test_cc:
--	@if [ `uname` = SunOS ] ; \
--        then \
--          if [ `which $(CC)` = "/usr/ucb/cc" ] ; \
--          then \
--            echo ""; \
-- echo "============================================================"; \
-- echo "|                                                          |"; \
-- echo "|   This SUN C compiler produces a bad phred executable.   |"; \
-- echo "|                                                          |"; \
-- echo "|   Please see the PHRED.DOC file for more information.    |"; \
-- echo "|                                                          |"; \
-- echo "============================================================"; \
--            echo ""; \
--             exit 1; \
--          fi \
--        fi
-+phred: $(OBJS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o phred $^ $(LIBS)
- 
- 
- daev: daev.o
--	$(CC) $(CFLAGS) -o daev daev.o -lm
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o daev $^ $(LIBS)
- 
- 
- clean:
diff --git a/sci-biology/phred/files/phred-071220-fix-qa.patch b/sci-biology/phred/files/phred-071220-fix-qa.patch
deleted file mode 100644
index ab4d2ea023f6..000000000000
--- a/sci-biology/phred/files/phred-071220-fix-qa.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix implicit declarations:
-* daev.c: In function ‘processParameters’:
-* daev.c:849:14: warning: implicit declaration of function ‘isdigit’ [-Wimplicit-function-declaration]
-*          if( !isdigit( argv[iarg][0] ) )
-
---- a/autoPhred.c
-+++ b/autoPhred.c
-@@ -57,6 +57,7 @@
- static int xstrcmp();
- #endif
- 
-+int freeMBRData( MBRData *mbrData );
- #ifdef ANSI_C
- int autoPhred( Option *option )
- #else
---- a/daev.c
-+++ b/daev.c
-@@ -58,6 +58,7 @@
- #include <sys/stat.h>
- #include <time.h>
- #include <math.h>
-+#include <ctype.h>
- 
- #ifndef _WIN32
- #include <dirent.h>
---- a/mergedBaseRead.c
-+++ b/mergedBaseRead.c
-@@ -63,7 +63,7 @@
-   Peak *peak;
-   Observed_peak *obs_peak;
- 
--  static initFlag = 0;
-+  static int initFlag = 0;
-   static char mchar[256][256];
- 
-   if( initFlag == 0 )
diff --git a/sci-biology/phred/metadata.xml b/sci-biology/phred/metadata.xml
deleted file mode 100644
index ccdff086e20b..000000000000
--- a/sci-biology/phred/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-biology@gentoo.org</email>
-    <name>Gentoo Biology Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/sci-biology/phred/phred-071220-r2.ebuild b/sci-biology/phred/phred-071220-r2.ebuild
deleted file mode 100644
index 2d33df654a1b..000000000000
--- a/sci-biology/phred/phred-071220-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A base caller for Sanger DNA sequencing"
-HOMEPAGE="http://phrap.org/phredphrapconsed.html"
-SRC_URI="${PN}-dist-${PV}.b-acd.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="phrap"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-071220-fix-build-system.patch
-	"${FILESDIR}"/${PN}-071220-fix-qa.patch
-)
-
-pkg_nofetch() {
-	einfo "Please visit ${HOMEPAGE} and obtain the file"
-	einfo "${SRC_URI}, then place it into your DISTDIR directory."
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin phred daev
-
-	insinto /usr/share/phred
-	doins phredpar.dat
-
-	newenvd - 99phred <<- EOF
-		PHRED_PARAMETER_FILE="${EPREFIX}/usr/share/phred/phredpar.dat"
-	EOF
-
-	newdoc DAEV.DOC DAEV.DOC.txt
-	newdoc PHRED.DOC PHRED.DOC.txt
-}
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 9df2c38b8523..9c95fe8943da 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
deleted file mode 100644
index fd686915e851..000000000000
--- a/sci-chemistry/votca-csg/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST votca-csg-1.6.4.tar.gz 537966 BLAKE2B c9ccc3aa28bdc4a2a2c080104b70602d8cf4be19a71e7d0b4a1c03d11f54b645984103d1662823a9308a4e4c4baedef731de06ff314b168f89e7326c0d3c8ee9 SHA512 4cdbf6c0a593720675f48f574ff9a93d038a48037543c1e09a4559d3eb262a2d8bf83d5f5dab85b4820a541e0c57f7cca78315d5b3382763e8acd8cc0fcb65ac
-DIST votca-csg-2021.2.tar.gz 4300675 BLAKE2B 8db666e77bc7d6d8da34fed97b0466e5296019aa703f324d46531992c0af544c31b2e3e4595883791cef7acd6d2d52eff8edc7eeedecaae0eb9e0cbf334748ab SHA512 5808edd96199cad6e5fc803a0e489f3d2f376da3d64f565536cc37561a0fcd22960563af7d3f86522bcc7336c8d6f7c7f6501b36feb960aae5168904156bfbf6
-DIST votca-csg-manual-1.6.4.pdf 1242124 BLAKE2B 003a255d2869c8185f9e03038f646a80b682be3daceb18757c791f5d52101379402aee20c5dcb65ef8ce651bd6f6590ad5249e835e53ce92e04eb33214017a9e SHA512 36956acd24a21cb0a1dd26d6640b41b7473132948327c05856191b4f9531b4d1d5f98be68a9d1a847935d47633d483e87c2300634233a6e617a010c1fb563690
-DIST votca-csg-tutorials-1.6.4.tar.gz 5944389 BLAKE2B 66f1d4947bb28ec602250226ad2c08cc02278a90776acbcadca2df3078361435fb2353ee0fa299d0d19697d36682f20aab709d45539d5ac7e7070942601ebc3f SHA512 7e40037f2e70c861fd7f5c63806c17ad56672a340a8795fa745414940c55f593bef32b9f6b9050400131ed9e66aa927149e9d324a1c264364d8504baf1921e28
-DIST votca-csg-tutorials-2021.2.tar.gz 5942042 BLAKE2B a03627406a3b56ebf978dc82629e1f0950bfbb121a0f6c7fd60341986efe4892ba8bf1e6b526e6df2df5fb81351177ad97816568521b9dc6a91e72d6853c1e62 SHA512 3ddeb3e57353e6d4e59163ee1303b39d4e3b623309875f280bf8c02dde76d0615b32a27ea960a301b61b81034a538df87dfe97a53dfdd0c81f52629eadd64f1f
-EBUILD votca-csg-1.6.4.ebuild 2308 BLAKE2B 65ae92b9302300cbb0d18a0ca3cc3937040e5827dd9719907a6e8d8c93380205c538eae815718e4453ebf80a76c38aa250901a5b7a37617e7b5481d127788586 SHA512 5b50632329d68e1dd196e842c8118173391b266e086b3949bbc5afd93bd22bb25895c6d95728b82b5c908b8c759eddd7f8eb1e31a5392b6898a92522337a5d5f
-EBUILD votca-csg-2021.2.ebuild 2115 BLAKE2B 7dbbec43db92a5b8c6420f468e6eb0d9488262dd70dd5ec23ee4482e4807e398bbca5cce619ea58f654521a8a7b5b50d20cd40630ef1a414ca5a0fec783e825b SHA512 54f8441f84c22134785b8297c5a7e96a0e7305b342631b82c9f4a3b06a0c97d5ee665848d4206100e1287c7a00ae8428fe7e1632584356b29544f3b89d6ba435
-MISC metadata.xml 677 BLAKE2B 4d577f0229184293e80dca331cba9f8d234a73eb73b6eac92d7e87e2aefe90de69be1323d3e401cfedb0aa6f18ab77b7ae6f3f4c8c1aca836d7ac8a57184eb32 SHA512 f7999c1c10630ae72535609f9be857e7efbe89f0cc99f55268c66271625777e64c0a552317c49cde3ef5652be68c7e91630b8cd038b255b71a1566fac75b91e7
diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
deleted file mode 100644
index e20cfda723ef..000000000000
--- a/sci-chemistry/votca-csg/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<use>
-		<flag name="gromacs">Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
-		<flag name="extras">Pull in extra applications from <pkg>sci-chemistry/votca-csgapps</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="github">votca/csg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild b/sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild
deleted file mode 100644
index 5630d124ef7d..000000000000
--- a/sci-chemistry/votca-csg/votca-csg-1.6.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 cmake
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	PDEPEND="${PDEPEND} doc? ( ~app-doc/${PN}-manual-${PV} )"
-else
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		doc? ( https://github.com/${PN/-//}-manual/releases/download/v${PV}/${PN}-manual-${PV}.pdf )
-		examples? (	https://github.com/${PN/-//}-tutorials/archive/v${PV}.tar.gz -> ${PN}-tutorials-${PV}.tar.gz )"
-	KEYWORDS="amd64 x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-	PDEPEND="extras? ( ~sci-chemistry/${PN}apps-${PV} )"
-fi
-
-DESCRIPTION="Votca coarse-graining engine"
-HOMEPAGE="https://www.votca.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples extras +gromacs hdf5"
-
-RDEPEND="
-	app-shells/bash:*
-	>=dev-cpp/eigen-3.3
-	dev-lang/perl
-	~sci-libs/votca-tools-${PV}
-	gromacs? ( sci-chemistry/gromacs:=[gmxapi-legacy(+)] )
-	hdf5? ( sci-libs/hdf5 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig
-"
-
-DOCS=( README.md NOTICE CHANGELOG.md )
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		if use examples; then
-			EGIT_REPO_URI="https://github.com/${PN/-//}-tutorials.git"
-			EGIT_BRANCH="master"
-			EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials" \
-				git-r3_src_unpack
-		fi
-	else
-		default
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_GMX=$(usex gromacs)
-		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-		-DWITH_RC_FILES=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newbashcomp "${ED}"/usr/share/votca/rc/csg-completion.bash csg_call
-	for i in "${ED}"/usr/bin/csg_*; do
-		[[ ${i} = *csg_call ]] && continue
-		bashcomp_alias csg_call "${i##*/}"
-	done
-	if use doc; then
-		[[ ${PV} != *9999* ]] && dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf"
-	fi
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/tutorials"
-		docompress -x "/usr/share/doc/${PF}/tutorials"
-		rm -rf "${WORKDIR}/${PN#votca-}"-tutorials*/CMake*
-		doins -r "${WORKDIR}/${PN#votca-}"-tutorials*/*
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please read and cite:"
-	einfo "VOTCA, J. Chem. Theory Comput. 5, 3211 (2009). "
-	einfo "https://dx.doi.org/10.1021/ct900369w"
-	einfo
-}
diff --git a/sci-chemistry/votca-csg/votca-csg-2021.2.ebuild b/sci-chemistry/votca-csg/votca-csg-2021.2.ebuild
deleted file mode 100644
index 8cd79831d9cc..000000000000
--- a/sci-chemistry/votca-csg/votca-csg-2021.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 cmake
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-else
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		examples? (	https://github.com/${PN/-//}-tutorials/archive/v${PV}.tar.gz -> ${PN}-tutorials-${PV}.tar.gz )"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-fi
-
-DESCRIPTION="Votca coarse-graining engine"
-HOMEPAGE="https://www.votca.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="examples extras +gromacs hdf5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-shells/bash:*
-	>=dev-cpp/eigen-3.3
-	dev-lang/perl
-	~sci-libs/votca-tools-${PV}
-	gromacs? ( sci-chemistry/gromacs:=[gmxapi-legacy(+)] )
-	hdf5? ( sci-libs/hdf5 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig
-"
-
-DOCS=( README.rst NOTICE.rst CHANGELOG.rst )
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		if use examples; then
-			EGIT_REPO_URI="https://github.com/${PN/-//}-tutorials.git"
-			EGIT_BRANCH="master"
-			EGIT_CHECKOUT_DIR="${WORKDIR}/${PN#votca-}-tutorials" \
-				git-r3_src_unpack
-		fi
-	else
-		default
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_GROMACS=$(usex !gromacs)
-		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-		-DBUILD_CSGAPPS=$(usex extras)
-		-DENABLE_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newbashcomp "${ED}"/usr/share/votca/rc/csg-completion.bash csg_call
-	for i in "${ED}"/usr/bin/csg_*; do
-		[[ ${i} = *csg_call ]] && continue
-		bashcomp_alias csg_call "${i##*/}"
-	done
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/tutorials"
-		docompress -x "/usr/share/doc/${PF}/tutorials"
-		rm -rf "${WORKDIR}/${PN#votca-}"-tutorials*/CMake*
-		doins -r "${WORKDIR}/${PN#votca-}"-tutorials*/*
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please read and cite:"
-	einfo "VOTCA, J. Chem. Theory Comput. 5, 3211 (2009). "
-	einfo "https://dx.doi.org/10.1021/ct900369w"
-	einfo
-}
diff --git a/sci-chemistry/votca-csgapps/Manifest b/sci-chemistry/votca-csgapps/Manifest
deleted file mode 100644
index f81774a0e49e..000000000000
--- a/sci-chemistry/votca-csgapps/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST votca-csgapps-1.6.4.tar.gz 19589 BLAKE2B 90a20c3acef3254b412697dbb543c216d4546241c2f98d8b1e6c7fbd2de5dc5268965f1035843c6832579158843069c610ebbf3363d2e604a1c7c3dc82e3d8d2 SHA512 89ea658092e979c90b9f3d75a8dd9f8ec95278c26fafb30c31a23581dcd7a65e52c8c7696ef14da5821e283d16ab96880041b7b20c9097f99b2fc1eac4a38184
-EBUILD votca-csgapps-1.6.4.ebuild 600 BLAKE2B 1c09b68b2bf4497dd45335823296fbc3ec9e11c12588ed1d7d1ba261bc61d14b7260c2618922cfa09f7303525ed3fec4c1d744fb855f05ae29001c53ef2d9a4d SHA512 5203f67e3ac3c96f807ba42d7ce6b9daccdf71fb51422e204908092e44a5ddb89eb33a5c44ea6dbf571cf7ad2b5f3c826d01ce90a51f64514c61ae41473dd1f2
-MISC metadata.xml 458 BLAKE2B 7ece1794095e4423ca590746617a391a434d36916e38f3b6b723a53d38c0804eda2fea4d17e3dc4db67fdee0fb94accb7d9f84b8821993c3370bb013543bc86b SHA512 5871a39220f39dfde991bfcb5d825f3b876c0fe1cea13d87171b1a4675db311c579fbe7930d9fc350640c9545d466073e6d1eb8f7cf2870f1d95ae92804520f7
diff --git a/sci-chemistry/votca-csgapps/metadata.xml b/sci-chemistry/votca-csgapps/metadata.xml
deleted file mode 100644
index 525a7af3b235..000000000000
--- a/sci-chemistry/votca-csgapps/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">votca/csgapps</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-chemistry/votca-csgapps/votca-csgapps-1.6.4.ebuild b/sci-chemistry/votca-csgapps/votca-csgapps-1.6.4.ebuild
deleted file mode 100644
index 132c6fce4013..000000000000
--- a/sci-chemistry/votca-csgapps/votca-csgapps-1.6.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-else
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-fi
-
-DESCRIPTION="Extra applications for votca-csg"
-HOMEPAGE="https://www.votca.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-cpp/eigen-3.3
-	~sci-chemistry/${PN%apps}-${PV}
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
diff --git a/sci-chemistry/votca-xtp/Manifest b/sci-chemistry/votca-xtp/Manifest
deleted file mode 100644
index 410ea4b4a035..000000000000
--- a/sci-chemistry/votca-xtp/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST votca-xtp-1.6.4.tar.gz 1405299 BLAKE2B 9d4e9d3f87e0c6be886df77bf52f9d8c0b4010fb1d77621a51b739986f3f5d70c85637c0d7b4d6a8a06d7dfc7e70ff5491bdc833a1b9da6fe1e8a9742a82d220 SHA512 f35e9605f4ac92547c801b254de792b5c3bf40200e8636869467997412357251df08f88ad851bc76cb0ba15428f06f28dbd4f64043a7612273468c8d653e52af
-DIST votca-xtp-2021.2.tar.gz 2192074 BLAKE2B 75b835501d70d1f90010bffce7cdaf3718629c8ec07d0cc10b11e6422c64f37ae32ba30c5b3006cd04863bba1986de1214fe7dbe7a6a12d76c21b4fe3e3b075b SHA512 d79e2e8973ad35a47ac0b1872cc6906aaec3881f4c8dc5ef4d9001b661212592bc309b1a82982db9c4d2827ba7749cd0bbc3134e29798c0bfaf794dee04a7cb6
-EBUILD votca-xtp-1.6.4.ebuild 916 BLAKE2B 3f322407b39ca300186e1e283a6a85749b79518cbd7355577992fc4eeb7931c419e018a384a29d1e84becc5a7c94f7905c96d26cf6a750a9b0124ea35a40bd7a SHA512 65a479d3292c7296cbfb6543fe47e54f2824705dcbc2b2e75f6f2f4fda9f827ce15904aacff59c927061547a45c940eebef4f4fa3e3bcb226f401a6817dd74fc
-EBUILD votca-xtp-2021.2.ebuild 1072 BLAKE2B fd96c0a844636d52b3d4f10fc3cd4ad04061f6e015d1e8b087bcd50157e4d8a2586d7a4948b39987628d6efd9fc0c373d8bb77344bc62c3651d7b08704bc59fc SHA512 a1e95165d8c55351762d5a1cf70316862de2e30b765df1aaf8d904aa0cc0bf8d9e1f75aba3c88a4c7b273fee29d6a1bc89d710bb3fe298da5ee92b4f427a4f4a
-MISC metadata.xml 454 BLAKE2B 649578a46b3cbea28539fb2f2716518819f2740155433d1af07d3ee3163ccd3c2db2c69b75de829db3c46e3e2ef500892abae16b2b920b8ca5ac68e205c93cd8 SHA512 427fc4f2f5c0e265af0f6cbd7341860e3c8c62afcfacd0edf2ec53e9eb2228dfb3ada0f9f273127a0805f8fb87cbae4e14daefbc068d6afe655c917cb6c74df4
diff --git a/sci-chemistry/votca-xtp/metadata.xml b/sci-chemistry/votca-xtp/metadata.xml
deleted file mode 100644
index 979a4dea2e23..000000000000
--- a/sci-chemistry/votca-xtp/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">votca/xtp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-chemistry/votca-xtp/votca-xtp-1.6.4.ebuild b/sci-chemistry/votca-xtp/votca-xtp-1.6.4.ebuild
deleted file mode 100644
index 6a0bba5928b3..000000000000
--- a/sci-chemistry/votca-xtp/votca-xtp-1.6.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 cmake
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-else
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-fi
-
-DESCRIPTION="Votca excitation and charge properties module"
-HOMEPAGE="https://www.votca.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-cpp/eigen-3.3
-	~sci-chemistry/votca-csg-${PV}
-	sci-libs/hdf5[cxx]
-	sci-libs/libxc
-	~sci-libs/votca-tools-${PV}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README.md NOTICE CHANGELOG.md )
-
-pkg_postinst() {
-	einfo
-	einfo "Please read and cite:"
-	einfo "VOTCA-XTP, J. Chem. Theo. Comp. 14, 6353 (2018)"
-	einfo "https://doi.org/10.1021/acs.jctc.8b00617"
-	einfo
-}
diff --git a/sci-chemistry/votca-xtp/votca-xtp-2021.2.ebuild b/sci-chemistry/votca-xtp/votca-xtp-2021.2.ebuild
deleted file mode 100644
index 4d4db8635e4d..000000000000
--- a/sci-chemistry/votca-xtp/votca-xtp-2021.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 cmake
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-else
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-fi
-
-DESCRIPTION="Votca excitation and charge properties module"
-HOMEPAGE="https://www.votca.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-cpp/eigen-3.3
-	~sci-chemistry/votca-csg-${PV}
-	sci-libs/hdf5[cxx]
-	sci-libs/libxc
-	sci-libs/libint:2
-	~sci-libs/votca-tools-${PV}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README.rst NOTICE.rst CHANGELOG.rst )
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please read and cite:"
-	einfo "VOTCA-XTP, J. Chem. Theo. Comp. 14, 6353 (2018)"
-	einfo "https://doi.org/10.1021/acs.jctc.8b00617"
-	einfo
-}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 343d49ef2382..5c726ba11895 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index c2565286db3c..adf526b3bac6 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,8 +1,6 @@
-DIST kicad-footprints-5.1.12.tar.bz2 3382783 BLAKE2B 6f7725bebd6099d86780ed2582aacfb3abff4db6065a6a17fcd7631782a0c2e1e8a23064f80cd95c79bbaca8da52003f01fce7e398e95596e45f15b144eeef7f SHA512 e717886dc742f37b626226065953a36829b50f9bf203efe1dbeab41d4dbe3a898bd65fbde9fa059ea9374ea92905faeb0ccd19dfb1a62f2d6a445c07f90b89a9
 DIST kicad-footprints-6.0.6.tar.gz 31647789 BLAKE2B 3af7027987b25c4a3ee19925acaa539cea643656e1662f0b80ec76c807aca9ef7433228fc88cdd0c34b80e7bbb886abd5c11765983e9adc5b347ce01bd4b51c4 SHA512 6d93a90bfc0b246c70b336aa9265a051a33d8b490a81271fb85ab73cd19184a031f3429ce8ae9e1650ece475a30f0f283c43c5bb2d1f427b4129d4ed61480ac0
 DIST kicad-footprints-6.0.7.tar.gz 31657956 BLAKE2B 127ac81c83841919903b300af89c2126e1f53ff1c03d6dcd2466eac8d4733da4f923831e24aa43fca2b5c6d9ee4389bd67f0bd2b4d300adb5356e261b14e897e SHA512 e0959846e057df46e38385d1fe71895930435fc51ad03bbc893481264d969d9739967b069855b59341388fec5458a4f2c71c527b7af7357437c5606c91f5436d
 DIST kicad-footprints-6.0.9.tar.gz 31723499 BLAKE2B 33856d28a52f8f516c96c38c68aabe3d57c3f7eade5cb654cd0dca15f36263b9860f252468edf0b94f228c2497ef7e862cebfd023e2a166ce1696a89c1cff1e1 SHA512 43436a61fb1be66dc6cd6079e49e7af0f7d374f074874fd008eb45c2b3faee596e102173a274064a536f11c4525f223c9e8c2a33969811414811a226e69affaa
-EBUILD kicad-footprints-5.1.12.ebuild 435 BLAKE2B f8452914dfffb5c899cbf8e0112318f96f3833628f90ca48c208c26b6a558ce69eb1e90f390f686c88b51ecc194abcf1bbc87aaa1457ded6980af0b0e49ee5c4 SHA512 9945e466d7812e9c44f4481a077cb19162a7d2ce73425a12b5e6bd51a1ae7cf7fa8d7f91cde116d55665cb49585e4936f8a2d141f1f8a612f49c0b8a1c8a736d
 EBUILD kicad-footprints-6.0.6.ebuild 869 BLAKE2B 8cf2547e8d1065a2d2e18e3056849f622afd39881ff90d15280b1500ce2635b2dad15fa7b85bfda6387c7b98ae08eb161eedae2c11f06a83e9349b22062e087e SHA512 5b60dc906f7d3207ec36587297a1193b221bab2ff0116b94913ad3e7d4f58c3ebc398ecbb1f391313c0cc267b91b78cf0a7c257c568e62293f4ccaa5aacb6320
 EBUILD kicad-footprints-6.0.7.ebuild 870 BLAKE2B 5ba8eda9374024ba6293409b98a89035b74ed2b2e5de5cce90045edac7cfdc54c8fd7669804a55796c53954e1d503a03ea94cfc1053cb76d440268cafc427a93 SHA512 561c2bb63e31558701f619373be2fcc8490ce0294300733014506b344934e5d7a5c7ff50bb6242860ec51d755569640cbe4f2328d6766e0559b7558ec10aaae6
 EBUILD kicad-footprints-6.0.9.ebuild 870 BLAKE2B 5ba8eda9374024ba6293409b98a89035b74ed2b2e5de5cce90045edac7cfdc54c8fd7669804a55796c53954e1d503a03ea94cfc1053cb76d440268cafc427a93 SHA512 561c2bb63e31558701f619373be2fcc8490ce0294300733014506b344934e5d7a5c7ff50bb6242860ec51d755569640cbe4f2328d6766e0559b7558ec10aaae6
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.12.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.12.ebuild
deleted file mode 100644
index 919b81b50669..000000000000
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.12.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
-HOMEPAGE="https://kicad.github.io/footprints/"
-SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
deleted file mode 100644
index d4b70499495c..000000000000
--- a/sci-electronics/kicad-i18n/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kicad-i18n-5.1.12.tar.bz2 2934525 BLAKE2B 7aef8a0e5213be38e5517a539469cba41d67dc2495539c7f5722f6cf7e3a86b8eaefa341d18a621b36c100ddd89466fbf5ac9d8071e5f78587161a8c0bb430d1 SHA512 178a17919e762f284aaf1fab75d527085a2bcec8dc6e236a552c6c471aab5ca4f747d297d8f148dbe9cc80a0c4994b712b54da077029ff484006b6c42dc22916
-EBUILD kicad-i18n-5.1.12.ebuild 460 BLAKE2B 38b747ca7fabe171abf556b066d32a3df6341e251e281d77b22d03003618a031f40a7af9833f0c9d4e298d1fdac23a42dec3ced550a763ffa4fe0dde3a0d1b58 SHA512 f52004d96a8178f9dfef2f150809c24328b28d7c2e470153be50d4508be5a203f207367548f3231328b5988e884bf1d01684c719830c4d6e57f9e15059503f47
-MISC metadata.xml 479 BLAKE2B fd990df6242d9081bb213dac1e32e547db6d02a8dd5ecd149f6bd24ba7f89dba98b1157406c4ef3c86e228ee3ed5f18017a76eeb49b40c317479e19dca0012c3 SHA512 3a14633361827d68742c28e7bd2c77990c7ae5370c32db8969e944378f180354e3e07cede2aa63454de9732b2b9c5a9e8a5e76b8e7d914251c31f5be3a666824
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.12.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.12.ebuild
deleted file mode 100644
index ec60fdc59456..000000000000
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.12.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools GUI translations"
-HOMEPAGE="https://gitlab.com/kicad/code/kicad-i18n"
-SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND=">=sci-electronics/kicad-5.1.6"
diff --git a/sci-electronics/kicad-i18n/metadata.xml b/sci-electronics/kicad-i18n/metadata.xml
deleted file mode 100644
index 8cbb9ea9aa19..000000000000
--- a/sci-electronics/kicad-i18n/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>zoltan@sinustrom.info</email>
-		<name>Zoltan Puskas</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">kicad/kicad-i18n</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index 675ce59a4f78..35a39cbd3002 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,4 +1,3 @@
-EBUILD kicad-meta-5.1.12.ebuild 620 BLAKE2B a4c802e020999a16be0b615bb2bb18d11330b041822a283f541f98d17b6d247c9ca835c5d177928fce26a638412c94de6fdf122f5eb3c5afdc8dd7365ff6a0f2 SHA512 aa7ff651a6cc3761f88b87462b91d3e125e69c8155a95676d77013a0a9824f454cc3fa276ea88e1ef2a2c7a5cccc89e0085b698354d145e3ce38a451018d50f0
 EBUILD kicad-meta-6.0.6.ebuild 616 BLAKE2B 3a43f155c4ed2251422a0d0c52f443ad98a9828a9b69f2a18070100618886dcb4e6094750600eb63b23a479fcb01288500a8905b6b865290a68d03936d67bc47 SHA512 eb73ca87b606a1b9f515338b2dc9fc7e6eb59221d406d8028ac225a9cd4158030f7bd6107fef7755afa6fb2031ac2f529e8035138739d0bc3312bf5f49f964ba
 EBUILD kicad-meta-6.0.7.ebuild 617 BLAKE2B 586b8fa96d7345fbc8976f0cac98c8357ac316d90f74433d4e48d759ae4613150e05f5caa5e0da83c4ca0f680edf8cf46370346bad694f941f5c12959effd9ce SHA512 0ccb2e1737e9b0b1589905e78818d7b5ccd7221ec329cb21c95902da32a59fa67400fb038edc05447d0632aaab0f6f3f265ba07b067f523ffa1f1ed16968e53d
 EBUILD kicad-meta-6.0.9.ebuild 617 BLAKE2B 586b8fa96d7345fbc8976f0cac98c8357ac316d90f74433d4e48d759ae4613150e05f5caa5e0da83c4ca0f680edf8cf46370346bad694f941f5c12959effd9ce SHA512 0ccb2e1737e9b0b1589905e78818d7b5ccd7221ec329cb21c95902da32a59fa67400fb038edc05447d0632aaab0f6f3f265ba07b067f523ffa1f1ed16968e53d
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.12.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.12.ebuild
deleted file mode 100644
index 03f88d62d7d9..000000000000
--- a/sci-electronics/kicad-meta/kicad-meta-5.1.12.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
-HOMEPAGE="http://www.kicad.org"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="doc minimal nls"
-
-RDEPEND="
-	>=sci-electronics/kicad-${PV}
-	>=sci-electronics/kicad-symbols-${PV}
-	>=sci-electronics/kicad-footprints-${PV}
-	doc? (
-		>=app-doc/kicad-doc-${PV}
-	)
-	!minimal? (
-		>=sci-electronics/kicad-packages3d-${PV}
-		>=sci-electronics/kicad-templates-${PV}
-	)
-	nls? (
-		>=sci-electronics/kicad-i18n-${PV}
-	)
-"
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index ca5a554802af..c3ca72e7a303 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,8 +1,6 @@
-DIST kicad-packages3d-5.1.12.tar.bz2 727191578 BLAKE2B 534ba480de72ffbc8ac0968e5a7b04f2b7ccfb0ef8bb88bdad7e4e6d90536f9ae7bd101316512e1fa2e27b607fd0dd8e53d0729e48368362177b066c6bab3802 SHA512 eb4895e0c46448a74acf10e8c72dee6ea89fee9d53b93c0927d592f4ee944497b642ed575b1b5457ff0db731f654d054d539aff007a17b8d8366c03edb15b6d2
 DIST kicad-packages3d-6.0.6.tar.gz 951710688 BLAKE2B 16176514519897167807b9c2d6659b16d38574484bc09fd871c97ea943531f8726a8173b5a3d143818397eb1086db0d6bda43add357c95e92bffac05560ec9f2 SHA512 f8231c4ce508eb379ceb397cf6e9f963411a0a5cee5d1fa9a9e929c964662d391ab12555c4d3e8bca1b9507338571f3036af7f24e6a4d093f8f2aa3ba93e9345
 DIST kicad-packages3d-6.0.7.tar.gz 952830693 BLAKE2B 0eec72303c3146f3b11092a2e7129e53b68fefa4a869e9e87302aa04e092d96514f12a2344b8964a13701a1d7198ad39848b5496c81ae0090ce41670b4a7618f SHA512 cbbeaa85df3e2b9a8c8616994607ff446b8d97dc039562b9c3823ad8cf2efabc02eb49f1a34b6ac3545db21dfbb264d79d05f2edeb2c79a13fd1093999f331f9
 DIST kicad-packages3d-6.0.9.tar.gz 953182554 BLAKE2B a0f9810d1236c3ef1b0adae3cc2f1d8172fb52add6a9d5666dd32431725a1d3fd0456119ef21b05bd390ec90fce359b46e846f0af063feb4f8d97bc69da57f68 SHA512 fe014b35ce9071ed48d00481d509fba678dc0bea5170f626de9b18c0e0285cb441fcc635197da40af869e35c50104a9a69d991348d6031293ee166b734ba7cc9
-EBUILD kicad-packages3d-5.1.12-r1.ebuild 559 BLAKE2B 698bb6c1eeb4f63d69f29095bd17b00d5b420c1dd16faec9910e2b5a13e8be124d9c087dc1678ca3d516d1a8f143e8b15e68244d150955f37f23a5d7b1f8a617 SHA512 0475814185604358e047f864a847b273cbe032cbb0a5997f49a3afdc77c66c7fdb15b762b6f5337016f737f857b036bd37b64d5315858fc082dc87156871b691
 EBUILD kicad-packages3d-6.0.6.ebuild 1066 BLAKE2B 58c9ec2662c5dac6d00c7c27a73fa52e4b14edc380d9adee048085fa6bb46aec99f7e3c3ae7d753ec93eff5bf48d9aaaef87ccebc7ea200ea6b26c7190683652 SHA512 37b37d76ef40be3c002929d466acea36a509038ce8a3ec47560f3ebd7423141dbe014fe5e056308c75ac67779475ff12c1667785623cc7e7a34c29656d2ff93a
 EBUILD kicad-packages3d-6.0.7.ebuild 942 BLAKE2B fe22314c91aaed1c42debc8fa6058c43d4755a1dfbddc2e8021e6935568032d031be44b54cce025522c7c6fc502f13970c279caf2748f86a0f734f8cce400b77 SHA512 165a43d1e0a7203c7c95831ac9a6a294dde4cbe07873483db9f76ce041641c1d55b92bb38862baadf29a94ff074437eafcdcbc5b709f80b63ae6b5ff4723bdd0
 EBUILD kicad-packages3d-6.0.9.ebuild 942 BLAKE2B fe22314c91aaed1c42debc8fa6058c43d4755a1dfbddc2e8021e6935568032d031be44b54cce025522c7c6fc502f13970c279caf2748f86a0f734f8cce400b77 SHA512 165a43d1e0a7203c7c95831ac9a6a294dde4cbe07873483db9f76ce041641c1d55b92bb38862baadf29a94ff074437eafcdcbc5b709f80b63ae6b5ff4723bdd0
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild
deleted file mode 100644
index d37150d3243e..000000000000
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
-HOMEPAGE="https://kicad.github.io/packages3d/"
-SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kicad-packages3D-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+occ"
-
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]"
-
-CHECKREQS_DISK_BUILD="11G"
-S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 503f02223c35..72a30542e185 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,8 +1,6 @@
-DIST kicad-symbols-5.1.12.tar.bz2 1815145 BLAKE2B e3a74c0e2cb24f4286cdd7fa63b62c72c39575475305680ba8e19d5b3acb5c6cbff1e17d37d169043949ad89ffb9b94f0341e1faf7d063c1cf9872d31b863e21 SHA512 32e73b8a43e54779e4b95fc13505d603c7ef70600467a1e38f2685288aa9223ca29cc44a552d8c02e153cbf3048faa59610bc92e81dbbed7a432c16db0bd05f6
 DIST kicad-symbols-6.0.6.tar.gz 4845755 BLAKE2B 32bf6a03f5f06be09b571e0d5470059bc799d662aefd40554e6d9603f29862af3d75f600218f715026349216bbc1a6ea3000eff5a3a5ef8c66a8643f83872090 SHA512 edd8f2d2d34c0431bd23a8ae0433f2ce311aebecef4672ddf7b5d1bfaf71bf4cd8f98f3dcaa9e1662f5a928e204aff834b5e19cea77a31d2e3a23373f760406c
 DIST kicad-symbols-6.0.7.tar.gz 4846798 BLAKE2B 1691027e1bb9e93ee4e390590e748ff0dc0994d740f999a1220c9897c44deb71b62de2df4a1cb8817cca828317b3d7ac7a678bcff1a9570abedf3b9cce518541 SHA512 27b05f46b48de338266a713da92cf96af59918fbc4850de05bce5ddf5ed9b2d7e949cbbf8c23b22663c2388824f8de464bafe1df31e829620c0ff19f4e7f7be2
 DIST kicad-symbols-6.0.9.tar.gz 4854079 BLAKE2B ba50c3062dc01145239d0950072bcaa6b61b2dbcf954fcf6e96e0d06c2c9952bd571c81a0e05dcdff462524c38e8c8807752e7d854eb7684397634414b55b8ab SHA512 2cc44ead8029cd502cc5301b4515aa23275d32068e091a0a4a645f6fd9ed88f2b7d329d9faa7e66cde58cedeb47810c66db8e6f9313c2bbfe18e5a272f82a163
-EBUILD kicad-symbols-5.1.12.ebuild 429 BLAKE2B f05364cdfb4fc1e8e6a79722c374d2f260ab46c6e35c09d209e1121cb6f188177073c2ef05283dae3700f8c3c6767216666f9460044e6c9b1525766b0898b98f SHA512 7cf1cff346c6ce05516825d89d08c25a7af0903464e92cd0003fe212bb58fb870c26692dbcc932ef1a552729e6927ed08e291ff0a022dcd4403ddb632f02ccee
 EBUILD kicad-symbols-6.0.6.ebuild 761 BLAKE2B b9f070b83420d68a492ef74d4fb6bab88a90fc1d06aeeda2f0d409b04e5e10930f0e45800f176616943781d20146389e786b33e1d86bc322e9a65119eeb5d2b9 SHA512 bf4dfbf3a602f124027fb8757092a7266649d87b505eb79e1d73bc240aba889546284fd416f635a885cafa0c6518d2e8018944c1f2f7c505fe80808c7bfabcb4
 EBUILD kicad-symbols-6.0.7.ebuild 762 BLAKE2B fd144c2c48d52163f6fff0528bb0e5becab560e9405ec4f37d19a9b355c6e46f288d2eeed8dcf226083aac028862bc5275a91ec5491518e13bc5ecf752aeecda SHA512 07d48e69e2dbc8e5a3987bfcd3f4887fa134ed8c886b2635aff46d3bf542229365be05f8cb5f9ece27d3aedd03d6ec688b08dfaa8dc33b689bc50ed653e844de
 EBUILD kicad-symbols-6.0.9.ebuild 762 BLAKE2B fd144c2c48d52163f6fff0528bb0e5becab560e9405ec4f37d19a9b355c6e46f288d2eeed8dcf226083aac028862bc5275a91ec5491518e13bc5ecf752aeecda SHA512 07d48e69e2dbc8e5a3987bfcd3f4887fa134ed8c886b2635aff46d3bf542229365be05f8cb5f9ece27d3aedd03d6ec688b08dfaa8dc33b689bc50ed653e844de
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.12.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.12.ebuild
deleted file mode 100644
index 0af175056d99..000000000000
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.12.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
-HOMEPAGE="https://kicad.github.io/symbols/"
-SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index bc2306d01826..7a9e9c2c2a57 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,8 +1,6 @@
-DIST kicad-templates-5.1.12.tar.bz2 1552173 BLAKE2B 51791729e049aa835f15b80f783d07c099dd177783b1a78209e7c7db709a3b0a18bd22572227ab5193d4da955796bc4c78f502fdedd275f379f84fa49108a324 SHA512 4f44816fa78048c0db93ecd10ae980236bc5ef1ed5170270ac761dd5fc32d08a5c8bf733837e6dceecf736f75fa09780326af813de04cbd69345cf376815d430
 DIST kicad-templates-6.0.6.tar.gz 1057646 BLAKE2B 3bca2c6557ea8879d53a24a9a97872235c7d6289259936744a098745d0aaca9c2e397d471aa738d0007813c77e8a299c2975393bc0c0e62212be293cd210c049 SHA512 b9c4df8b7da9f5e3405a942c3afb09f5c387e311927042889211fb3c3a2a4610a1ccdc94ca2c1e1ae06e351617b15882adf5899f6dbfb392611feb5711e5be92
 DIST kicad-templates-6.0.7.tar.gz 1057666 BLAKE2B 62b6d6b93cf94c6085c69f349259eeaf9d7fdb9aa9faf631c4ee89de20d9f2c3d70e6afa9ff90ccaf9bbb3ad1877907d375ae6777dda3a841d3e263ea9edf2d6 SHA512 c04f2754d2ed8e18fdb054ecaa900a80f8f937096513dbe0a9dbd89c341490657ad673488bf9f3a3d0850861c99524127128b8efb1283e2df3feefcea8806d53
 DIST kicad-templates-6.0.9.tar.gz 1057613 BLAKE2B c2c0c78093995629216cbcb93c40a05e1494da90a6cb91909e54fcb115fb7d6e10b3015a94200fef61407a6beccdc0f2bea84319531b39562bdf19ccf243a726 SHA512 f5e82599dc8532b2f286d62e650084b4d0470308a2cf447831027a85ea1028587342d51d4005018449f17fcbc9bd9f6ed850d7e3818c88692906790ef8981471
-EBUILD kicad-templates-5.1.12.ebuild 438 BLAKE2B 245672d11e479bd59d83eae963c7606addb45d8202a7212034dc9d92f8eb27b2809844848722dccc2777dd4126e67b48049934a1077774f598a8ed9e1c1fc638 SHA512 e9e21e3a0b429a9f1d267f6d0f9dde8405ababdfb5cd81c8e3d8f6f7e1f136490c88238fbc699b296631cc75359f8c2205bd0f10f160cd15fcd1dcdce777c122
 EBUILD kicad-templates-6.0.6.ebuild 697 BLAKE2B e863371c758f0c33fe272c8f8bdb192e4c8f1a5a5c38807997b24df591a41c5b4616b58f260ec921efc6291c5b3ba970754b1adb95235b1dd5c4b52b5d4d60d4 SHA512 3a82c50efed4363dff2c6eb5371c5a10ee286b34f4a01a102c2b2d60494faf13903509219411586af16e07e86c522817f9c2063c89d6100f2bc5a58ec35c2283
 EBUILD kicad-templates-6.0.7.ebuild 698 BLAKE2B fcfe2e16a5b2864d82ec552ffdb3dc3600fe618575c1af65ebd2ee1db71e9d55081abd85c22648692dc1523ebefae42618bf35e1645644d48472111e1c0d05d7 SHA512 d6cbe3de9d0efe622e84d779652826169a2ad4f75e6f3855df57aba9947be776d0b856e6e4e759423345437bda0c8e4e1e48c7789e19e078f82305be00be66fd
 EBUILD kicad-templates-6.0.9.ebuild 698 BLAKE2B fcfe2e16a5b2864d82ec552ffdb3dc3600fe618575c1af65ebd2ee1db71e9d55081abd85c22648692dc1523ebefae42618bf35e1645644d48472111e1c0d05d7 SHA512 d6cbe3de9d0efe622e84d779652826169a2ad4f75e6f3855df57aba9947be776d0b856e6e4e759423345437bda0c8e4e1e48c7789e19e078f82305be00be66fd
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.12.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.12.ebuild
deleted file mode 100644
index 211b692af0c3..000000000000
--- a/sci-electronics/kicad-templates/kicad-templates-5.1.12.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools project templates"
-HOMEPAGE="https://github.com/kicad/kicad-templates"
-SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 708db9212b95..c8137b7fb536 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,16 +1,10 @@
-AUX kicad-5.1.5-help.patch 4660 BLAKE2B c0521bea600748605dd581c34d63b6d084225d339f035167c3d0f0801f396ddfbbee22d843be53f81440b199c307604c98f08509fe9ec55efab6c297a7175947 SHA512 704fb0cc60bc18610bd410028c5c6302548bac646b0653ba32355b03fadbe4d8366dbad18469d5fd49d1d86e70497a13cbc2748c9e4b139d3a640c46bce50a36
-AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd
-AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636
-AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146
 AUX kicad-6.0.6-unitialized-variable-fix.patch 592 BLAKE2B b26757a1e9d4115616a721fdba7527cb72d489ae75976f9967f24cd12735b6f090a71bdb0c7d632d33ada0b3dc77f0d7f9370d02c34d83bd0afebb608621b85d SHA512 2f1e81132e87858f789833bd05fdda2309fc344c1535295c6308e3058bed85edbfd9900a0529e1489eb6f87bb27146a7dec2893a10d311c43b7117c00beba948
 AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827ad88a4c3e82d120bd07392892b61d0e63892732f5469b1fe1472eac9584175acbc7aa611171f6fb9285017826156b30c SHA512 5abb158ec7e8a5ef8049797886e26febc018499dd7f5c8defdf9104b59371efa05cbec8e19e8fe22295e8e54c30095d347cccfa4c43db62b6ac4eb07bb8a080e
-DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
 DIST kicad-6.0.6.tar.gz 45086249 BLAKE2B fbf1f11cbf4838186e1ecb42127f7b182d3cd13b4af147211c85244d361cbf83387f5d102efdc80a63cfff36e343e6c4e07fef7f95dac4c6666844c5bc9d0ec2 SHA512 c472a6b81e3065e0499cad8467527d3531dc4d5861f50079ecb2ae6fccaf2c4d24fbeae8e9fe0cdde5ef548458fcef9615d6539426abe391a629dd539406065a
 DIST kicad-6.0.7.tar.gz 45143677 BLAKE2B 4ab9132be84cb6c6c566a826e5966f4fe64922dcd66f78c558126b37a276e075af80440da35071c864457298f6f964ba15511d0038424f473c3fb079d5f042e6 SHA512 0466650d166becbde23f1202e8bbe73ac7c743b5baad9608252fe4e960f0d15aad363664b69d840ef4568bf6d1c042b94252afce8657594a5f8193c979613e0e
 DIST kicad-6.0.9.tar.gz 45166663 BLAKE2B e4d45c589a8e76d7c121ac4ab7adefc5fd44d4ccbff7140196caec56c309f6e83d47a3ea9cf79f59de57c3bda43b3d32a2bea82c5850c2a7a58a6e1db27a06a7 SHA512 49e6bd3c9f6e0c9839c4fac18dc12dc7ef16183f6fbe8091992e2223c7fb085b3119d46797c0b0cf86fd2813e3c4def9eb1f2adbff1bf072a363f1a501da9354
-EBUILD kicad-5.1.12-r3.ebuild 4837 BLAKE2B aba22b05d6e6fbaa39908d7fd110c95a41edff4a8d9efdea99bfc437c457f66e56e12159a93664b72862ab222b699126eeafb687d03578bf1edcada174bf1536 SHA512 059d5d9d348dd72820c201151a0c65a5656a559a8e2de0cd40ea2d8a37e17aed9eda3172f107dd88b9fa85cecf7a38aa749de76dd45c3e68367015c58ae8afd4
 EBUILD kicad-6.0.6.ebuild 4366 BLAKE2B fa9ccb2ba0a81a5de7c112ae73ef4813b1e33d075f90c1c9347d1f09cdd7b816679da5faa4df8d2cbbbfb17a5595e3adc1cfda2dae62f780b4c6413629305307 SHA512 9ee659dc6d8eb0f2df19193dde25378c678d72124d5fd5953b44c8770a43b20474090ea0a4bbbfeccb2668484826cdb08f7da5f6fc4247bc159f6b4b074d25e9
 EBUILD kicad-6.0.7.ebuild 4374 BLAKE2B 8cdf7dcb17bcc2bc5d6ae231dfea4dc6b663a25e934d774e4946b52af4441ac4edbffcaed8477344cddc56b3171c8a1b35f5d8d27a711423136aaa767741abe7 SHA512 68fa214b4196598359e0457985c8dc5b0181aa7fc71f0a8b26ca8ab0e4da5b114a6bc55cd67b53d8f243fb4d215351ef21c651d593b7c7be471fbded24b50d61
 EBUILD kicad-6.0.9.ebuild 4374 BLAKE2B 8cdf7dcb17bcc2bc5d6ae231dfea4dc6b663a25e934d774e4946b52af4441ac4edbffcaed8477344cddc56b3171c8a1b35f5d8d27a711423136aaa767741abe7 SHA512 68fa214b4196598359e0457985c8dc5b0181aa7fc71f0a8b26ca8ab0e4da5b114a6bc55cd67b53d8f243fb4d215351ef21c651d593b7c7be471fbded24b50d61
 EBUILD kicad-9999.ebuild 4326 BLAKE2B 4d51f9b3335b6c467da37674f3ce1f210638ebd36622e75ee91b5fd68064cde1b01865cbe4eee3c675bf75b33fef9f85f8d08bb83d61161b6c69ee6c7558b3cd SHA512 dcc45f008991468763672db95c93e1e3068664cdb715eb7125cae78858410c4a9487892a0c9890395cca6be39e7030bd54d77f5c69d0a4746ecbbe9150e16628
-MISC metadata.xml 1047 BLAKE2B 03c2a39b8655b0d943da6c4146ff4b1e7fe0f72c0928a202d593d932fca1f78e4445652d10f337aa69a08540c0721ba18e0106a97c482318f527c53978512f47 SHA512 53a68bb971d174c208529b370013b09bedd588c8bb3974b4d0b9c86037e6fdd34d35bdcbcd620277ace3914916e262f086dd47fe56fb29af8bbe05eedb9061d1
+MISC metadata.xml 922 BLAKE2B bfdb3ce1ee74c7b6f2da1a5fbe7835e2114af83b594edabab7b7674000462ee6963acee3bb1f384bed0b4a36b0529aebdab801fe3a482b23e742d9186e7684b2 SHA512 575659f3c5d0fc74469ff14f8abaf58776f1d0ffdd16b85e9f617d3e956d2d0c1c7f70aeebf02aa5c7afadcea0e0a589e6fb16f160b398482524fa7ce592ba4e
diff --git a/sci-electronics/kicad/files/kicad-5.1.5-help.patch b/sci-electronics/kicad/files/kicad-5.1.5-help.patch
deleted file mode 100644
index 1b37e3013c1e..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.5-help.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt
---- kicad-5.1.5-orig/CMakeLists.txt	2019-11-14 09:09:45.000000000 -0800
-+++ kicad-5.1.5/CMakeLists.txt	2019-12-15 03:41:57.574995996 -0800
-@@ -442,6 +442,10 @@
- set( KIFACE_PREFIX  "_" )
- #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX}  KIFACE_PREFIX:${KIFACE_PREFIX}" )
- 
-+# KICAD_HELP is the location of the help files accessed from the UI
-+# (usually provided via kicad-doc package)
-+set ( KICAD_HELP share/doc/kicad
-+    CACHE PATH "Alternative location of KiCad help files.")
- 
- #================================================
- # Locations for install targets.
-diff -Naur kicad-5.1.5-orig/CMakeModules/config.h.cmake kicad-5.1.5/CMakeModules/config.h.cmake
---- kicad-5.1.5-orig/CMakeModules/config.h.cmake	2019-11-14 09:09:45.000000000 -0800
-+++ kicad-5.1.5/CMakeModules/config.h.cmake	2019-12-15 03:42:00.368013375 -0800
-@@ -59,6 +59,10 @@
- /// The install prefix defined during CMake configuration or fall back to CMAKE_INSTALL_PREFIX.
- #define DEFAULT_INSTALL_PATH            "@DEFAULT_INSTALL_PATH@"
- 
-+/// KiCad help files path can be different on some systems allow adding alternative,
-+/// search path for them. Defaults to CMAKE_INSTALL_PREFIX/share/doc/kicad
-+#define KICAD_HELP                       "@KICAD_HELP@"
-+
- /// The wxPython version found during configuration.
- #if defined( KICAD_SCRIPTING_WXPYTHON )
- #define WXPYTHON_VERSION                "@WXPYTHON_VERSION@"
-diff -Naur kicad-5.1.5-orig/common/searchhelpfilefullpath.cpp kicad-5.1.5/common/searchhelpfilefullpath.cpp
---- kicad-5.1.5-orig/common/searchhelpfilefullpath.cpp	2019-11-14 09:09:45.000000000 -0800
-+++ kicad-5.1.5/common/searchhelpfilefullpath.cpp	2019-12-15 03:42:03.168030796 -0800
-@@ -25,7 +25,7 @@
- 
- #include <pgm_base.h>
- #include <common.h>
--#include <config.h>     // to define DEFAULT_INSTALL_PATH
-+#include <config.h>     // to define DEFAULT_INSTALL_PATH and KICAD_HELP
- #include <macros.h>
- #include <trace_helpers.h>
- 
-@@ -69,6 +69,10 @@
-     wxArrayString   subdirs;
-     wxArrayString   altsubdirs;
-     SEARCH_STACK    ss = aSStack;
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+    SEARCH_STACK    altss;
-+    wxArrayString   moresubdirs;
-+#endif
- 
-     // It might already be in aSStack, but why depend on other code
-     // far away when it's so easy to add it again (to our copy) as the first place to look.
-@@ -76,6 +80,7 @@
-     // This is CMAKE_INSTALL_PREFIX unless DEFAULT_INSTALL_PATH was defined during
-     // build configuration:
-     ss.AddPaths( wxT( DEFAULT_INSTALL_PATH ), 0 );
-+    altss.AddPaths( wxT( KICAD_HELP ), 0 );
- 
- #if defined(__WXMAC__)
-     ss.AddPaths( GetOSXKicadMachineDataDir() );
-@@ -104,16 +109,17 @@
- 
-     // Based on kicad-doc.bzr/CMakeLists.txt, line 20, the help files are
-     // installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux.
--    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
-     // Below we account for an international subdirectory.
-     subdirs.Add( "share" );
-     subdirs.Add( "doc" );
-     subdirs.Add( "kicad" );
-     subdirs.Add( "help" );
- 
-+    // For custom help path installations via ${KICAD_HELP}
-+    moresubdirs.Add( "help" );
-+
-     // Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are
-     // installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows.
--    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
-     // Below we account for an international subdirectory.
-     altsubdirs.Add( "doc" );
-     altsubdirs.Add( "help" );
-@@ -159,6 +165,9 @@
-     {
-         subdirs.Add( locale_name_dirs[ii] );
-         altsubdirs.Add( locale_name_dirs[ii] );
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        moresubdirs.Add( locale_name_dirs[ii] );
-+#endif
- 
-         fn = FindFileInSearchPaths( ss, aBaseName + wxT( ".html" ), &altsubdirs );
- 
-@@ -188,8 +197,27 @@
-         if( !fn.IsEmpty() )
-             break;
- 
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".html" ), &moresubdirs );
-+
-+        if( !fn.IsEmpty() )
-+        {
-+            // Prepend URI protocol since we will open in a browser
-+            fn = wxT( "file://" ) + fn;
-+            break;
-+        }
-+
-+        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".pdf" ), &moresubdirs );
-+
-+        if( !fn.IsEmpty() )
-+            break;
-+#endif
-+
-         subdirs.RemoveAt( subdirs.GetCount() - 1 );
-         altsubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        moresubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
-+#endif
-     }
- 
-     return fn;
diff --git a/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch b/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch
deleted file mode 100644
index 1495037b1b72..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt
---- kicad-5.1.5-orig/CMakeLists.txt	2019-11-14 09:09:45.000000000 -0800
-+++ kicad-5.1.5/CMakeLists.txt	2019-11-19 02:08:32.309282631 -0800
-@@ -355,10 +355,10 @@
- 
-     elseif( NOT APPLE )
-         # Thou shalt not link vaporware and tell us it's a valid DSO (apple ld doesn't support it)
--        set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
--        set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
-+        set( CMAKE_SHARED_LINKER_FLAGS "$ENV{LDFLAGS} -Wl,--no-undefined" )
-+        set( CMAKE_MODULE_LINKER_FLAGS "$ENV{LDFLAGS} -Wl,--no-undefined" )
- 
--        set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
-+        set( CMAKE_EXE_LINKER_FLAGS_RELEASE "$ENV{LDFLAGS} -s" )
- 
-         # Defeat ELF's ability to use the GOT to replace locally implemented functions
-         # with ones from another module.
diff --git a/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch b/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch
deleted file mode 100644
index b01a6b7d79f6..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
-index b265e2363..eb1187d86 100644
---- a/eeschema/dialogs/dialog_spice_model.cpp
-+++ b/eeschema/dialogs/dialog_spice_model.cpp
-@@ -34,6 +34,7 @@
- #include <wx/wupdlock.h>
-
- #include <cctype>
-+#include <cstring>
-
- // Helper function to shorten conditions
- static bool empty( const wxTextCtrl* aCtrl )
-@@ -804,9 +804,11 @@ bool DIALOG_SPICE_MODEL::addPwlValue( const wxString& aTime, const wxString& aVa
-     float timeF;
-     m_pwlTime->GetValue().ToDouble( &timeD );
-     timeF = timeD;
-+    long data;
-+    std::memcpy( &data, &timeF, sizeof( timeF ) );
-
-     // Store the time value, so the entries can be sorted
--    m_pwlValList->SetItemData( idx, *reinterpret_cast<long*>( &timeF ) );
-+    m_pwlValList->SetItemData( idx, data );
-
-     // Sort items by timestamp
-     m_pwlValList->SortItems( comparePwlValues, -1 );
diff --git a/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch b/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch
deleted file mode 100644
index 675ff749de8d..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur kicad-5.1.6-orig/CMakeLists.txt kicad-5.1.6/CMakeLists.txt
---- kicad-5.1.6-orig/CMakeLists.txt	2020-05-11 11:27:08.000000000 -0700
-+++ kicad-5.1.6/CMakeLists.txt	2020-05-25 20:45:57.199559075 -0700
-@@ -929,7 +929,7 @@
-     set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime )
-     set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons )
-     set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications )
--    set( UNIX_APPDATA_FILES ${PROJECT_BINARY_DIR}/resources/linux/appdata )
-+    set( UNIX_APPDATA_FILES ${PROJECT_BINARY_DIR}/resources/linux/metainfo )
- 
-     # Install Mime directory
-     install( DIRECTORY ${UNIX_ICON_FILES}
-diff -Naur kicad-5.1.6-orig/CMakeModules/WritePlatformMetadata_linux.cmake kicad-5.1.6/CMakeModules/WritePlatformMetadata_linux.cmake
---- kicad-5.1.6-orig/CMakeModules/WritePlatformMetadata_linux.cmake	2020-05-11 11:27:08.000000000 -0700
-+++ kicad-5.1.6/CMakeModules/WritePlatformMetadata_linux.cmake	2020-05-25 20:54:51.927438936 -0700
-@@ -36,11 +36,11 @@
- string( TIMESTAMP KICAD_CONFIG_TIMESTAMP "%Y-%m-%d" )
- 
- # Configure the KiCad appdata file
--configure_file( ${PROJECT_SOURCE_DIR}/resources/linux/appdata/kicad.appdata.xml.in
--                ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml
-+configure_file( ${PROJECT_SOURCE_DIR}/resources/linux/metainfo/kicad.appdata.xml.in
-+                ${PROJECT_BINARY_DIR}/resources/linux/metainfo/kicad.appdata.xml
-                 @ONLY )
- 
- # Ensure the file was configured successfully
--if( NOT EXISTS ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml )
-+if( NOT EXISTS ${PROJECT_BINARY_DIR}/resources/linux/metainfo/kicad.appdata.xml )
-     message( FATAL_ERROR "Configuration failed to write file kicad.appdata.xml." )
- endif()
diff --git a/sci-electronics/kicad/kicad-5.1.12-r3.ebuild b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
deleted file mode 100644
index 7c3cfe6697f1..000000000000
--- a/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_9 )
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="https://www.kicad.org"
-SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples github ngspice +occ openmp +python"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
-COMMON_DEPEND="
-	dev-libs/boost:=[context,nls]
-	media-libs/freeglut
-	media-libs/glew:0=
-	>=media-libs/glm-0.9.9.1
-	media-libs/mesa[X(+)]
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	github? ( net-misc/curl:=[ssl] )
-	ngspice? (
-		>sci-electronics/ngspice-27[shared]
-	)
-	occ? ( <sci-libs/opencascade-7.5.3:0=[vtk(+)] )
-	python? (
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
-			dev-python/wxpython:4.0[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	python? ( >=dev-lang/swig-3.0:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-CHECKREQS_DISK_BUILD="800M"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.5-help.patch"
-	"${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch"
-	"${FILESDIR}/${PN}-5.1.6-metainfo.patch"
-	"${FILESDIR}/${PN}-5.1.5-ldflags.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	default_src_unpack
-	# For the metainfo patch to work the kicad.appdata.xml has to be moved to
-	# avoid QA issue.  This is needed because /usr/share/appdata location is
-	# deprecated, it should not be used anymore by new software.
-	# Appdata/Metainfo files should be installed into /usr/share/metainfo
-	# directory. as per
-	# https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
-	mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || die "Appdata move failed"
-}
-
-src_prepare() {
-	# Fix OpenCASCADE lookup
-	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
-		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
-		-i CMakeModules/FindOpenCASCADE.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
-		-DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-		-DBUILD_GITHUB_PLUGIN="$(usex github)"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
-		-DKICAD_SCRIPTING_PYTHON3="$(usex python)"
-		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
-		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_USE_OCC="$(usex occ)"
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-		-DCMAKE_SKIP_RPATH="ON"
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	if use occ; then
-		mycmakeargs+=(
-			-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-			-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile dev-docs doxygen-docs
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
-	fi
-}
-
-src_test() {
-	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
-	ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die
-
-	default
-}
-
-pkg_postinst() {
-	optfeature "Component symbols library" sci-electronics/kicad-symbols
-	optfeature "Component footprints library" sci-electronics/kicad-footprints
-	optfeature "3D models of components " sci-electronics/kicad-packages3d
-	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
-	optfeature "Extended documentation" app-doc/kicad-doc
-	optfeature "Creating 3D models of components" media-gfx/wings
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index a75b4ff9ecf1..36c0a94d2d79 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -10,10 +10,8 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="github">Add github support into PCB editor</flag>
 		<flag name="ngspice">Enable circuit simulation</flag>
 		<flag name="occ">Enable viewing 3D rendering of designs via <pkg>sci-libs/opencascade</pkg></flag>
-		<flag name="python">Enable python scripting support</flag>
 		<flag name="pcm">Enable plugin content manager</flag>
 	</use>
 	<longdescription>
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7139e2593dd7..56fd1a32f2b8 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/libgenome/Manifest b/sci-libs/libgenome/Manifest
deleted file mode 100644
index 4b091a7a0ea6..000000000000
--- a/sci-libs/libgenome/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libgenome-1.3-fix-c++14.patch 979 BLAKE2B 84f2affdaabd36923b92dd9cb91d90b6626845a44acfd1d79fa39f0f46803386b645b608d67515a02603de7771e5ad7bcca7c89e278235758e368de70e34f130 SHA512 9b527401e9d3708adbf5c97727a6c337d776c2a8b097644dc732192e114cfa679413975007aa1c9e2814c27a3617e1e6bb1fc23e6bae30ac146fde1fac6ec6bd
-DIST libgenome-1.3-r1.tar.bz2 128503 BLAKE2B d64784f8b220fa5bf32a4e22b8884755e38ce03fa9d17fc11cd79dfe662051f5518852631bd5a081ab52f0139434d5571d0dde49ae873297cb52a9153949e478 SHA512 0fd1895d9ea1ac75e4efaeae9abd5241193dba17f91426a5be7b244331ac7939c37d51bb08f8378d64a96573ad38b39e2583a928aadf9421e8b5c17fe217dfd4
-EBUILD libgenome-1.3-r1.ebuild 692 BLAKE2B 60760d10a46118af2bfdf2ee4e7d75483948368bd34c89abeae9710206e0f3b9fde1b0970e1f10318b9c37b3a6560855cbb593360d16a618a02299a4fbf6ad2f SHA512 e8a0eda85242af55698bb84d442926293886424af20640b78807aa7ac3aef58358aba4ff83351b456b7fa7262a68618a053eb52649fcd4f57681a4e59d8e6912
-MISC metadata.xml 262 BLAKE2B adaacf2ac22ce09f8b1b68f538773c1e2101156181ff302eca2ce1280ee5d45db4eb302a8eee1bbead5e55942443dd16ef924cfbfdc95a1658dc6a9f460468a2 SHA512 ac924b6b530d96645f173d40f7a2bf0e3abbf49048ebf7fadcea3dd553cd25504f0e68a103395de1fb59a2e5e11497dcead601be01cc6f0295ccbc4155f67e3f
diff --git a/sci-libs/libgenome/files/libgenome-1.3-fix-c++14.patch b/sci-libs/libgenome/files/libgenome-1.3-fix-c++14.patch
deleted file mode 100644
index ffe30ef91fa2..000000000000
--- a/sci-libs/libgenome/files/libgenome-1.3-fix-c++14.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix building with C++14, which errors out due to collisions with internal abs() function.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594372
- 
---- a/libGenome/gnDefs.h
-+++ b/libGenome/gnDefs.h
-@@ -175,13 +175,6 @@
- 

- #define CONTIG_SECTION_SIZE 3

- 

--// some compilers don't have abs() for 64 bit ints

--#if (defined(__GNUG__) && ( __GNUC__ <= 2 )) || defined(__INTEL_COMPILER) || (defined _MSC_VER && defined __cplusplus)

--

--int64 abs( int64 a );

--

--#endif

--

- #ifdef __cplusplus

- namespace genome {

- #endif

---- a/libGenome/Makefile.am
-+++ b/libGenome/Makefile.am
-@@ -29,7 +29,7 @@
- gnGenomeSpec.cpp  gnLocation.cpp  \
- gnRAWSource.cpp gnBaseFeature.cpp gnSEQSource.cpp gnSequence.cpp \
- gnContigSpec.cpp gnSourceHeader.cpp gnException.cpp \
--gnFastTranslator.cpp gnPosSpecificTranslator.cpp gnDefs.cpp
-+gnFastTranslator.cpp gnPosSpecificTranslator.cpp
- 
- library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)
- 
diff --git a/sci-libs/libgenome/libgenome-1.3-r1.ebuild b/sci-libs/libgenome/libgenome-1.3-r1.ebuild
deleted file mode 100644
index 03f05c029ad0..000000000000
--- a/sci-libs/libgenome/libgenome-1.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Library for sci-biology/mauve"
-HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
-SRC_URI="mirror://gentoo/${PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc static-libs"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${PN}-1.3-fix-c++14.patch" )
-
-src_prepare() {
-	default
-	rm libGenome/gnDefs.cpp || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libgenome/metadata.xml b/sci-libs/libgenome/metadata.xml
deleted file mode 100644
index bdabd1d83788..000000000000
--- a/sci-libs/libgenome/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-biology@gentoo.org</email>
-		<name>Gentoo Biology Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sci-libs/libmems/Manifest b/sci-libs/libmems/Manifest
deleted file mode 100644
index 000a9af685b1..000000000000
--- a/sci-libs/libmems/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX libmems-1.6_p1-boost-1.62-type-traits.patch 537 BLAKE2B f8c8e5d84c2eadd220a4a065495d9cfd7d66817a564cba6a31ff73e5ae88fe952ad149f37cb69abf2b90355596a202ab71eea8f1592f3a529af191632aafcd88 SHA512 6f3cd95004fb5a8a8f9649593029ed313b9dde368a8f9c72fed8374ca913303442f6e47519a3163b6a05b4306be888dde1201f51ffb1b244bdd7eebbf5fb2f33
-AUX libmems-1.6_p1-boost.patch 4223 BLAKE2B d99dc901ab209fcebd5fd19373177f1e9d81d8c5b6b174f8f31cab7be0e46cbd3aa31e09c04cab40000ca0a5bea6932d193950cc9e6795e68e4e231bb1a5cbbd SHA512 296d0149d83e7fe87973088febe8a47e7e71f40379a8c9acb980264a7966dc43bed331326f86cab11cfd968192075ebcf684feb4998aa8b12ed5eaf2875de709
-AUX libmems-1.6_p1-broken-constness.patch 803 BLAKE2B 8622a4dcec47f4322a97f6122243fc87c4938a991188fa27f58d9bc5a0a57b7794b32eb856458e4c63ede63abfa978cce1b13e243f538adcdeffc088e7498929 SHA512 dc4234972789412af2833ae2f3741a9e4ef309e34bc55e28b08d08f5d9a3fb973d0885ac0e88ff44a9d5ec4cfe474cf5f85656f1fe50fb34d5679e849c32e67b
-AUX libmems-1.6_p1-build.patch 844 BLAKE2B e75e882f7bb3be40815dcfeb11a3849b6a5abf45aa92ec10c6d609cb22de1bf41191d833f198b1cf1d1ef4360ccc5b65707a42327122af17087afce89472b9d9 SHA512 cb333dbe99dd03ad563b218c2b553735012ff5ce8d841e4ee56138253ab4cc33a5ab4521df2c51c99620c3b0a1e9ab976f4994c9b707b557c8979c6fb237bbde
-AUX libmems-1.6_p1-fix-c++14.patch 715 BLAKE2B 23496cf231ae7bb7ce6eda9d5c465ec02a838293dd846d625ac0e943e461fa0eb1f7293330d74bf7ecc49e55acecb039ba3627fa9f331f8bc4dba8e6926e2781 SHA512 e298d0badcc0b84e291e60a450e90c343ea76ffc201d8bd09c5f70264cac3532507659eb940927586171e2ee753972c1cb09b71d7c1a5bfe2ba8ce4ea0f1e570
-AUX libmems-1.6_p1-format-security.patch 547 BLAKE2B fed9a7684dda9f4f5b6b7e46b3810ec4cdad614d70dea3f7644927749a6abd53f613e6d377717460f74ac838ea9e29255a70a7e966abe153ea0cbda33e723e77 SHA512 5f441833249dd3b0ebed17bd16d5ad5f0bdae777025b3432fb2a9e527ac9edd410239ee2ab02fca2f24125dca2c0c64ebda15fb03d59b65b238f5d1d65ff6629
-AUX libmems-1.6_p1-gcc-4.7.patch 2220 BLAKE2B d0f3db3808318b4ce5c6e6d531b062faee403ade57046fe112471eeda05317853e6dfc0faf61ce88f922d1c4c9a5cdcfb95bb6044048bcb97fc6ad388dd75dac SHA512 685c24779b00c18b08b2d548d03c2412d502dcacc0e14a64ab44c14406293265fb96a33041a7b13d96132cf6372bf8e2a7a0402606055084c1fb37d92dbfa77b
-DIST libmems-1.6_p1.tar.xz 226628 BLAKE2B 6410f8e0dc40855ce7a09127f4aa70face9007d5edbe424d595d8607a341137d8892008c5e6d9a37cbed05158d04b7d5a5ff5f02ba441b90cb30cbea2d21c88a SHA512 c6336f69b767bba010617deb2de9bb8fbbbaf516de3b1d293b062c76c6a763166080badd730938c6d849602d64a968edb6d4622b5d3e7ea7a6d8bc38164d3d73
-EBUILD libmems-1.6_p1-r3.ebuild 1082 BLAKE2B f83cd716c866a2ff953e1a85e58c5408c3a01f2e0e8e0c9dce245dfc13ddb543cfe16572d1eee47db3c6291f2aabc9dd1ed9884752fd1097810c366bb6e5be63 SHA512 820172885a2b88725d7745e0efbac43be50ef18968ddf824b8c245b9178f1bde7d72609daf9bfbcbdde467b955cdff3a8e8224da4df93d3a30d5f1737a9442ce
-EBUILD libmems-9999.ebuild 553 BLAKE2B f80afb98ed438e587556988fe894850c582039a19e9bcde9f89c8da70bffc1dd074f18642a52f495928653e4c40a8173df002bc742021e268055c0b7bd9ab63d SHA512 dac9d6144d57e4cc04d2ea8f4cd7390dd979b622f4633bf6583c1922d15a5aead4be577697deccd2ab57102d682f3ee37f0c310676c350496450aad9a035de38
-MISC metadata.xml 262 BLAKE2B adaacf2ac22ce09f8b1b68f538773c1e2101156181ff302eca2ce1280ee5d45db4eb302a8eee1bbead5e55942443dd16ef924cfbfdc95a1658dc6a9f460468a2 SHA512 ac924b6b530d96645f173d40f7a2bf0e3abbf49048ebf7fadcea3dd553cd25504f0e68a103395de1fb59a2e5e11497dcead601be01cc6f0295ccbc4155f67e3f
diff --git a/sci-libs/libmems/files/libmems-1.6_p1-boost-1.62-type-traits.patch b/sci-libs/libmems/files/libmems-1.6_p1-boost-1.62-type-traits.patch
deleted file mode 100644
index 609d0de0c478..000000000000
--- a/sci-libs/libmems/files/libmems-1.6_p1-boost-1.62-type-traits.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Shuffle around Boost type_traits, which otherwise causes issues with boost 1.62.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=595986
-
---- a/libMems/AbstractMatch.h
-+++ b/libMems/AbstractMatch.h
-@@ -16,8 +16,7 @@
- #include "libGenome/gnClone.h"

- #include <vector>

- #include <algorithm>

--#include <boost/type_traits/remove_pointer.hpp>

--#include <boost/type_traits/add_pointer.hpp>

-+#include <boost/type_traits.hpp>

- #include <boost/dynamic_bitset.hpp>

- #include <libMems/SlotAllocator.h>

- #include <libMems/configuration.h>

diff --git a/sci-libs/libmems/files/libmems-1.6_p1-boost.patch b/sci-libs/libmems/files/libmems-1.6_p1-boost.patch
deleted file mode 100644
index 4f0c775a6d9c..000000000000
--- a/sci-libs/libmems/files/libmems-1.6_p1-boost.patch
+++ /dev/null
@@ -1,120 +0,0 @@
- libMems/Backbone.cpp           |  2 +-
- libMems/Files.h                | 64 +++++++++++++++++++++---------------------
- libMems/ProgressiveAligner.cpp |  2 +-
- 3 files changed, 34 insertions(+), 34 deletions(-)
-
-diff --git a/libMems/Backbone.cpp b/libMems/Backbone.cpp
-index 86698a9..0025cd8 100644
---- a/libMems/Backbone.cpp
-+++ b/libMems/Backbone.cpp
-@@ -15,7 +15,7 @@
- #include "libMems/Islands.h"

- #include "libMems/CompactGappedAlignment.h"

- 

--#include <boost/property_map.hpp>

-+#include <boost/property_map/property_map.hpp>

- #include <boost/graph/graph_traits.hpp>

- #include <boost/graph/adjacency_list.hpp>

- #include <boost/graph/topological_sort.hpp>

-diff --git a/libMems/Files.h b/libMems/Files.h
-index 8d6e9be..8191065 100644
---- a/libMems/Files.h
-+++ b/libMems/Files.h
-@@ -22,44 +22,44 @@
- 
- #include "boost/filesystem/operations.hpp"
- #include "boost/filesystem/exception.hpp"
--#include "boost/algorithm/string.hpp"

-+#include "boost/algorithm/string.hpp"
- #include <string>
- #include <sstream>
- #include <iostream>
- #include <iomanip>
- 
- 
--/**

-- * Register a file name to be deleted before the process exits

-- * When passed an empty string, it does not add to the list of files to delete

-- * @param fname	The name of a file to delete, empty strings are ignored

-- * @return A vector of file names registered for deletion

-- */

--std::vector< std::string >& registerFileToDelete( std::string fname = "" );

--

--inline

--std::vector< std::string >& registerFileToDelete( std::string fname ) {

--	// since this vector is needed when atexit() is called we allocate it

--	// on the heap so its destructor won't get called

--	static std::vector< std::string >* files = new std::vector< std::string >();

--#pragma omp critical

--{

--	if( fname != "" )

--		files->push_back( fname );

--}

--	return *files;

--}

-+/**
-+ * Register a file name to be deleted before the process exits
-+ * When passed an empty string, it does not add to the list of files to delete
-+ * @param fname	The name of a file to delete, empty strings are ignored
-+ * @return A vector of file names registered for deletion
-+ */
-+std::vector< std::string >& registerFileToDelete( std::string fname = "" );
- 
--void deleteRegisteredFiles();

--inline

--void deleteRegisteredFiles() {

--	// don't be a slob, clean up after yourself:

--	// delete any files that are laying around

--	std::vector< std::string >& del_files = registerFileToDelete();

--	for( int fileI = 0; fileI < del_files.size(); fileI++ )

--		boost::filesystem::remove( del_files[ fileI ] );

--	del_files.clear();	// clear the deleted files from the list

--}

-+inline
-+std::vector< std::string >& registerFileToDelete( std::string fname ) {
-+	// since this vector is needed when atexit() is called we allocate it
-+	// on the heap so its destructor won't get called
-+	static std::vector< std::string >* files = new std::vector< std::string >();
-+#pragma omp critical
-+{
-+	if( fname != "" )
-+		files->push_back( fname );
-+}
-+	return *files;
-+}
-+
-+void deleteRegisteredFiles();
-+inline
-+void deleteRegisteredFiles() {
-+	// don't be a slob, clean up after yourself:
-+	// delete any files that are laying around
-+	std::vector< std::string >& del_files = registerFileToDelete();
-+	for( int fileI = 0; fileI < del_files.size(); fileI++ )
-+		boost::filesystem::remove( del_files[ fileI ] );
-+	del_files.clear();	// clear the deleted files from the list
-+}
- 
- 
- /**
-@@ -80,7 +80,7 @@ std::string CreateTempFileName(const std::string& prefix)
- #endif
-         boost::filesystem::path path( prefix );
-         dir = path.branch_path().string();
--        name = path.leaf();
-+        name = path.filename().string();
-         if( name == "/" )
-         {
-                 dir += name;
-diff --git a/libMems/ProgressiveAligner.cpp b/libMems/ProgressiveAligner.cpp
-index 3be5fe0..5667a9e 100644
---- a/libMems/ProgressiveAligner.cpp
-+++ b/libMems/ProgressiveAligner.cpp
-@@ -27,7 +27,7 @@
- 

- #include <boost/dynamic_bitset.hpp>

- #include <boost/tuple/tuple.hpp>

--#include <boost/property_map.hpp>

-+#include <boost/property_map/property_map.hpp>

- #include <boost/graph/graph_traits.hpp>

- #include <boost/graph/adjacency_list.hpp>

- #include <boost/graph/johnson_all_pairs_shortest.hpp>

diff --git a/sci-libs/libmems/files/libmems-1.6_p1-broken-constness.patch b/sci-libs/libmems/files/libmems-1.6_p1-broken-constness.patch
deleted file mode 100644
index 0bd922c9e111..000000000000
--- a/sci-libs/libmems/files/libmems-1.6_p1-broken-constness.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix bug 529770 caused by non-const copy constructor.
-
---- libmems-1.6_p1/libMems/Aligner.cpp
-+++ libmems-1.6_p1/libMems/Aligner.cpp
-@@ -939,7 +939,7 @@
- 	MatchLeftEndComparator( unsigned seq = 0 ){

- 		m_seq = seq;

- 	}

--	MatchLeftEndComparator( MatchLeftEndComparator& msc ){

-+	MatchLeftEndComparator( const MatchLeftEndComparator& msc ){

- 		m_seq = msc.m_seq;

- 	}

- 	// TODO??  make this do a wraparound comparison if all is equal?

---- libmems-1.6_p1/libMems/Aligner.h
-+++ libmems-1.6_p1/libMems/Aligner.h
-@@ -49,7 +49,7 @@
- 	LabeledMemComparator( uint seq ){

- 		m_seq = seq;

- 	}

--	LabeledMemComparator( LabeledMemComparator& lmc ){

-+	LabeledMemComparator( const LabeledMemComparator& lmc ){

- 		m_seq = lmc.m_seq;

- 	}

- 	boolean operator()(const LabeledMem& a, const LabeledMem& b) const{

diff --git a/sci-libs/libmems/files/libmems-1.6_p1-build.patch b/sci-libs/libmems/files/libmems-1.6_p1-build.patch
deleted file mode 100644
index 04d5dd9c82ac..000000000000
--- a/sci-libs/libmems/files/libmems-1.6_p1-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- libMems/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libMems/Makefile.am b/libMems/Makefile.am
-index 6101f71..d66053d 100644
---- a/libMems/Makefile.am
-+++ b/libMems/Makefile.am
-@@ -2,10 +2,10 @@
- if DEBUG
- D_CXXFLAGS = -Wall -g -D__GNDEBUG__
- endif
--OPTIMIZATION = -O2 -Wall -funroll-loops -fomit-frame-pointer -ftree-vectorize 
- AM_CFLAGS = $(OPTIMIZATION) @DEPS_CFLAGS@ -DUSE_POSIX_AIO @OPENMP_CFLAGS@
- AM_CXXFLAGS = $(OPTIMIZATION) @DEPS_CFLAGS@ @BOOST_CPPFLAGS@ $(D_CXXFLAGS) @EXTRA_CXX_FLAGS@ @OPENMP_CXXFLAGS@ 
- AM_LDFLAGS = $(OPTIMIZATION)
-+AM_CPPFLAGS=-I$(top_srcdir)
- 
- LIBMEMS_H = \
- RepeatHash.h      MatchHashEntry.h \
---- a/libMems/dmSML/util.c
-+++ b/libMems/dmSML/util.c
-@@ -2,6 +2,7 @@
- #include "config.h"
- #endif
- 
-+#include <stdlib.h>
- #include <stdio.h>
- #include "libMems/dmSML/util.h"
- 
diff --git a/sci-libs/libmems/files/libmems-1.6_p1-fix-c++14.patch b/sci-libs/libmems/files/libmems-1.6_p1-fix-c++14.patch
deleted file mode 100644
index bde8efeb4c9c..000000000000
--- a/sci-libs/libmems/files/libmems-1.6_p1-fix-c++14.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Correct compilation with g++-6
-Author: Gert Wollny <gw.fossdev@gmail.com>
-Bug-Debian: https://bugs.debian.org/811870
-Forwarded: yes
-Bug: https://sourceforge.net/p/mauve/bugs/46/
-Last-Update: 2016-06-30
-
---- a/libMems/ProgressiveAligner.cpp
-+++ b/libMems/ProgressiveAligner.cpp
-@@ -1599,7 +1599,7 @@
- 		c.SetLeftEnd(child_1, ancestral_matches[mI]->LeftEnd(1));

- 		c.SetOrientation(child_1, ancestral_matches[mI]->Orientation(1));

- 		c.SetLength(ancestral_matches[mI]->Length(1), child_1);

--		cga_list.push_back(make_tuple(c.Copy(), &bs[mI], ancestral_matches[mI]));

-+		cga_list.push_back(boost::tuples::make_tuple(c.Copy(), &bs[mI], ancestral_matches[mI]));

- 	}

- 

- 	stack<node_id_t> node_stack;

diff --git a/sci-libs/libmems/files/libmems-1.6_p1-format-security.patch b/sci-libs/libmems/files/libmems-1.6_p1-format-security.patch
deleted file mode 100644
index 3ad3da2a8d80..000000000000
--- a/sci-libs/libmems/files/libmems-1.6_p1-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- libMems/dmSML/dmsort.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libMems/dmSML/dmsort.c b/libMems/dmSML/dmsort.c
-index 4c99215..2cbfa7e 100644
---- a/libMems/dmSML/dmsort.c
-+++ b/libMems/dmSML/dmsort.c
-@@ -825,7 +825,7 @@ int InitdmSML( long working_mb, long buffer_size, const char* input_filename, co
- 		if ( fgets(buf, sizeof(buf), fp) )
- 		{
- 			sscanf(buf, "MemTotal: %ld kB", &memTotal);
--			fprintf( stderr, buf );
-+			fprintf( stderr, "%s", buf );
- 		}
- 		fclose(fp);
- 		// allocate about 6/10 of physical memory
diff --git a/sci-libs/libmems/files/libmems-1.6_p1-gcc-4.7.patch b/sci-libs/libmems/files/libmems-1.6_p1-gcc-4.7.patch
deleted file mode 100644
index ec620ebb35aa..000000000000
--- a/sci-libs/libmems/files/libmems-1.6_p1-gcc-4.7.patch
+++ /dev/null
@@ -1,71 +0,0 @@
- libMems/CompactGappedAlignment.h | 36 ++++++++++++++++++------------------
- 1 file changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/libMems/CompactGappedAlignment.h b/libMems/CompactGappedAlignment.h
-index bf78477..942d4aa 100644
---- a/libMems/CompactGappedAlignment.h
-+++ b/libMems/CompactGappedAlignment.h
-@@ -13,7 +13,7 @@
- #include "config.h"

- #endif

- 

--#include "libGenome/gnDebug.h"
-+#include "libGenome/gnDebug.h"

- #include "libGenome/gnFilter.h"

- #include "libGenome/gnSequence.h"

- #include "libMems/SparseAbstractMatch.h"

-@@ -103,15 +103,15 @@ public:
- 	/** Eliminates any columns that contain only gap characters */

- 	void CondenseGapColumns();

- 

--	void swap( CompactGappedAlignment& other ){ swap(&other); }
--
--protected:
--	// for use by derived classes in order to swap contents
--	void swap( CompactGappedAlignment* other ){
--		std::swap( align_matrix, other->align_matrix );
--		std::swap( bcount, other->bcount );
--		BaseType::swap( other );
--	}
-+	void swap( CompactGappedAlignment& other ){ swap(&other); }

-+

-+protected:

-+	// for use by derived classes in order to swap contents

-+	void swap( CompactGappedAlignment* other ){

-+		std::swap( align_matrix, other->align_matrix );

-+		std::swap( bcount, other->bcount );

-+		BaseType::swap( other );

-+	}

- 

- 	std::vector< bitset_t > align_matrix;		/**< aligned positions have true values, gaps are false */

- 	std::vector< std::vector< size_t > > bcount;

-@@ -572,7 +572,7 @@ void CompactGappedAlignment<BaseType>::CropEnd(gnSeqI crop_amount){
- 			this->SetStart(i, 0);

- 		}

- 	}

--	SetAlignmentLength( this->AlignmentLength() - crop_amount );

-+	this->SetAlignmentLength( this->AlignmentLength() - crop_amount );

- 	this->create_bitcount();

- 	if( !this->validate() )

- 		std::cerr << "CropEnd error\n";

-@@ -806,13 +806,13 @@ void CompactGappedAlignment<BaseType>::CondenseGapColumns()
- 

- }

- 

--namespace std {
--template<> inline
--void swap( mems::CompactGappedAlignment<>& a, mems::CompactGappedAlignment<>& b )
--{
--	a.swap(b);
--}
--}
-+namespace std {

-+template<> inline

-+void swap( mems::CompactGappedAlignment<>& a, mems::CompactGappedAlignment<>& b )

-+{

-+	a.swap(b);

-+}

-+}

- 

- 

- #endif // __CompactGappedAlignment_h__

diff --git a/sci-libs/libmems/libmems-1.6_p1-r3.ebuild b/sci-libs/libmems/libmems-1.6_p1-r3.ebuild
deleted file mode 100644
index 513fd1f3af61..000000000000
--- a/sci-libs/libmems/libmems-1.6_p1-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Library for sci-biology/mauve"
-HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="doc static-libs"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/boost:=
-	sci-libs/libgenome
-	sci-libs/libmuscle"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-boost.patch
-	"${FILESDIR}"/${P}-gcc-4.7.patch
-	"${FILESDIR}"/${P}-broken-constness.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-	"${FILESDIR}"/${P}-boost-1.62-type-traits.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen doxygen.am || die
-		HTML_DOCS+=( html/. )
-	fi
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libmems/libmems-9999.ebuild b/sci-libs/libmems/libmems-9999.ebuild
deleted file mode 100644
index 782686270355..000000000000
--- a/sci-libs/libmems/libmems-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools subversion
-
-DESCRIPTION="Library for sci-biology/mauve"
-HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
-SRC_URI=""
-ESVN_REPO_URI="https://svn.code.sf.net/p/mauve/code/libMems/trunk"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="doc"
-KEYWORDS=""
-
-CDEPEND="
-	dev-libs/boost
-	sci-libs/libgenome
-	sci-libs/libmuscle"
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sci-libs/libmems/metadata.xml b/sci-libs/libmems/metadata.xml
deleted file mode 100644
index bdabd1d83788..000000000000
--- a/sci-libs/libmems/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-biology@gentoo.org</email>
-		<name>Gentoo Biology Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 36af4a808631..172e17cf2ce5 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -12,11 +12,9 @@ AUX opencascade-7.7.0-avoid-pre-stripping-binaries.patch 1357 BLAKE2B 2f26c4a4e4
 AUX opencascade-7.7.0-build-against-vtk-9.2.patch 1360 BLAKE2B 39bcae904286687ff2aca6662f18d67e72a341e98281b0b04b7b302ad9d0adfa576ad82ce3cfa646e1b9f4107580231bf8613d0cdb72791fda478485c8072827 SHA512 3afb471767b78b4096e00a8eab4c71a90944c70945a16f45ac372ab824c4c6a140c165882e7cb15c95c95d70ae4c9298cc03fc7cd4ebe920bb7ed4eb38aba0a5
 AUX opencascade-7.7.0-fix-installation-of-cmake-config-files.patch 1823 BLAKE2B e84bb8627ba5cee166c483631511d150ef9af2c1aa966d7154926600da0674214b3fce8363dcff7d94204c36a92f236ede0f7849039a3bd4509d04d91444204f SHA512 242604d59b3596644b1efa95ce9d7b3d30dbb1bd49f79e28a4ea66ac9b6d4728a32cf31ceb9078875a39bb7b8775ba3ce685560045684b803037a61e2f37d2a4
 AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019
-DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
 DIST opencascade-7.6.3.tar.gz 48216090 BLAKE2B ff0b63250e77b0240bd99bba38cd0e6b0a8c88bf39e495f5d51d7913f097e2cad83a5ad121e9d56de11c74008249c99a41f4615269a085b7cf97c3d7f0477d6d SHA512 c708f76edb707ba18bdfe7442ed8fa500894ee6c1cd8d0313eb906b3aa7dfa40a575f04dbccd70e84395d670f2b93fb8529f3d59726449234e627b9f35b9dded
 DIST opencascade-7.7.0.tar.gz 48393806 BLAKE2B b41da7bdd07aa6ef52f7833bef3e8a9fc2ca16cbf754773cb7adcc059c11c2a7937d279a2b6cf3096e7af6fbb42c6fdc2a5c98340d6b084d2ba100ba2c538f2a SHA512 6c90e2761f752241417ae6f18d819f51e66b32f3a50a97384f29ed73fa07f4cded84c71a6f6ba302d5e35c57e2fc13001619521eaf45757e4e5ff670d94bbf5c
-EBUILD opencascade-7.5.2-r6.ebuild 4944 BLAKE2B 7478866b004cdb0e8a29b0341646e367dda0637b06ef844e159c5e10449d45a62a79f37cf4386a709a082c4b002db7623de7f75f72a8b0c50a031d1e248c7bed SHA512 dd8bf6a0c7d60e9e1cd20b88805e7106f552f773c736df619885479319d81ee54de6a793e56d6189836421e0ba454d1e780294961760ca9914c25a032959830c
 EBUILD opencascade-7.5.3-r8.ebuild 4977 BLAKE2B 09303b0bd2784d3db5eb2ed08f6cfa961a3a520a415612fd85e17d378bdf8783e57d8aa5400f8667fd73f21e272818e1e30def087dee9f88c5fd961e9b372a46 SHA512 1a3b1c38a9c7a3a04360261e995994c762389512aac0cd82687c08f7beb6491350d768d5343b54b83460538e663788bf5e00b503936f5364b3296a20039da935
 EBUILD opencascade-7.6.3-r1.ebuild 4685 BLAKE2B 5351fbd25c858e42f36e1fed3cbb39d22b2e06d0ffe41b69c97239dc27924b2bcb976deac5e33921fe2db8ef0a455d07077181429c4aa81ba800e95050180d7f SHA512 796036d3a0c6d24e5ecd3a3d81df64565f22aed96feaac0ceafad8cf8eb2e8914d64a3cd81c9856d042cd281ab166114e448580fd023f09e76b4f06a56d7a23b
 EBUILD opencascade-7.7.0-r1.ebuild 4808 BLAKE2B 233a0b6b837b0099935ec1cc87c33f9d54eb622a926a29066ff166c8ea064eb86a316f2cc10d148661f5944d988e6222afc4d5bd1d72fff105727f194624e733 SHA512 ac5969f42da17f2fc2965785b420c41831fd46060b42f761f11f67a1c5fe81c0496da994d2dc222dc39168cf3bd38bae887b7c1a3f6cbe6fdb146c1ea94a25da
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
deleted file mode 100644
index f2acaba15e74..000000000000
--- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-MY_PV="$(ver_rs 1- '_')"
-PV_MAJ="$(ver_cut 1-2)"
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="https://www.opencascade.com"
-SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="0/${PV_MAJ}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk"
-
-REQUIRED_USE="?? ( optimize tbb )"
-
-# There's no easy way to test. Testing needs a rather big environment
-# properly set up.
-RESTRICT="test"
-
-# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
-RDEPEND="
-	!app-eselect/eselect-opencascade
-	dev-lang/tcl:=
-	dev-lang/tk:=
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	dev-tcltk/tix
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/ftgl
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu
-	examples? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	freeimage? ( media-libs/freeimage )
-	tbb? ( <dev-cpp/tbb-2021.4.0 )
-	vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-cpp/eigen
-	dev-libs/rapidjson
-	doc? ( app-doc/doxygen )
-	examples? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
-	"${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
-	"${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
-	"${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
-	"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
-	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
-	"${FILESDIR}"/${PN}-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
-	"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	use debug && append-cppflags -DDEBUG
-
-	sed -e 's|/lib\$|/'$(get_libdir)'\$|' \
-		-i adm/templates/OpenCASCADEConfig.cmake.in || die
-
-	# There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
-	# assumptions it makes about installation paths. Rather than fixing it, just
-	# get rid of the mechanism altogether - its purpose is to allow a
-	# side-by-side installation of release and debug libraries.
-	sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
-		-i adm/cmake/occt_toolkit.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOC_Overview=$(usex doc)
-		-DBUILD_Inspector=$(usex examples)
-		-DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916
-
-		-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
-		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
-		-DINSTALL_DIR_DATA="share/${PN}/data"
-		-DINSTALL_DIR_DOC="share/doc/${PF}"
-		-DINSTALL_DIR_INCLUDE="include/${PN}"
-		-DINSTALL_DIR_LIB="$(get_libdir)/${PN}"
-		-DINSTALL_DIR_RESOURCE="share/${PN}/resources"
-		-DINSTALL_DIR_SAMPLES="share/${PN}/samples"
-		-DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin"
-		-DINSTALL_DIR_WITH_VERSION=OFF
-		-DINSTALL_SAMPLES=$(usex examples)
-		-DINSTALL_TEST_CASES=NO
-
-		-DUSE_D3D=NO
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FREEIMAGE=$(usex freeimage)
-		-DUSE_FREETYPE=ON
-		-DUSE_GLES2=$(usex gles2-only)
-		-DUSE_RAPIDJSON=$(usex json)
-		-DUSE_TBB=$(usex tbb)
-		-DUSE_VTK=$(usex vtk)
-	)
-
-	use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-
-	if use examples; then
-		mycmakeargs+=(
-			-D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
-			-DBUILD_SAMPLES_QT=ON
-		)
-	fi
-
-	if use vtk; then
-		if has_version ">=sci-libs/vtk-9.1.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
-		elif has_version ">=sci-libs/vtk-9.0.0"; then
-			mycmakeargs+=(
-				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0
-				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
-			)
-		fi
-	fi
-
-	cmake_src_configure
-
-	# prepare /etc/env.d file
-	sed -e "s|lib/|$(get_libdir)/|" \
-		-e "s|VAR_CASROOT|${EPREFIX}/usr|" \
-		< "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die
-
-	# use TBB for memory allocation optimizations
-	if use tbb; then
-		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die
-	fi
-
-	# use internal optimized memory manager and don't clear memory with this
-	# memory manager.
-	if use optimize ; then
-		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
-			-e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
-			-i "${T}"/99${PN} || die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	doenvd "${T}/99${PN}"
-
-	# remove examples
-	if use !examples; then
-		rm -r "${ED}/usr/share/${PN}/samples" || die
-	fi
-
-	docompress -x /usr/share/doc/${PF}/overview/html
-}
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
deleted file mode 100644
index 23d5b001cdac..000000000000
--- a/sci-libs/votca-tools/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST votca-tools-1.6.4.tar.gz 109929 BLAKE2B 8bc55fcd0a021002f11d412440a369a169c3c62ae5978781010de0a05502e43ed1ccbe5066e3d46ac8ef6fd0c1471baca70d35f6468ccbfd480dc0fa6f2b5047 SHA512 7a334071086e755960a3bd938c1baa1979c4cc9cd8f865af00540fa45365bf1c3153ffb8a5a5948618c47ebafcda9ecc62850d44ea06b7f35ac4587bd423439a
-DIST votca-tools-2021.2.tar.gz 115115 BLAKE2B 9ce16d96b6da7ee9cf9be60a69536555d21eebdad2260100bf35a0c4fe0a5b8cb76c2a3b54476fd843f5428ec5fb3fd33ae79b9fd6b27a90530637c550f06712 SHA512 84e756df4c6e355e149fd105835cfb0fd03935c824e2f7e4149ad92ed6fa81d5a43a7dd6aa532b5ee6e4a79794a94db08f8533e9f0cf99afa604c5ad9f7cb133
-EBUILD votca-tools-1.6.4.ebuild 749 BLAKE2B d5cd0bec7f6d8e375e1786d1c44c006276a9be8912498ae5b5f169bf9d44b097725915d44c1a2d55bd7f287182e597ad1eb4d35796544a971c47871c2109f106 SHA512 1f372e97bcd60d296aa9cc464ba23690ab9d8bed56ac6831f126bee24f3be33d1bf3cc1a5dcd2a90695dd38bc032022de1663e4f014a18068fb7bdf75c822d68
-EBUILD votca-tools-2021.2.ebuild 855 BLAKE2B f635ba0f513812a88ca1945ba50da22213102c6c79a92a7b4cfd0069f70d72058c1ad51586c9e3385013369e3f6c71b7c78a8d97ac3e5c9c3a37d76428db0ee2 SHA512 068dc366b9b2a6858a5ce27cfcc7d949a361992f834b7621fc71d80a30ece2c5e05b9e127a506b88fb295befafb25c38661e3cdc936cfc9b5c9f881177aac4e4
-MISC metadata.xml 456 BLAKE2B 872b69b5cc95376bf9a28d0c1a16ae7fa52b3b0c356ffef0f70f69ed95da623a335edf4e7917da06880747c469dce762ba5534e3c5854264d8b6895f530b33a5 SHA512 741e6734a956099207e96de6d1fce8db9601d0d3582130a2c45b6a7cb7b140ef56a300483b392d556d303aafbd39833e4f4dff7fd4d6605d39eb8d9a88c8b6aa
diff --git a/sci-libs/votca-tools/metadata.xml b/sci-libs/votca-tools/metadata.xml
deleted file mode 100644
index 0368cd91250f..000000000000
--- a/sci-libs/votca-tools/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">votca/tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-libs/votca-tools/votca-tools-1.6.4.ebuild b/sci-libs/votca-tools/votca-tools-1.6.4.ebuild
deleted file mode 100644
index 37b977cdd6b1..000000000000
--- a/sci-libs/votca-tools/votca-tools-1.6.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="https://www.votca.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-cpp/eigen-3.3
-	dev-libs/boost:=
-	dev-libs/expat
-	sci-libs/fftw:3.0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig
-"
-
-DOCS=( NOTICE )
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_RC_FILES=OFF
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/votca-tools/votca-tools-2021.2.ebuild b/sci-libs/votca-tools/votca-tools-2021.2.ebuild
deleted file mode 100644
index 184243331d2d..000000000000
--- a/sci-libs/votca-tools/votca-tools-2021.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-	S="${WORKDIR}/${P#votca-}"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="https://www.votca.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-cpp/eigen-3.3
-	dev-libs/boost:=
-	dev-libs/expat
-	sci-libs/fftw:3.0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DOCS=( NOTICE README.rst CHANGELOG.rst )
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_RC_FILES=OFF
-		-DENABLE_TESTING=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_MKL=ON
-	)
-	cmake_src_configure
-}
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index a07623c684f9..625324139619 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/flashdot/Manifest b/sci-misc/flashdot/Manifest
deleted file mode 100644
index 2ae2b2e69d08..000000000000
--- a/sci-misc/flashdot/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX flashdot-1.1.4-Makefile.patch 300 BLAKE2B c771a361aedb8eafd0e8e376b71889ec41a4d75330f172481890d7b39251dc09e3c1961de87acd435579031fe82206550422872c6cf54359137f246b7afed5f3 SHA512 034c946c4d1ec7905ebc370b7a59418b4e63903f684d9da4c3be3d89747b12b5f25ce786a967f66250b5095401f76541ecfee78ca205859477527c7a42e2d13c
-AUX flashdot-1.1.4-gsl-ocaml.patch 1045 BLAKE2B 43809e76d518a755cc9bb2e0a0eca1d4e54cd749081f710a34ef96bc4af201452673a25b8a5e431839d148cbab10f69638c5b98539b9d969d262026677efccdc SHA512 010edd228c29189bb07eec81ec3b0ceb968ccfa99f6cf85d1d1b2b1b8b2af040b674e75fdf57662cdbb6ca076b9ea02d5164530ef91012bb3e9ea89de9457f0b
-AUX flashdot-1.1.4-ocaml-4.09.patch 736 BLAKE2B dbef65cd2a61062b70c509970bfe9d574493c371e8ebdc81f6c1bdb15e7c38ca01938c11461e973b7285a0fc69b368f31a30b4b00027fba4e5e482ff6d5384bb SHA512 3cf6b9c4b5290c02915112646e8456b76a6931882d998647001a9c38af1aff0ee48d75617aae75f5cca442d8932dfdcb1342b5cad044f019af72bd29d64f7408
-DIST flashdot-1.1.4.tar.bz2 464763 BLAKE2B bed4b23ad21a8526714820ebf113e53a775dff39c0fcd3cdde847fb0a46ffbde5cd3f62ae2b92584ff1ad5c3b1b0a939130c3a182905b16503b60c1321a90e78 SHA512 2c7f803ca002f8a2d9205a6148c3bf602aa79c04fb67444cdfb23626706777d8463739f119ff124b58f7dc30c75750f95045fab4059540936082cfda7deea8c0
-EBUILD flashdot-1.1.4-r1.ebuild 1502 BLAKE2B 3b30ce3d0d4f9c9d373dd5461141de349bd6202b7e3893df552f104a10f6f8dc010b4b723d07554e0e2b505c8ade0f0d5b63b09a714a7a6f3e3024dcc7421224 SHA512 1789dcec6b4043c2b683d4b9545aec257e6cd3be09f83ffbc67ffe6442138f732496dd32cabe7493c08ad2692125dd9e1b3282359a86adebfb1e052c71ec924e
-MISC metadata.xml 427 BLAKE2B 1fce303158c98ae384772601c9beda1b3463e4788fff19047741b7d76b8cfda2743b255bd8a1d2bb68facca576d6d0d3751bcd89bd382dc2e8da942c8f45aabc SHA512 70817c09e9eb61fdded563779021905bf2879e1f96ffbe15f5703ae9c3a8435d111838818aa18fe8992e835c505fcb518cd5bf319bc3d14c062fb9451482e2a3
diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch b/sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch
deleted file mode 100644
index 077367bd2ab0..000000000000
--- a/sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mathexpr/Makefile	2022-03-22 10:51:43.081062080 +0100
-+++ b/mathexpr/Makefile	2022-03-22 10:53:37.226190652 +0100
-@@ -72,6 +72,6 @@
- # Dependencies
- depend:
--	$(OCAMLDEP) $(OCAMLINCS) *.mli *.ml > depend
-+	$(OCAMLDEP) -I $(XMLLIGHTDIR) $(OCAMLINCSLOCAL) *.mli *.ml > depend
- 
- include depend
- 
diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch b/sci-misc/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch
deleted file mode 100644
index 4e94e5b84eb1..000000000000
--- a/sci-misc/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix errors caused by wrong parameter type:
-* File "mathexpr.ml", line 423, characters 55-56:
-* Error: This expression has type int but an expression was expected of type
-*          float
-
---- flashdot-1.1.4/mathexpr/mathexpr.ml
-+++ flashdot-1.1.4/mathexpr/mathexpr.ml
-@@ -419,7 +419,6 @@
- 		| "NegativeBinomial" ->
- 			let p = float'_of_string (aod cont_type "P" "1.0") in
- 			let n = float'_of_string (aod cont_type "N" "1.0") in
--			(*uncomment this for ocamlgsl > 0.5 ::::let n = int_of_float n in::::*)
- 			fun () -> foi  (Gsl_randist.negative_binomial rng p n)
- 		| "Pascal" ->
- 			let p = float'_of_string (aod cont_type "P" "1.0") in
-@@ -4094,7 +4093,6 @@
- 				| "NegativeBinomialPDF" ->
- 					let p = float'_of_string (aod cont_type "P" "1.0") in
- 					let n = float'_of_string (aod cont_type "N" "1.0") in
--					(*uncomment this for ocamlgsl > 0.5 ::::let n = int_of_float n in::::*)
- 					fun x -> Gsl_randist.negative_binomial_pdf (int_of_float x) p n
- 				| "PascalPDF" ->
- 					let p = float'_of_string (aod cont_type "P" "1.0") in
diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch b/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
deleted file mode 100644
index 285a2c746e20..000000000000
--- a/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/fls/fls.ml	2021-04-26 16:24:25.363442099 +0200
-+++ b/fls/fls.ml	2021-04-26 20:10:54.965405870 +0200
-@@ -750,7 +750,7 @@
- 		match input inp s 0 1024 with
- 		0 -> Buffer.contents res
- 		| n -> 
--			Buffer.add_substring res s 0 n;
-+			Buffer.add_subbytes res s 0 n;
- 			fill_buff ()
- 	in
- 	let s = fill_buff () in
---- a/mathexpr/mathexpr.ml	2022-03-22 12:36:30.252580025 +0100
-+++ b/mathexpr/mathexpr.ml	2022-03-22 12:32:10.594137416 +0100
-@@ -2859,7 +2859,7 @@
- 					while true do
- 						let n = input f strbuf 0 1024 in
- 						if n = 0 then raise Exit else
--						Buffer.add_substring resbuf strbuf 0 n
-+						Buffer.add_subbytes resbuf strbuf 0 n
- 					done;
- 					Buffer.contents resbuf
- 					with Exit -> Buffer.contents resbuf
diff --git a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
deleted file mode 100644
index 1843fa0f3f89..000000000000
--- a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Generator for psychophysical experiments"
-HOMEPAGE="http://www.flashdot.info/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
-	dev-ml/gsl-ocaml:=
-	dev-ml/lablgl:=[glut]
-	dev-ml/ocamlsdl:=[opengl]
-	x11-apps/xdpyinfo"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}/${P}-gsl-ocaml.patch"
-	"${FILESDIR}"/${P}-Makefile.patch
-	"${FILESDIR}"/${P}-ocaml-4.09.patch
-)
-
-src_prepare() {
-	default
-	MAKEOPTS="-j1"
-	use ocamlopt || MAKEOPTS+=" TARGETS=flashdot_bytecode BYTECODENAME=flashdot"
-	sed -i \
-		-e "s|^VERSION.*|VERSION := ${PV}|" \
-		Makefile \
-		|| die
-	sed -i \
-		-e 's:Gsl_matrix:Gsl.Matrix:g' \
-		-e 's:Gsl_rng:Gsl.Rng:g' \
-		-e 's:Gsl_randist:Gsl.Randist:g' \
-		-e 's:Gsl_sf:Gsl.Sf:g' \
-		-e 's:Gsl_math:Gsl.Math:g' \
-		-e 's:Gsl_vector:Gsl.Vector:g' \
-		-e 's:Gsl_permut:Gsl.Permut:g' \
-		-e 's:Gsl_linalg:Gsl.Linalg:g' \
-		-e 's:Gsl_cdf:Gsl.Cdf:g' \
-		mathexpr/mathexpr.ml \
-		mathexpr/mathexpr.mli \
-		mathexpr/random_rng.ml \
-		mathexpr/sequences.ml \
-		mathexpr/multibin.ml \
-		flashdot.ml \
-		|| die
-}
-
-src_configure() {
-	./configure --prefix=/usr || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" CALLMODE=script install
-	rm "${D}"/usr/share/doc/${PN}/copyright* || die
-	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
-}
diff --git a/sci-misc/flashdot/metadata.xml b/sci-misc/flashdot/metadata.xml
deleted file mode 100644
index 2af31d9443ce..000000000000
--- a/sci-misc/flashdot/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-	FlashDot is a program for generating and presenting visual perceptual experiments that require a high temporal
-	precision.
-	</longdescription>
-</pkgmetadata>
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 3eb1c07e100b..bf8a4ac6dd81 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-valgrind/Manifest b/sec-keys/openpgp-keys-valgrind/Manifest
index 09f2fd6dd0ce..eb488effd244 100644
--- a/sec-keys/openpgp-keys-valgrind/Manifest
+++ b/sec-keys/openpgp-keys-valgrind/Manifest
@@ -1,3 +1,3 @@
 DIST openpgp-keys-valgrind-20230124-gpgkey-5C1D1AA44BE649DE760A.gpg 5236 BLAKE2B 7ee5acba54608f450d7081cfc9411ad6e0d965e607143750cb491306eef8943c10b5e52ead9cba1e55a212f94c7e2d13ea4e18d7aff212fc4e455493a8dde091 SHA512 dc44ed3e38f54c3e57a4d83fa8b48ce2a8694802dd6bbf057cf432958f88ace9b585ee36a59ba98444e76c9aef0e998b9108a3807f97ebd6ba62303b41ab4690
-EBUILD openpgp-keys-valgrind-20230124.ebuild 776 BLAKE2B 62e396bedc4818f6de0c85a3beb5b27310ca083aa1d24b85277867383fe6ce57aa04d016e36799e8f068de1058cb8d828a777e48bc3cab6a0f4a4bd895877f67 SHA512 969c23ce97af9dcdfd0a4867f8538114c05d72873052d3b46526112c097fd34b84cac8e7e6d69f638e9ad73a664854883e5d497cc36014bf3fdbbb324177d1e7
+EBUILD openpgp-keys-valgrind-20230124.ebuild 770 BLAKE2B 1e19c6fd1f0def710aa2cdc7839604b3453c88c2bd4b78e6ef40217f6f56f7909a2d51dd9dac53daf2f342db599b97113b141931c15f1eededaf3c33cf928e57 SHA512 3efad4c4260caa30d4d1f8244889f07afbdf8a154a041a361f900c68b2f63afcf34aaf1901bbc05241ec56c74f3208a18146aa506cfa0f8cb98cee683cdbf69c
 MISC metadata.xml 375 BLAKE2B 72dee23224be2203a15318c1a1a8ca66a095cf657497a85f91264e9f78a438768a89fec40cf9b0ae758e50fbd262be03a7e5ef9483af6c4d223e1de4e03fb132 SHA512 7c24e3882ee69ef2032529d1b332517f07dfcce0cfdc8f2257877b67ddd9adda7c8551927522c7bb6cfe46b9fb6b16b231e94bdaf498176fbc4f47e8549299c8
diff --git a/sec-keys/openpgp-keys-valgrind/openpgp-keys-valgrind-20230124.ebuild b/sec-keys/openpgp-keys-valgrind/openpgp-keys-valgrind-20230124.ebuild
index fd5605fdc2b6..b0acd6aae827 100644
--- a/sec-keys/openpgp-keys-valgrind/openpgp-keys-valgrind-20230124.ebuild
+++ b/sec-keys/openpgp-keys-valgrind/openpgp-keys-valgrind-20230124.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sec-keys/openpgp-keys-vincentlefevre/Manifest b/sec-keys/openpgp-keys-vincentlefevre/Manifest
index 9a9841e822ea..5c4ab60f6f63 100644
--- a/sec-keys/openpgp-keys-vincentlefevre/Manifest
+++ b/sec-keys/openpgp-keys-vincentlefevre/Manifest
@@ -1,3 +1,3 @@
 DIST key.asc 15034 BLAKE2B eed69fb1e4faeaa555ef487d299b98a1af8dbbb750ed74d1298dc54ad564c0ff7d14c1b0282fd8357450e5e1e219c8fab0edce9800f1cb646b3feaf51971e07d SHA512 ab857ddb8e4510dc4c7a020a6b565edcc23c85ac04436c1789e632780e47531d7f49dbd0be3da68f3b226c841ff5ca42d4c596c1dd417fa3a46d63bc5ec5fc87
-EBUILD openpgp-keys-vincentlefevre-20221213.ebuild 550 BLAKE2B 92526297416e8300b98e7c4ecbaf83329ec655e673e6ee3222ac09c9998275c8583e2194156260a4df7e3dda7fc5086a480e025e4e361d0b261d43c87451af17 SHA512 ca544b1707519e60961f85cbe6f156f6b6da232e52d0f7a7692cb019e2a6d96d975c8ac5863dfec0d7c628a92309c2c2a6e9f3ac6550ab340996b591e3a8544a
+EBUILD openpgp-keys-vincentlefevre-20221213.ebuild 545 BLAKE2B 2dd9c096ee1da07a602a27f04a617b2f06544f74947ceed9cc092096b76a6881c99785ed6673a6845821c6db00dfda658b761c4fcff3b347f26461910d365413 SHA512 8882af012340e329a9824dda69e2dbc1d76d9090a915469997469e881803509b216270dc4ed64ea355825fd5ea81637bbec7ace825db790ecfd9645e94b3ea6f
 MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
diff --git a/sec-keys/openpgp-keys-vincentlefevre/openpgp-keys-vincentlefevre-20221213.ebuild b/sec-keys/openpgp-keys-vincentlefevre/openpgp-keys-vincentlefevre-20221213.ebuild
index 9e48c952c04f..de207df5ec59 100644
--- a/sec-keys/openpgp-keys-vincentlefevre/openpgp-keys-vincentlefevre-20221213.ebuild
+++ b/sec-keys/openpgp-keys-vincentlefevre/openpgp-keys-vincentlefevre-20221213.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 30056a5a909c..1ebf6c595865 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 4d733966e96e..fa26f2b5081c 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -7,6 +7,6 @@ DIST grep-3.8.11-908f.tar.xz.sig 833 BLAKE2B 460e7eb98f803995de43e919cae2d01e261
 DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 SHA512 2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79
 DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a324877a75821d086a128a20d00df3d7cd960ec45709f40f21488bbcf993c6fe667ef23663688b33296e650b SHA512 8266b58485f225c2189814e3898c72e59d251b729e0c302d31f57abdb7ac2e6e28dde2c5c8095673b6f007b2a3ebc26db1dca910a7771aba80dad4b3c6761ee4
 EBUILD grep-3.7.ebuild 2274 BLAKE2B b847a17bfe835e573a6406c728e99c1af5687bc2e83bdb4c1b6103790f587210c5bd3f4121c7fb83d8c96805a6a7fc636f06050df1f8f591d95e931f2cfecbc9 SHA512 dace79b242b68187cf8d756b4c91a7873eb8c1b1a3f631b67bb07192a95c4c4af521db19e6a943ae03f1d885317c0d6f497e129c7644e36d5dc97963415396ee
-EBUILD grep-3.8-r1.ebuild 2870 BLAKE2B ef19db94761e3e8fcfd6bdd03429bdd16501cf4724597f0aabff96f4f1d1712a3307ee6b87e9888e0f73de1f2d1ba31769211412aeb42687f24bd3fd8474861d SHA512 3e63dc69b45d4903241cc54ea5efbad05db1d6f7874671c803007e728932aa18472bb777be830ddba4ee5e47ef60f0f01972f2339fb89136f90960d118b39158
+EBUILD grep-3.8-r1.ebuild 2864 BLAKE2B 73886083ae0bd870df99d4ff7352e6cd46746910efb52b6dc7e76fe7d11ca3c7c91f31da396caef5d24c370b3e37c5dff0d2d352d0380d01aa61519ba71dad6a SHA512 48bdeeac5adae34b260d8e5203e56c0750980327b099197c496c8734d4038fb9826d7a805e11b3537e1ccfbbd4abf45d12fac3ecb7136856bf7cdde7bcca5db9
 EBUILD grep-3.8_p20221230.ebuild 2870 BLAKE2B 95027ad8262acaf8a2771f3ea0644cbc65380d511e3a00015b1f026747a3926812cf55000c30e6ab7f3a55d5ba6ae4cb88da66456cd88575fe8f58e8b35625cd SHA512 5bd00afd540781a082c77bf8758a3a5ec6a98fc6dead8bc062257955e3df4b2dd8ec85d5a8e6d6b1530b0dc821e331463079245411b97e06f06b1579bbec54a5
 MISC metadata.xml 666 BLAKE2B 0c90e38d5363234474093ece5c9e0cbb99c01731a80c52869d700b7367fd74eec23f355653174b315f91ca7b41b4c5c9f5645ffaba043b3918c3c22c2c817ea4 SHA512 8e46c5c28b55063a7c74dfc637eb59785dc35651027e144acf4aea7f0ad7a4e43a3692946252acdf0d4a66ff8bdcfa89664fdf8bae71f1db688c06014c2a6a0f
diff --git a/sys-apps/grep/grep-3.8-r1.ebuild b/sys-apps/grep/grep-3.8-r1.ebuild
index 383ac1eb28d7..478a7ab38aff 100644
--- a/sys-apps/grep/grep-3.8-r1.ebuild
+++ b/sys-apps/grep/grep-3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 864934d4abc8..000f9365b59d 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/pam_fprint/Manifest b/sys-auth/pam_fprint/Manifest
deleted file mode 100644
index 6e981edb68f2..000000000000
--- a/sys-auth/pam_fprint/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pam_fprint-0.2-headers.patch 281 BLAKE2B b05e33732c83483a790198dd884c7051f071a450935e8236a6d345446d4bc9c415815c251c9fd537f78abb7822a12e8b94916c429bf0635bfc4edc441ca897ff SHA512 f7bbc72805ccbea7ba66b88fdf1f9793b3e8c076e7e64cab0be2c04881fb786b7ba9559067efad2956a3fd26aa647794b19b0cd0c52472fbd3ecd7205d71d006
-DIST pam_fprint-0.2.tar.bz2 72781 BLAKE2B 196bfd6a714da2d0fa8fe616a63e31008024a02b785aa393a62acd2267c1cc87382aef1d7af8d9f626c406534dd1e952dec520e6fc5dc0bc52d157246762c15c SHA512 c860488efabfd6301b4e19596e15545bbcb1a15f79bfd7c61a357ef47cf0a621ec0d15328d5be30f7ef045813e18333bd0aea7fb8fcb06681007dcacca6396fd
-EBUILD pam_fprint-0.2-r2.ebuild 648 BLAKE2B 2c7f0f96e4fb7ed78287090fa91e7be48c2946e2082437e1d3fab80c98dbfa23cccae9da977f8d5a599b6d5515425b4136678ef08133c6f835c10268eb792547 SHA512 30ce64b0613975c8a3d27407297d71ae2737c2285aec7b0eaa1cc3de13a72fdebd75b4e9694a80e072d133c7a58011032e881bbdac2e2c2557dd731847582451
-MISC metadata.xml 244 BLAKE2B e33de6604aa3c4e2c73bab01dab8387fa6c030ed7061346eca6ac4da3c8ab92fa2ce3084b82dc3dee7014b04685b9161395db8c9a6d51760e84b521a1e14426e SHA512 b148b3fc992b6984609615433f93f4929343cbdbb0253fc179c0306bacac592e007ac639ca4e42499f838fdb1588d76a658f5213f49801e86d561121b1b79b77
diff --git a/sys-auth/pam_fprint/files/pam_fprint-0.2-headers.patch b/sys-auth/pam_fprint/files/pam_fprint-0.2-headers.patch
deleted file mode 100644
index 9ff6e551ee87..000000000000
--- a/sys-auth/pam_fprint/files/pam_fprint-0.2-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Add definition of free and setenv, Michael Weber <xmw@gentoo.org> Oct 18th, 2010
-
---- pam_fprint-0.2/src/pam_fprint.c
-+++ pam_fprint-0.2/src/pam_fprint.c
-@@ -22,6 +22,7 @@
- #include <sys/types.h>
- #include <pwd.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include <fprint.h>
- 
diff --git a/sys-auth/pam_fprint/metadata.xml b/sys-auth/pam_fprint/metadata.xml
deleted file mode 100644
index 89c3d29171c9..000000000000
--- a/sys-auth/pam_fprint/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">fprint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-auth/pam_fprint/pam_fprint-0.2-r2.ebuild b/sys-auth/pam_fprint/pam_fprint-0.2-r2.ebuild
deleted file mode 100644
index 147cbb18ae28..000000000000
--- a/sys-auth/pam_fprint/pam_fprint-0.2-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam
-
-DESCRIPTION="a simple PAM module which uses libfprint's functionality for authentication"
-HOMEPAGE="http://www.reactivated.net/fprint/wiki/Pam_fprint"
-SRC_URI="mirror://sourceforge/fprint/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	sys-auth/libfprint:0
-	sys-libs/pam"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-headers.patch )
-
-src_install() {
-	dopammod src/${PN}.so
-	newbin src/pamtest pamtest.fprint
-	dobin src/pam_fprint_enroll
-	einstalldocs
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 2f23e531dddc..22adb9240161 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 9bc94c7dbccb..25317b11565c 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,15 +1,11 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-common-13.0.1.ebuild 593 BLAKE2B f7d78facc226d949240f31d10bb01f6a2bbe3c806d7f7c22a78d715d29de74723bedccdeefd029d309b090afe63821e10a1bd27662ff156640820fbca1896bab SHA512 48e5c5f3d4716c15018aa246cf61fbf898c4c459b1f04710da155084a8cf5b8a6df7697c300d297ac48ee1a8a8cff9bc9b4fca712455032f78cb26e9f77ef955
 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
-EBUILD clang-common-15.0.6-r1.ebuild 4633 BLAKE2B 97a3579b763c713d2484bdea899f42848afc7c73f6857ef9898a9958db8c8e54438a395cc6372735b797583da6919a69ef343585335dd47140fba4dad7f63162 SHA512 f8c49366042ee08c198ad9df000a2fd33597e5a50b15472dee0b078d3775be087c6e0f58e1a0b50ddd605a6f73f37361603e6e5da69d65f7c749c454bd525a70
-EBUILD clang-common-15.0.6.ebuild 3509 BLAKE2B 70910eaf42d62c4e570f87d5eeef778c1457ed37832fd90978992e16437d1af48e70d5393fe4193055d048fea0cde3836782828560b6d65f288b5ed2dc056cdc SHA512 d2a107dde9888e718e087653ddf42d51c39f78ce348d3e9932e3db73ccebee4877aac3fca2ab9fb63028cefda30cd5c764e381b70abbf09e509a1de5f5cf7f44
 EBUILD clang-common-15.0.7-r1.ebuild 4626 BLAKE2B edaacc5b0fed376e342377e2e433838ddf150dc77aea27f32a172e2b23219d9fc3e01ec3cf8e0efb3991987a34b79ab857b9687856bc97119f97eb7e6d8adeb6 SHA512 8ff4b1129e45271e4281813e0bb970e19d74bbe560eb63238eaabeec11a1907cbe24a7252cfcad5fa566c49d95c85212507c1eb0b7be093d6ad2995d966025d4
 EBUILD clang-common-16.0.0.9999.ebuild 4686 BLAKE2B c2bf510db70a7708d56746c035eebe20b332ace167138ae5260375dc5bfe15e2b8478692636cca60cebd9ebc2e418324377e3d17ebb49db7e30ecd6ad11e6db3 SHA512 abb81468747c4f83554c35792f6fd1e282b0edfa02a34157c0594cefef42b91c95092b35a88b7b4b7abfb17bff95029065b86f2c2724df5badb5924f915fd63e
 EBUILD clang-common-16.0.0_pre20230107-r1.ebuild 4692 BLAKE2B 0628160af123d42ea6cc9a2d39d0115ccc3d0f4461f2bc3b13946d3fb587a100092df73ba512aa016bf359283cf8790cf465cdbf7a230f1cd02e536d570424cd SHA512 08f8ef115f59f74a3b845af7563dbd43819c4fb37ed27a2fc0c65ce3c0f7c7e61eb3617b1e8c54c598d5cff0a1b8988d0ed32f8fa40c6b4428545a5f8f1bf05a
diff --git a/sys-devel/clang-common/clang-common-15.0.6-r1.ebuild b/sys-devel/clang-common/clang-common-15.0.6-r1.ebuild
deleted file mode 100644
index 4c031af64c3b..000000000000
--- a/sys-devel/clang-common/clang-common-15.0.6-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	hardened stricter
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind )
-		!llvm-libunwind? ( sys-libs/libunwind )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( sys-devel/lld )
-	!default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-	!default-compiler-rt? ( sys-devel/gcc-config )
-	!default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-	local flag missing_flags=()
-	for flag in default-{compiler-rt,libcxx,lld}; do
-		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
-			missing_flags+=( "${flag}" )
-		fi
-	done
-
-	if [[ ${missing_flags[@]} ]]; then
-		eerror "It seems that you have the following flags set on sys-devel/clang:"
-		eerror
-		eerror "  ${missing_flags[*]}"
-		eerror
-		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
-		eerror "The build is being aborted to prevent breakage.  Please either set"
-		eerror "the respective flags on this ebuild, e.g.:"
-		eerror
-		eerror "  sys-devel/clang-common ${missing_flags[*]}"
-		eerror
-		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
-	fi
-}
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-
-	insinto /etc/clang
-	newins - gentoo-runtimes.cfg <<-EOF
-		# This file is initially generated by sys-devel/clang-runtime.
-		# It is used to control the default runtimes using by clang.
-
-		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
-		--stdlib=$(usex default-libcxx libc++ libstdc++)
-		-fuse-ld=$(usex default-lld lld bfd)
-	EOF
-
-	newins - gentoo-gcc-install.cfg <<-EOF
-		# This file is maintained by gcc-config.
-		# It is used to specify the selected GCC installation.
-	EOF
-
-	newins - gentoo-common.cfg <<-EOF
-		# This file contains flags common to clang, clang++ and clang-cpp.
-		@gentoo-runtimes.cfg
-		@gentoo-gcc-install.cfg
-		@gentoo-hardened.cfg
-	EOF
-
-	# Baseline hardening (bug #851111)
-	newins - gentoo-hardened.cfg <<-EOF
-		# Some of these options are added unconditionally, regardless of
-		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
-		-fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	dodir /usr/include/gentoo
-
-	local fortify_level=$(usex hardened 3 2)
-	# We have to do this because glibc's headers warn if F_S is set
-	# without optimization and that would at the very least be very noisy
-	# during builds and at worst trigger many -Werror builds.
-	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-		#ifndef _FORTIFY_SOURCE
-			#if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
-				#define _FORTIFY_SOURCE ${fortify_level}
-			#endif
-		#endif
-	EOF
-
-	if use hardened ; then
-		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-D_GLIBCXX_ASSERTIONS
-
-			# Analogue to GLIBCXX_ASSERTIONS
-			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-			-D_LIBCPP_ENABLE_ASSERTIONS=1
-		EOF
-	fi
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		EOF
-	fi
-
-	local tool
-	for tool in clang{,++,-cpp}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-		EOF
-	done
-}
-
-pkg_preinst() {
-	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-	then
-		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-		if [[ -n ${gcc_path} ]]; then
-			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-				--gcc-install-dir="${gcc_path%%:*}"
-			EOF
-		fi
-	fi
-}
diff --git a/sys-devel/clang-common/clang-common-15.0.6.ebuild b/sys-devel/clang-common/clang-common-15.0.6.ebuild
deleted file mode 100644
index 967a94fd0cde..000000000000
--- a/sys-devel/clang-common/clang-common-15.0.6.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	stricter
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind )
-		!llvm-libunwind? ( sys-libs/libunwind )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( sys-devel/lld )
-	!default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-	!default-compiler-rt? ( sys-devel/gcc-config )
-	!default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-	local flag missing_flags=()
-	for flag in default-{compiler-rt,libcxx,lld}; do
-		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
-			missing_flags+=( "${flag}" )
-		fi
-	done
-
-	if [[ ${missing_flags[@]} ]]; then
-		eerror "It seems that you have the following flags set on sys-devel/clang:"
-		eerror
-		eerror "  ${missing_flags[*]}"
-		eerror
-		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
-		eerror "The build is being aborted to prevent breakage.  Please either set"
-		eerror "the respective flags on this ebuild, e.g.:"
-		eerror
-		eerror "  sys-devel/clang-common ${missing_flags[*]}"
-		eerror
-		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
-	fi
-}
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-
-	insinto /etc/clang
-	newins - gentoo-runtimes.cfg <<-EOF
-		# This file is initially generated by sys-devel/clang-runtime.
-		# It is used to control the default runtimes using by clang.
-
-		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
-		--stdlib=$(usex default-libcxx libc++ libstdc++)
-		-fuse-ld=$(usex default-lld lld bfd)
-	EOF
-
-	newins - gentoo-gcc-install.cfg <<-EOF
-		# This file is maintained by gcc-config.
-		# It is used to specify the selected GCC installation.
-	EOF
-
-	newins - gentoo-common.cfg <<-EOF
-		# This file contains flags common to clang, clang++ and clang-cpp.
-		@gentoo-runtimes.cfg
-		@gentoo-gcc-install.cfg
-	EOF
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		EOF
-	fi
-
-	local tool
-	for tool in clang{,++,-cpp}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-		EOF
-	done
-}
-
-pkg_preinst() {
-	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-	then
-		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-		if [[ -n ${gcc_path} ]]; then
-			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-				--gcc-install-dir="${gcc_path%%:*}"
-			EOF
-		fi
-	fi
-}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 1884b9a83558..10f998d10fb8 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,6 +1,5 @@
 EBUILD clang-runtime-13.0.1.ebuild 704 BLAKE2B a75c3997e7f744e1c50f7672bcd3564229fb1b55b8e2a5dac7ca38e8d390d61b76df6dec7134356ddf6487b63adb613ec7484240681f6c5cec9d7fe41912c353 SHA512 a1d245b587ec92bdca8b557d7e821d5f217bb1866a4804539305068d946c42355b1e84e3491d238b549c24822ad60aa872f761ef4418895b13d68f7574fef9f8
 EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
-EBUILD clang-runtime-15.0.6.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f
 EBUILD clang-runtime-15.0.7.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f
 EBUILD clang-runtime-16.0.0.9999.ebuild 1369 BLAKE2B a25d32189f78e993706138f339ad0645e3042bd283ddc26b4189c117ea2368d0a1c2b09c2f5f538112bcad65fc14dc0d29f16e4d6ff98e3401c3bdb74d59d750 SHA512 c37860675576d51047f5347400753a19469ea0e2e6ff49a3a5ba6e35f5b33372c06ee2ac1e82aa4a681f35e8c186a1ff8eb25a9eccd0ee35e5ab3d57873f40e0
 EBUILD clang-runtime-16.0.0_pre20230107.ebuild 1357 BLAKE2B 8bffc2e195aea4f0c5c13d8f730dbf7cf5afade08d6ca9915addb9a148d4fa28d01331461adc16221840095a8b94d997795e25fb01c68ca6260b24471abd2747 SHA512 cd391453ef4a5ef739d9897b25fc1899062c20e23dbb1bfa4ef33ada3a697ffaedaf6956ba82fd114b8f24a5c8de3d255b5d114c545968f0689bd6cb38b64ba6
diff --git a/sys-devel/clang-runtime/clang-runtime-15.0.6.ebuild b/sys-devel/clang-runtime/clang-runtime-15.0.6.ebuild
deleted file mode 100644
index c4f7620e1212..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-15.0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		sanitize? (
-			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
-"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 0725fa31f3f7..acac9df73901 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,22 +1,17 @@
 DIST llvm-13.0.1-manpages.tar.bz2 202187 BLAKE2B 32a761426dbe4c3c355d30660254305cd88b6d513faee04c78e370cea9d38761108a9be4c4b4ac39b6a74400af1f9d37ffd11ab05acd7340175c8d66845ae7d9 SHA512 9495e1daf588540fdb8b9ee905a9b6be4693bd70b7f42c8e8a0d667242fc24dc853c45918d3bc09d02f0761ad61541bc9749c1498e312da129abdab638a0d572
 DIST llvm-14.0.6-manpages.tar.bz2 218186 BLAKE2B 4491296e490936a2d7b518e19a0ff6312b89abeef3fbe5da5d0b93bb2add1088ddf64a0b00ec8846062d19b1ad31e53eadee7ce03c9034aab554e183d1baccf6 SHA512 f8328dc2ec1e8d941d47e583ee31fae7bdcebb3f854b5c8a4a84bd19a79bf5427ad204012c81349bc05a291e41cf48e5129b4578bbd5d4490dd01e1c0b5823bf
-DIST llvm-15.0.6-manpages.tar.bz2 229125 BLAKE2B 926c31b02e295fb2a58056fd75cd04017edcb9b01d23316f002e7d3a00ef77e84d6f04bf8387f1fe9a1d159c7d271248766d3205e747c4e9542bf93f209300da SHA512 94225b46013fab113ecdbe7c150dbb989eae2007c4ed338014fbff7e6e1dd7340eec58c560f22ac1b04df8e14678b33b372c9afd06c10943f099b1a7bb63a048
 DIST llvm-15.0.7-manpages.tar.bz2 228425 BLAKE2B 573b030a32407cfe241fb2c8c62bed8e7c54f9daf4b8cffdd2d4e5ca2e40b5ec5ed3724475aedf77119be1a4d9de847a989e933d315e6d94908e407a19c98047 SHA512 86d5eeea2757b0a627c8d2d6e70a3265fc0207085f4e473cdd6e8b624c719625dead23fd1737742a1bea27b1c4631ef3e8e3041a1122a85fcb49859e5bfbee49
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
-DIST llvm-gentoo-patchset-15.0.6-r1.tar.xz 20344 BLAKE2B ae43aea6ff2989f03f490939f9c05b5bb41d03205037adb4a13c928cede113eb113a5ac8406ef814bd9da21f298d64a9efdbd30adb89a969caad60954b46577e SHA512 c105ba86bd116130ff5aac64ba138c1b83fc50e81dc1293e45e311c64b7d1dfefddb7a8585c3d75091d70e15e1a0a179d8c646416e6a6a159edb12c5dcf59914
 DIST llvm-gentoo-patchset-15.0.7.tar.xz 19300 BLAKE2B b70e81d744c2eba5cd851e7b690ce8979b3064973f522be7c93bfb541860000a4bc8b17219f8788dfc8a527217dd13946cf7836640698ddd3d4b3fde493dfbf8 SHA512 daffff6ae4a0874aff1a423b4bb36701ecb5a35a36ae91d4ed7fda58b83e50ffcdc30498c84be4711fd3e1f227bf312dbe930019203e0a131944439af2aa94f7
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 260d3fed4578927cf654a3f364466a4d40da4526c4bb73438a63392105d07974a380a3a2cba1f1b2bfa3c99545e1e423a4953a15c58af81d860a02fcb7212d34 SHA512 ebb91165ea8a3f661c8d8cabca3aba073b6021d9bfc42ad5dd5e9d177c532c5aa1be9b403e9199ff3a4aaef339340d9113126ded20643463f28f5137038eab9d
 EBUILD clang-14.0.6-r1.ebuild 11719 BLAKE2B 116c47c61ca5f55544a886a81f1c443ab0d81d525d3e0e2137fed1aa8a872d0dfa5b0e9734ede6832cccabf141f8f788672c717f4e8c66df95ec0065cf5f1e79 SHA512 f27cd603fa3b02b9a3cad09231472a7047c2d6cb057a9b85a5ca7a9de93e7ec2c35e578cd50dd187886cb34f8fa88e32d3cf7f51c0c019b7b2ad232a127a8f38
-EBUILD clang-15.0.6-r1.ebuild 11954 BLAKE2B 1f83a038f9632948caf8cd8fc598337a09960405755b37480a7eaf5767b252b07ab096e3b920c76e68f5f3cc1d72cfd41fbdcc9e47a7ce7c2175f2a2e7933b50 SHA512 dc11d666bfcb47b79b41cabd974943eef0598d2116c7c01ded2c578b37afa7c93749b79b21a71504b2a684de4e6a2dfcb4b3f5f250b79c95b5a3287dbf5da685
 EBUILD clang-15.0.7-r1.ebuild 12114 BLAKE2B a5a741792ec216d7942597dc6eb4e0c868738698cc4894a2053ba3acf23e347941079b67ba1c0d87fcdc37db4b72be0d30ff6a9870e3a716fe6127ebbb0b7770 SHA512 defb873f69065300f6c1eeb766b23aad7deb4ee1ef5d8de9b6d748c0cd524b58aa45a635f79ad833da8bcce537de9ca1a4c3ee62f57c6cd596f7f35a96471731
 EBUILD clang-16.0.0.9999.ebuild 11809 BLAKE2B fea22fa24054a45527d9bdd7b1fefda36eb7ad345cce748ca6ee3e7e200b63331d39dfc7149051a91e9874e42aadfb0019b56418a2201f8f494bf0903f47e526 SHA512 e4e3d20b3ca0a9692d132999b84879921837f084875eb07ca88423afb11684d6702f094be6833270650c00372e320c0986db2faf28c76ccccd1095614728d52f
 EBUILD clang-16.0.0_pre20230107.ebuild 11888 BLAKE2B 46d7463ac2022887874a597d172497b1e04b715c326eb629c5fde978bf36ca0229be7d06f333647a7d392c7bcfead3a8ecefedb2848689b5f0713e50193aace4 SHA512 de47068ccb31519b4eb8f782d5a81379d667913b39c59128eb4c0c22a4d82cf3818547bf393d18d392aa7f2309c0aabc4434986328cf55272bac86037f657c5f
diff --git a/sys-devel/clang/clang-15.0.6-r1.ebuild b/sys-devel/clang/clang-15.0.6-r1.ebuild
deleted file mode 100644
index 0e089832722b..000000000000
--- a/sys-devel/clang/clang-15.0.6-r1.ebuild
+++ /dev/null
@@ -1,467 +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 cmake llvm llvm.org multilib multilib-minimal \
-	prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x64-macos"
-IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-	>=sys-devel/clang-common-${PV}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	doc? ( $(python_gen_cond_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-	~sys-devel/clang-runtime-${PV}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing/Support
-	llvm/utils/{lit,llvm-lit,unittest}
-	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
-)
-LLVM_PATCHSET=${PV/_/-}-r1
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# create extra parent dir for relative CLANG_RESOURCE_DIR access
-	mkdir -p x/y || die
-	BUILD_DIR=${WORKDIR}/x/y/clang
-
-	llvm.org_src_prepare
-
-	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-	eprefixify \
-		lib/Lex/InitHeaderSearch.cpp \
-		lib/Driver/ToolChains/Darwin.cpp || die
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-					# conditional to USE=doc
-					docs-clang-html|docs-clang-tools-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# common stuff
-		clang-cmake-exports
-		clang-headers
-		clang-resource-headers
-		libclang-headers
-
-		aarch64-resource-headers
-		arm-common-resource-headers
-		arm-resource-headers
-		core-resource-headers
-		cuda-resource-headers
-		hexagon-resource-headers
-		hip-resource-headers
-		hlsl-resource-headers
-		mips-resource-headers
-		opencl-resource-headers
-		openmp-resource-headers
-		ppc-htm-resource-headers
-		ppc-resource-headers
-		riscv-resource-headers
-		systemz-resource-headers
-		utility-resource-headers
-		ve-resource-headers
-		webassembly-resource-headers
-		windows-resource-headers
-		x86-resource-headers
-
-		# libs
-		clang-cpp
-		libclang
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# common stuff
-			bash-autocomplete
-			libclang-python-bindings
-
-			# tools
-			c-index-test
-			clang
-			clang-format
-			clang-offload-bundler
-			clang-offload-packager
-			clang-offload-wrapper
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-fixer
-				clang-move
-				clang-pseudo
-				clang-query
-				clang-reorder-fields
-				clang-tidy
-				clang-tidy-headers
-				clangd
-				find-all-symbols
-				modularize
-				pp-trace
-			)
-		fi
-
-		if llvm_are_manpages_built; then
-			out+=( docs-clang-man )
-			use extra && out+=( docs-clang-tools-man )
-		fi
-
-		if use doc; then
-			out+=( docs-clang-html )
-			use extra && out+=( docs-clang-tools-html )
-		fi
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-build-py
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_VERSION}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# disable using CUDA to autodetect GPU, just build for all
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${BUILD_DIR}/bin/llvm-lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DLLVM_BUILD_DOCS=ON
-				-DLLVM_ENABLE_SPHINX=ON
-				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-			if use extra; then
-				mycmakeargs+=(
-					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-				)
-			fi
-		fi
-		mycmakeargs+=(
-			-DCLANG_INCLUDE_DOCS=${build_docs}
-		)
-	fi
-	if multilib_native_use extra; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -x "/usr/bin/clang-tblgen" ]] \
-			|| die "/usr/bin/clang-tblgen not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-		)
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check-clang )
-	if multilib_native_use extra; then
-		test_targets+=(
-			check-clang-tools
-			check-clangd
-		)
-	fi
-	cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	if use extra; then
-		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-	fi
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-		done
-	done
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-	if multilib_native_use extra; then
-		# don't wrap clang-tidy headers, the list is too long
-		# (they're fine for non-native ABI but enabling the targets is problematic)
-		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-	fi
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-	if use extra; then
-		elog "Some of them are vim integration scripts (with instructions inside)."
-		elog "The run-clang-tidy.py script requires the following additional package:"
-		elog "  dev-python/pyyaml"
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 9de8c8ea9169..a6659ebdaa08 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -2,12 +2,14 @@ AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20221208.tar.xz 72098912 BLAKE2B 8167b3d91fb95c727caa3a76d8bd6d70e0d0bd79eda72305f3005c9f7163dcd425c75386ba55b2d71644ecf83d998a4bccb6fd265bb615dcdd104f27cadb8e76 SHA512 5e49159d86300eaa4c2f34fb3537b5f257931e861a1a1217dbabcfcd5ef9da224d4a6023aaf8d24c8893ecd204ec0cd6e96349ae0dd445d62d92ebb041aeb054
 DIST gcc-10-20230119.tar.xz 72112952 BLAKE2B 6e28cba9f6ff5c9f9231828bb400c82b8658a4f9c0166c28a6a12d71728d4460904152a8c84bbeff88c06b7f9378937b7b61bf4a871a10c56bd005170dc5fde2 SHA512 6cbb567ef1da1b6fa65892b6e71c3b7cd37e0c483e049720ea1987d444a0e7b4eb15d1e99f4e35995acdce560a811a779574eeba52bb252c61325accedd6a5c5
+DIST gcc-10-20230126.tar.xz 72121284 BLAKE2B add27f5cacaf5c36c4c54e2c71f6e60edd03242bf52e1729aa708cc6d927814f3640cccbf9711d105c252b90e980e0ab071a2204c7859045c35bacaac9664c7a SHA512 619f73041be838b0e48a10f5dbe4bb775367fc13511f4b98d65c4336b397f1ccae2df64f11b7cd066e2635783b2d61f815c3ab0a6478ec3c98dd7b33728d2ae5
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
 DIST gcc-10.5.0-musl-patches-1.tar.xz 3816 BLAKE2B 5995f934a40665d877342853fde8b414eed8770c72e6b11b295b7e7b3c9d38d7407dff63b5751f4449f6fa842c02e87f156cc868e7436a8313f7c8514242d255 SHA512 b93cc54cd7b78fdc487df7c449b03bbfd10094e45f3f8eef20cd69f27a68a14817fe662a2ec119b384eea2dad0491b70f838d010457e386700030b76457afad6
 DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5544b369720e8c54fc59375e591ebd0a429b7e81a2a3df86bd2eaf19e4b8148bf2e1b0c8410de3944d4801ce412016b2 SHA512 5855aa23ee0b262c20a1b6fd2d4a947180c079dc00e0fa675043edceee0c822eec0dc752f5fcb281b70c04e50c6fcaf6c5d5160ab15d3f0c51fa030eb2d79d26
 DIST gcc-10.5.0-patches-4.tar.xz 17880 BLAKE2B f368b741fd42199c85b770ec45a5232d27295cf7796163251f24fa963f2264c473e161bb34e66b43c4b227e41859d540a66331111392478b280b289d359806c6 SHA512 94f7fbd1b4672f0378c85ac3a96f7954cd22bd7cc1013c32519bbe1cae0ebb5183e14469c61dfc9d931b8d1c261f2ead1c4b47278104d1b5189a0c787aabc40e
+DIST gcc-10.5.0-patches-5.tar.xz 17324 BLAKE2B e97b471fb6115fd0421be8a6390f7d88312de7ac0132fde3aa43dbf2a49d3bc640ec05f766f20363f033adeaf0430e90c42b5a6f92a422d1a82128f119e769f6 SHA512 2589b8a3be0bc60dd7b205ef9955dfd1ba525508879b30ee8057779d2677783c7c13a0bf901bc2a126e15c52d440663e6fe22a299d935e0706a037406e1cfb31
 DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e246c8481da5bd32620dcb15d2acd008bad60d2576a301f03e444e3d93a3c72d5184740c6fb3de2bc05e1863b68a0bc SHA512 33d9581d434c012526eb4d49a4453cf77c57b459fd43f84e49bc764745e0772939eac007e119269f4f1989755df8678613732a84474c691b0c2452237c5b38a3
 DIST gcc-11-20230120.tar.xz 76201244 BLAKE2B 07bc819dad3e2ee3747f09f43fd73a4263f06274362728174b32d9ead52ea95c25ea6a192397378b9b4c4f958285d97488d28e425c26129d23f143b1a8668fbc SHA512 81f71aeb706b4ccb89e2af5201770fd72cc3190b9b5eac0b5a25a522626b9c4015a2e5d13e4bd1360ac0f7f1be27df51fc530c15ce3c3d782f39f34d5c58803e
 DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac
@@ -30,6 +32,7 @@ DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f7
 EBUILD gcc-10.4.0.ebuild 1445 BLAKE2B 05518ec2cdf0180f4db63dcab413097ca777381b496d6b7b7cebc0bf2b04395d14b74daa398ea2e2d916df4f6034357cfc740939e0fb346bbea71a8a09603fbb SHA512 8fd4642dd974006efe35f6d45ebfda66fe5dac0d4e2371804ede5d94e6e820b95cedac08c11de766c0c711bef7c55900cdaeaffe889691f7acd7470c32e7e3b4
 EBUILD gcc-10.4.1_p20221208.ebuild 1446 BLAKE2B 81b537066cd4a53c08b2bb6d037f8981e70f31fd9563dda1d825057e186f6d206e9a283fcde619cbaf323ef3bdff45a1bd84a530c2275c7e28204716bd0b012b SHA512 6e790aa4d4dfbfb77374a75c9f8ef72c6c14610c7f4778822d8fd16520350969345574104aa28f5656d1fc2ef0d6ab6b2177e12fb2ea1c62bd6e7975fc0d8c64
 EBUILD gcc-10.4.1_p20230119-r1.ebuild 1447 BLAKE2B c40e4b0e510a372217b386f3dcf9d7a78f3e578719f4f11fe058c23ffbd9865b83e36067b71ba00e61af000a97115c1049fa51480c376a8e4c06460e11704cb4 SHA512 e33cb02509571d9f4d2023435405059ae2bdd9b09eacd0407992db952f6db061f1d346ecde2a31b7e2829815f27a211e2e7d7e490d266e183f3756349ddc4a86
+EBUILD gcc-10.4.1_p20230126.ebuild 1450 BLAKE2B 58a5ff72aa680c73e69ec677dee48042c96f9d48a1613590d251b728480b1b7789033a636f512bbc1f39d1fe744dece04aaedff16c847713ba38a8b012fa9f54 SHA512 a8dbd2c20cdb8926c35794e25e0a654f610cf2f2877958c98f32131537d5b43b559dff77a882fa87d0b7c5cfe8dd1148e92198b6d0eb3949c9f75e3bc8f0c6c4
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
 EBUILD gcc-11.3.1_p20221209.ebuild 1286 BLAKE2B 5bb5bb1dfa617deb42fd1194fd51172e7865f6890bf430d2269ce0a5c27854b494e2ef2a997371dafd6328b2c59656718201ad0dae946911d18ddfae01ad9904 SHA512 d8242777dd4aec49d56319b7da0423a3d39a906cc78650e733db27a3021603fe7043cfd5f2e5497847ca64f7439ebaca20b01a2fb7264d790748d300d87377ab
 EBUILD gcc-11.3.1_p20230120-r1.ebuild 1288 BLAKE2B c396af7d86e9e73e3dd1b59d921050066f1918aefe5c1cf8917101d995aad083357fac704feec5948f3100158ecfe09d7ffc7d03f8947aca1a7186d32dabd823 SHA512 9f318f3c78085b1e0d09941781481126b28806a162dd050d6264b35b3397203138fc0621dc1878c0d478ef9a94caec171f0e03e081e8e637edbfafc3efeefed8
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230126.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230126.ebuild
new file mode 100644
index 000000000000..c89d4e49e425
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20230126.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+#TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="10.5.0"
+PATCH_VER="5"
+MUSL_VER="1"
+MUSL_GCC_VER="10.5.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+#fi
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index a205fe4b04da..03f336df8728 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -8,7 +8,7 @@ AUX libtool-2.4.6-pthread.patch 1496 BLAKE2B dc49604133c6c65a2290a8879c243b35b20
 AUX libtool-2.4.6-pthread_bootstrapped.patch 532 BLAKE2B aeb1592c07a9c5eeed81c483e348786fb1cede29b09fa8e74d0fcf7fdb6ad36fd980823d13b3e20cc7a54d5c518e0f557928b440ef9d0fd6723a8d5f8774c098 SHA512 05c1cee7a3d90bf4768cabaaba47290dc668db7c14173abf99ed8e64dae92191537f89c3304a4d42c01ecc2280d37104c47f621e44b3d19db481846bb225a2a1
 AUX libtool-2.4.7-werror-lto.patch 2248 BLAKE2B 3537c599ee310fda695b1a671770e1d2c5a943e763641515738e8d13907b807b92727182a34af4c20598c3ad228a2b660f10fd582c2f65d1fdef11b92f5fc68a SHA512 b16f835fbec1ecf6c8408c0705fc94886f35443394298e9ae1d1893dbf7dbad11325b636ccc9d0ddeecc00a13a7b5ae78867dd1369b0fc2fcd9276808f326146
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
-EBUILD libtool-2.4.7-r1.ebuild 3386 BLAKE2B 632fbd05cc5d68ac399a5cba403a195331cb6ebee94973c9d8fe0f196249306a5fdd6f113923e76bad2be97b07e82b2b9c5109b2b46795831b1a45371f017e10 SHA512 572a9f696f28e0f9fb86724034f232519a6a88dac00d252f46f7c24a29034f4d965a8a056973edeb68950c23ca86edce647527b75b3cc305dcd64ae060f9a503
+EBUILD libtool-2.4.7-r1.ebuild 3384 BLAKE2B ac71d0956d6de8bf54c5b438ecffc8df6b394fb19ad74f1436bf227f21f39727f3e8d65ab84d4eda366c62c7e90c2388f3dbc2495f0301676827a4cbf40224a9 SHA512 32bdda61de879d6427ee1ba3e5197aae1a39f6ef8e69957c7b3236d24d1492e8d2e98205517f4ac3778849e1f23e102c8bcb53b9b473abada26e958516477940
 EBUILD libtool-2.4.7.ebuild 3334 BLAKE2B 196ccbd4276180bfaf120646fadfd75ea6572b0bb7ae587e4ce6a8cc5131fe8eac0d10429bb46b14ab936f083082c1898a583f41c9fd12e165768f4bf95890f8 SHA512 6da3a005faf45047ba8b25677b6c8f34348f978410920db68c44a5c0d388733f4dc3adea27034883256cd43f1eaab03ed55947b18e5bf061b96a3327346b2bf3
 EBUILD libtool-9999.ebuild 3342 BLAKE2B 34bd3f7dc0c7b42eb419a107eeff91a3d5f1f7074c56615bcd924a5f1190951f510f7ae270046dcaff5826285b4ebb64f3d3899828a6af012bc4dd28a3a37824 SHA512 705d5ce0f3c8c506771208325b62072c1c4cafacdfa9f0af4ed4988ebfb3995f090b70d20f8d5566ba382beaea037f99e92e7734c8987f1e8140ea4d15b173a8
 MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609
diff --git a/sys-devel/libtool/libtool-2.4.7-r1.ebuild b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
index 75a9976589a1..7152e6b324e7 100644
--- a/sys-devel/libtool/libtool-2.4.7-r1.ebuild
+++ b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 3ec033dcfad0..233d70e8fbbb 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,14 +1,11 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lld-13.0.1-r1.ebuild 2003 BLAKE2B 2fed1597f869a715267d27db0ce1a713e9a5dc65bddd21a1ef5be08e2ac756dc04d3db49d5b01c9781161da2a4bf100cd5fc01d772a2ac1819aec1e24408f9c7 SHA512 b690f7092574da74300d3ff36764a6a3b1dc722e1600c0d1d6712eb21052825994fe1c2aaf2db0359466657ac83083f1e617cbc89fc8f0d2c8fff2b6a5bdd948
 EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B 4db1dfc9b1997d31cc68240ae0b05afeae5a6b1cb24a0eb2012bc28b2ac8c0da4b532d270d070db5fd401717320a74b006628c19a12c787e2f9ba2dc24eb25b1 SHA512 73b2f0e7b27497ce9037cd10503b328378ff9a2e32cd36e6e264f5423cd05732da4ea2ef97b637fc344a4f3d5d3597c60dda29dba7eb509391c176d32d53a427
-EBUILD lld-15.0.6.ebuild 2094 BLAKE2B 1994e3430ea215e4c8aa54f84e1c845c3bf1dfa164b6c1ba785bcba027bf7e4c422c8fe58a31f5910fbce067a1091b889caf95067c6c213ffe5de0f0dda1d18a SHA512 9c25a149905220c3cd9d5ffc0f1c80481394433f0e87d76455f6f4ee50d1e43c9399e262e21f3095edfc261f670b7fc10f35a11b9dddb1bc8d3d10f151c70f66
 EBUILD lld-15.0.7.ebuild 2094 BLAKE2B 1994e3430ea215e4c8aa54f84e1c845c3bf1dfa164b6c1ba785bcba027bf7e4c422c8fe58a31f5910fbce067a1091b889caf95067c6c213ffe5de0f0dda1d18a SHA512 9c25a149905220c3cd9d5ffc0f1c80481394433f0e87d76455f6f4ee50d1e43c9399e262e21f3095edfc261f670b7fc10f35a11b9dddb1bc8d3d10f151c70f66
 EBUILD lld-16.0.0.9999.ebuild 2029 BLAKE2B 65cf3f20ddf1a4e3c9019df2fb9afc6bca038d88dbd29bbd7ea6c767e68ec2b824f4be6b04139bf98211177c30db0fd9ed5f351e0207d1530382c6fb618a3d19 SHA512 69eb8e93fd5f28789dca326dbbb658c4060b57ccdeae7e12aec5d842aeb944748a167983b67c00a98972cfff7350ac54ffe381db54c3d7a18e7970ca0190bf34
 EBUILD lld-16.0.0_pre20230107.ebuild 2029 BLAKE2B 65cf3f20ddf1a4e3c9019df2fb9afc6bca038d88dbd29bbd7ea6c767e68ec2b824f4be6b04139bf98211177c30db0fd9ed5f351e0207d1530382c6fb618a3d19 SHA512 69eb8e93fd5f28789dca326dbbb658c4060b57ccdeae7e12aec5d842aeb944748a167983b67c00a98972cfff7350ac54ffe381db54c3d7a18e7970ca0190bf34
diff --git a/sys-devel/lld/lld-15.0.6.ebuild b/sys-devel/lld/lld-15.0.6.ebuild
deleted file mode 100644
index 7bccf83c3662..000000000000
--- a/sys-devel/lld/lld-15.0.6.ebuild
+++ /dev/null
@@ -1,84 +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 cmake flag-o-matic llvm llvm.org python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}
-	sys-libs/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	test? (
-		>=dev-util/cmake-3.16
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-15-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-
-	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
-	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
-	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
-	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
-	# to existent directory ${WORKDIR}/libunwind/include.
-	mkdir -p "${WORKDIR}/llvm" || die
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 0e28fdfb232c..0afc4572e77e 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,14 +1,11 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-common-13.0.1.ebuild 607 BLAKE2B 01e55167e8a1a1568105090883f42c0c56c496eaa3ae179d1e44acd1d2f59977a6ce0d4d9c5bbbec38df5afc5cce7aff77a38c1618d415f431c4a413ea90bbf1 SHA512 4a5370e4e43bc5268ab32bcf4ae328890aeeab293da8fe74f3b52504ce57e5adc36de5240ff91e54a35f1f48840df7d821fd94600b1193c676c55590379bb8fe
 EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
-EBUILD llvm-common-15.0.6.ebuild 601 BLAKE2B 3dd38d17640ed52ff0be26db026475a9d0e7e1acebe95043bc6e0e63e32ff4f03c5637a9dcce25987f673962447feb4aa015f8b5b5cb33553dc1a4f843b75399 SHA512 e8a93a72d06810cface48cce2d8f8a890cdf009939a96350a23fe407b064c05a3016c663d11a3866dc2dd0fd87599b5ac234895c8c42c902e9b0cdb37dba7b62
 EBUILD llvm-common-15.0.7.ebuild 601 BLAKE2B 3dd38d17640ed52ff0be26db026475a9d0e7e1acebe95043bc6e0e63e32ff4f03c5637a9dcce25987f673962447feb4aa015f8b5b5cb33553dc1a4f843b75399 SHA512 e8a93a72d06810cface48cce2d8f8a890cdf009939a96350a23fe407b064c05a3016c663d11a3866dc2dd0fd87599b5ac234895c8c42c902e9b0cdb37dba7b62
 EBUILD llvm-common-16.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 EBUILD llvm-common-16.0.0_pre20230107.ebuild 530 BLAKE2B 8475e3b53197e4d4632f635af86038889c0e93161819f3b655a570f8b3b774f392a786c67320845ca7be620bcd22acfd0349ec9376435deff1f4333c993abeb3 SHA512 2f899fd29442895532c45eb8c97e1bdf19aaef19406382b81ebad16cb9eb6d4181a637a10d090060557f1d0b33dc579828c2c5c5d5ad02d0c5a4a3cca256caef
diff --git a/sys-devel/llvm-common/llvm-common-15.0.6.ebuild b/sys-devel/llvm-common/llvm-common-15.0.6.ebuild
deleted file mode 100644
index 5c69c0a3337c..000000000000
--- a/sys-devel/llvm-common/llvm-common-15.0.6.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
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 50297d1f90bc..c5fb4d48d576 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,22 +1,17 @@
 DIST llvm-13.0.1-manpages.tar.bz2 202187 BLAKE2B 32a761426dbe4c3c355d30660254305cd88b6d513faee04c78e370cea9d38761108a9be4c4b4ac39b6a74400af1f9d37ffd11ab05acd7340175c8d66845ae7d9 SHA512 9495e1daf588540fdb8b9ee905a9b6be4693bd70b7f42c8e8a0d667242fc24dc853c45918d3bc09d02f0761ad61541bc9749c1498e312da129abdab638a0d572
 DIST llvm-14.0.6-manpages.tar.bz2 218186 BLAKE2B 4491296e490936a2d7b518e19a0ff6312b89abeef3fbe5da5d0b93bb2add1088ddf64a0b00ec8846062d19b1ad31e53eadee7ce03c9034aab554e183d1baccf6 SHA512 f8328dc2ec1e8d941d47e583ee31fae7bdcebb3f854b5c8a4a84bd19a79bf5427ad204012c81349bc05a291e41cf48e5129b4578bbd5d4490dd01e1c0b5823bf
-DIST llvm-15.0.6-manpages.tar.bz2 229125 BLAKE2B 926c31b02e295fb2a58056fd75cd04017edcb9b01d23316f002e7d3a00ef77e84d6f04bf8387f1fe9a1d159c7d271248766d3205e747c4e9542bf93f209300da SHA512 94225b46013fab113ecdbe7c150dbb989eae2007c4ed338014fbff7e6e1dd7340eec58c560f22ac1b04df8e14678b33b372c9afd06c10943f099b1a7bb63a048
 DIST llvm-15.0.7-manpages.tar.bz2 228425 BLAKE2B 573b030a32407cfe241fb2c8c62bed8e7c54f9daf4b8cffdd2d4e5ca2e40b5ec5ed3724475aedf77119be1a4d9de847a989e933d315e6d94908e407a19c98047 SHA512 86d5eeea2757b0a627c8d2d6e70a3265fc0207085f4e473cdd6e8b624c719625dead23fd1737742a1bea27b1c4631ef3e8e3041a1122a85fcb49859e5bfbee49
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
-DIST llvm-gentoo-patchset-15.0.6-r1.tar.xz 20344 BLAKE2B ae43aea6ff2989f03f490939f9c05b5bb41d03205037adb4a13c928cede113eb113a5ac8406ef814bd9da21f298d64a9efdbd30adb89a969caad60954b46577e SHA512 c105ba86bd116130ff5aac64ba138c1b83fc50e81dc1293e45e311c64b7d1dfefddb7a8585c3d75091d70e15e1a0a179d8c646416e6a6a159edb12c5dcf59914
 DIST llvm-gentoo-patchset-15.0.7.tar.xz 19300 BLAKE2B b70e81d744c2eba5cd851e7b690ce8979b3064973f522be7c93bfb541860000a4bc8b17219f8788dfc8a527217dd13946cf7836640698ddd3d4b3fde493dfbf8 SHA512 daffff6ae4a0874aff1a423b4bb36701ecb5a35a36ae91d4ed7fda58b83e50ffcdc30498c84be4711fd3e1f227bf312dbe930019203e0a131944439af2aa94f7
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-13.0.1.ebuild 12004 BLAKE2B 4e04c4b85e2b3c739fd69895ad0ef5b6d029319da6982f1719ca162ac6b9dec2793526b6c9a9ed7a74c66975d1dea15f7759731e11b56a372dc2165b54082529 SHA512 4bcc027ed659cfa4831995b62c3276eb67c38bffa63fa8b161251bc482c1a4fbd5d139a542bb302c4187a89da0153728a10bb60b1c441b74584d0137364ec65d
 EBUILD llvm-14.0.6-r2.ebuild 12379 BLAKE2B 878f5723404dd8b85e874c8b8cd83ec3da07ddb4b38c1129d74eb838518cb0cc2db52370bca3065af6329b19b8f3741c6cb64ecb2a0ca6506560ebab122d2e8b SHA512 35dfcb42c1d4a477541c4433ab69cb38e25c55d9061133381660eea5cdff8c2b9b4683eb9fd310b909544dab322cf9c85565c0f3df3453ce1f993c36874599a9
-EBUILD llvm-15.0.6-r1.ebuild 12550 BLAKE2B f89218a5d755507c1595f94b718cb8386ff5277dcc4afe178746319ae26a2cb3512799b14e9c1bdc0ed8a229d6bf34dbb07f338437454ff46e0d08084c4bc309 SHA512 ece3b64ea97b1d61a074ac9e715dc7252b827c538876f2a8b2b2c72c675d999309e07b26ad05a6e15297020320762ce3bcc4860403c7eee9ece6141aadee9a4b
 EBUILD llvm-15.0.7.ebuild 12547 BLAKE2B 614c03ba1864eb535f1c3685d09d639de6222d20711023bff39b6ab257114ad2fc5a7565f8227829d057ec65ca157ee9dcfd16bb40cec5b0fa6abfbf11ea6654 SHA512 8580f74800122d1d0b7c8114f8555fdbab6291daf20c15ae9fc125a58b203f7ccd7bbcb4fb7aea9181b9abc0e296c7b91417a15a4c50a31b4c65f01c7fba17c8
 EBUILD llvm-16.0.0.9999.ebuild 12342 BLAKE2B 2ee8d346c927e1e32242b2ae5146cbcc0280030197d24e72908064403646975497bd469f14d1a46d5c93823e22b757b074f3215593fef68429060e733a2006ba SHA512 09b426cce2ffd6e56b354b7ec0d5ed4ef69fb16b7bd20f1afb1c05239cc106daae1c9246e5b24b29f88654a2a4bc7f4a907d55cead98aafed34465af84b6007d
 EBUILD llvm-16.0.0_pre20230107.ebuild 12348 BLAKE2B cab528b783d40bcfa24127b9d777374b163844a37b706162933f3020c36cec79263b29e3cb356d1f702467705322c8daff1d01f6c32018524bbc5e1e8f9d4459 SHA512 5ca3ef40d6ef141c733a09b8492e1cf5724ee826ab4e63d8055289a7955a88270b863dc2782cf313e4ea852129bfe95d0aa8b9a755df61303963ce8277f28655
diff --git a/sys-devel/llvm/llvm-15.0.6-r1.ebuild b/sys-devel/llvm/llvm-15.0.6-r1.ebuild
deleted file mode 100644
index abc25ccb0f70..000000000000
--- a/sys-devel/llvm/llvm-15.0.6-r1.ebuild
+++ /dev/null
@@ -1,521 +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 cmake llvm.org multilib-minimal pax-utils python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="
-	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
-	xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
-	exegesis? ( dev-libs/libpfm:= )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xar? ( app-arch/xar )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	binutils-plugin? ( sys-libs/binutils-libs )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	>=dev-util/cmake-3.16
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="
-	${RDEPEND}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_MANPAGES=1
-LLVM_PATCHSET=${PV/_/-}-r1
-LLVM_USE_TARGETS=provide
-llvm.org_set_globals
-
-python_check_deps() {
-	use doc || return 0
-
-	python_has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_uptodate() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the ebuild is up-to-date
-	check_uptodate
-
-	llvm.org_src_prepare
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# shared libs
-		LLVM
-		LTO
-		Remarks
-
-		# tools
-		llvm-config
-
-		# common stuff
-		cmake-exports
-		llvm-headers
-
-		# libraries needed for clang-tblgen
-		LLVMDemangle
-		LLVMSupport
-		LLVMTableGen
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# utilities
-			llvm-tblgen
-			FileCheck
-			llvm-PerfectShuffle
-			count
-			not
-			yaml-bench
-			UnicodeNameMappingGenerator
-
-			# tools
-			bugpoint
-			dsymutil
-			llc
-			lli
-			lli-child-target
-			llvm-addr2line
-			llvm-ar
-			llvm-as
-			llvm-bcanalyzer
-			llvm-bitcode-strip
-			llvm-c-test
-			llvm-cat
-			llvm-cfi-verify
-			llvm-config
-			llvm-cov
-			llvm-cvtres
-			llvm-cxxdump
-			llvm-cxxfilt
-			llvm-cxxmap
-			llvm-debuginfod
-			llvm-debuginfod-find
-			llvm-diff
-			llvm-dis
-			llvm-dlltool
-			llvm-dwarfdump
-			llvm-dwarfutil
-			llvm-dwp
-			llvm-exegesis
-			llvm-extract
-			llvm-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-jitlink-executor
-			llvm-lib
-			llvm-libtool-darwin
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			llvm-modextract
-			llvm-mt
-			llvm-nm
-			llvm-objcopy
-			llvm-objdump
-			llvm-opt-report
-			llvm-otool
-			llvm-pdbutil
-			llvm-profdata
-			llvm-profgen
-			llvm-ranlib
-			llvm-rc
-			llvm-readelf
-			llvm-readobj
-			llvm-reduce
-			llvm-remark-size-diff
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tapi-diff
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			sancov
-			sanstats
-			split-file
-			verify-uselistorder
-			yaml2obj
-
-			# python modules
-			opt-viewer
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use binutils-plugin && out+=(
-			LLVMgold
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-		-DLLVM_ENABLE_ZSTD=$(usex zstd)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		# used only for llvm-objdump tool
-		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		mycmakeargs+=(
-			-DLLVM_VERSION_SUFFIX="libcxx"
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-
-#	Note: go bindings have no CMake rules at the moment
-#	but let's kill the check in case they are introduced
-#	if ! multilib_is_native_abi || ! use go; then
-		mycmakeargs+=(
-			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-		)
-#	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use binutils-plugin && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-		[[ -x "${tblgen}" ]] \
-			|| die "${tblgen} not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DLLVM_TABLEGEN="${tblgen}"
-		)
-	fi
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
-			CMakeCache.txt ||
-		die "Incorrect version, did you update _LLVM_MASTER_MAJOR?"
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	tc-env_build cmake_build distribution
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${LLVM_MAJOR} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 2ed53c998d18..741be64da025 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -13,5 +13,5 @@ AUX patch-2.7.6-fix-test-suite.patch 3006 BLAKE2B 4b00c743f880f3cd672d6d37ff89d6
 DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
 DIST patch-2.7.6.tar.xz.sig 801 BLAKE2B 8f2decb10402ecf0208d05ea7cce3bae565d31ee2bb2a118367c117d25b158d8bd525cae654ec0c0e2c036cc8f47a331edc1bb10b100683ade64dfa3b651988b SHA512 1302a1110dcda4f3d83b5263415d72be55c46dae0efb1c123e9c346154e09def5657004bbe7249e2d014555349410e7a5217140dd8852331235f75bcc757351b
 EBUILD patch-2.7.6-r4.ebuild 1810 BLAKE2B fa83066043ee859735774069feda3aadadd1d0c5fa1d80e8c4d5230fe02299f0dd8a4df50936cb69129c02bc1e5e1a627d73b0358b4b971f0c9fddeb41370d9e SHA512 8b23ef0402619209c5eb37c31b0278d306a1684c3e6a73954252f4f0f64c89376261166cc312b694818c4fb333b7f54d6101d89c2011699658fa1413f77cc8ac
-EBUILD patch-2.7.6-r5.ebuild 2019 BLAKE2B 9a746d255ebd4f3237cc0b902c666db0bed6a329c2635cf9167461d059ccae6cea02c67ed8fe59aac602fad9e45eba677d5895dad1d7cc57f0d5ddf31f9a0749 SHA512 2b0970a8826e9ce2bb441ebbf5bf0fc9253c2021c4fc5898e3440cdbf38d1a5d0a9a918f3a1f5489b0c2fafccb92da5113b8d4605040b0fd59f4bf0437d6c8ac
+EBUILD patch-2.7.6-r5.ebuild 2015 BLAKE2B 2c8d7a19f8fd788b14696419ec702aa461abaa034679d6d4231fe4578c2fa3b024974c6125e9738565232fad8008286c17af06d5dc9b9f0051ee9fe91d61a28a SHA512 ec41806420e4165b265f4b87a9f4b6380ceeebdc5e2e89559b74626f5206a60ce5f45f32aaf8abd526db33b18787854b5885cf61cea663f69d5c6c990ca6371d
 MISC metadata.xml 329 BLAKE2B ac0ac5e4a422955e2e1cc040d03ab9df083c70d0275145366ffe47c04fb08ac5e9c1cf776ab9c96e023910a0f66a7ff3cfd8377574d8e282cd78c435a6d8bdd2 SHA512 a0c5d5bc2d111a6d22afa4bae0e56ac7f927798122fed5373dd64a214d7b51dc436482bf21eb2ef32073c2f4004cb6dd6449afd58b7ab6936ed3c2e3a4c39872
diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild
index 803a7e832e09..1f64ef5366c6 100644
--- a/sys-devel/patch/patch-2.7.6-r5.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 6c41662819ac..bf68918c681f 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 9326ab957fdf..1c4ed10897c3 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,18 +1,14 @@
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-gentoo-patchset-14.0.6-r3.tar.xz 16904 BLAKE2B ebf67455071d6d3744cfc0491b8a33c4c63bfdbcf668565fa0718f6cdb01bced53be9d1cdf6774f6cd8427c07c0ede69503d74cf3574642a6967b38730248ebb SHA512 adc5a3212657d1defa7b720d1a7e9e91586439a34964d44b6897d21be3d208bd15c04bf20502dd7125ef8c368defaeea146eb844ca321be56eebcee52be606a9
-DIST llvm-gentoo-patchset-15.0.6.tar.xz 15888 BLAKE2B a3d02ad1b3e17b951252963accde21f9bdd430e0fc084a5c6cd6419d403a2712d06a02cb8402a098baae794d766faffa0da89cf2797957044c5145a2a6f2bab9 SHA512 e4252b5856885a2aa78c607cb3bd874eb9a8c9d3d03646091a71fbb6d2584bd29cf9d2fb7c381e52be0b665fbd258ae46137ff8b238b8b906d3950042fb73fe5
 DIST llvm-gentoo-patchset-15.0.7.tar.xz 19300 BLAKE2B b70e81d744c2eba5cd851e7b690ce8979b3064973f522be7c93bfb541860000a4bc8b17219f8788dfc8a527217dd13946cf7836640698ddd3d4b3fde493dfbf8 SHA512 daffff6ae4a0874aff1a423b4bb36701ecb5a35a36ae91d4ed7fda58b83e50ffcdc30498c84be4711fd3e1f227bf312dbe930019203e0a131944439af2aa94f7
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6369 BLAKE2B 6c3f934fe38caca16161992ec09283ccda42751573b29ed920fab09d210fd415367b41bcd77f8069a711db320a1421067d0da75d5e1fc44a9087c7fa4dfcba9e SHA512 c98e47504210e68f8fee17d2c1bc2ec85073234d46a830751faf58444fe8af473b8b419653165b900ff1ad5d0c81d3f9cd7e4cb40f9de412c44cacfce8c5395a
 EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6381 BLAKE2B d6b9d293aedc2488beaa0e181b4a3501c2436f275d449f043af0315bd9951d88233b71258300fa9f6409272ed3b75f6657791b526270f2b62ac462b43e10b95a SHA512 658e7ca3a6a099b7f903123915b7ca4ec1c2b35292b8187ef8389283cc4c03c2cbc08ec5032e264f49f52675d9257389f4fe9032ad576a36ae6a4e5bd9e8fa92
-EBUILD compiler-rt-sanitizers-15.0.6.ebuild 6433 BLAKE2B 2d2b4fa03ac907778c4b1d90e0a3e8b686385fb517e8933d51d7cb22d833b40d3d0fb42971accb96b4e933c35cf961b4cd4bf75878220738632c6828d884664b SHA512 34f5038a9dc9a4274a9e3c2f91837f458c85ecf75a66a2de0845994904450c85d4ef2617ccdb5414d1a99b70ae44c155dc311f312dad4e11bccd212a1009e926
 EBUILD compiler-rt-sanitizers-15.0.7.ebuild 6433 BLAKE2B 2d2b4fa03ac907778c4b1d90e0a3e8b686385fb517e8933d51d7cb22d833b40d3d0fb42971accb96b4e933c35cf961b4cd4bf75878220738632c6828d884664b SHA512 34f5038a9dc9a4274a9e3c2f91837f458c85ecf75a66a2de0845994904450c85d4ef2617ccdb5414d1a99b70ae44c155dc311f312dad4e11bccd212a1009e926
 EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
 EBUILD compiler-rt-sanitizers-16.0.0_pre20230107.ebuild 6254 BLAKE2B cf7575a46a8678ff6ed69bb3e5863b062948af66bee98d60be8e728d30095ee34272b5a89d99bb31ee6ae87e3831cbb8120bc9f62ce0a0662caf42126582aa72 SHA512 da6daf348f285fe8c56d707fe185318647eb08bc6decc614d4b7f690f729fe4ae5580bc9d216aeb2a18881a729ed50cacf2d32a591c768ccc095e43969ac7b6b
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.6.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.6.ebuild
deleted file mode 100644
index e5fe7115aaf8..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.6.ebuild
+++ /dev/null
@@ -1,219 +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 check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_VERSION}"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-# base targets
-IUSE+=" +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		!!<sys-apps/sandbox-2.13
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_VERSION}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-LLVM_PATCHSET=${PV/_/-}
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	local flag
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if ! use "${flag}"; then
-			local cmake_flag=${flag/-/_}
-			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-				cmake/config-ix.cmake || die
-		fi
-	done
-
-	# TODO: fix these tests to be skipped upstream
-	if use asan && ! use profile; then
-		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-	fi
-	if use ubsan && ! use cfi; then
-		> test/cfi/CMakeLists.txt || die
-	fi
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local flag want_sanitizer=OFF
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if use "${flag}"; then
-			want_sanitizer=ON
-			break
-		fi
-	done
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_VERSION}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error if has_use tsan and SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_VERSION}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_VERSION}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${LLVM_VERSION}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_VERSION}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_VERSION}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 3cbda70ef506..11e6eb5b8217 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,18 +1,14 @@
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
-DIST llvm-gentoo-patchset-15.0.6.tar.xz 15888 BLAKE2B a3d02ad1b3e17b951252963accde21f9bdd430e0fc084a5c6cd6419d403a2712d06a02cb8402a098baae794d766faffa0da89cf2797957044c5145a2a6f2bab9 SHA512 e4252b5856885a2aa78c607cb3bd874eb9a8c9d3d03646091a71fbb6d2584bd29cf9d2fb7c381e52be0b665fbd258ae46137ff8b238b8b906d3950042fb73fe5
 DIST llvm-gentoo-patchset-15.0.7.tar.xz 19300 BLAKE2B b70e81d744c2eba5cd851e7b690ce8979b3064973f522be7c93bfb541860000a4bc8b17219f8788dfc8a527217dd13946cf7836640698ddd3d4b3fde493dfbf8 SHA512 daffff6ae4a0874aff1a423b4bb36701ecb5a35a36ae91d4ed7fda58b83e50ffcdc30498c84be4711fd3e1f227bf312dbe930019203e0a131944439af2aa94f7
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD compiler-rt-13.0.1.ebuild 3880 BLAKE2B 218087fa112daef84de0e0a28126b7fb19e71a6206279a856c1d0b97232125a695f2349bf9c5bae51ceaa4bdbb1c5a4d086c047675d3b8601854f8ca1009f88a SHA512 689f563143daa17b9d319c9af2f8d1501e1ba1c80bb528dfbf2f63de26b9f17e30a3071ec363c3f4e65ba0063c366eb944b23431f6a0e05988d3a91a5a2679ad
 EBUILD compiler-rt-14.0.6-r1.ebuild 4247 BLAKE2B 53a61ea821f52d45691acce10f2aa6155606930796f142a18683b7259357ad770552de88d11115f9a97c77975c4866e2082fcfb770ad6ded5ec6d70393aabbc2 SHA512 bbfdc05c22f3750b0f8c9a84118b70beff97fc360c5c133ad58bdfe78762320cdbb0b170f6154eb5098bc9dc2ecb2643871c8ce85162c47235cf1408d5ef67e9
-EBUILD compiler-rt-15.0.6.ebuild 4259 BLAKE2B 2d7636f409dedb9bc78e77312355ca3859adbd108cb0d6001c2d9cab89b09847003d4148d013332ce93292678743a9b7197791d51048758d351292b8d53c833f SHA512 ebe6fbaaf6ff68d5f12f61f8e9d02608321b3e4db9ccf7be43e7a43de7c6600a1a506e48bf1468ca16b0d3ea894a5603b3f468a9ded7cbfa76145c7c8b8ec20e
 EBUILD compiler-rt-15.0.7.ebuild 4259 BLAKE2B 2d7636f409dedb9bc78e77312355ca3859adbd108cb0d6001c2d9cab89b09847003d4148d013332ce93292678743a9b7197791d51048758d351292b8d53c833f SHA512 ebe6fbaaf6ff68d5f12f61f8e9d02608321b3e4db9ccf7be43e7a43de7c6600a1a506e48bf1468ca16b0d3ea894a5603b3f468a9ded7cbfa76145c7c8b8ec20e
 EBUILD compiler-rt-16.0.0.9999.ebuild 4164 BLAKE2B 332c450aab09115e23d14304e1f1bfa8c9482ced7acff7d6b80ac09d88f6d5a1481f090c837a7876bc264e3f1451b3bc5f285a71a38a7bf64ad3845299ca9b59 SHA512 7dcaae258434c5cce6b225c49b71e1987ac5af36f83ce25962ade4b2c836f13034fb54fed2723e7d089dc77b20159c0dd04c67f9a6928b62550d594db7f98cc2
 EBUILD compiler-rt-16.0.0_pre20230107.ebuild 4170 BLAKE2B 5c863321f73c784ae997fe46377fc6525ece43664cd41c8a8178aa764f820788c6b8072a99f0d79246721cbfdbba99cb06faacf93509246a94242af35f6820b7 SHA512 2eb75d0677db0d1ff130849651dae53c2f180a78e8103f012e4c4dc6d967db533b4457647221aa85a26adbb04c936ccbe18d5ad29a571554773049951e5b8de1
diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.6.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.6.ebuild
deleted file mode 100644
index 284371357cd2..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-15.0.6.ebuild
+++ /dev/null
@@ -1,150 +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 cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_VERSION}"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_PATCHSET=${PV/_/-}
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang; then
-		# Only do this conditionally to allow overriding with
-		# e.g. CC=clang-13 in case of breakage
-		if ! tc-is-clang ; then
-			local -x CC=${CHOST}-clang
-			local -x CXX=${CHOST}-clang++
-		fi
-
-		strip-unsupported-flags
-	fi
-
-	if ! test_compiler; then
-		local nolib_flags=( -nodefaultlibs -lc )
-
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
-			# Avoiding -nostartfiles earlier on for bug #862540,
-			# and set available entry symbol for bug #862798.
-			nolib_flags+=( -nostartfiles -emain )
-
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_MEMPROF=OFF
-		-DCOMPILER_RT_BUILD_ORC=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index db5ffaeec766..7260f543a8ff 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -3,16 +3,13 @@ DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679
 DIST llvm-gentoo-patchset-15.0.7-r1.tar.xz 21400 BLAKE2B 6b149cb721ac476b728bf9b0197f630d3db40622b85e3d099cdbc1d85ec14872d4e1eb0c94be6edc20fc6187da29b42f934dfb765f2077425a5b919900bb97c0 SHA512 d84d48caa3781633c7c6147e0b786417e93e4b5c9d1393809164e6d355a56673013ed0ea9bc3309488d7cfb794c1b336c888adc52dcd95e70c16d9208c36bd15
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libcxx-13.0.1.ebuild 6768 BLAKE2B 36c10303fd96a4e4abc70f7fca2b1206cb32ecb4130061ac13ca29970c68d3ef5540b00dafd34c03f2052ee8c099f20d561c4572ffc65b73ea6dd5ace6aba4b5 SHA512 c067b3c184667dad0deb3c2fd345de4f863ee1d4583f883b9a848d61a980b13c707bc434454b98fc815d234a1975ab5fc76c0fc28ebcf54fb5868918b12dc593
 EBUILD libcxx-14.0.6.ebuild 6948 BLAKE2B b8f0793a4542a76b789ae6c3cfc392bdba7c8d033a6d41328cd32754af3affb663b87f8811cf53fcc3be9e2bcb9f8691a64bd613b26bfd8b5c99a9c11e9c57ee SHA512 d280604fe14e1488a1b9538ec7da100639024e34ed65c5efe11c7fd563073ded3655d302e61b1b657766ec2b3fc78d2192f905377b3f5d55fcf20ecba58262b3
-EBUILD libcxx-15.0.6.ebuild 5281 BLAKE2B 91ef259e7e911d759553378e78dadac1f69a8d890eaec9572d987674b22943b07ae83bd6c7fa6f0968da0bb14709436117ca6beb7786fa329dfebb268273e0fd SHA512 038ccd5504bbb990f8b6bf35ed64ca197a84f14e2860e277bd488693e583474332c73afd1a48911786b6352373a1f09763899d2408907ada836a992cb733ed43
-EBUILD libcxx-15.0.7-r1.ebuild 5307 BLAKE2B e67fddd39b63b876011f09b93bbf9f77c184ad74c325cfe25add294aaa3aba6293d2c5d6324dcf89644ee04afad8a46bba5c5ea8db944d07e2954fa4cab1e8bf SHA512 48667b4e2b65210309812a869cf448635ec344549c26359118988156e418a08881413eddefc74e69d1744aa3d53abd8737d765e55aa1e44cae990292b4e392ec
+EBUILD libcxx-15.0.7-r1.ebuild 5306 BLAKE2B 346390544e06d0fac9c21e341ab97a40b51c6af8c0bfe33771e634a1b4f081fabbbe24a749572f2129adfd26c5e8992442775dd5bfc557cbf50988bacc510137 SHA512 4cc723ca0b09ebedd5c7caed4008c392c3843f93674f0a913c067c147c74b755061bc9cdbfd51037505f0d395353791237275382e6b321f8dc7a83b24a7c5e4d
 EBUILD libcxx-15.0.7.ebuild 5281 BLAKE2B 91ef259e7e911d759553378e78dadac1f69a8d890eaec9572d987674b22943b07ae83bd6c7fa6f0968da0bb14709436117ca6beb7786fa329dfebb268273e0fd SHA512 038ccd5504bbb990f8b6bf35ed64ca197a84f14e2860e277bd488693e583474332c73afd1a48911786b6352373a1f09763899d2408907ada836a992cb733ed43
 EBUILD libcxx-16.0.0.9999.ebuild 5238 BLAKE2B d31f97c2b6fad3c8b357cf1d9c2bbcf52fcf8ddef4cd5e52a1e5a8d413751441032cc964eeb4ea3509e3ee16aab6342dcbd38a9b7e7d9299021834e834054c37 SHA512 4c7f95ca928f5d7dcada11ae250a0468a3797bf024985635eaf815dab7341863bd7add87abd459e49a2fa0b19b12ae87cfe6d5799780f1594130eb134e4347ff
 EBUILD libcxx-16.0.0_pre20230107.ebuild 5244 BLAKE2B 293399fe1fc0f91f115697a27d265f422e1c9535e0cfad5087a3faa3a9660e4e4210acf61bb4863d9c3fb4899eb23d74ceb8d6103da405eed47cb9157a413305 SHA512 c7ec13ea1c4a6e867fce9971b6fcfc4ab4c862f36a67c8b0484ebfe7708f0455310b9475c581ac1d635344db2a544eedf5649b0633900b10000f1ee0e9f065b9
diff --git a/sys-libs/libcxx/libcxx-15.0.6.ebuild b/sys-libs/libcxx/libcxx-15.0.6.ebuild
deleted file mode 100644
index c8284848d512..000000000000
--- a/sys-libs/libcxx/libcxx-15.0.6.ebuild
+++ /dev/null
@@ -1,204 +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 cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv sparc x86 ~x64-macos"
-IUSE="+clang +libcxxabi static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? (
-		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
-	)
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		>=dev-util/cmake-3.16
-		sys-devel/gdb[python]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=system-libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES=libcxx
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxx
-}
-
-multilib_src_install() {
-	cmake_src_install
-	# since we've replaced libc++.{a,so} with ldscripts, now we have to
-	# install the extra symlinks
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		dolib.so lib/libc++_shared.so
-		use static-libs && dolib.a lib/libc++_static.a
-	fi
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_static}.a || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps=(
-		libc++_static.a
-		$(usex libcxxabi libc++abi.a libsupc++.a)
-	)
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=( libpthread.a libdl.a )
-
-	gen_ldscript "${deps[*]}" > lib/libc++.a || die
-}
-
-gen_shared_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_shared}.so || die
-	local deps=(
-		libc++_shared.so
-		# libsupc++ doesn't have a shared version
-		$(usex libcxxabi libc++abi.so libsupc++.a)
-	)
-
-	gen_ldscript "${deps[*]}" > lib/libc++.so || die
-}
diff --git a/sys-libs/libcxx/libcxx-15.0.7-r1.ebuild b/sys-libs/libcxx/libcxx-15.0.7-r1.ebuild
index 7fc94c670538..b0445e061e96 100644
--- a/sys-libs/libcxx/libcxx-15.0.7-r1.ebuild
+++ b/sys-libs/libcxx/libcxx-15.0.7-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~riscv ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="+clang +libcxxabi static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 7b50560ce5de..5a75502f5c63 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,14 +1,11 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libcxxabi-13.0.1.ebuild 3468 BLAKE2B 2f0f4469527be7df50173cd1be4c4e4f0640e5a452493ee302e0271ea506b06916c0cfd321be861dd760eb9c1eb1fd270709d52030334fda5db8875f886b8119 SHA512 0bd3ae225e63c8dd761cc6f2c1b43cee8f80a254f9104dd12d8affda81e306788cc8134160193474a06f730758fab844d74ceee5cf5bbd775d89265e2da2bec7
 EBUILD libcxxabi-14.0.6.ebuild 3384 BLAKE2B 71c0a0a1765bdfcc6829d5ac3a1e260f541cb6a4a8b1557db6d6fd17d540dcaa85df21ddae645afd72a620f1b52c42dd8d8d18bb0983b853059f4d598c9ef6ae SHA512 c7a8b74eaf423d166ff5eb8fdd7e7a124c6c0caebdc4f22cd542c7f08e3eb3906e6c3c2a1895cebc74eaef07e90c47721965873888ee4c0a46a8be72bf5fe6ef
-EBUILD libcxxabi-15.0.6.ebuild 2909 BLAKE2B a1aafff6c1499a13f5301819477c822ad16c32442d47d1ca04e343c8a56a7936dc1c4a8e8c75394bf2d77adcd91cefb4264e5ff0e15212a2df703fab0b1631de SHA512 9cfa80c345874e87e0adfa96b2e9382252f8ab989eb651133531e0ab86f29ac759f0485f017703c344dd21cf35f063c410160106dbbed4ccf29562b1621bee20
 EBUILD libcxxabi-15.0.7.ebuild 2909 BLAKE2B a1aafff6c1499a13f5301819477c822ad16c32442d47d1ca04e343c8a56a7936dc1c4a8e8c75394bf2d77adcd91cefb4264e5ff0e15212a2df703fab0b1631de SHA512 9cfa80c345874e87e0adfa96b2e9382252f8ab989eb651133531e0ab86f29ac759f0485f017703c344dd21cf35f063c410160106dbbed4ccf29562b1621bee20
 EBUILD libcxxabi-16.0.0.9999.ebuild 2866 BLAKE2B 8eb6ad38adec95b1dfda64dfff47255bd19841975520320f9842ddd79b1162674dcc933d167585ed6f497c5b54095d8aa96b0af9335f1fa8bfb27619668f0c91 SHA512 be61b1a89549b0d531795483e350924ffc03f85bf0fb2f5fbf75a743d56e8da95598fb4f114ce2c3ffa903254dbbe35f171aacad7ce3cd5f358ca1d763d4934e
 EBUILD libcxxabi-16.0.0_pre20230107.ebuild 2872 BLAKE2B 9a0dd0aa38b9e6229d49c96c4a7b97cfba583702c0fcd620cd570a9e2428b59ac0f1aa02153aba54c0a9187f07fd2ff85aec9e4df072d2f64f5af371c54a9b28 SHA512 85ad4be182dee73e514ed4d69ae6ad570c0854a79ed2d5660c86ed12f794ab6107564d6d46ee79933e3690f79a81bc573afa9cd194548dd9c68347bea4c79b17
diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.6.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.6.ebuild
deleted file mode 100644
index 1b6f8964e39a..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-15.0.6.ebuild
+++ /dev/null
@@ -1,116 +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 cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv sparc x86 ~x64-macos"
-IUSE="+clang static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-	!<sys-libs/libcxx-15
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
-	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_build cxxabi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" cmake_build install-cxxabi
-}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 44f7bc10bdec..4e30f56ac982 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -2,15 +2,12 @@ DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574
 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libomp-13.0.1.ebuild 3907 BLAKE2B 6004ffd9d6b183b99bc9f2117e7db2aef65bce75cad55b9bcdbe4447fcaf23a9535b270f08d29d4c574fcba86a656eb6ea5db82439f7ba51610b43b74e5db405 SHA512 acbac5e01f2acb6621b7c1c6f3cb774320884794058128399d0e5d1fcef3b18404346f5f707a318dbad0d5f9ca07474ffcbc06a8d092b9bfeb0793bc5cdb21f2
 EBUILD libomp-14.0.6-r1.ebuild 3917 BLAKE2B d92540af690dd622122ad1a4ed2548afa141f1254fbe9a9b3d34286b36f0fa70ccaf915f218c1bea8c68377ea20724db9443d365e2e5f290707f444d3ff47ca5 SHA512 433ae63716103af5aa493c7dbae43f10003cac95abaae579dcb61cba6390da4b9b3fc921e410ba899719bd170fa153a7b3d66c8776c37fd074066173c1fea160
-EBUILD libomp-15.0.6.ebuild 3400 BLAKE2B f3861589a39fa019f47e103225606b5ad3b889222ea0d46f3d955524c5de77d4e0a1c12d3ac426e53ee46824e7de240cad4fc931cf0b239e492417b8159ccabb SHA512 89f27e3bfbcd801eeab05b42d4e20d2adac99b800eeacb1ad27c44505aaed12a1e5a3e17953844f986c084a3928b30083736f3a51689c5c26bbf4ac5a4f21c19
 EBUILD libomp-15.0.7.ebuild 3400 BLAKE2B f3861589a39fa019f47e103225606b5ad3b889222ea0d46f3d955524c5de77d4e0a1c12d3ac426e53ee46824e7de240cad4fc931cf0b239e492417b8159ccabb SHA512 89f27e3bfbcd801eeab05b42d4e20d2adac99b800eeacb1ad27c44505aaed12a1e5a3e17953844f986c084a3928b30083736f3a51689c5c26bbf4ac5a4f21c19
 EBUILD libomp-16.0.0.9999.ebuild 3769 BLAKE2B a5c3ebbfd36869cb4ab676d40f374391e394cee4e2eb2d77c4cdf605ec4b36736621fd7883c3a509922c8140f235ced7b3e6e6267510c771c53271647bd2e5b1 SHA512 c1b55fa30e12c856830fb31e02f31b23c2f64741b8da46a8ac1982718064b6203754919fbfaa99e7850503b325263ec987b87aac0c6955d3b712399548ab13a5
 EBUILD libomp-16.0.0_pre20230107.ebuild 3450 BLAKE2B c698732a256b4236436f8228e334d2f34885fb1093aa5afa8d2e069a1d7dce169756ec29d15b0dabd355bdb1f657af67eef776ec31bb184d9252600eb582a5a7 SHA512 a5117c5017f593e8801f471ad9c359f2cb31b72323195bec42c0759d49fd497dd69f3b1af27db474b63ea07306ac57a68d040cd3c94b9588dc64a1c9134ab964
diff --git a/sys-libs/libomp/libomp-15.0.6.ebuild b/sys-libs/libomp/libomp-15.0.6.ebuild
deleted file mode 100644
index 46dfae21f41d..000000000000
--- a/sys-libs/libomp/libomp-15.0.6.ebuild
+++ /dev/null
@@ -1,131 +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 flag-o-matic cmake-multilib linux-info llvm llvm.org python-any-r1
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
-IUSE="
-	debug hwloc offload ompt test
-	llvm_targets_AMDGPU llvm_targets_NVPTX
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		virtual/libelf:=[${MULTILIB_USEDEP}]
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-	)
-"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	offload? (
-		llvm_targets_AMDGPU? ( sys-devel/clang )
-		llvm_targets_NVPTX? ( sys-devel/clang )
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	# LTO causes issues in other packages building, #870127
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-
-	if use offload; then
-		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
-			)
-		else
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
-			)
-		fi
-	fi
-
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	addpredict /dev/nvidiactl
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 040bb5dc55ee..43e4510fee6a 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,15 +1,12 @@
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-libunwind-13.0.1-r1.ebuild 3772 BLAKE2B 55db31f560c6e4cc6c6acb703f9df7dd3e0e691c2d0d8c15660a89c4e41ad0ff7b1c515a440567f4cc5842e07f296d8042dc71ba1380f250dfd1ab93608444cc SHA512 f0efdfb6bf2e7ec8c41863b475e9646171d7c1da075e4298e47d101da5338c5c7945b98c2c3178d27f6e9eee565691f04a2fa2145584c7b66a3c98dd7afa21f6
 EBUILD llvm-libunwind-14.0.6-r1.ebuild 3161 BLAKE2B ba7b19ed2bc77b52eee0b04d938541d2eb4053b65a641e55e54ebac85adcd432fa60b2b484003890bc96be83d61410bb58c2f3a86f12a7c574044a8e10427db9 SHA512 11854f9ef2a552a96e51c618958e553d4cd4affc78312845a223d0fe6d2ff62e8f8b2b3c29ad4a093b08a6df63b230f21b9ef6b63440058322f6a00f160df3e4
-EBUILD llvm-libunwind-15.0.6.ebuild 3032 BLAKE2B 9b47e894db1a764f3eca3135f4caba68261953f4433af017b7bb53181e345ad26c570733f997022c53c9ef49a0a3b823188d92cfcc16a2113825d767b1ffab2a SHA512 0b68480fb2a8e5a351574e81fbcff824cd324754ed40378f06fec12fedbba94a921043d72db6ecc37f8b0680b7f518bbbd8d63f69ce8d84f86ca522653d293fb
 EBUILD llvm-libunwind-15.0.7.ebuild 3032 BLAKE2B 9b47e894db1a764f3eca3135f4caba68261953f4433af017b7bb53181e345ad26c570733f997022c53c9ef49a0a3b823188d92cfcc16a2113825d767b1ffab2a SHA512 0b68480fb2a8e5a351574e81fbcff824cd324754ed40378f06fec12fedbba94a921043d72db6ecc37f8b0680b7f518bbbd8d63f69ce8d84f86ca522653d293fb
 EBUILD llvm-libunwind-16.0.0.9999.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
 EBUILD llvm-libunwind-16.0.0_pre20230107.ebuild 2984 BLAKE2B 89f6251c89eb54defcddf231cbc4c34005b5d0421e2886b2eebcc1a8f98f88271357e6efac8a46b8d4616912611bf7c935c7cd60b15a6b42f74e3bbedcd629a2 SHA512 d4b223d191f0d0bcd19805050e3e770dc7faf4e68031f329deb085bd1562d278e2eea3f040405526025711d6ac4b390497ecf329f4ab31a00c3edf53186cc2fd
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.6.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.6.ebuild
deleted file mode 100644
index 4623b458be97..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.6.ebuild
+++ /dev/null
@@ -1,123 +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 cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="+clang debug static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/libunwind
-"
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-
-	# https://github.com/llvm/llvm-project/issues/56825
-	# also separately bug #863917
-	filter-lto
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	# https://github.com/gentoo/gentoo/pull/21516
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libunwind"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
-		-DLIBUNWIND_INSTALL_HEADERS=ON
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-		# avoid dependency on libgcc_s if compiler-rt is used
-		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-
-			-DLIBCXXABI_LIBDIR_SUFFIX=
-			-DLIBCXXABI_ENABLE_SHARED=OFF
-			-DLIBCXXABI_ENABLE_STATIC=ON
-			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-			-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-			-DLIBCXX_LIBDIR_SUFFIX=
-			-DLIBCXX_ENABLE_SHARED=OFF
-			-DLIBCXX_ENABLE_STATIC=ON
-			-DLIBCXX_CXX_ABI=libcxxabi
-			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-			-DLIBCXX_HAS_GCC_S_LIB=OFF
-			-DLIBCXX_INCLUDE_TESTS=OFF
-			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-unwind
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 52b2e3f032fc..6d66034728d1 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index 1312bca4b9db..87ab7c599174 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,3 +1,3 @@
 DIST menulibre-2.2.3.tar.gz 488117 BLAKE2B 2bb157f6f8fb1af8c5059bfa2f93dbf99eb3a0cf9b3072cae28284d50c6a7d847da7a7dc5905ff59386f7d69029f7ffd7c39cb9137e029355fea2f52741283c6 SHA512 bd554606ad35cdd41272ed656427ae3f610d6aacfc9e91e4de6ed342034e1bb6070812017a1372d04b0df4008ae1cd7207ca243142a874b6abb0a00893740da3
-EBUILD menulibre-2.2.3.ebuild 1296 BLAKE2B 39a23e3693c8cbebd26413ef55153e287844d69421c76bc87f4ed91a29e983a04b19757a66d3c21bc8776d80dd7011d04d5d2ad2812ba2b8742da111f65d29ba SHA512 6658415c5289011597bdd84bcd725faf8d3d7768a3b217dacdd1b5f9dc9d2ffa103b29556b3d0b71c2b2157e9236737c057ea6472cc89583ba001747e949a4aa
+EBUILD menulibre-2.2.3.ebuild 1315 BLAKE2B c1e297299c8db6f4e0ac1b980ee02df86ce3d0b2eec5231ce7a653b6967b21ed2786cfa9af15d9c9fb8aa567381e9f3562b21fa2fbc896b6e164918589c364b0 SHA512 996edfa5b0527df130cda9cbc1cd97e672aca8aeb3072c98069d967fc7471c096890ab50402ca054cfcc0974e14fc79969a897837062d3751bc98466fe5b5100
 MISC metadata.xml 276 BLAKE2B 5ae33ec24b361408186426738ecfc12a6a3ae761e023050d59a02b6bdf5f4dd788ac33ef6c9ff0c0c27e415fb369aa3cf8118bdc6268d95c3a33e75a5341140e SHA512 f186b9f746afb87c00b913f67250ed8a6f9563df447b2caab6717b212c7a8e09ae78b7dcce76bf4acdff238ff12d1faf3b997991a38ba34beae17f734b37b060
diff --git a/x11-misc/menulibre/menulibre-2.2.3.ebuild b/x11-misc/menulibre/menulibre-2.2.3.ebuild
index 7161e3740c3c..edeabe5b03f5 100644
--- a/x11-misc/menulibre/menulibre-2.2.3.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1 xdg
 
@@ -27,7 +27,8 @@ RDEPEND="
 	x11-themes/hicolor-icon-theme"
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/python-distutils-extra[${PYTHON_USEDEP}]')"
+		dev-python/python-distutils-extra[${PYTHON_USEDEP}]')
+	dev-util/intltool"
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all
diff --git a/x11-misc/xowl/Manifest b/x11-misc/xowl/Manifest
deleted file mode 100644
index a39d28652d57..000000000000
--- a/x11-misc/xowl/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD xowl-9999.ebuild 835 BLAKE2B 0b62861c6314ca3319d719c4924e417b97e1149ce75a89a8e706466feba23e0a6e1dfb61193efe50ccaa956aee538ea91e1411ccadc1c13ffe4eb03e72d50bba SHA512 2117d69da04af0bd8e26b73dd68a47c17fec877ec30cd495a061cf36ba12737a94286606cba560e2776fc00673d64fbdd55440dfe88fa3d0f1f33734cb039681
-MISC metadata.xml 249 BLAKE2B 4cf0a9b7f61b34a311e1143385d4c1afab79281b46cbbf52d4a0a7fdc05895ef104339a4733cc51bfee1540cfb75535560d3b59b05d3c89dc57e3784c565a03a SHA512 9e843b53ec094ab7cbb8c341c26cffe9b1d1b790210e25e5ae98807bf5d4a3c4b2556adf7798bf7d006bbf3063e1c4a455e7460099a63f0ef1e66f182761e4a6
diff --git a/x11-misc/xowl/metadata.xml b/x11-misc/xowl/metadata.xml
deleted file mode 100644
index 1e7482581ef7..000000000000
--- a/x11-misc/xowl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">seanpringle/xowl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/xowl/xowl-9999.ebuild b/x11-misc/xowl/xowl-9999.ebuild
deleted file mode 100644
index e563aab37668..000000000000
--- a/x11-misc/xowl/xowl-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic git-r3 savedconfig toolchain-funcs
-
-DESCRIPTION="X11 Obstinate Window Lister"
-HOMEPAGE="https://github.com/seanpringle/xowl"
-EGIT_REPO_URI="https://github.com/seanpringle/xowl"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXinerama
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	restore_config config.h
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-}
-
-src_compile() {
-	XOAT_COMPILE=(
-		${CC} -o ${PN} ${PN}.c ${CFLAGS} -std=c99 ${LDFLAGS}
-		$(${PKG_CONFIG} --cflags --libs x11 xft xinerama)
-	)
-	echo ${XOAT_COMPILE[@]}
-	${XOAT_COMPILE[@]} || die
-}
-
-src_install() {
-	dobin xowl
-	dodoc xowl.md
-	doman xowl.1
-	save_config config.h
-}
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index dd9e68ff1df0..e53dfea2e3d1 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/xoat/Manifest b/x11-wm/xoat/Manifest
deleted file mode 100644
index 63dd6f3b6a31..000000000000
--- a/x11-wm/xoat/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD xoat-9999.ebuild 876 BLAKE2B bf56745670cce7761b321586c36829b0b6e57c91a54d3613c6705f72681e6041f686ea76b88321f4d9c42edcee9bada458671d4fb1973b62885867985497bfdb SHA512 751dd83e50e6998561c22bf949cfa8dd8058e4cb0010e900a365d5fc61386c6e84bc9ec04b1e8f2d82018ec77c1ee97697dace73e8f4e2708266cc4c51e4960e
-MISC metadata.xml 249 BLAKE2B fce49a056c621e7913fd1efdf99926139ef3a0023b10f93e0822e8a723af48c40201814b161b3dc161c6b4ab3cb2ea9c16b89bfdd24cf46c4ebc70d739caab5a SHA512 a2ab0a62b441bfede229d15d0109d5aecf227f35068984cc7a371ad8dc61c3bd3c5696432e83ef657009293f3fedde92b48c9a01646a9b40e55bfb606716a184
diff --git a/x11-wm/xoat/metadata.xml b/x11-wm/xoat/metadata.xml
deleted file mode 100644
index 44fb5a523ab4..000000000000
--- a/x11-wm/xoat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">seanpringle/xoat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-wm/xoat/xoat-9999.ebuild b/x11-wm/xoat/xoat-9999.ebuild
deleted file mode 100644
index 31b9838afc84..000000000000
--- a/x11-wm/xoat/xoat-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 savedconfig toolchain-funcs
-
-DESCRIPTION="X Obstinate Asymmetric Tiler"
-HOMEPAGE="https://github.com/seanpringle/xoat"
-EGIT_REPO_URI="https://github.com/seanpringle/xoat"
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXinerama
-"
-RDEPEND="
-	${DEPEND}
-	!savedconfig? ( x11-misc/dmenu )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	restore_config config.h
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-}
-
-src_compile() {
-	XOAT_COMPILE=(
-		${CC} -o ${PN} ${PN}.c ${CFLAGS} -std=c99 ${LDFLAGS}
-		$(${PKG_CONFIG} --cflags --libs x11 xinerama xft)
-	)
-	echo ${XOAT_COMPILE[@]}
-	${XOAT_COMPILE[@]} || die
-}
-
-src_install() {
-	dobin xoat
-	dodoc status xinitrc xoat.md xoatrc
-	doman xoat.1
-	save_config config.h
-}