gentoo auto-resync : 27:06:2024 - 07:59:39

1618 files changed, 16234 insertions, 14096 deletions

diff --git a/Manifest b/Manifest
index a5ea72421a60..ff30e2fda3c6 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29810 BLAKE2B eaf57a108ad3f4aff7bed67afe0f9e585a521afbb295e5cbb5e28332ad8550cdfb14c05165c76cd83d398690b4fdafa74e7312495bcc39086a00f3cccd4e5107 SHA512 92805c8f1bc20d6426c174fbfe01889f677c240990109a628df7a2397ddcffa75e5cf91421c4207b098719794189be1593663dc4efa25a69fd33e14d6eac7e4b
-TIMESTAMP 2024-06-25T22:40:16Z
+MANIFEST Manifest.files.gz 29779 BLAKE2B e0d0711bf6a7db877c22961a986f642d3a735eae3f2fb20990eccbbb85f7ff722a01a11885b8acbb1a442b5393c3fa470e7fad60e51cd8e162b951c5e250a12d SHA512 f31cda86bf32fd275cd67cac89432dfe5845e41bfb58f1228ae15d5352750937b05d91649f9e9d3ea23faca46cf0bd0a51acbd0d0d3c68054aa3fd93db1cea3a
+TIMESTAMP 2024-06-27T06:11:17Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZ7R1BfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZ9AoVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCm7RAAmMA+fzVNC5WIvYY4kJaH2i7D0lEgMKdX7lwT0dYtCTE33jf4iWzJNH52
-i3B+78DXYL0Xk2WzBcrxzfdmvYUZ2JQCJatf5pm4RF2DqKujB9/oFuqC4cVtYd9s
-Jd7hfxWpFFsIwnWN7NcnA6Tg6lxgWSQyO7HKh5hXtso7EgVyLk0MmR4J8WV9zcbS
-Y9wUJJho4gXrq7jkxl+jG1pk8hk79cnjAq4O5nwxxgalQk19sMpzvRpVoeV0zsuP
-An1Ty/SXHMAyL18EvPbHpCmWXLDHlGjq6xLOI+se/OKifX+I9rjCGwLUwUTzJ58C
-qEF7BfopMiV92nxDIwRE7zyFIrR93wkI37ozjLXNLxTBAiq6W3t2Agn3BTMcOzAy
-RhY1lXAGN2K7e79CCHgiNEhv6DZOnVoLWx9tgauzZ5NCLrXLnDgBs8CdoMY/U5DD
-39UsS9t8yfsjb2zr31ouMiW3I6jEYU9BSTsBETENX7pbgd7xYt0KPXZAeMtIJNlz
-ATMNFxLahbKwkzUyFhHM3P9qBBWzwMkNKtQuUvpHl/tqB1r6F4qp6Rwp6cIRgYOV
-2fI4V0yUdAZbYbkY7RMsFvC4wWrAe/VKzG9xHC38m0FhQsI1or9DSDdqOQZShvJn
-CX6zWZ8Ig90Gjcxdxq+FSdIDKquhanL7xUY+q0g4BU9MjmZ5xWc=
-=gDYo
+klDu/A//WSGREx9jId8FHmaQHdpwdeX1BuiSWzoC2/HYRQT0eftN89J16GuzaB3w
+ZK5GsviolCOyOqWjWRXrD/YtBcOkf/Zmh/J8z6p9oIluX4xGk8fQKS1vF5AA8sNo
+bnbaKcRvcbY9Y8AB0CW6NeNQ/Nsnv+DlNKFi0tv/bG0jp6K+T3kjH0QF3rV3rmlO
+VX5Yq52gC6gW9QTwCN5UIXlVZ11KCb1zXZUHDypRvnK7Vd0EBvWyHF+krYw1mYav
+r52ngpI6iQFHUnvYhtzPoWNQAo14NrO4JUAzeE7w/qLsgVRlC2b5W0EA4Pi7HxR6
+ewaCuiqufnJIJCPdc3IdXrka5Gxl/C7B8iA2A83Ja2hf3X38IyN56/ojNFdv9313
+jL72Xt+rFUha1JKKJ4AldAOJ5ECbzEg8wAJL+Y5HfQPT7RMajtohLX/1pg6ceP1w
+GNOJh952QPBjy6EONqiiF9ZV2w68u+SuXH0SZ8CIXDMgYjlkGjNaOEK9V4DML76i
+5DodYEtSD3fnIK4BR+HpSOl+jGJzZ2//DmgyVFMS6V2M3V0FucqeAlJsDiWUmbL7
+ZojpdVHbdwsOnG6BX9nuujGaunMZFi3gabIx3Vc/8Txh0grUjSvbXc9iWJ+xgdUD
+s3mkVx0cVnwtETrIyRGDsOOvP8hYRAYnWpDaSUSorQHZ60Z4gtc=
+=QSZp
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index c11a13bb4125..07ac071fd5a8 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2e58da9c7a88..6dda94322636 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 8e46a52add1e..5979e308120e 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,9 +1,13 @@
 DIST aws-cli-1.33.13.gh.tar.gz 2751169 BLAKE2B b849f4c5c0eac5092c3f163c4344a7bee332f374f252bc295794cb1e5a4024e08f353815362f0e7016b054d881927650c407d527f557c828543d1a5b96e9bd0b SHA512 7cdea65b6cd4fc7b51b657f9abf2e5cde41ef5d87f6fa45659ebedb2047fc09af9d457aeb8779f56fb55518acb12d139d486f8e95dfe7679ae5f8c21d901e608
 DIST aws-cli-1.33.14.gh.tar.gz 2749890 BLAKE2B 36e95b79c748a4acc8438ac4a7e4fe3973c17a9ee963c61d685b101dd09c4e978a98f8dbaa8eddeea60ca33035a2a40df233fb5e05e68f346a924f724ecf0b7b SHA512 54ccab1dd5bbe10fbb1349021b92e27ca75a9ef8ad01cc4b208019097069d0c0ca739da0ef5d2ae1978c3abfa1969697b192c215b0705aaae995b8abdf487a72
+DIST aws-cli-1.33.15.gh.tar.gz 2750103 BLAKE2B 2ad6ab41063af26ced883a7e0d7c0fb0a70864763eb04e0d2c054f70578eb59759cda82bb684c8885f131aa7769ca3922ba67dbdb2608ce130595f2b4278f669 SHA512 d808563245bb78ad40908075941348f7e350fe0b7162f8f703cececee053aec6182f2e2c202bd80083065b6e7f48f8479d35bbf4fb26ee44e9ba9b0e1bdb7690
+DIST aws-cli-1.33.16.gh.tar.gz 2750667 BLAKE2B f62f0f58b5f1d665431f1b140dc1f718cb57eda2b55b9689708899a2005734c8edc20caa7b845de7dfd1b3c14c6162dae8554d3d7ec1b898f7e94c4958d99fa0 SHA512 65094c518a5553346624997b066bfd65a0f8c812e27d587d1ef1a63c0370bb56b8e4fd5a190fd0112c79532aa97d01c1ffbb2a11ffdc44a8686ebe37642f5bff
 DIST aws-cli-1.33.4.gh.tar.gz 2740224 BLAKE2B 40fb26f895a28e41e45c861194ca959490d1675e2f9926bbcb5b092d4496b20be3e68f4eb370ffef541bd607c41181d34caa4e5674fc262b60cd882401530153 SHA512 faeced07895fc891803136061839d499b372cbf89e6e642e2782120d2b1a50486e01ae07ba7ee04c9fe84ffefd0e329e000d76f38f5839b048bbfdab59a64785
 DIST aws-cli-1.33.9.gh.tar.gz 2744062 BLAKE2B d888e111d93ec22c6bbabf083d612b15845883e2e56814a37173f79c108e4fe25745dbba83d46f99f54e7ddcc2f471c81e3b568de7233eb7e0bb51ed25a89f7a SHA512 5bdb9873487570c841b582ee466d989705c2fc5827386356819507caa8e105b76b0101555f8a6ee485f38aaa433881470fdde5cb21f6fdc88243c92ce7c31a81
 EBUILD awscli-1.33.13.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.14.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
+EBUILD awscli-1.33.15.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
+EBUILD awscli-1.33.16.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.4.ebuild 3048 BLAKE2B 12780280e20a5681960cbfeaea03d9f3fcc292c8f1c1b2f174652dd6a76e0aad304e84a5acc67687f5585781bee6ad8568cafc6b02bf69aee39d180b1dfa7154 SHA512 805bcb6a01036c600f8a9423eda8459177d5729e11c6c9c17c4197ce06f5a0126b06cb3b760fee8f11cd81e2f962a67e982e79798aa6590099465818c3d6fc06
 EBUILD awscli-1.33.9.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.33.15.ebuild b/app-admin/awscli/awscli-1.33.15.ebuild
new file mode 100644
index 000000000000..a7a293c4a8e8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.33.15.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+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+1).(z+118), sigh
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
+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.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+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 serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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.33.16.ebuild b/app-admin/awscli/awscli-1.33.16.ebuild
new file mode 100644
index 000000000000..a7a293c4a8e8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.33.16.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+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+1).(z+118), sigh
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
+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.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+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 serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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-containers/Manifest.gz b/app-containers/Manifest.gz
index cd652cf2d6fb..ec848e976358 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index 02ba3e7c97f2..558ab03af4a9 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -7,6 +7,9 @@ DIST lxc-5.0.3.tar.gz 975269 BLAKE2B 533d97fe4d986acbf5d562bb2c295a63df2a9a8bfc2
 DIST lxc-5.0.3.tar.gz.asc 833 BLAKE2B c35278ed17cad76d2ea94b3985e0110731efea751fb5f1c2d1c9db71486e4844285f372a94c8611dcfe91fdb16459694843b9e0a8273cfc68a56f549c7162cfb SHA512 a5ce5769d49abdf35d94de8273fd3e9c2a8ba4fafea71cf33ee6bce1d83531c8b550d972f7080409a4cc5a92e9d04ece50ed108f92c6aec4868d150e58d7d11a
 DIST lxc-6.0.0.tar.gz 964053 BLAKE2B d41bcab4e225c139d4d41df5291717e4d196fe3b48d978a993811b74a08e7a75e1528f4bf44f694a624537632bdec642cd80cf51a528dea848baa11c10471afa SHA512 acff2fc70cf2c65af37b70a21239482c3d845c408f7132558b54980e4400c23670c63178a3a3dfb239f047f529004df93cd829d728852a8c8647ce6babf7857f
 DIST lxc-6.0.0.tar.gz.asc 833 BLAKE2B d2cda07e605d64dbb650506cf536c545e2c5746973c834f4d4f409064e2ba8265040b13a60e124e30e154bbc5a51c704bad0fa2ff5530effddfa449618aa60a7 SHA512 4e56ffa7395877714f993d9c54cf8b9df91cdced96c5a609b63f5e3896a0a51db8ba6f99bf2360d60af202df79123deea72215bf854d8798d3af361a4888445e
+DIST lxc-6.0.1.tar.gz 964526 BLAKE2B 6fb6442e0a9a356433351f412c9a1e4f18155146e49f40ebe6e132ea770a8737793df0c7ca13ca70ce631a2308ff525fca2fd2d127b98edbd00e0af7efce6879 SHA512 7e8b9740178ae46a2ad3ba3f1e509f69f978d0a2a1f7e1938213ae9cb9a80f496d01be64958cad4aa6f01a73f1d8c3759c3e9df9df4f67c77e603ea0809d79c2
+DIST lxc-6.0.1.tar.gz.asc 833 BLAKE2B 8469ff5603c48205c6451630ec8f03617c648e3d13f73ebd7d908017422b75613e5489b42ad0f598fcf5cf9e241fccaeb4b0ec3ac186a670ed56a252e282b16e SHA512 e0ebd29c3e793e1159e350854e2ac7adacd918b76dfa2de1e0227fd45034ac9308d02b7da1c0c80eae471ebba44a0804a7a0bf17cbf1c18de45bc63974e017e0
 EBUILD lxc-5.0.3.ebuild 5052 BLAKE2B 99a20e705617194a9e38ec6dabbc52fd43dbd5615a6b00379921f4ba200c2110f666878c00195917109f37cfed961258978b79bc3db0814986c36429537e660c SHA512 050ebb35250bd258a602ee84f9f1b1c35531caa0c3f9954bb8380927a8c262ffd66776cc0af643aaf69a7e0c51dccfe82bb2e3993e264ba2a0c91de8bd94faf5
 EBUILD lxc-6.0.0-r2.ebuild 5193 BLAKE2B 6a3944ab47411d9d1c3ea2b67f9a641ec080676fa6925c6dca3a69bb2aa8e51f081c15bdfaea20b6747acfb27d3652f6a9b364814fe06a3f5fb96feb4e650022 SHA512 ea170951f34a2c9c7066cc6d6fa1274dc3af8320bb2fa479aa31367ac6480601b403899845e22ed4b628d2fe7650e7099c168b451b51e27c6918bc6551b44b62
+EBUILD lxc-6.0.1.ebuild 5195 BLAKE2B 1d5f632c92a214ded8f92fcafdc119c9c8ef9510a629849062d55f8061d57ac3b7cf82c2ce8798d166912b2cdab315c21456d5fe98aeb8a46e0d66d9187f5450 SHA512 3a4e41f4527f6871016a7730b84be5b6ecec43290eb6f5838e883ea3d4b69c2c63a58287bffee09875f4bdcb8fbc280e03e2a23fab51b4093cec045004f43e45
 MISC metadata.xml 721 BLAKE2B 8aaa67af4ae36f07ac2d893f0d67d86de08d9da065b5ca7118a7a795a2b2ecb55b37a87b95b456ebc8806bbdc9f36e92901b6888cb75f494a7151393b33b6d44 SHA512 3b90cb1c80e2ee9ef3d30273c91ab625ec79ad240edc40dea011078ab44759b03c3ac28484cfc639b4108557a7c5e00e798b4e335da9ba94a5a836f51ee7701a
diff --git a/app-containers/lxc/lxc-6.0.1.ebuild b/app-containers/lxc/lxc-6.0.1.ebuild
new file mode 100644
index 000000000000..dcbf0d98541a
--- /dev/null
+++ b/app-containers/lxc/lxc-6.0.1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 linux-info meson optfeature systemd toolchain-funcs verify-sig
+
+DESCRIPTION="A userspace interface for the Linux kernel containment features"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )"
+
+LICENSE="GPL-2 LGPL-2.1 LGPL-3"
+SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while bumping.
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd test +tools"
+
+RDEPEND="acct-group/lxc
+	acct-user/lxc
+	apparmor? ( sys-libs/libapparmor )
+	caps? ( sys-libs/libcap[static-libs] )
+	io-uring? ( >=sys-libs/liburing-2:= )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? (
+		sys-apps/dbus
+		sys-apps/systemd:=
+	)
+	tools? ( sys-libs/libcap[static-libs] )"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig
+	man? ( app-text/docbook2X )
+	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+RESTRICT="!test? ( test )"
+
+CONFIG_CHECK="~!NETPRIO_CGROUP
+	~CGROUPS
+	~CGROUP_CPUACCT
+	~CGROUP_DEVICE
+	~CGROUP_FREEZER
+
+	~CGROUP_SCHED
+	~CPUSETS
+	~IPC_NS
+	~MACVLAN
+
+	~MEMCG
+	~NAMESPACES
+	~NET_NS
+	~PID_NS
+
+	~POSIX_MQUEUE
+	~USER_NS
+	~UTS_NS
+	~VETH"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
+ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_configure() {
+
+	# -Dtools-multicall=false: will create a single binary called 'lxc' that conflicts with LXD.
+	local emesonargs=(
+		--localstatedir "${EPREFIX}/var"
+
+		-Dcoverity-build=false
+		-Dinstall-state-dirs=false
+		-Doss-fuzz=false
+		-Dspecfile=false
+		-Dtools-multicall=false
+
+		-Dcommands=true
+		-Dinstall-init-files=true
+		-Dmemfd-rexec=true
+		-Dthread-safety=true
+
+		$(meson_use apparmor)
+		$(meson_use caps capabilities)
+		$(meson_use examples)
+		$(meson_use io-uring io-uring-event-loop)
+		$(meson_use lto b_lto)
+		$(meson_use man)
+		$(meson_use pam pam-cgroup)
+		$(meson_use seccomp)
+		$(meson_use selinux)
+		$(meson_use ssl openssl)
+		$(meson_use test tests)
+		$(meson_use tools)
+
+		$(usex systemd -Ddbus=true -Ddbus=false)
+		$(usex systemd -Dinit-script="systemd" -Dinit-script="sysvinit")
+
+		-Ddata-path=/var/lib/lxc
+		-Ddoc-path=/usr/share/doc/${PF}
+		-Dlog-path=/var/log/lxc
+		-Drootfs-mount-path=/var/lib/lxc/rootfs
+		-Druntime-path=/run
+	)
+
+	use tools && local emesonargs+=( -Dcapabilities=true )
+
+	if $(tc-ld-is-gold) || $(tc-ld-is-lld); then
+		local emesonargs+=( -Db_lto_mode=thin )
+	else
+		local emesonargs+=( -Db_lto_mode=default )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# The main bash-completion file will collide with lxd, need to relocate and update symlinks.
+	mkdir -p "${ED}"/$(get_bashcompdir) || die "Failed to create bashcompdir."
+
+	if use tools; then
+		bashcomp_alias lxc-start lxc-{attach,autostart,cgroup,checkpoint,config,console,copy,create,destroy,device,execute,freeze,info,ls,monitor,snapshot,stop,top,unfreeze,unshare,usernsexec,wait}
+	else
+		bashcomp_alias lxc-start lxc-usernsexec
+	fi
+
+	find "${ED}" -name '*.la' -delete -o -name '*.a' -delete || die
+
+	# Replace upstream sysvinit/systemd files.
+	if use systemd; then
+	rm -r "${D}$(systemd_get_systemunitdir)" || die "Failed to remove systemd lib dir"
+	else
+		rm "${ED}"/etc/init.d/lxc-{containers,net} || die "Failed to remove sysvinit scripts"
+	fi
+
+	newinitd "${FILESDIR}/${PN}.initd.9" ${PN}
+	systemd_newunit "${FILESDIR}"/lxc-monitord.service.5.0.0 lxc-monitord.service
+	systemd_newunit "${FILESDIR}"/lxc-net.service.5.0.0 lxc-net.service
+	systemd_newunit "${FILESDIR}"/lxc.service-5.0.0 lxc.service
+	systemd_newunit "${FILESDIR}"/lxc_at.service.5.0.0 "lxc@.service"
+
+	if ! use apparmor; then
+		sed -i '/lxc-apparmor-load/d' "${D}$(systemd_get_systemunitdir)/lxc.service" ||
+			die "Failed to remove apparmor references from lxc.service systemd unit."
+	fi
+}
+
+pkg_postinst() {
+	elog "Please refer to "
+	elog "https://wiki.gentoo.org/wiki/LXC for introduction and usage guide."
+	elog
+	elog "Run 'lxc-checkconfig' to see optional kernel features."
+	elog
+
+	optfeature "creating your own LXC containers" app-containers/distrobuilder
+	optfeature "automatic template scripts" app-containers/lxc-templates
+	optfeature "Debian-based distribution container image support" dev-util/debootstrap
+	optfeature "snapshot & restore functionality" sys-process/criu
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 0c54ad1c31ce..ccf709b06ad2 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index cbc91e88d882..d8aa1f723028 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -5,7 +5,7 @@ DIST vim-9.0.2167.tar.gz 17405049 BLAKE2B 496c8f9672bc4ecce743a145bc2b671bf09034
 DIST vim-9.1.0366.tar.gz 17861209 BLAKE2B 8771f5ef6a966c1b5992a437dd6cf1de9525458f61a4cd8fa53737a7bde29a4da101668639a301288a266ee8b3911857d1ba5b4e88870b60473eb1eaa608d7a5 SHA512 11be2a6e349c7b6d26fc1943c35ea18c662baa4f30ae76936eefb30e0b4d988bfcaedf7ecd2c3903f64e23c75957f55b9bb4073e0f38c7eb10ef0ee0dc652ddb
 DIST vim-9.1.0470.tar.gz 17919981 BLAKE2B 90ebffc6e7b6162f8a047976659e044b75aaa946799b901e9f8c88f04a787543cde56545c8c6e5394fa2bc957d2e46810c5ca3f1315fc20a398a57bbdbc90f4c SHA512 41b71e9e5385237b30aa256f064c9d5c914b29a97c0ec562f1995ac5d476fcf840c3f0e9a52e599f6084777db147e83fcbf0ec6b985bb94c126264d4cbafb964
 EBUILD gvim-9.0.2167.ebuild 9887 BLAKE2B e5834640a338b28612d8185b0364f3b47eebf4293fca9e14b1ee0c0689263fcce5a9bc19b5eaa3f11ad4ff0f68ba85c9be847f63b0a29e947cf4b44a41c3f5e2 SHA512 3bffa18e082cf43f2d3593b1c722ef0124dc11a45b3631f50dbb0581ad8904b5474c11884a1e5da39f1b255841cc22a4bfe6d69f0215451ec5a31fd2414c7641
-EBUILD gvim-9.1.0366.ebuild 9890 BLAKE2B 9ff3d7012d48a91d0d25fc23f9328ab8c7950371ed865161967b76ba1ef4866b447123dee3b94148456b956e740a08b7068184806b0316c61b85a03d8ece986c SHA512 eabaa54b423c5d3867c1a3757bd5e847cdea9d2553faa97aa1202b391880c0e4df0f8937773fe0f8cc496c25f84c474960570ad884973e8b639eb64e5d1d523f
+EBUILD gvim-9.1.0366.ebuild 9887 BLAKE2B c8cf54220ee4cf55d3cef4741b9697875b438b43efa7429c3c793e632cba94200c728310bef12aa07a2438d53b9d4c676126b98972385ba5ae19c6c3eeefeaa9 SHA512 bb90bf08a90e304bd4aa2c4f162504ef0510f4623425bd371b8fcdfde09005d7ada97fdb1b1e9c511f4528f9468d7338a054fbb4040fc73e9119e12dccbd3516
 EBUILD gvim-9.1.0470.ebuild 9894 BLAKE2B 3dc13abdf322638135338af0838fa1ea21c4e5c58956dddd8b8b58d033088f14158e18e88fb8633454b7eca30a2af0b0b2d55c5a4e4d31a49085752bb48fe532 SHA512 0cdbe263de561bbfd00c7deef08d848983ffe51e676871bea776fc84e067bef5bb533f51532e479714694600ef1f70e3f684bd9a857df4172a7c9ad882001cfd
 EBUILD gvim-9999.ebuild 9894 BLAKE2B 3dc13abdf322638135338af0838fa1ea21c4e5c58956dddd8b8b58d033088f14158e18e88fb8633454b7eca30a2af0b0b2d55c5a4e4d31a49085752bb48fe532 SHA512 0cdbe263de561bbfd00c7deef08d848983ffe51e676871bea776fc84e067bef5bb533f51532e479714694600ef1f70e3f684bd9a857df4172a7c9ad882001cfd
 MISC metadata.xml 938 BLAKE2B 14b5a8f0a77608a07d2d8241cf4b48b4b418f905e688962f995495ccd2dc649d1ab2ab14076042d814e8a33df21557f2a76f78e9df5e8eb810f361a5c0930fa5 SHA512 3e6cb69512c6a02fb56e78c7d1f4e5223ba15ce0036df81dc536dd3b4c16bb76bb37f403a767473a2a2a8fa55e075e9f5142f6b7a0037d282569841a1032293f
diff --git a/app-editors/gvim/gvim-9.1.0366.ebuild b/app-editors/gvim/gvim-9.1.0366.ebuild
index 0b232812613b..c4bccf290862 100644
--- a/app-editors/gvim/gvim-9.1.0366.ebuild
+++ b/app-editors/gvim/gvim-9.1.0366.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 S="${WORKDIR}"/vim-${PV}
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 251774c45424..b81365566a57 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -8,7 +8,7 @@ DIST vim-9.1.0366.tar.gz 17861209 BLAKE2B 8771f5ef6a966c1b5992a437dd6cf1de952545
 DIST vim-9.1.0470.tar.gz 17919981 BLAKE2B 90ebffc6e7b6162f8a047976659e044b75aaa946799b901e9f8c88f04a787543cde56545c8c6e5394fa2bc957d2e46810c5ca3f1315fc20a398a57bbdbc90f4c SHA512 41b71e9e5385237b30aa256f064c9d5c914b29a97c0ec562f1995ac5d476fcf840c3f0e9a52e599f6084777db147e83fcbf0ec6b985bb94c126264d4cbafb964
 EBUILD vim-core-9.0.2167-r1.ebuild 6831 BLAKE2B 01e1e660c4d95ac5f5924517f61dd4fbccb5f9b5181fdad746b5408ae7585eaef1ab8d89e0418550fe6b477edeae36454fcd55fc56a99d129c9695cf30fe5ad3 SHA512 d9c2e925d2fec4e45cbb0ece1857f55d0c4a4d18474bd5008e45522c94afbaf8f98dd4f2d94c79c7098c338317b1bf7ec158695b5faad74c4a4ff052490f41d3
 EBUILD vim-core-9.0.2167.ebuild 6823 BLAKE2B 974a975f63108cc482fecf483d409ee7be1c253d6f92fd84b506b3857c8a6f97a44e4b616a1c39bf8372fb0a62ab773e79726c5bf15d4191d98b45cc12144e49 SHA512 737eeef845c896aa3ae374910c7c04785401b7436a6edd171c2c0b350515a8869b33630d59a1c52beec80f83711f341be1b68e678d8d24665f90ce357dfcc4c9
-EBUILD vim-core-9.1.0366-r1.ebuild 6827 BLAKE2B 1da8c6bae65a89486e9ccc3723c331b06775c17fa37dcafe2d90bac18e5c8f90219917fed3d4ec6dd539d4680bd4e3f0b808c0b8afde76411171fde71788cda2 SHA512 c35cdfb1702be432d2965279f942ac059400302a31ea58ca7fc57b9808b8bb6e43d73a9a5ccdb596263bb57ca719a31cb82e2f6501738210ee402ef336a44ed8
+EBUILD vim-core-9.1.0366-r1.ebuild 6824 BLAKE2B 633ed86e85ecbebf5c9c4d5146220d5ef900529c76186c127dc77d8ea19567f1e8e6c1bcd254898bf723c21cf5a4d72c79792a13c9bb0a2f1260d5737a2184bf SHA512 cd309b2eae985bdfca44ed55bf1981fc8ea12e003d31639db7340a38783cf6e69aeee16267433abc08bc9a3704cdc4c29b654369c8bc3b6cef77dca6837d5ed6
 EBUILD vim-core-9.1.0366.ebuild 6831 BLAKE2B 07597fc638c99f2d3730b888f1aeaea7df7d451658143ca978725de68d34c5346173f938e4b6096d430597a2623b05a49719da78b9c9d25d1f542e2a28b10aeb SHA512 b60277d5d5e7edb7edbed65f98ebad8334dc0b09ee6e9e073af6b6346fb3883127bc5e1b89d0991cfe71e1c716732487caa6396bcbf6aa01825022dfe150d319
 EBUILD vim-core-9.1.0470.ebuild 6831 BLAKE2B bbd21d28d7f4697aa8562960f94b21551b702d3480bfadeab5ae187db5c73af12131b409dabc38b3c3b31c06a90d26f6fe9abcc25cb6332d2856c444b24bca5b SHA512 37db3fd8e3574a42f9b06c34ccdf7eae8c5afac15c0043e1665bacd87d2feb061eae3a17b214f58183dcc2299c065d9be017a94ecec0c0d5bb573092767e2950
 EBUILD vim-core-9999.ebuild 6793 BLAKE2B 2ac9acdd6249cbe1fb1174bfa85bc33b066d7d2203d1857270ee1ce07411b60fd40f9becaa37d9508fa48bf7757f7dc541d1f4f6385f8abd816e6c832bbcdf89 SHA512 9ec9a32793fe40b602406d23b12a0cddb2046de858da16732a28b5e70cf4ce78cec8ab6bf6c5c39241cc5dac243775d91b36dff9a8d6f93d0d2c5adef49c8188
diff --git a/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild b/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild
index 5e2838b7e83b..3acccba1fa94 100644
--- a/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild
+++ b/app-editors/vim-core/vim-core-9.1.0366-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 S="${WORKDIR}/vim-${PV}"
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 2543cce3304f..d2cd5393394e 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -4,7 +4,7 @@ DIST vim-9.0.2167.tar.gz 17405049 BLAKE2B 496c8f9672bc4ecce743a145bc2b671bf09034
 DIST vim-9.1.0366.tar.gz 17861209 BLAKE2B 8771f5ef6a966c1b5992a437dd6cf1de9525458f61a4cd8fa53737a7bde29a4da101668639a301288a266ee8b3911857d1ba5b4e88870b60473eb1eaa608d7a5 SHA512 11be2a6e349c7b6d26fc1943c35ea18c662baa4f30ae76936eefb30e0b4d988bfcaedf7ecd2c3903f64e23c75957f55b9bb4073e0f38c7eb10ef0ee0dc652ddb
 DIST vim-9.1.0470.tar.gz 17919981 BLAKE2B 90ebffc6e7b6162f8a047976659e044b75aaa946799b901e9f8c88f04a787543cde56545c8c6e5394fa2bc957d2e46810c5ca3f1315fc20a398a57bbdbc90f4c SHA512 41b71e9e5385237b30aa256f064c9d5c914b29a97c0ec562f1995ac5d476fcf840c3f0e9a52e599f6084777db147e83fcbf0ec6b985bb94c126264d4cbafb964
 EBUILD vim-9.0.2167.ebuild 10707 BLAKE2B 27a0169d443a594d198a1f039fa83db1adca666b6f9185cef9e31aa87003c48c7f1bf78c0610237584b68bba15525b82d0b5a32b8002ce94e1cc482e35436c57 SHA512 a24b5a9bbceee61249b02d94601b97499867b2d32cb5b0198004e887df5871dd77a45eabb26e62f51abe6885659b2397cf596da018776e29d24aa4cba8557659
-EBUILD vim-9.1.0366.ebuild 10711 BLAKE2B d40b65cf6032573d5e8a38b6bbaf7df6f814bc2b39697e1bff83aad413f08ff422fc8a9fd9d4329569be448cc5f66129e3ea383d2367c557d5c8529a87c99ed8 SHA512 0f5bd589f99a01380c993afe6bca9afb26d89eaf7b2639ec2680dca2e356be04b75515f9f4ab97c9e273ba67030db7c8122009c6a0db074f5ca68c6df891fb76
+EBUILD vim-9.1.0366.ebuild 10708 BLAKE2B a1aee6a33119d4d0eaa86d21cf7358848fd3656dce444cd28cdec227172b2395f06cb640dc4b482e10810fdca5188a559c05c3568fa92174da1b3f07fd64c9a9 SHA512 2f5f891cfd2fdda20212abeb604bf9ab037022da3acc8b1c2ac1685357d70152af0c85f9e927700799a9c837787ef51529020ec41f172b91b862e204d3216b96
 EBUILD vim-9.1.0470.ebuild 10715 BLAKE2B 81e76e538c195d00cdd1439449bedf61009fc94d41d777f29d0eb4db8343c268a0138d09d755b2f0839be23ee7338f2c8d0f3dc1d95adbd28e43db8620be4e50 SHA512 584a3c1302fbf26c19b9c8c9f9408d4ba7eb89b1dbdb1b7212d2b8f3cf1b82cf375800e522555a0f3138517bf98ef7d201f4f7c146fc657e18ae4d2ec7fd2a1e
 EBUILD vim-9999.ebuild 10715 BLAKE2B 81e76e538c195d00cdd1439449bedf61009fc94d41d777f29d0eb4db8343c268a0138d09d755b2f0839be23ee7338f2c8d0f3dc1d95adbd28e43db8620be4e50 SHA512 584a3c1302fbf26c19b9c8c9f9408d4ba7eb89b1dbdb1b7212d2b8f3cf1b82cf375800e522555a0f3138517bf98ef7d201f4f7c146fc657e18ae4d2ec7fd2a1e
 MISC metadata.xml 1164 BLAKE2B 39fb0d92234f77f68213d7185ca6c4f9145cca22f8a4c27f8bafeec464232b493bfea9f853ba0d5cd613885728ac0b10f1e11a16910af8fcd211a3a338904264 SHA512 d89a143dc214c3397c2a299b18e3499dc7797a39fbaa731dee2887c9f62b367f1d3f79b7f76b7014ad31caf8ef3bd612c9881b2f72a6b79142684f222483b157
diff --git a/app-editors/vim/vim-9.1.0366.ebuild b/app-editors/vim/vim-9.1.0366.ebuild
index 0671b61266ac..7caafb9755e3 100644
--- a/app-editors/vim/vim-9.1.0366.ebuild
+++ b/app-editors/vim/vim-9.1.0366.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index cac2c2a51602..2a9d3d1472e9 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/check-jsonschema/Manifest b/app-misc/check-jsonschema/Manifest
index b1d991cc7252..6676140c8579 100644
--- a/app-misc/check-jsonschema/Manifest
+++ b/app-misc/check-jsonschema/Manifest
@@ -1,7 +1,5 @@
-DIST check-jsonschema-0.21.0.gh.tar.gz 214872 BLAKE2B 0ee013e379523e5a957e745d550c2014872eab9fc3281aad575f92abfada30b7e0853177bd06147b69a81100bf6b987b485342a087830845c32648efc1c7a9a0 SHA512 dd839a9bb104e1fc68e4a7507077dc991dfc9e840f785c4b7024f2838488eb8b8c6a8f7718f0f821981f5b6b23b1d67745948f48db55a0c589395cf43bfdd2a7
 DIST check-jsonschema-0.23.3.gh.tar.gz 229537 BLAKE2B a8a40ddc383f38096693a2079b73a8a8fe2ceed5d1e118e539957c205c500807518c0380aa18cae2524efdeda33987f057350ba73b7a699240706ff4e276eafc SHA512 14f9eb6b203e3aec6ca35f75304bd24fd5a09c2b89bcbbf69c22e0c0f44c587972015677498fef1a378683c77f94d9319450daccadddf5fecbe7c738dd16c726
 DIST check-jsonschema-0.28.4.gh.tar.gz 270302 BLAKE2B a5355ed124d6e3bd076403448c3d7fa7c62524c6da49eb5a61d226485639812bdea28b53c570b084e976749b92c1ee586b0285111a543b1a3e8a734ea8d6cc67 SHA512 f4c693ea0951c246814775f26d5c3e5de8020484a92ae15e2a13e284ccb2c58f2bdf7dbdb66612661304f5ff9e6ba88eb3f89e7f0ad23a3f6fc8fcc61372ceea
-EBUILD check-jsonschema-0.21.0-r1.ebuild 1185 BLAKE2B 17cd12999fe1dac82e6b9e1ef55fd74797b511216d7b58b8ee1f1e45748d60498e1f525b744ff72590f7ebb788746aee5d04653a6a8fb4f2f5a351a9da95a128 SHA512 8361afbd0f191ca71dff79e5879711b5d4a330880cf2f8cb865b745f0c083cfb5d5340e7c71bf619a27989b9c9bebf0d911d3e10f53493798c9a0e3b792c9b6a
 EBUILD check-jsonschema-0.23.3.ebuild 1205 BLAKE2B 0c989674195df4dd318437f210d1756cdcd339b2673cba225b32a0ec43dc772e01664e02b333e365f3fd2a045db8fcd647f66cdf87436ad5678dd2e8a43d3b67 SHA512 03718b851d6d3fed0495f1f476f2a53f36f6d825baaf90188150861407c4653463ec3b0367a00f45011e4c0cdd7b1f155a0ac4385b42e1da284c5ea495392481
-EBUILD check-jsonschema-0.28.4.ebuild 1411 BLAKE2B 63a75c25a8161055673fd30db872bd9dbe5549d50f1c1e4528a42d25aaab8ccad61ba1566ce7949d8807679275ae9e7e76d66078feef8167a70e3102b99ead73 SHA512 8cb7041e7e0aa0daa8453123d733f5cc3e869d1fd693c83505d6d9188075dc24c0997a24628f856a08412a605ba8159cb78a96bbc6cc67224ea49338f6e35149
+EBUILD check-jsonschema-0.28.4-r1.ebuild 1446 BLAKE2B d8a601f2ed06ad0f245a4478dfd1522467bc59855c843ace915abe881989002c346b41c705a5c292071838e8c390a3a0b08f4d15db58c937322b0570e6944bf1 SHA512 12014029778985e7f58f451d8b1664221ce438493f17dd33206e2e3afbf96e72055db61f9072e19680eed516149514305c3a2b9fbf48d6d6d413d10961027043
 MISC metadata.xml 403 BLAKE2B d0254150920ea63313734ad154391cf5d61176b56f53f26c2c8d8408ee571ce0fb4fb1383a6c63ec9f2542fdd66c35feee6b4d926f5cee3cf50253458305c346 SHA512 37cf237a2d7fdf5fe238e42a91d14d29fc01c807546a313b605cead57b50eff9a3fb2b66ed65c5aa019a727778356be659a0466cba5bc7f1b3a1bff8be8da42e
diff --git a/app-misc/check-jsonschema/check-jsonschema-0.21.0-r1.ebuild b/app-misc/check-jsonschema/check-jsonschema-0.21.0-r1.ebuild
deleted file mode 100644
index 76210a0e1221..000000000000
--- a/app-misc/check-jsonschema/check-jsonschema-0.21.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="A CLI and set of pre-commit hooks for jsonschema validation"
-HOMEPAGE="
-	https://pypi.org/project/check-jsonschema/
-	https://github.com/python-jsonschema/check-jsonschema
-"
-SRC_URI="https://github.com/python-jsonschema/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=(
-	README.md
-	CONTRIBUTING.md
-	CHANGELOG.rst
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-		dev-python/sphinx-issues \
-		dev-python/furo
-
-python_prepare_all() {
-	# relax deps in setup.cfg
-	sed -r -e 's:([a-zA-Z.-]+)([<>]|==|[<>]=)+.+:\1: ; /importlib-resources/ d' -i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/app-misc/check-jsonschema/check-jsonschema-0.28.4.ebuild b/app-misc/check-jsonschema/check-jsonschema-0.28.4-r1.ebuild
index 6a978782fceb..7bd7ebde5d74 100644
--- a/app-misc/check-jsonschema/check-jsonschema-0.28.4.ebuild
+++ b/app-misc/check-jsonschema/check-jsonschema-0.28.4-r1.ebuild
@@ -24,7 +24,9 @@ RDEPEND="
 	dev-python/regress[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
 "
 BDEPEND="
 	test? (
diff --git a/app-misc/jaq/Manifest b/app-misc/jaq/Manifest
index 3217cd35668a..efe57a923d0e 100644
--- a/app-misc/jaq/Manifest
+++ b/app-misc/jaq/Manifest
@@ -1,11 +1,8 @@
-DIST ahash-0.8.6.crate 42780 BLAKE2B ce2fb8201a484715d42bbd9ca1bfe2d5f541d90e3619ebd437c34a018920b679d5a11f9e96be48fbdabd2e98a379c0395d118616f21eb9004724d8fcb04b2b2b SHA512 46428b27e96be1f30058b9383a94988beeb5064dfb4df04d6959b451d0c77ef69fc51f07fdf9511ab9728295eb6beee7783c31a2297f9e473fc537883e722b73
 DIST ahash-0.8.7.crate 42894 BLAKE2B 56f4b2f577eb2752e675fa2b3191c65e0bb88575f92e8d906714296fca1daace46e93256672fce08cc5b4ac11d40a690a06b32a99fb50fd0df4f042773c33b6c SHA512 2c9eaa22f7bda47a781994c769d4a2ef15ba0f511fdd4ec4680c13d4c1809f1ce01adecc3b3776793158062d28ad9e5f0b1d1c0a9429e43dd07cd99540eae7a6
 DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
 DIST allocator-api2-0.2.16.crate 59025 BLAKE2B fda69b52435a7243eb19bc55914a1961e59dbad5ac12c40db39cccdf7a99c742da59c3ef160350808698db24b91e0ce655cd1acedbbcbe20c717604aae23ea5e SHA512 e1eb0df6b44b62115795ebf772f81e9ac0b6d273afd81659dbddb7eb6628b6e5ef6a60ea21413e79ee638afb72e6872ba83a075f6324daf93f2f1eda48daff2f
-DIST ariadne-0.3.0.crate 21829 BLAKE2B 9aa92dab32aaafb131c390206c32b7336f05b1eb5a6eae244db68625cf039830e9ce079faaf6d2d72c9e95a3eb93bb5450bb2915f6f15def13a2d6ec5fac37c0 SHA512 ff00de0667ff8dfabe11086e5bffccaef595924481d6458de5b598bd9362e9f12f103061c2b7faddc3923018e4ed211315ced7d53d4209236bcbc1f923490047
 DIST ariadne-0.4.0.crate 24894 BLAKE2B f53c5b80237c24e02510a66c198534945a9bfe9385b76cd54c7cd63005ffff2f3565a804c73133a1a2ccebb055e3c721ccad40eebf37e07f3423238e1ccbdfbb SHA512 1699be4d7554145d2798f88b1752d3f45efc353c2d311256af751e4dc06bf47d056370e581c16c59657d7696bcf5985bd5a12c1488fce205564ae620d822a344
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST base64-0.21.5.crate 77134 BLAKE2B 901cf92d7dd8af2bbb789ffbe60972c1fd295b16690ecebbcb500e4613afa057ab2b294bbafdcaa4007f46412825260a0711d89e55664418a503dde02c8afd1a SHA512 40b1d8470a932c8b7f31717e33bf26742c1bf920caae639b8a992f77e64d5e6d287569742c1348daa25b7325f8ca8d8a312754a743dab3932181f37149d91b16
 DIST base64-0.22.0.crate 81568 BLAKE2B 55e6bf8888de846bc14010fd706686544a1706dc9cea034435b5bf97bbbfcdab57210e69b425c9f2adf7b088b6f2cbe0f8148077a8be3aad88114c404738682c SHA512 116928d2fed66b43ecc8ffb4e1cdafb1aec3005e0034e2cacf1cd3cac7a591aed8e423fb2523900c25a4592ada49d3a0e438703afe7bb66dd1ab9fcaade24000
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
@@ -16,10 +13,10 @@ DIST chumsky-0.9.3.crate 75112 BLAKE2B e74663dcf524513bf54494c62ad154fc3c3560910
 DIST clap-4.0.22.crate 205175 BLAKE2B a0d0284c00b5011b8ce24a290444947970c784d13ad2273227a4d619d14bac7bcf9336911df5d49748b38ca29dcca211596630b5ed121a058492ff4e0463b616 SHA512 d6b54e31c4780be7d712bed266b2cee4ad1454c75d9dc542fac301156e1724ca07422228632d901b4e7590eda13ec2c8349ba59c5da12ac1991e9fac540d0c55
 DIST clap_derive-4.0.21.crate 27567 BLAKE2B cbef7e547b0d0a145ee7696a773e1dce541866dd4878797e9b810b7506dd11d75ae9cd2547b4c3330569390568a1039588406ee614b9eaa2b1a619951b0e67e5 SHA512 95bbddfd09de9dc1c64266743e9877aaed086be56f7e0f6e933dc5245724fead7163316a7bb4a744bc81597e4d079fb0abfea891766a17e0b1aafba011dd74df
 DIST clap_lex-0.3.2.crate 9650 BLAKE2B c07d8a180cfb959a5c9a2a79ba5343aea2185fbd10052a8e1fdfe0bc8fc2e9433a762d117bfdbb6cef497eb79eb8c757227681559ee995753f1eec738c4c1510 SHA512 f7c55878d3b35e37af607a035b471aaf6c2b1d849c26fba1df6e5585c0af0b93abe0b6409c504d4ee122c9c653daa2e47a89b6d06f31559db760a88a73c42006
+DIST codesnake-0.1.0.crate 8858 BLAKE2B ba941b8fee340d990afdeaf0c146d263ba73949f038bcf73f0dc6ac0810db549a0cac4683e54e52cd2a7f52ee5bb30c51d51064c4c5980922f3c057adf80f3db SHA512 c75b39b4bcbaeb3ab150ae572d13a30ad353ac4074b590ed8bd5756f54607d3b64a02c54bb9177d525da9bb12f588ebbdcf752499ecddaa0e7f2bc70d4a7221f
 DIST colored_json-3.0.1.crate 12606 BLAKE2B 62c8c730c6ff81eb2f470431c40ec8b2dc048a6994617d9ce0cb772eeb9dc01c10ba11e178b53d0e871233b7862e3769d3e758ae8e4773e7ad75a01c36bcd81e SHA512 6ca02d2b1d340617d27766e3d624f49af6100ad54f4496971a62a3dc02192bf5c6b84c67fc92cbf9870ec3569e4e60e24e25dedf96f609f5d32b2d183d157563
 DIST console_log-1.0.0.crate 28943 BLAKE2B 1717f161a7d3a92d5161119cb7ffc477b763716e5022e8cd528caf6e8d28eff9ec4bf53a7c45a68956d61109b4d50dcc582051e697c7a5e4a591e6e67e054510 SHA512 e44e2acf873fb86822474c6e2a7dc2964384db096b3ee13673bb57990dc0a930a306f53360f9d1145faa31bcbd194f8fcc1674bdbc2f6b236e7eefb4bc43a06a
 DIST dyn-clone-1.0.11.crate 11771 BLAKE2B 06e4d872c6a3f8fbdabaefce706b5214641c457a669c19f2f536f6e1346f8bc8f70c97e7ac1e759e084e337997d0c8dbed88402bf9fc898203de0f36119451e2 SHA512 c26181d9b7410f0927b5a88b6aecb372bec6ced68053ce65cd9f9dceed756e913dec169b71b9c34331eef6d0aafac209a858ab4a9f77617e4d95b3a6d194148d
-DIST either-1.8.1.crate 16027 BLAKE2B 2fad54b5f20bb8540fff5959ca7b2f9021c814ee610895d770f7081b12ebe2c93ce754c462df9d81824d479ca75e07f4a9e398c07a655f4abe2740b9c9de9c62 SHA512 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e
 DIST env_logger-0.10.0.crate 36574 BLAKE2B d2f387682059fe9b4566ab995be449c58c57b8df5e5d8bd5ffd153aec1648721d8a9606d3f9aa034263651f5182043e08b6cc08d2d29d0a10f6cc61df9949a06 SHA512 4dd02f9d333a1f15657167ef4bd403eda5426cad17e0a4a43fa20cc65449345eb4d3fae2d6b10a3480016b9e23497fac13ed7e70b40c9450ef430be9f910d3e4
 DIST equivalent-1.0.0.crate 6621 BLAKE2B 5e2c461898c2b029430c526db25188ca37b5c1f9f562c1950a7cb26b824c8b06d0ce62542c234e909873c329982641abe091f99074b6e40f13898b39fc4a5a86 SHA512 006fd57e6829b1dd9644abaa6f650098f22302e9882fa5b852c695aecdead8e353426626c56b772ab362303dff23777cc7012ec04f9618403d54f0e03e29278e
 DIST fastrand-1.9.0.crate 11910 BLAKE2B 570c66ec1d4ace08b9790299759e3b6f0394aca52c4ec2e02258229c198846cba7c0627807548bac3ef1f86c7e512c4bd105f1e18e35ac0ea6934f76a6838e1f SHA512 321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52
@@ -30,11 +27,9 @@ DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b6
 DIST hifijson-0.2.0.crate 17534 BLAKE2B d0aadb9615c1fa3f84ed0a0a9b8397a8741fe2f1b550d727875a30d4ba2bc3d354ad28d3d30ec2e116fc55113c2b6331440fa9f037da49712727cb3172315a51 SHA512 d4f2298428f3c9b0701ad1f4bee881d1f205af72d8670a2ef671387169a413de5f93a3f7b3ea962adb507298f89d2e0ccfec4a1735177818a8124d27047598d2
 DIST indexmap-2.1.0.crate 68224 BLAKE2B 9d833570cbb63ecae138ca234b998bd0e5b11b1a7e3d5ef4a21212bb32d0998395f1fc609f66860bdbab198081687630f583f5a2e495fac1afa40ff48bee8a0f SHA512 9d303eef918b9264b9fe326cc1d71f4095f7ed5639ed8696efa3e9be65dff2c50ada4495409e109e7718997db51ae1fd865cf8e88978107d7823faba14380600
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
-DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d
-DIST jaq-1.2.0.gh.tar.gz 83012 BLAKE2B 60a211d5e46ba79f8916606bc8d193fd39d334ab03cc7e133490e61c7c562ebe977e97c1d6d2b607049408bb286f44b9df709e91c1b5a03d2b2f77cd549a93ea SHA512 10b98ea4e147378fbc37b9e76c41dc79b88f65cc446ceb8ad444d8d2c558b4d73b30ecee01cea2dbcd96d8b4b46cb0f5811ae7a71423cce88693cc51f9aba271
-DIST jaq-1.3.0.gh.tar.gz 84115 BLAKE2B 47bac27c23f7d779d92062cf8bc0b747932708cdb93fd9a7e0074f09a54e87de209b5120f194677809b00315be0d24192df89848891e140d7e76a4cc7bc7b15d SHA512 00e3b32dc53036d8437708f48734c136a3c2a219ac84106c65d0bbac5797bac51aa2665064402d7b0efbc8710c859286cec20c5232be3d4e26e1896b968e515b
 DIST jaq-1.4.0.gh.tar.gz 97078 BLAKE2B 6b5286848035bf96d6b91d7af195998af0effca6a5c89c477d928f58107c6b1fd4da66d6b27861032ee34484248f0077c936d28956a1471a2de001ae2b908eac SHA512 1d5ea0d0a4dc109fb8696e518eed4a235c14423cab1859cffe81f2fd8a085ebfcb3a01bfd87f6d6ad398a1945662ab83cc064bb2da1af618e46acdf262504b13
+DIST jaq-1.5.0.gh.tar.gz 98828 BLAKE2B 0fb64d9622302c44f27bdcb71db46c16939c86a7fae7357639d309a3cb152685fb2b622837cc1158bc96b401817a1f0c9cde98435d92def670e1bdae9d2e51eb SHA512 1b3839a07b4539d61e4d18645fd90bb4312675df36b01702b373ea16534155fa000208b11d21ce000136e237f5ae5321ca3531144012c7dade3f5f8768c1575a
 DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9
 DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
@@ -68,6 +63,7 @@ DIST time-core-0.1.0.crate 6597 BLAKE2B 43137c5cbeb61a89c1cbbef325f2e2dc4b907d4c
 DIST time-macros-0.2.8.crate 24295 BLAKE2B 6b54c83b11db8c8490383764a0e6f3a2c3f17c44adab2d19e69dc3fc5b27c5a44bd57bd0e6885c54ae493bd5e2c05a6237f72be93a3a2fbf297c47c02d28c61d SHA512 4e604f926a620b1caeba90bc5de1129f6a6bb4548890d6e31306ac419c7b6d421b548b3887a929da3209fad28cba8d57b989503e52f16af243375d545b5aefde
 DIST unicode-ident-1.0.10.crate 42039 BLAKE2B 3365850e1991b9e572c6917a35f3c85523d921d5ebd9fa7025fbc1ce2a0518b06aaa9f3e3bfafb47d357226b5b9964145c7f1b5ddc16cb7280542f6c96f650ec SHA512 5dcc24e138a86f84cb05290332d02953b0ca18839ead1e74b0319bc361ea449700e04d62a51e435cba266121e463643e017718d3023a84f844a59e4ca4475686
 DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe
+DIST unicode-width-0.1.13.crate 457228 BLAKE2B 757c4da5fa090369a26130b08440c2348f1cd1c0dfbb6770dd75b65eba797eaa65f5d683f0c2862cced06124d46a89b4825af0d990f6adc2df8709b8ef291665 SHA512 9781d6dab2c6343e8c28ec66b50cb4293261bb2114e122fa80ad2facdb23020f5b621c38030193b918669e58adf143808e5ab4c507c18beb6dc61e97b2e296f4
 DIST urlencoding-2.1.3.crate 6538 BLAKE2B 65777b0990aa6b3d27a47f36114da8622026ac8946b5ffb6e04172b666ec7244a55c250a7fb626472bb2b636eb32ee945599cee5ce7351c3cef2322366db15ff SHA512 035848d9243ed6a4528377b56edd7f8bcb5f824381b420dc8f5c4bfc3f1246655c54eaa7de0e4aaa7138e0b08fd796b9ace140ab919aed2d94f6952b577386ac
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
@@ -82,11 +78,9 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
-DIST zerocopy-0.7.20.crate 121557 BLAKE2B 24e63690b03c5becade47aa7ed16ef7a3d482c4cc8d0dfcf470f01f7592e3a704e4c52f0ab361b6fca4af18f977e33ff2bb4feb64d13daa1fcb62af9f9731be5 SHA512 fc3f883e4cfa38d01443841242a64575e69fb2ce0cfcdd71a28dd4ccb95e383ea1839a199fb13a58f9faf7608720a38cb0537612d7d832c3582946ee638886a0
+DIST yansi-1.0.1.crate 75497 BLAKE2B c0d396c93a733ed6ec12aca3385d816f39b1f1fbed75da460f491f0cbfc30ba462842ebd1627fa8e5d2b7c0f37913a23747e5f5e23df1cb7c85d965e6c37159b SHA512 182c8c6c60a30a727d8f8b90bbf0527d91fa8ae9d8eb20e5414614b43ee6dc532f4b19241adbfb9299cb0004b39fe627036269b60b0c3860d9e1ea4413aca541
 DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
-DIST zerocopy-derive-0.7.20.crate 528379 BLAKE2B 247ab986cb720903df383429a6785c7dec230f6888246a9a7539a1bc8061601b27cea8baf4db2fab491fb32842901466ac32cc80504b3eaf35c25cd1a27ec9e8 SHA512 3c76100c3c9c1a5aae39750448f8ed37069be8e65cc74d67cc983c7e69988581f98248183955294e7c8d044c7a968b6e6534b8f84d9969693cbe4c5f679d5818
 DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
-EBUILD jaq-1.2.0.ebuild 2020 BLAKE2B d8e5cb12b49a8403ddcb75938d1740597fd9f2bb1537e7a080ed7d5e6118d0d829c73ec9e7236533db55c3cd1a25309e3c6dab1ba1bff186b7749661705d1a76 SHA512 1c7be2ecf38d4dae14b1636e94f78192c902fbd055043dd19c8f98d07bdbb9c0cecba272e4a7107d31f8c3ddc476a67967b2824fbb38a4a821469053353ffc04
-EBUILD jaq-1.3.0.ebuild 1990 BLAKE2B 2e432a879b09320ac03b7ffc4b1f1e2c933073d5d85f33c5ccc01ac3f80ed7fbdbcdc71d4118de3d8f34e9d543a9f4f0bad5db9f2ddf35713375319db66b93ba SHA512 6274f776ef1fe0a33fe4027cb2b8099e732db6a596602c67027db33965e05ba707eb099e677e350c684e9c05bceae972eb537221ae345f7f16ae9ebbd2a845cd
 EBUILD jaq-1.4.0.ebuild 2197 BLAKE2B cad00fbe8b86b3d5eb721569dcf6ccce93ad4ffe00814cb5524066a011ec69c3a06041c8ceaaabf64f751b829521a38c64de7cf56b4d34f9943c7cdb5946ab26 SHA512 ccf17533c1377f6721835e16b6b55c6210361a7a3487dcffda31273dfe750a20d1de83d4ec67cbcc0a4a25505a7326c5cca8778b8d97920e899d4a94659cc3dd
+EBUILD jaq-1.5.0.ebuild 2171 BLAKE2B 6ca1e87e463e2bc91f8ee722580bf312d8dd99b1c970c863f6fa07f0f93905db16d425f2431094fe23d3023ccf0871b9d0333b1490f8b1c69659bca920b307b0 SHA512 73a8bee310bc6aea334ddd6fdf0212f2ed0d5a6dc6e6e68dbd87c9a7c9653c3b77f8b0826e69a757c9f093c179cdd1e0c80f406cdce1b5dca1aa0625c86e6d88
 MISC metadata.xml 325 BLAKE2B 2e15e2db0c3a78c4c900f31700316693f33b3e570667ab3eaa7035b27433cdc4e37363d8a321ce16a86ce390bcd7f62c0ea8ff21a2d02c3eec651009f81c4023 SHA512 a513a093b135a21f21ca022f51890d1f7fea33ba833d269b76a889dabb95291da71d5aee28f1e92e01768dab1e97fa8aeabcee81c532e0168f2bad52b7d45c57
diff --git a/app-misc/jaq/jaq-1.2.0.ebuild b/app-misc/jaq/jaq-1.2.0.ebuild
deleted file mode 100644
index 038569f57680..000000000000
--- a/app-misc/jaq/jaq-1.2.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.10
-
-EAPI=8
-
-CRATES="
-	ahash@0.8.6
-	aho-corasick@1.1.2
-	allocator-api2@0.2.16
-	ariadne@0.3.0
-	atty@0.2.14
-	base64@0.21.5
-	bincode@1.3.3
-	bitflags@1.3.2
-	cc@1.0.79
-	cfg-if@1.0.0
-	chumsky@0.9.3
-	clap@4.0.22
-	clap_derive@4.0.21
-	clap_lex@0.3.2
-	colored_json@3.0.1
-	dyn-clone@1.0.11
-	either@1.8.1
-	env_logger@0.10.0
-	equivalent@1.0.0
-	fastrand@1.9.0
-	getrandom@0.2.10
-	hashbrown@0.14.2
-	heck@0.4.1
-	hermit-abi@0.1.19
-	hifijson@0.2.0
-	indexmap@2.1.0
-	instant@0.1.12
-	itertools@0.10.5
-	itoa@1.0.9
-	libc@0.2.147
-	libm@0.2.8
-	libmimalloc-sys@0.1.35
-	log@0.4.20
-	memchr@2.6.4
-	memmap2@0.9.0
-	mimalloc@0.1.39
-	once_cell@1.18.0
-	os_str_bytes@6.4.1
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.69
-	quote@1.0.29
-	redox_syscall@0.2.16
-	regex-automata@0.3.7
-	regex-syntax@0.7.5
-	regex@1.9.4
-	remove_dir_all@0.5.3
-	ryu@1.0.14
-	serde@1.0.190
-	serde_derive@1.0.190
-	serde_json@1.0.108
-	strsim@0.10.0
-	syn@1.0.109
-	syn@2.0.38
-	tempfile@3.3.0
-	termcolor@1.2.0
-	time-core@0.1.0
-	time-macros@0.2.8
-	time@0.3.20
-	unicode-ident@1.0.10
-	unicode-width@0.1.11
-	urlencoding@2.1.3
-	version_check@0.9.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.5
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	yansi@0.5.1
-	zerocopy-derive@0.7.20
-	zerocopy@0.7.20
-"
-
-inherit cargo
-
-DESCRIPTION="Just another JSON query tool"
-HOMEPAGE="https://github.com/01mf02/jaq"
-SRC_URI="
-	https://github.com/01mf02/jaq/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	BSD EPL-2.0 MIT Unicode-DFS-2016
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	>=virtual/rust-1.63
-"
-
-QA_FLAGS_IGNORED="usr/bin/jaq"
-QA_PRESTRIPPED="usr/bin/jaq"
-
-DOCS=(
-	README.md
-	examples/
-)
-
-src_install() {
-	pushd "${S}/jaq" >/dev/null || die
-	cargo_src_install
-	popd >/dev/null || die
-	default
-}
diff --git a/app-misc/jaq/jaq-1.3.0.ebuild b/app-misc/jaq/jaq-1.5.0.ebuild
index 6d694021e2fd..84cd770b0588 100644
--- a/app-misc/jaq/jaq-1.3.0.ebuild
+++ b/app-misc/jaq/jaq-1.5.0.ebuild
@@ -1,26 +1,27 @@
 # Copyright 2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Autogenerated by pycargoebuild 0.13.1
+# Autogenerated by pycargoebuild 0.13.2
 
 EAPI=8
 
 CRATES="
-	ahash@0.8.6
+	ahash@0.8.7
 	aho-corasick@1.1.2
 	allocator-api2@0.2.16
-	ariadne@0.4.0
 	atty@0.2.14
-	base64@0.21.5
+	base64@0.22.0
 	bincode@1.3.3
 	bitflags@1.3.2
+	bumpalo@3.14.0
 	cc@1.0.79
 	cfg-if@1.0.0
 	chumsky@0.9.3
 	clap@4.0.22
 	clap_derive@4.0.21
 	clap_lex@0.3.2
-	colored_json@3.0.1
+	codesnake@0.1.0
+	console_log@1.0.0
 	dyn-clone@1.0.11
 	env_logger@0.10.0
 	equivalent@1.0.0
@@ -33,6 +34,7 @@ CRATES="
 	indexmap@2.1.0
 	instant@0.1.12
 	itoa@1.0.9
+	js-sys@0.3.69
 	libc@0.2.147
 	libm@0.2.8
 	libmimalloc-sys@0.1.35
@@ -64,15 +66,21 @@ CRATES="
 	time-macros@0.2.8
 	time@0.3.20
 	unicode-ident@1.0.10
-	unicode-width@0.1.11
+	unicode-width@0.1.13
 	urlencoding@2.1.3
 	version_check@0.9.4
 	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.92
+	wasm-bindgen-macro-support@0.2.92
+	wasm-bindgen-macro@0.2.92
+	wasm-bindgen-shared@0.2.92
+	wasm-bindgen@0.2.92
+	web-sys@0.3.69
 	winapi-i686-pc-windows-gnu@0.4.0
 	winapi-util@0.1.5
 	winapi-x86_64-pc-windows-gnu@0.4.0
 	winapi@0.3.9
-	yansi@0.5.1
+	yansi@1.0.1
 	zerocopy-derive@0.7.32
 	zerocopy@0.7.32
 "
@@ -89,7 +97,7 @@ SRC_URI="
 LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+="
-	BSD EPL-2.0 MIT Unicode-DFS-2016
+	BSD MIT Unicode-DFS-2016
 	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
@@ -111,5 +119,6 @@ src_install() {
 	pushd "${S}/jaq" >/dev/null || die
 	cargo_src_install
 	popd >/dev/null || die
+
 	default
 }
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index de55af69bf68..b970d73f7396 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index b184800bddb4..9f8d44dce9a6 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -2,6 +2,6 @@ DIST homebank-5.7.4.tar.gz 3670067 BLAKE2B 3be94dc9e1ec11fc67fb7dab1655c9e2ab852
 DIST homebank-5.8.1.tar.gz 3722739 BLAKE2B 23042c8fc952faf2da039934f4b82c9c5949649647bac1861cf291dc360929911316fa912e676bd1b2d87f7290e0b6a4fdce035b1e7ca6558bf613365f71e8d6 SHA512 900228b813c79bd4a5f1257a51e422e4748c7b7e9945d6d9c72c04097caf2275dd8294fd901a55fa6110c8c75be418e89a3a541a3350d350ef01b052e0cfb1f6
 DIST homebank-5.8.tar.gz 3714120 BLAKE2B 72c8f635a6328df767cb2d94195dccf067cec98266c820e3fcfd764886aaffd5341130b6102e7e56b6623dfc2f78658a5dcad7f23839e0091c0d10a8674b2a4f SHA512 c004cdb88e905d24554ecc52632ca92d5a13ffd61addfdea3374a09ea6f53b848a9f92f4b3eebae06550d72898fd318482c8ab21cb0bb2366c63ff89ac0f349d
 EBUILD homebank-5.7.4.ebuild 814 BLAKE2B 0f131af50cca25e3dbd57482e534511e9e6c1b2943700479ce9593f95422d4555196a11301a4238fe12b9f4fb69d7a43ec4d197ccb9969963a7c2e4110b6fe00 SHA512 401467a50015625c37b037545f888a50748784d96a2eeffb34e3b5a0c1b51ce7b4aff0e12f119f03c370da4487a490e43ddda19dbdb2e4e440df1d1e84be0568
-EBUILD homebank-5.8.1.ebuild 817 BLAKE2B b0235cee7afa47641e04d45aec669e94fc97cda3fe3f2101dd299a213cbcb7e53867ca985b31266d829f770be434dc16ef07d54640b2c337c42c352f9a75ba38 SHA512 efda2d371b19d611cec5d76cb55fb5f6c4ffa29886d22305d00835fa257e9a229d9587cba8b755dee978b17ec7df53633b0fcf44d6ae8858cb417e057fffcf3f
+EBUILD homebank-5.8.1.ebuild 814 BLAKE2B 8190829b7861628d6b7e9a7269df76741b5ddff1928eb33c7e8d64e8f85d2989208b7c983b79d31ab3417ee0a92276ba79f70b3b6c58f71eae56472255b59580 SHA512 c93fc64735ce523eb460e3a7c4b3c36913412dd008cf345d5debb81b3095e80a9b1f3bc1079c4caee925f6d3cdc77d6d833c3a0d2fdc6975f2aa06e70d6e1148
 EBUILD homebank-5.8.ebuild 817 BLAKE2B 164cc4ac83ec8e2745b47b304d207ac7959f1ce558f3d5a1995fb35363bcc75d0fd4ed5013c3d7553349ee3b0ee8cd7a42c061b3184ec1aa65329c2403d9a113 SHA512 d6dc0e4a2817dfcdf89ef6428b8332bd6b4a147f3709a36e8fd80730eb27e38f6292e294fc78050bc69384b69765f8e47d65615beb70a5b3c829cc80dfdf6bf2
 MISC metadata.xml 322 BLAKE2B f0ed3691f77c7dba631ced8827fc442dec42c7cae9c07f66e69304ad862112233defc63cb443c5321b3ffc385976ae3b46165d3e31318e564e35ee01b1875d05 SHA512 449b8694aa9236e7925b62ba3249bff5d567a3710ac8ade8db75a5403dd0bb58380717c15fe42cc082beeee3030aa65ce90d047f18a1d67d19dd50771315f013
diff --git a/app-office/homebank/homebank-5.8.1.ebuild b/app-office/homebank/homebank-5.8.1.ebuild
index b794b4f11bfc..3cc624ffae3a 100644
--- a/app-office/homebank/homebank-5.8.1.ebuild
+++ b/app-office/homebank/homebank-5.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.gethomebank.org/public/sources/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="+ofx"
 
 RDEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ef4fc4ee6588..ed67f15deaa0 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 297057749833..41ce77e2bbf5 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -2,7 +2,7 @@ AUX all-completions.patch 2037 BLAKE2B 92a706e0dce6a6dd316b168fd4a93a8d6e52f80ce
 DIST lesspipe-2.11.tar.gz 171212 BLAKE2B aa7cf35f00d9db4ad7cb48ae89089a4d0c5d6c6e41ec902bc7ba6d4fd218f8ea90e1fdf3d6fcbac1dd1f86eb841a0daa6838b0086905fd4b0535d91040ef85aa SHA512 ed75d8529bd24876b11a50d0ada476299569d0fe716c390de84a0630ae475594f96370ffbed64fc5d9e2417dcbaa7b2f68630e32f665dff799667c2653b0265f
 DIST lesspipe-2.12.tar.gz 171915 BLAKE2B b1181cc5ca6ec8ca918bff31def6d6fde5f6bcfde9d48e0a23a088ee9ff178e3e9ff330b1c27a3d74b63d227c94292141414bec8c25d0035f9fec01c6760b8b9 SHA512 9c6945b0f5a5672e3b9b0035ebc63ab3197c1b3d1dfc3d4a2280c1f11421d98ccc5c016273a308a96f61a47f4da6d6658502534284fff81fd75365a4ba91c27e
 DIST lesspipe-2.13.tar.gz 173413 BLAKE2B 06752c71822233bf7f5f9f55b416222963a05cb9b7ce60d204b989d5d7052e5d24ca26f0ddc9e2520789e89cf8e2be456a77f616adefe65e637d0761948a734d SHA512 e4e2448f9d001c1da3ca2d9ad029598cc51bd3ce381f77d4b77093d8df8162111726af09690611f91542b2f8f437dcc448b95505adfc92a724bff151490ddd3d
-EBUILD lesspipe-2.11-r1.ebuild 1925 BLAKE2B e63508fc246a9848ccdb92429790c6bf6dce42b3325815f33e771ab3040bfd0510ed64b3fe8b2efe65d8bf1d3c4fa775eaffa636805fab8704be4bdace3e5450 SHA512 afe904b57613c25d56b5d2632341da27b45fee8a38637d0ccbd66b4a26c3091588ae0e367d6faa23f80f97a490912eceb3021269eedfd7d3ac7bc4e5046fb8e9
-EBUILD lesspipe-2.12.ebuild 1756 BLAKE2B d82930f4d3f917d2bff46b3ae00ccc08df337388d8c2eee1bcc56c9b9877fdfc43fa93808c774b52d9434e11d2022e92a0430ca858d781a11d466cffc976ea9a SHA512 5ecc8fb1597b037af5c91025e666b8017e479fa144c22291a79d5fc0fe70473ffb6fa8d94847441853bc1664b8f9e3a2e028c02f6ec69880ffdb3ae073fe9173
-EBUILD lesspipe-2.13.ebuild 1758 BLAKE2B ca5ecd566c8bcf89a6690a30d6946d73a3a6fff0371ff5959b93e3c06c59af3ea1304cf12d9a8046af542396700f5f0bdcb8c5ee065b02d587d6d28a4f9c3769 SHA512 c5eaca6e2ac1138f4d7986bf6278377109d4135506fa9cf687457284f6d902377fd675b5b95082e434093e1d7275406146b97e45fa7078719bb4ef1af88233f9
+EBUILD lesspipe-2.11-r1.ebuild 1973 BLAKE2B 85353a548f69a8721c1fa1f685e59b0e3bb0cfe60de87fadc152cf2eee749f3aba94e5683ce481d349074594f2f4b5464c24e4d819b5277313981ad7fc25b001 SHA512 6a42f8812a7e51795179c1e72c2c2446b39b35307627f4d77295a3ba6332737e37826bb42781c791510d416de0ce24353c1bad8cf9aa4ab41fbc23377e55d869
+EBUILD lesspipe-2.12.ebuild 1804 BLAKE2B 436d70e8b55c9a50f7a71f53f0350d9585be8d790c0e5911b6d2a83dfaa98e315ba4198afa872b4135db51cdf2838f349640ccebc271fe3c4fe99a6c4f59a6f6 SHA512 d8617308a131e3712694607cf8f0adc1d089b1c334b3f3e2defcb2aa13465c2112967b50ea30a0df0bffa9628270e4a4014c9381102051dd7680464aee411196
+EBUILD lesspipe-2.13.ebuild 1806 BLAKE2B 61b628a758f8f92c58b04462ec15910d56d7e67f329f5217821a0e2cfad39bc2c036e838b9d69bbade68fdd19defb8d043c58fcc3af7ea7e1ec66b12153b89c7 SHA512 1048dc25b8ea509dbfc5015403ba1c78e9aeeb8fb565af7236c7e401a75126eeacc6d32b445449cc2decaefde13988fc38931b671bdb64dc270cce6021ace040
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-2.11-r1.ebuild b/app-text/lesspipe/lesspipe-2.11-r1.ebuild
index 975d91af0d67..bbd53d1c3046 100644
--- a/app-text/lesspipe/lesspipe-2.11-r1.ebuild
+++ b/app-text/lesspipe/lesspipe-2.11-r1.ebuild
@@ -55,6 +55,7 @@ src_install() {
 	#   . /usr/share/bash-completion/less_completion
 	#   Or consider installing the file less_completion in /etc/bashcompletion.d
 	rm "${ED}"/usr/share/bash-completion/less_completion || die
+	rmdir "${ED}"/usr/share/bash-completion || die
 	insinto /etc/bash_completion.d
 	doins less_completion
 }
diff --git a/app-text/lesspipe/lesspipe-2.12.ebuild b/app-text/lesspipe/lesspipe-2.12.ebuild
index 24065f86cbcf..a0393dafe206 100644
--- a/app-text/lesspipe/lesspipe-2.12.ebuild
+++ b/app-text/lesspipe/lesspipe-2.12.ebuild
@@ -50,6 +50,7 @@ src_install() {
 	#   . /usr/share/bash-completion/less_completion
 	#   Or consider installing the file less_completion in /etc/bashcompletion.d
 	rm "${ED}"/usr/share/bash-completion/less_completion || die
+	rmdir "${ED}"/usr/share/bash-completion || die
 	insinto /etc/bash_completion.d
 	doins less_completion
 }
diff --git a/app-text/lesspipe/lesspipe-2.13.ebuild b/app-text/lesspipe/lesspipe-2.13.ebuild
index 9b06994b07f0..31e7d52d9b69 100644
--- a/app-text/lesspipe/lesspipe-2.13.ebuild
+++ b/app-text/lesspipe/lesspipe-2.13.ebuild
@@ -50,6 +50,7 @@ src_install() {
 	#   . /usr/share/bash-completion/less_completion
 	#   Or consider installing the file less_completion in /etc/bashcompletion.d
 	rm "${ED}"/usr/share/bash-completion/less_completion || die
+	rmdir "${ED}"/usr/share/bash-completion || die
 	insinto /etc/bash_completion.d
 	doins less_completion
 }
diff --git a/app-text/spellutils/Manifest b/app-text/spellutils/Manifest
index 9092c331a718..92f7ca86eac8 100644
--- a/app-text/spellutils/Manifest
+++ b/app-text/spellutils/Manifest
@@ -1,4 +1,6 @@
+AUX 0001-allow-running-modern-autoreconf.patch 1268 BLAKE2B 3c8ecdca0f3df3ff5b199eb910532b2f57a09281a212202d1c602be8994812c7a92c1e2a12c140f7c35a6b410446f928fa17571d828a258a592466a016bec35b SHA512 554f2156ac3b30016538b9d5ebb75cc643a219a0b9bd4dcab8c51fb00d7439bd22aba0a81fb9f5272c629605a9d4485c5009836b90707a98cc7d6fca161d6779
 AUX spellutils-0.7-nls.patch 433 BLAKE2B aa85963ace2272facd52b6e8478c1522d363ca81011f53d8971802b74835065cddae904fb3bf873886ae90f9efee3d4362fba13141cf28e1a2d27422c1f5d44b SHA512 94ab6bba55800559ad2621001df828ff67d40df045a63737a112545d558a5436a85cd3220993daf91c23591cc6b94ef692dad9811e08ca0066d602ece07b5b8e
 DIST spellutils-0.7.tar.bz2 110421 BLAKE2B b415a8be96962b88c4ba64270b43e90e42a3ebe23d765ef970cf55a22ada842f269878c4b3a72e6284864d1d1c3e4ade1e84aaf28d4fa39f86f0280db4f27e4d SHA512 030b06038c587e668fcbef95afc64e28db48a25f2b247b829155c1a5b66d3b3012650cb4c13e5de41a70a1665b05fbfb44a4cd0b1295868e611a21d855f02f9e
+EBUILD spellutils-0.7-r1.ebuild 2397 BLAKE2B ccebc7a67cfde09d4216d7550ea5242cd42fe32b64133e085203080d88ff1d2733b4b89dcb434b2075f7a5e83531786f3b23d6896681dc59c5e16e623266cdab SHA512 4697a99c77d0ae44fbc065bd91ec750232f0ae906bd7f5e9e7a42367ab6e4476f16a6458c82990cff2f496c3d3f005398703295af13d278f61ceb7af204ef240
 EBUILD spellutils-0.7.ebuild 684 BLAKE2B 8756b375935826882174d604cfd15078048cd1acc5fe54f967109a96e410590371df840d77bdbf462a8e097c17b73cedf69671c44237232289e5e657ca269727 SHA512 5009c6e89fef86e8030664026d88a58000bc015e38c0225d85f360e8dec5860f93d4078c6782a491be775a65cd5794e74bfd01fec4c43fbae6eac3df427acd60
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/spellutils/files/0001-allow-running-modern-autoreconf.patch b/app-text/spellutils/files/0001-allow-running-modern-autoreconf.patch
new file mode 100644
index 000000000000..629647b661cf
--- /dev/null
+++ b/app-text/spellutils/files/0001-allow-running-modern-autoreconf.patch
@@ -0,0 +1,52 @@
+From afd4a8c7b29f812621caaa44c5dff3549cbde2ee Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Wed, 26 Jun 2024 10:44:56 -0400
+Subject: [PATCH] allow running modern autoreconf
+
+The release tarball uses autoconf 2.13 and the configure.in uses things
+that no longer work.
+---
+ Makefile.am  | 2 +-
+ configure.in | 8 +++++---
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3eecd1a..e21e0c3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = intl po
++SUBDIRS = po
+ 
+ bin_PROGRAMS = pospell newsbody
+ 
+diff --git a/configure.in b/configure.in
+index 9730ada..26ffd1a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(pospell.c)
+-AM_INIT_AUTOMAKE(spellutils, 0.7)
++AC_INIT([spellutils],[0.7])
++AC_CONFIG_SRCDIR([pospell.c])
++AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+ 
+ dnl Set of available languages.
+@@ -22,7 +23,8 @@ AC_TYPE_SIZE_T
+ AC_TYPE_PID_T
+ 
+ dnl internationalization macros
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_VERSION([@GETTEXT_VERSION@])
+ if test "x$prefix" != xNONE; then
+ 	LOCALEDIR=$prefix/share/locale
+ else
+-- 
+2.44.2
+
diff --git a/app-text/spellutils/spellutils-0.7-r1.ebuild b/app-text/spellutils/spellutils-0.7-r1.ebuild
new file mode 100644
index 000000000000..af888195ec4e
--- /dev/null
+++ b/app-text/spellutils/spellutils-0.7-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="spellutils includes 'newsbody' (useful for spellchecking in mails, etc.)"
+HOMEPAGE="http://home.worldonline.dk/byrial/spellutils/"
+SRC_URI="http://home.worldonline.dk/byrial/spellutils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="nls"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/0001-allow-running-modern-autoreconf.patch
+)
+
+src_prepare() {
+	default
+
+	# This is a filthy hack born of the fact that gettext is absolutely insane.
+	# It requires you specify exactly which version of gettext you have installed
+	# at the time of dist, and the tool to automatically update this explicitly reads
+	# from /dev/tty "so that gettextize cannot be abused by non-interactive tools."
+	#
+	# The gettext docs do, of course, claim this is entirely optional and only
+	# needed if you run autopoint. They neglect to mention that running
+	# autopoint is mandatory. Failure to do so produces this:
+	#
+	#   configure.ac:11: installing './compile'
+	#   configure.ac:26: error: required file './config.rpath' not found
+	#   Makefile.am: installing './depcomp'
+	#
+	# and the call stack points back to -- you guessed it -- AM_GNU_GETTEXT.
+	# Which internally requires config.rpath, a file that is explicitly copied
+	# over by autopoint.
+	#
+	# AM_GNU_GETTEXT helpfully points out in code, rather than in docs:
+	#
+	#   configure.ac: warning: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION
+	#
+	# Perhaps what is meant by "The use of this macro is optional; only the
+	# autopoint program makes use of it" is that you can deliver a `make dist`
+	# tarball that isn't built from publicly distributed versions of
+	# configure.ac, since you can add the macro, run autoreconf, then delete
+	# the macro and rerun autoreconf. It is a very funny definition of optional.
+	local gettext_version=$(gettextize --version | awk '/GNU gettext-tools/{print $NF}' || die)
+	sed -i "s/@GETTEXT_VERSION@/${gettext_version}/" configure.in || die
+	eautoreconf
+	cp po/Makevars.template po/Makevars || die
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 467d64d105be..87a3607ea077 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/rocm-cmake/Manifest b/dev-build/rocm-cmake/Manifest
index 28ece17a7858..fa82be83a476 100644
--- a/dev-build/rocm-cmake/Manifest
+++ b/dev-build/rocm-cmake/Manifest
@@ -1,4 +1,8 @@
 AUX rocm-cmake-5.0.2-license.patch 631 BLAKE2B f3beee352aa6dba1d8b30e9e4193915d8b97d3aac3143f79b12c7b6f438a3557d6ee3eabb7835764cb5b2470f6f6f20ef82757356bd8e2f43eeeb8e20966d4c2 SHA512 818a019b93cfa0712fdb8faba32e7415aafa68b337cc147f3259165ffc028ec2e0353cfb0680053cdc8e8069c75df07356939eb7adb5b1295010e4d501a59546
+AUX rocm-cmake-6.1.1-license.patch 520 BLAKE2B 4a00b068a3bb330ad2a1b981e6f36f8ac700e7d14e234541ede8657f30583c7e16b89f7729d559f36e7909fa9c43bc123a9bfb4a2b3778833b9a2af157b926f8 SHA512 8a4dd0b1035f66c233bec885ea64ceca5c2d8e140fb9de752f09de08c996551123abc45b2a6967b1696aef16924727268521f9c00d99ef9e6e8783d9c1bbf520
+AUX rocm-cmake-6.1.1-no-rocmchecks-warnings.patch 1431 BLAKE2B eedeb63f394ace78c298ac77e920a43616924a475d53154b9e904c44dd0118defc7aa7405963dacbb9d60e49fe1be78533e9896e6f9d92bc9acc48fee6ee806c SHA512 45599dfe29f1800319baf36635a8306b73aac4425797168235be578554e63b43a12b451fc343231d735d1d1bbae073bf1192c4c3292ce1014db8fbb130b5cc7a
 DIST rocm-cmake-5.7.1.tar.gz 50940 BLAKE2B f3a36cedfc15af69819b576bf8f8bdfe7b49e5dd1d4db57f707295f14a8d64904745f454fc211b28adfde369c82cb42a061c05b6675679e11a3946f6ebfea6d5 SHA512 1265ed8e23a04f9cff57b43f815e8fbbb1a3f200bc040e01ceaa92c322088c9ef04da795b09d732c6466dc9a3fefc505b8b474d3f18f55cff491758aa53a6e6b
+DIST rocm-cmake-6.1.1.tar.gz 86888 BLAKE2B 91064e82199ac317c273005b9b6c07e33ab5199b456467e84ac0937036d26d1d5c1286e1e38932b2da11700fb2a7a90795e34d4a7c03ed3bf58959402060091e SHA512 af6d4e124a3ec4d1e810867db69d738ebe7cfea672065bb5279b72a4d4efce8c14305e76173f760044977082c6aa069453d8eef488368a88ac57eb9df20f8b0c
 EBUILD rocm-cmake-5.7.1.ebuild 775 BLAKE2B 00c9e426dee2cb49d2ec17149f388a8262217c4fe6bfef406bb9bb8c8e2ab2519f28b6043560bea3c0722729fcdebe7b7488ece5780783aaf6ab4a1534061d20 SHA512 90b114853f760f8622b7a1c3a403d81cd555258a41bea56b6ae5bca83d20287a5b314ecbc5413bccede7083e2aa5ae783dd215dda7e4fe954257e3dd927c1423
-MISC metadata.xml 504 BLAKE2B 5b7976e66353bfe9bec6d7c7ebb318d4f3922f4128e0a5f224fb983b876d9fd328c0d3dea68f4d92f3d740555eaaf5ef99de610957f0375076a3e8f5df04eb99 SHA512 32299ceb61b177b44e8117c5e2d249df25f75ddb5398bc1bd62bcb0462347a183fcdac6f9c14d6e2fd076d860dab401d9e6f7714ac3492adea7268edd953421f
+EBUILD rocm-cmake-6.1.1.ebuild 912 BLAKE2B e0a965c617856b22bc43b142be1de8a030da43dc5b9c375eabb14de2b2254e6f2badaa80727b2e94e38a85bfff7bb36124a5ec4a9935c6f3c69728be2a5dfb7b SHA512 add66398a09ba709b6b702dd794361202b68e42c1f946ed1d156cf3b7c2dfaea9bbf2c2b94ad1d4b762a0e1ff8b583f1d7a4d1fc4f273f1c8dcbd69199b6a4e9
+MISC metadata.xml 612 BLAKE2B cbab269204bacde90025f8f0575016692e4d7785127fcad21bdac56cd3c6b1e5a8b52b4abfefbdb91cf39db9c0a06ca90b1a37bffdb106319540a899d5c5e896 SHA512 d39324e34a7374dfa1fc43aa93d9f6c439b8d6311605b37919fe18c776d881713cc6b874a43428a607be00ffcc8a0b7c1b8cd62d0f6f039b1ec2d255b17cee1a
diff --git a/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch
new file mode 100644
index 000000000000..f8770b345f85
--- /dev/null
+++ b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch
@@ -0,0 +1,12 @@
+This is not needed. Gentoo will collect license files into
+the documentation directory in ebuild.
+--- a/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
++++ b/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
+@@ -409,7 +409,6 @@ macro(rocm_create_package)
+     if(PARSE_PTH)
+         rocm_parse_python_syspath(${LIB_DIR} ${PARSE_NAME})
+     endif()
+-    rocm_setup_license(${PARSE_HEADER_ONLY})
+     if(PARSE_COMPONENTS)
+         rocm_set_comp_cpackvar(PARSE_HEADER_ONLY "${PARSE_COMPONENTS}")
+     endif()
diff --git a/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch
new file mode 100644
index 000000000000..73030e7b9b20
--- /dev/null
+++ b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch
@@ -0,0 +1,25 @@
+Gentoo uses cmake -C <...>/gentoo_common_config.cmake approach to set toolchain variables.
+There is nothing wrong there, so there is no need to print huge ROCMChecks warnings.
+--- a/share/rocmcmakebuildtools/cmake/ROCMChecks.cmake
++++ b/share/rocmcmakebuildtools/cmake/ROCMChecks.cmake
+@@ -34,20 +34,6 @@ function(rocm_check_toolchain_var var access value list_file)
+         elseif("${base}" MATCHES ".*/CMakeFiles/${CMAKE_VERSION}$")
+             set(cmake_module On)
+         endif()
+-        if(NOT cmake_module)
+-            message( "
+-*******************************************************************************
+-*------------------------------- ${message_title} --------------------------*
+-  Options and properties should be set on a cmake target where possible. The
+-  variable '${var}' may be set by the cmake toolchain, either by
+-  calling 'cmake -D${var}=\"${value}\"'
+-  or set in a toolchain file and added with
+-  'cmake -DCMAKE_TOOLCHAIN_FILE=<toolchain-file>'. ROCMChecks now calling:")
+-            message(${message_type} "'${var}' is set at ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt:<line#> shown below:")
+-            message( "*-----------------------------------------------------------------------------*
+-*******************************************************************************
+-")
+-        endif()
+     endif()
+ endfunction()
+ if(UNIX AND (ROCM_WARN_TOOLCHAIN_VAR OR ROCM_ERROR_TOOLCHAIN_VAR))
diff --git a/dev-build/rocm-cmake/metadata.xml b/dev-build/rocm-cmake/metadata.xml
index e13f2f7b5728..9b05010ce860 100644
--- a/dev-build/rocm-cmake/metadata.xml
+++ b/dev-build/rocm-cmake/metadata.xml
@@ -9,7 +9,11 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
+    <maintainer type="person">
+      <email>lockalsash@gmail.com</email>
+      <name>Sv. Lockal</name>
+    </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/rocm-cmake</remote-id>
+        <remote-id type="github">ROCm/rocm-cmake</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild b/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild
new file mode 100644
index 000000000000..7d097ae7d18f
--- /dev/null
+++ b/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/rocm-cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ROCm/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/ROCm/rocm-cmake"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+RESTRICT="test"
+
+DOCS=( CHANGELOG.md LICENSE README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-license.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-rocmchecks-warnings.patch
+)
+
+src_prepare() {
+	sed -e "/CMAKE_INSTALL_LIBDIR/s:lib:$(get_libdir):" \
+		-i "share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake" \
+		-i "share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake" || die
+	cmake_src_prepare
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 0145d9af9f3f..6ca67b4714d5 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index dd06800a82dc..e7e9b2ffc8bf 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,7 +1,7 @@
 DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e
 DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3d747dd5e90dd279038fa5c71bb7b7d9ba1cf7e6143898b2a1d24d100584bd2a48ded41a426870c4825eec1b2 SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c
 EBUILD gtest-1.13.0.ebuild 1870 BLAKE2B f2ea03a8fa7c5d8c39b4a8af7e1a2ee7871fb0636fa457b1a0b850e0307d0f030228d0c7b60fc5b9545cd412b5b6d2886ccc690977682fbd307ff4bf82967a85 SHA512 4fd2ad52f159021aa883364dc0ec5c65376d6efff0279c9aaf516df5f258678df2c2bc84d5b19d638aa7831138e9af3dbb64ea7f7e80ae09923d02a9445ac4ba
-EBUILD gtest-1.14.0-r1.ebuild 1992 BLAKE2B 2b20026e7f95e0278ad1bb4cf846162fa18a01ac335aaf612514c72da5ad1bc6fb6e12235694b48cceaaac37e6a9516ba8a6975507f2810e268f2c94aeb01fcd SHA512 48cd1d97f023120cef32b237b6aa72d1745a015facc87db8450f049619114e84f5cd6ecb32a6ff72e455ca45768f20f2d5a18d2ae77a67183fac83ba7f26c5b9
+EBUILD gtest-1.14.0-r1.ebuild 1991 BLAKE2B 1bf94cf1ef46c97e6b40bb35d2a461f276966f05184e38d73d24b3756dbdee8f3f55a57a93afb91446bb165f9633c23b092b3162e2ab643d167f9c102018df66 SHA512 06d6eb4b8215ee8746d8752e582a9d43b09b8d617ee35e0a544deb63dc662b3a64849fbf509f93ca09d2f40ffdff18b25e7297c2ce2f3c1329dadad4a5c74c9d
 EBUILD gtest-1.14.0.ebuild 1755 BLAKE2B 50437b841c5a62f9f1d39e499bd2190bc0aa2e024fb81e4b834d3c44182e0d349bf8afe07b59a9ebf8ec375c27b234b09572849c34b51f9f7b47400ab7f2c440 SHA512 6888c92fa06a074cc83a8a99b661d2d5db561bd4860e205b10c58d3327eefd7baf5fad8b314f212001df595aa0c225164081420ebd37f6d7423471d9be4a8460
 EBUILD gtest-9999.ebuild 1996 BLAKE2B c42acf93040334dd0300980e64d6ad662b0e33b4147d6e2dc2ec10ca9d618d4b2e21840963c114258579439dc736bf6db2b2d11cd56defb2ea7e27210efbcda3 SHA512 be1189ec0f6e3319d3d7b32208c51e6d4d6b8312750ea2ee0d8438ad61a1a1320302ef60645a6c68526c53bd1cf1cc84bd98869b3e61fa8803876714b18793b8
 MISC metadata.xml 553 BLAKE2B a6d63b3f65e8cc9bf95fb0197c48f6adcca359f118797b0bb6c624d09dd586efe066c990e6cb709d42f8cbf32f67feeccf74b9662d13ddfd57f6b13f199585d3 SHA512 e1edf26c4cf978203c3c6e3fda887923dbf76101860dc8e6a81a7218f88fae0f28d4b78ce6cf34b5d3a61c550e1042d5fb3d3530f88b5277a5b46c8943dc0677
diff --git a/dev-cpp/gtest/gtest-1.14.0-r1.ebuild b/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
index ae470f21a696..afb21ca17db8 100644
--- a/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index fad64d1ab094..bcfe7cc944f6 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
diff --git a/dev-debug/lldb/Manifest b/dev-debug/lldb/Manifest
index 8bd416515de6..a3d4ce9aa14e 100644
--- a/dev-debug/lldb/Manifest
+++ b/dev-debug/lldb/Manifest
@@ -4,21 +4,14 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD lldb-15.0.7.ebuild 2787 BLAKE2B 606d1bef5194c6d173480719f131847bda2093a14937e831972e3514e86b9ab3f420f7d9cbc60457dacfa0613af21b88f0f91b20ac2215d10b18acf73a938885 SHA512 3e9adac80fbf2a37784e197e882d3a797e6f37b18afc06b8952f587b9259a0610b08702472360e4828e5499f56a520566cbbf869c19380227eaea172d2b35934
 EBUILD lldb-16.0.6-r1.ebuild 2605 BLAKE2B 93d0148ce952dc67a60579da1516398fe529c4efca3d15844fc7cc7aaac46ac9f5615eca85602346c0c5b6bebcb3343ca61a0e98aa7498e325200632ff084825 SHA512 51dc1b8d85da0bcd8e6f2a42f3da30f20861de1bcce8b03edd7ef924bdea38d192723d87364783e195585c1de096bb5a55ee46a8c9fb9b5da3e211a9228c59df
 EBUILD lldb-16.0.6.ebuild 2735 BLAKE2B 02d90b4ef7180e73efeff06ccb61f1f03ecda99183420245bec0c4b7884b01c570c2389a634db9f46386355bd3ccc9cc5a0a4a01e4254a8718a9668f96ea7517 SHA512 325400e59d98e87eceaf12710a127cc5927309f683f2460983004bd6acdd9115775b95b406b872464a0184e8a749d570265c9c18f2df7774021c4377574b68d6
 EBUILD lldb-17.0.6.ebuild 2713 BLAKE2B 241b5851ea908a150488f431501c3a83d321f7d9225a12ee306cb915b21c1f918b0d931a2575db8c5680a58c84ad8c9037c8e591ea280f8a13fda7ad2464238c SHA512 656fc28d597d39e11aa58405a39ca6fabc579fb6f48d31c8cf8b4356d5e6ba54c3ab691b57b64d227c1d13a87f7579b851a12589a1ab411972a36b952a0990f6
-EBUILD lldb-18.1.7.ebuild 2620 BLAKE2B f2a61e79df52d68eca32a9f95fd1d3ebcbd5e7b21dc71615255ccd85a08e39b26a017e9032c7d41be5796d11028fec62c45c3043cb375a2445ef0893e7c1cdb4 SHA512 ea49e817469d3a5d12d840a57034ad01141a4687bd8ccd1b2e2db8f98a5ccbe72823ddca5330aa8e6b89f6a077159882cb58b54d289a42c4a6563cc718e4130d
 EBUILD lldb-18.1.8.ebuild 2620 BLAKE2B f2a61e79df52d68eca32a9f95fd1d3ebcbd5e7b21dc71615255ccd85a08e39b26a017e9032c7d41be5796d11028fec62c45c3043cb375a2445ef0893e7c1cdb4 SHA512 ea49e817469d3a5d12d840a57034ad01141a4687bd8ccd1b2e2db8f98a5ccbe72823ddca5330aa8e6b89f6a077159882cb58b54d289a42c4a6563cc718e4130d
 EBUILD lldb-19.0.0.9999.ebuild 2579 BLAKE2B 60edc61e262a002ffc130dc86b3a77cf647f8bb62707a3c776d542dae3aeaa04fb38b5a6df6c2b7a7386a9267cb28f6af415cc6598e830bf45f13c7a5a8054f6 SHA512 78c3a75ad806b94b1b828ba7cede5f15f02b937b9522ed47882d1443baadb891e18d4c7f8bdfb0c0732bf7d763a92d0f934cdda2e0377a79e159e22c24753d40
-EBUILD lldb-19.0.0_pre20240608.ebuild 2579 BLAKE2B 60edc61e262a002ffc130dc86b3a77cf647f8bb62707a3c776d542dae3aeaa04fb38b5a6df6c2b7a7386a9267cb28f6af415cc6598e830bf45f13c7a5a8054f6 SHA512 78c3a75ad806b94b1b828ba7cede5f15f02b937b9522ed47882d1443baadb891e18d4c7f8bdfb0c0732bf7d763a92d0f934cdda2e0377a79e159e22c24753d40
-EBUILD lldb-19.0.0_pre20240615.ebuild 2579 BLAKE2B 60edc61e262a002ffc130dc86b3a77cf647f8bb62707a3c776d542dae3aeaa04fb38b5a6df6c2b7a7386a9267cb28f6af415cc6598e830bf45f13c7a5a8054f6 SHA512 78c3a75ad806b94b1b828ba7cede5f15f02b937b9522ed47882d1443baadb891e18d4c7f8bdfb0c0732bf7d763a92d0f934cdda2e0377a79e159e22c24753d40
 EBUILD lldb-19.0.0_pre20240623.ebuild 2579 BLAKE2B 60edc61e262a002ffc130dc86b3a77cf647f8bb62707a3c776d542dae3aeaa04fb38b5a6df6c2b7a7386a9267cb28f6af415cc6598e830bf45f13c7a5a8054f6 SHA512 78c3a75ad806b94b1b828ba7cede5f15f02b937b9522ed47882d1443baadb891e18d4c7f8bdfb0c0732bf7d763a92d0f934cdda2e0377a79e159e22c24753d40
 MISC metadata.xml 495 BLAKE2B dec5cbc692a57ddb85bccb855d6e16893e6e851c6e3b3f321693fd7cb8bf930167976573d61bfca3c29dc667bb57c2c11669299bcc80d1da04fb53ea90ca1826 SHA512 6168aeac121fa7b3f19fe2590c4ad52eae959bfd3bebceebc64a54d254a29226d5424ab031f9730af9f574e3956119856d1ea2008b5d24721b346cf8f5ad7f9f
diff --git a/dev-debug/lldb/lldb-18.1.7.ebuild b/dev-debug/lldb/lldb-18.1.7.ebuild
deleted file mode 100644
index 2d30fb2bfd7a..000000000000
--- a/dev-debug/lldb/lldb-18.1.7.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org llvm-utils 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 ~loong ~x86"
-IUSE="debug debuginfod +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	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}[debuginfod=]
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		>=dev-lang/swig-3.0.11
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
-	filter-lto
-
-	# 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)
-		-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
-
-		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-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-debug/lldb/lldb-19.0.0_pre20240608.ebuild b/dev-debug/lldb/lldb-19.0.0_pre20240608.ebuild
deleted file mode 100644
index c79bdcdf6f3d..000000000000
--- a/dev-debug/lldb/lldb-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-IUSE="+debug debuginfod +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	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}[debuginfod=]
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		>=dev-lang/swig-3.0.11
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
-	filter-lto
-
-	# 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)
-		-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
-
-		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-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-debug/lldb/lldb-19.0.0_pre20240615.ebuild b/dev-debug/lldb/lldb-19.0.0_pre20240615.ebuild
deleted file mode 100644
index c79bdcdf6f3d..000000000000
--- a/dev-debug/lldb/lldb-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-IUSE="+debug debuginfod +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	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}[debuginfod=]
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		>=dev-lang/swig-3.0.11
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
-	filter-lto
-
-	# 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)
-		-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
-
-		-DCLANG_RESOURCE_DIR="../../../clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-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-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2dbb916ce830..971b52fa6580 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/cxxopts/Manifest b/dev-libs/cxxopts/Manifest
index b06d3a5bf227..133a971897a7 100644
--- a/dev-libs/cxxopts/Manifest
+++ b/dev-libs/cxxopts/Manifest
@@ -1,5 +1,5 @@
 DIST cxxopts-3.0.0.tar.gz 97020 BLAKE2B 129b055dd03ce9e4a146d36587063f7155b47456d81e395ae6eeab8012e8d6cfcb410c305353f2ac2ec66a2f3e8d6169e1a0d27c53dcb35388b967d3c9cc86f1 SHA512 239479a3b35ddef6fc380ac9371e1cf7e3aea066f03e1ea538151fa2fff4296838daa976d55e988d8f87f40c0ae027767bcb214754177499413af1081315565c
 DIST cxxopts-3.2.0.tar.gz 160534 BLAKE2B b6fead8930e83b4af089631e584bec0777da2e7b58aeb5e44b03a1655795dd3aff3923a245699e936bef7e0e871da2c86dd5639d44a839f1ac305a694e811feb SHA512 7265de66b92591255488d01bc26ca874423c75223e2e157a99f14fdd3e92e8d2669b72732acac3ce835190f1a09c13a994c480f0513f229eba8aa008e3d98955
-EBUILD cxxopts-3.0.0-r1.ebuild 809 BLAKE2B 5291c3ac55e5ac860b8e19d25db868437c0fd4d535d7825cdf5e142f484e0fdc44753ff120f5c8ff8d2f126ebe58e88d02013d6224cc8583621cebdad7195301 SHA512 194ff3f680004ef541a556843487b69886caffe0a2579257bbffe27c4cf8161cddb2bb4b48564b79c307c3726a971013ba559742695ac9e995a48c8e54de78f5
+EBUILD cxxopts-3.0.0-r1.ebuild 807 BLAKE2B 7c74339991bdadd2381aaa7021a2495c314306edbafba07d87e3276b65ae3921c67a9ea661afd4e35d2048b4a64c473f8ad158f4604ac05288601fdd96b7caa1 SHA512 343454fa9133e0fb11c59123c2824f2d5f72117d7a48c34b8333ea5f187a3b07d3f819f9e23c8cb8c3eccd04fba2242e44c73421501fa90b13ee07086ccd0b1b
 EBUILD cxxopts-3.2.0-r1.ebuild 806 BLAKE2B e5d51cd222768601d22986fec35febabfb735b103a9659dcad88cf6cbcc494e7b138b06d1ec0d305135e1d88246edf4a0a068f46cbdedd7b1aa374c6dc5f689a SHA512 d5c810a90c8f9849aa5970798ce449bdbdff68f63aa4a901b93b00600bbce1714ec37f5f5377191d79e4e3769941779a78ce0fa015f1f3d00d6c806042a51b5b
 MISC metadata.xml 332 BLAKE2B e47af6e92da0d3bccbcda0d260bd264ce18f6473bbb217009f37d783a6df95c43ab1d7d786e28fe9e22a2105bcaa2c1b0045cc0977f87e5ecd9abe89b5a2fc34 SHA512 bc33deaa248a2e0fe36a64c173ed808ab02e2b894897b74afc369be5e0bbc09e60da8e278bb78ee38c7a2e40b1c9caed4668b259ab31b9ecc988d95fe5e725ef
diff --git a/dev-libs/cxxopts/cxxopts-3.0.0-r1.ebuild b/dev-libs/cxxopts/cxxopts-3.0.0-r1.ebuild
index dfcdc30a3aac..c00948527a8b 100644
--- a/dev-libs/cxxopts/cxxopts-3.0.0-r1.ebuild
+++ b/dev-libs/cxxopts/cxxopts-3.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jarro2783/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="icu test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/half/Manifest b/dev-libs/half/Manifest
index c2ccd9098b0a..4a8a4a17a18a 100644
--- a/dev-libs/half/Manifest
+++ b/dev-libs/half/Manifest
@@ -1,3 +1,3 @@
 DIST half-1.12.0.tar.gz 108704 BLAKE2B f0084f380b10485b30da3ff38c5e3098044cc21fe00b084b2b9dd69b9a5c06b2ddedae1cefa61197d74a14552da2e5648db3e3108044b5fc5f7975fa1e10c6d4 SHA512 152f9c08a4493662aed96ddce5d45ece94836727766a66060640f8f1f43ee6ecdb174e7e17421ba83f2a01ba836bb1cba9fe60d83aea517f4772b9038173274b
-EBUILD half-1.12.0.ebuild 408 BLAKE2B 7fc14f4d670525c623c553df33ac5601e8856a0774038d6b01b35a2a98c8f6c7bf3ed007e3fd27ea1311eced1d038308b28fdf5c1b083eb33f125461739f06cf SHA512 a0cc47409428a44014412c242901b10242bf7797eec1ef2ff80429243f4270d9c9414664900c2b9c2a3f01222a76db0711af15ac34f4b2fc6ea7f4dca2d4de8b
-MISC metadata.xml 531 BLAKE2B d345c2e820c5e68b97f02466447c07b4acf27583437e0be4a963f451353be1fa0f74e9fdd48865899e7e9a1d727a7bf72fa325b4917a436aae9f9d5a24368c9b SHA512 ca50773676dae704acabbde3fe93c37390a3d0a4619382b38fa24a85bd76c3e359411b248fcf6c512fb38cb617a00a868772fc28750f95bc308b43ebdad44fb6
+EBUILD half-1.12.0-r1.ebuild 405 BLAKE2B 65d5dc58dd6d497ab6ac57f5699437c26ec4e9e4a0db138cfb46555ecc98303e2d47436ad515f2c73020f0dc138b70f86350cb6f959cacfa6dff3d4fe46b87db SHA512 4ce181805921c4525015e6aca7395c2185acbc78cf31432cffff9763d8e524105cdc5923612f70bf92f3dbfa7494ccd28849fb78dc9004d4434e7de6ad157588
+MISC metadata.xml 644 BLAKE2B 1b9ec536ba3d78644b7867edc8012e300a395e53ae5fcec6f340f5cd4028448ffb6d1bd71ab692b795bb741d881ce2e6212827174c3f9bb71eb5f7151fc3ee06 SHA512 97ce68025483dd7922b9297d5e7190d89d3f4ad4509f5d6d4a979883185c890d8440635990759c06c9867e54bebc6d93351d8499ab57cc5a3ec4f203de186299
diff --git a/dev-libs/half/half-1.12.0-r1.ebuild b/dev-libs/half/half-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..ce8d4509174c
--- /dev/null
+++ b/dev-libs/half/half-1.12.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Half-precision floating-point library"
+HOMEPAGE="https://github.com/ROCm/half"
+SRC_URI="https://github.com/ROCm/half/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+src_install() {
+	insinto /usr/include/half
+	doins include/half.hpp
+}
diff --git a/dev-libs/half/half-1.12.0.ebuild b/dev-libs/half/half-1.12.0.ebuild
deleted file mode 100644
index ac2051bdc10b..000000000000
--- a/dev-libs/half/half-1.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Half-precision floating-point library"
-HOMEPAGE="http://half.sourceforge.net/"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/half/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1)"
-
-src_install() {
-	cd include || die
-	doheader half.hpp
-}
diff --git a/dev-libs/half/metadata.xml b/dev-libs/half/metadata.xml
index b71bc2af0234..64e8126aa406 100644
--- a/dev-libs/half/metadata.xml
+++ b/dev-libs/half/metadata.xml
@@ -12,6 +12,10 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ROCm/half</remote-id>
   </upstream>
diff --git a/dev-libs/hipother/Manifest b/dev-libs/hipother/Manifest
new file mode 100644
index 000000000000..6a8285991c7c
--- /dev/null
+++ b/dev-libs/hipother/Manifest
@@ -0,0 +1,3 @@
+DIST hipother-6.1.1.tar.gz 33496 BLAKE2B 026967cb298a888df441d543d70478836036b81dc26c8284410076daf18eb28dc42f7d4b6aaf2bfaa8b6c957ada8244afc0e7c40882c0370bc2b6a0ae94ffaf8 SHA512 ca4d5df9e3138e845be051aace8fb02d84b879439e6bc9ca1551853f80f54b554b9cad1a91c6c114160b21d3ca62fa47a88e32efe60c0f475ff8b56f7f18b5d4
+EBUILD hipother-6.1.1.ebuild 495 BLAKE2B 2131b211dca3d8f641f53046c0277401bcc36cdb14188601fc1f679857c99f1c7db0800a3b6887bb0f04ea9028b919e3adc8e90c085512366944009b8f62d76a SHA512 9caed4e1aa97ea5ffebe59afc8a66437f880b4edf6d6454380b5dd8e8e960d26579bb1646c5b28bc7951c83338a036ce89dcc7c9853e19f062fa6f6438a8e9fb
+MISC metadata.xml 415 BLAKE2B 20cf4a7c600ec912dbc5e93a8908f17cb463c3ab4d661023ff6b771f6d97308b075b5bd52e4bdf9d4ed7fb6c1d570c59decc410dba3310ce78f623c5938f5174 SHA512 6020bf53a35b25587f80d0aa10f4d2c047c13726171b570efd56e282387adfd84443fd5e565603fa96e0c64a965151a4afcdeb19c3903b4ec3949739a4c887e7
diff --git a/dev-libs/hipother/hipother-6.1.1.ebuild b/dev-libs/hipother/hipother-6.1.1.ebuild
new file mode 100644
index 000000000000..d842c224a91d
--- /dev/null
+++ b/dev-libs/hipother/hipother-6.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ROCclr runtime implementation for non-AMD HIP platforms, like NVIDIA"
+HOMEPAGE="https://github.com/ROCm/hipother"
+SRC_URI="https://github.com/ROCm/hipother/archive/refs/tags/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/hipother-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+src_install() {
+	insinto /usr/include
+	doins -r hipnv/include/hip
+}
diff --git a/dev-libs/hipother/metadata.xml b/dev-libs/hipother/metadata.xml
new file mode 100644
index 000000000000..9d92b0b0e73f
--- /dev/null
+++ b/dev-libs/hipother/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+  </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm/hipother</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 604b6fbb2433..dd63ec8403c9 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B ac2bd589fb3c29662799f97b1f649fd22b1b7ce5701879815bc01a05ae88421a830a6a3507b4dead181f24eb4e45c451e8ea1ebbdac2a2de51ddbc3cd9f53c66 SHA512 a3e39fbaddb322360f6362ef21713f375d04e02b2b9a3d43a3d47b26d5d43643a8c654181aef9518aee5f9805d09c446bbbf13342b74f09622e5e1b0c59470b1
 EBUILD libclc-16.0.6.ebuild 1665 BLAKE2B 27ffe7083936c466a749550797d109c7a48fc6aaf110977c53ae2d4c5edd558c958a4981020b2c74c6b0c47aeee184edc6e1f192da93f57972fe9cc9abfaa762 SHA512 5007264c688588ec9fd7e74e88a1c1810be2602b744a64d8927275bc8ceaf278d9598222c5d2e3d3fa64504364625b03951752ef7221fd1bf16cc26fbd54ad80
 EBUILD libclc-17.0.6.ebuild 1749 BLAKE2B 0b083103fc48654357f621bd3c40002fe9030598a4873519b186b601cd75cc1555a3930f26fe884c1970ddf5728c9a7dffc08e97ebdb151e55b80b204d327a4e SHA512 2509e6ff63a86ba1ceef095fab34b49642b7e6866111c289c124bb7ef9d4bad8f07c4927b45994555386536975c8a4c56401860dca25f2ef2014d9153abb4c8f
-EBUILD libclc-18.1.7.ebuild 1305 BLAKE2B 1fbb9db126a81d0cea598e600f7d29fd6a717fed77b09d10a475930e59717f36368588db190e1d56f33c81e7e4336b58725e9da910ef4c51c5f39a7d34bc0a90 SHA512 a90b45f9d8a039781f4d740dc8f6c3bc55187d97e59a97121101a7456a152cc287990207b1b3e690f1009cff65becb12348a0b2d36a33a981a72ad63cf64a217
 EBUILD libclc-18.1.8.ebuild 1305 BLAKE2B 1fbb9db126a81d0cea598e600f7d29fd6a717fed77b09d10a475930e59717f36368588db190e1d56f33c81e7e4336b58725e9da910ef4c51c5f39a7d34bc0a90 SHA512 a90b45f9d8a039781f4d740dc8f6c3bc55187d97e59a97121101a7456a152cc287990207b1b3e690f1009cff65becb12348a0b2d36a33a981a72ad63cf64a217
 EBUILD libclc-19.0.0.9999.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
-EBUILD libclc-19.0.0_pre20240608.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
-EBUILD libclc-19.0.0_pre20240615.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
 EBUILD libclc-19.0.0_pre20240623.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-18.1.7.ebuild b/dev-libs/libclc/libclc-18.1.7.ebuild
deleted file mode 100644
index 369d04fb2877..000000000000
--- a/dev-libs/libclc/libclc-18.1.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-r1 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 ~arm64 ~riscv ~x86"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_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// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240608.ebuild b/dev-libs/libclc/libclc-19.0.0_pre20240608.ebuild
deleted file mode 100644
index 2b8c5e63c257..000000000000
--- a/dev-libs/libclc/libclc-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_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// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240615.ebuild b/dev-libs/libclc/libclc-19.0.0_pre20240615.ebuild
deleted file mode 100644
index 2b8c5e63c257..000000000000
--- a/dev-libs/libclc/libclc-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_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// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index 1c16ead6b63f..bf5a6f7fd9a4 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,8 +1,11 @@
 AUX rccl-5.0.2-change_install_location.patch 936 BLAKE2B bd9feabfdeb0e6098e25baca8dd20a512b8761ab6d5b7ee4e723c268dec9b7200d125d4cb36fe540aedca396da51c094123f778d695f644788804e2f890d0697 SHA512 0fb0fadef6137d1a60dff8ae7e44df5a0769ea7142e182b86d2e4acee5a76397424b67ee73f25697494ad5d6e6ef60b71e889208775e6abf6f05f1c0d1b4b2b0
 AUX rccl-5.1.3-remove-chrpath.patch 1852 BLAKE2B 255a295ffe34301c3926fbff412bef9ef7e6625a69a7e3dba2e3c7cc281640f3e4bc30dbaa25c916edf71f6b23e801e9f56a6c06cdb9221f470881a9d1291793 SHA512 05fc9c20c76195f45daba5c4a3612a6d2572ba1ae0028a0710c8c92e55f7c70b03ab7722363942d05d8e3c89a40edaa0364c0aff64f9d712e0739954650a6bae
 AUX rccl-5.7.1-remove-chrpath.patch 592 BLAKE2B 8510698259154be9138c136c87c3650276140ac500a235049cdd1f8ea9dcc969ac6cd16b13ce628c448f1d5aa8c49818c455e761e96c24a0abc3aa0d3d431320 SHA512 7df69e5293edb3021f57caf9fa6ec12fd3c6a2841f62de4d6358092ec8f5c11f18d2f6434704e64c225327b3a55a4e64710cb07a82ebee103e4faa3865baa72d
+AUX rccl-6.0.2-fix-version-check.patch 552 BLAKE2B fb1230b262a959c783e6f796e83621c3b32f69cc81ab94c07a9596a8fa37bf2d496aebfe4bec97adf2873d3dc946e690d64f51b4d578528470436b9949cfa432 SHA512 efd6343ffd9b5dee9152787f993621e7bbd5a6d46d4b33d1c0c47ded4fd1a5da9dc753c956c646f48bde5dd6b61876a633d89810ba33861734ec2b2c0040d0ec
 DIST rccl-5.1.3.tar.gz 908274 BLAKE2B 46bff7b6e3d60d5884ccd7e19c54b2f47f90a337a8fdc6dca1a3cfee147e3652e1f912642cc134d4a82bf8daabd9f1391edff139d0517ab1078bd3d9650481d7 SHA512 20deb27c7ef3e6b6b73409950ac0d51286b4634f7002ce36a9a02cdd1d5b1f2db51f6decf773af83364c94f58cc96837da25299f5f5494fc15d8559a1b3c7fcc
 DIST rccl-5.7.1.tar.gz 1425561 BLAKE2B 852c111ad806d5c99f48b3c65c8cf37315c68b969f9544bfa14c1faf1d5557edcc57cdc21705ced6ded4a0288d42b1076e65fb67b3f89b4fa78cfba9d317b23e SHA512 5913b8ff67fa787714713b7d5b571374898be740d56c77db9f04fe7a3e6ca74023fa930a3494d8a6f984ac9e68ee318343835e110049d08700fe773376618af4
+DIST rccl-6.1.1.tar.gz 1679144 BLAKE2B 371d64691dc74f875c49e14df8f3f2d8b9c607376e6c5a889bd2bdb50607e88715d6d75ffed4ba3184a5b9b241cb37b8501e927a5f495632212909e410102490 SHA512 6c6376dd822182bcf28f573c0f3b5c7e52f94f4b670ee7c88519232f51b443d52cd37cbe6c41b5b6e9cb0b93c1124246a989f6e6a2ae74935134135585118002
 EBUILD rccl-5.1.3.ebuild 1091 BLAKE2B 0506cc6607a280c97d934ba9037289f8c06678efe6bd4f5c0501d855b1e765181c1273e4918cfed72a19e235ad5b182eb901eb97401419d57319282ef4134e07 SHA512 c3be588fe12ef890fd74ee6bd6a09ba1f0b461a7daef14efa9ebabdcea7f1b9a3bb1389e3eed8856c231b0bf05674939f952ebcd0f522fcbe6284d4aa2e8f583
-EBUILD rccl-5.7.1.ebuild 1810 BLAKE2B 8f08a567c56700655ea81daafeccee8a26ba708868365555b2418bce01055fdceb621edc67ba33dcc7565fba35c4057c86e1edf978f2bae66d4e508d95ffc1b1 SHA512 754c0a63fec1d87d50f499cc0ae18b32165572a694e7318203887648ce8e4baf9c4ada4a05c9ed9eaa87f8d159ebf27d4e9da51bbacac188fd7f6cd52b06e68d
-MISC metadata.xml 598 BLAKE2B bda73827e412b7addb0788cb2bd769138f8872f9be48abc482a455dd88de8bcccce6687041e15d27d79301459cb8455c773447d6cab64fef97ccdaa60c929c90 SHA512 66d6c53cb8f15c595d3c3a2de8eece79460cf0f4c0f5c0a082539a409aadd17f05f5b5561c7d65864db60b56117270c2c36e1ad547a91495f6628bf04f78d015
+EBUILD rccl-5.7.1.ebuild 1836 BLAKE2B 3286a92c9d08f9e0baac3ad3fbf0a9782109788b999bab8ac4864fa0ab47a6fcd53a73eee2d34a7cb5400998e60f246ec64df6f4a3f8bb07c38405e7f0b4417b SHA512 dd4dfeecdd908eeddba9d0450eba831ccc4778accbcab6023d4d47bac218d2e5d92a967744796b7c8854a579c5df16d8253795dd294183b2054dcf725a0372ae
+EBUILD rccl-6.1.1.ebuild 1605 BLAKE2B c819ea45053d9a2a46396b2c280e24620947addb1a3074c63c364c3b3669cdfd7d7995a7cf401eda8b3d296fa4529cf0a1b367ff58d24eae2746424f4cd4e209 SHA512 9238cf17ea6c21de22babd70d9639fdc20b4446cb3d5f6faf8dd6795cd5b0ef37db92b7e300df9977c788355ba8a9a603bf12db7fb8a476065559fa5074fb800
+MISC metadata.xml 695 BLAKE2B 7d52b2606665aebfade0d15c339f04fe9ac743d1ef402437adefa6a1ab710ae8e0367172cfa3bae8876609d40d26356cc9a93f555fd28f887cff957e38192416 SHA512 6b1d2a88fb7f88bc2bd1fd7126ba33a7d63b6e323cf43072a6c56fad3a5b8cde4262bc7ed7c9485a650544d562377b146d52088e2ecdd8c0e65d0b91addea57c
diff --git a/dev-libs/rccl/files/rccl-6.0.2-fix-version-check.patch b/dev-libs/rccl/files/rccl-6.0.2-fix-version-check.patch
new file mode 100644
index 000000000000..feff936129a2
--- /dev/null
+++ b/dev-libs/rccl/files/rccl-6.0.2-fix-version-check.patch
@@ -0,0 +1,15 @@
+There is no /usr/.info/version file in Gentoo
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -120,10 +120,7 @@ execute_process(
+ message(STATUS "hipcc version:    ${hipcc_version_string}")
+ 
+ ## Check for ROCm version
+-execute_process(
+-  COMMAND         bash "-c" "cat ${ROCM_PATH}/.info/version"
+-  OUTPUT_VARIABLE rocm_version_string
+-)
++set(rocm_version_string "@rocm_version@")
+ string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" rocm_version_matches ${rocm_version_string})
+ if (rocm_version_matches)
+     set(ROCM_MAJOR_VERSION ${CMAKE_MATCH_1})
diff --git a/dev-libs/rccl/metadata.xml b/dev-libs/rccl/metadata.xml
index 70bb629584c9..6ce4f3700a3d 100644
--- a/dev-libs/rccl/metadata.xml
+++ b/dev-libs/rccl/metadata.xml
@@ -13,7 +13,11 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCm-Developer-Tools/rccl</remote-id>
+    <remote-id type="github">ROCm/rccl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-libs/rccl/rccl-5.7.1.ebuild b/dev-libs/rccl/rccl-5.7.1.ebuild
index 1ebf9619a55b..846a21c20ca0 100644
--- a/dev-libs/rccl/rccl-5.7.1.ebuild
+++ b/dev-libs/rccl/rccl-5.7.1.ebuild
@@ -66,7 +66,8 @@ src_configure() {
 }
 
 src_test() {
-	CHECK_AMDGPU
+	check_amdgpu
+	cd "${BUILD_DIR}" || die
 	LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests
 }
 
diff --git a/dev-libs/rccl/rccl-6.1.1.ebuild b/dev-libs/rccl/rccl-6.1.1.ebuild
new file mode 100644
index 000000000000..35783657a50d
--- /dev/null
+++ b/dev-libs/rccl/rccl-6.1.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm flag-o-matic
+
+DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
+HOMEPAGE="https://github.com/ROCm/rccl"
+SRC_URI="https://github.com/ROCm/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	=dev-util/hip-6*
+	dev-util/rocm-smi:${SLOT}"
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
+BDEPEND="
+	>=dev-build/cmake-3.22
+	>=dev-build/rocm-cmake-5.7.1
+	dev-util/hipify-clang:${SLOT}
+	test? ( dev-cpp/gtest )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0.2-fix-version-check.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# https://reviews.llvm.org/D69582 - clang does not support parallel jobs
+	sed 's/-parallel-jobs=[0-9][0-9]//g' -i CMakeLists.txt || die
+
+	# https://github.com/ROCm/rccl/issues/958 - fix AMDGPU_TARGETS
+	sed '/set(AMDGPU_TARGETS/s/ FORCE//' -i CMakeLists.txt || die
+
+	# complete fix-version-check patch
+	sed "s/@rocm_version@/${PV}/" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# https://github.com/llvm/llvm-project/issues/71711 - fix issue of clang
+	append-ldflags -Wl,-z,noexecstack
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DROCM_SYMLINK_LIBS=OFF
+		-Wno-dev
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}" || die
+	LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests
+}
diff --git a/dev-libs/rocdbgapi/Manifest b/dev-libs/rocdbgapi/Manifest
new file mode 100644
index 000000000000..f884c00ddde6
--- /dev/null
+++ b/dev-libs/rocdbgapi/Manifest
@@ -0,0 +1,5 @@
+DIST rocdbgapi-5.7.1.tar.gz 251913 BLAKE2B 96dc859937fdde75a3d68368b29efdd14711e256c7d3c60cd40b128e9a0c066f108c02f7d47d9d64d7ca485e85e9d56d48cac6c67088fc3fbafe44d1d23a7ce2 SHA512 e30cf6062b07ced7de1660398cd84d104e632907cfaf9bc05d29289a81a977c2272b69ff0810db201675f9d7e8476b4451c988ad9da0a13eee01fffdde839d26
+DIST rocdbgapi-6.1.1.tar.gz 254274 BLAKE2B 1621dc715e2540578126ff2fa6dc30dc9db711689e82b5c750dd203aafa091c00f897425a372d4617bec25eddb7b9a44105e8c9b46eb660e197602ede2beecba SHA512 d613e633e27ad9f582b9612d7d088c3ea465c29d6520e94b4821e0340c736e556dcd4a89f8027701097ee4e2d8b55640a232d484f9fa26f8a9165c648f8af219
+EBUILD rocdbgapi-5.7.1.ebuild 1198 BLAKE2B 228aab82524870227733d7aeb6428de6d97974ce35ba94026766413dae743a80837fddac66984f21d36fd3dc35ed592eb44d41ad3e47ea809b0bc88604fb4a74 SHA512 6f8871f8dfced05905b9e9acc84fcf0bdb9ccc4cae9c96c61aedbf7818b4943fe94696f96ba8dba99f00e24986d1fbef923b2fd7b9744f6e890eace7a659b118
+EBUILD rocdbgapi-6.1.1.ebuild 1325 BLAKE2B b9c0086ce53a33a0280195fcbebe6bd9f030bd9390f73e4dc215bd7013c29985df13a268241da1db239262c102c4ccd32fc4de43b4d96bfe26b5e96fd5aa058c SHA512 fa6a2476f939534ed7ef4862c13e2d87967902822cd666c52c54e582d050af3a0eb3311f3888649abbdddc562698996dee4e534761cc1ccbbf83023ff1c9d81f
+MISC metadata.xml 499 BLAKE2B bf9cb4f91d5c6160bce2f5df41177fc18b153cd8c8c6a13384c68fddb4a9a6011eb0d40339af7f1d9c01200af57ee431d9193f68ed9724549445ec908ff07796 SHA512 7ed8d2bcb55b46e57cdbea6c4e6242ab5f660c7b1537c9ddfeb0c426495bc4c5e7e78b54bf66940d582c42913a1b3d36c5fc821abd7da666c782c141c001b355
diff --git a/dev-libs/rocdbgapi/metadata.xml b/dev-libs/rocdbgapi/metadata.xml
new file mode 100644
index 000000000000..696fb60c236e
--- /dev/null
+++ b/dev-libs/rocdbgapi/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+      <email>lockalsash@gmail.com</email>
+      <name>Sv. Lockal</name>
+    </maintainer>
+    <maintainer type="project" proxied="proxy">
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">ROCm/ROCdbgapi</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-libs/rocdbgapi/rocdbgapi-5.7.1.ebuild b/dev-libs/rocdbgapi/rocdbgapi-5.7.1.ebuild
new file mode 100644
index 000000000000..3573342f8b6f
--- /dev/null
+++ b/dev-libs/rocdbgapi/rocdbgapi-5.7.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="AMD Debugger API"
+HOMEPAGE="https://github.com/ROCm/ROCdbgapi"
+SRC_URI="https://github.com/ROCm/ROCdbgapi/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		app-text/doxygen[dot]
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-plaingeneric
+	)
+"
+RDEPEND="
+	dev-libs/rocm-comgr:${SLOT}
+	dev-libs/rocr-runtime:${SLOT}
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/ROCdbgapi-rocm-${PV}"
+
+src_prepare() {
+	sed -e "s/-Werror//" \
+		-e "s/if(DOXYGEN_FOUND)/if(WITH_DOCS AND DOXYGEN_FOUND)/" \
+		-e "s:\${CMAKE_INSTALL_DATADIR}/html/amd-dbgapi:\${CMAKE_INSTALL_DOCDIR}/html:" \
+		-i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DOCS=$(usex doc ON OFF)
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove unneeded copy
+	rm -r "${ED}/usr/share/doc/${PF}-asan" || die
+}
diff --git a/dev-libs/rocdbgapi/rocdbgapi-6.1.1.ebuild b/dev-libs/rocdbgapi/rocdbgapi-6.1.1.ebuild
new file mode 100644
index 000000000000..eff59469418f
--- /dev/null
+++ b/dev-libs/rocdbgapi/rocdbgapi-6.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="AMD Debugger API"
+HOMEPAGE="https://github.com/ROCm/ROCdbgapi"
+SRC_URI="https://github.com/ROCm/ROCdbgapi/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ROCdbgapi-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		app-text/doxygen[dot]
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-plaingeneric
+	)
+"
+RDEPEND="
+	dev-libs/rocm-comgr:${SLOT}
+	dev-libs/rocr-runtime:${SLOT}
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s/-Werror//" \
+		-e "s/if(DOXYGEN_FOUND)/if(WITH_DOCS AND DOXYGEN_FOUND)/" \
+		-e "s:\${CMAKE_INSTALL_DATADIR}/html/amd-dbgapi:\${CMAKE_INSTALL_DOCDIR}/html:" \
+		-i CMakeLists.txt || die
+
+	# Clang 19 detects error
+	# https://github.com/ROCm/ROCdbgapi/issues/12
+	sed -e "s/->n_next/->m_next/g" -i src/utils.h || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DOCS=$(usex doc ON OFF)
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove unneeded copy
+	rm -r "${ED}/usr/share/doc/${PF}-asan" || die
+}
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 78045596bbf7..5792dd8a6a5b 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -26,16 +26,21 @@ AUX rocm-comgr-5.7.0-symbolizer.patch 1503 BLAKE2B fa8071ad2bbcd0ab4e6f05260617c
 AUX rocm-comgr-5.7.1-correct-license-install-dir.patch 549 BLAKE2B c45452d4af4718aca315862064596347f5caa9301a02fb14228daa72fee70d7452d3f24ee7dfc9247433388655ec7cccf3168eeea17ce425bd2090230e57e451 SHA512 8a49aec20da6c35989fbafc985b9c3bc21f20b711e2bd6921b67542f83cf07557afffefc9dafa860eefea5db17203d7a064755059e6e16d2c083b09ef01e9a22
 AUX rocm-comgr-5.7.1-fix-tests-rocm-path.patch 651 BLAKE2B bddf164466fcd2d9066f9dba6cd557b6afa4023af60b21e0fa15729fae193b78f4632f5bb3fd7cdfa05a97b0179d63cd2d1baad00858da3a90ec76a7c0d65a88 SHA512 29a4b9bde355b2c8e776a2e11515576da28ca7895c2ca910482a758cba1b80fa034fb6a6d729d1730f8658e1c01ba8fe39dac88f190edcd7733969f6f85b5456
 AUX rocm-comgr-5.7.1-fix-tests.patch 1733 BLAKE2B 0b92d01929fd0376ef33dfca3dd2e43956a3652c9c653b3e30ddb3d7487caf8858367447270328c2ff6d9963d786c8ae50cc21efc90e9a9594bb9f50ecec5667 SHA512 181074ecd0a76f6dfabf476bbe98e399caec4e8b3dd04b01318dbfa34253ee5c27f28296f1f07801960b5b3abab1d07dac18e8e61d1e30971520c7df77364607
+AUX rocm-comgr-6.0.0-extend-isa-compatibility-check.patch 6555 BLAKE2B 5ef7b96754749b0dd0d1b18dbdc3377d51e87dde560d4c4ba2f9f521b62a46de4c8329c8a40316efa59d66c916872308504e5bc82d322de399438442016af392 SHA512 736365c111853d28e8d3277946abf50d97b76900f833d2d66e36830d57d6cfb3346d628a6ed5c21d560ca992f716d3fe38b72eef0f53f30c162dc3fa95985fec
+AUX rocm-comgr-6.1.0-dont-add-nogpulib.patch 1020 BLAKE2B e99408ab32428b7a320d10f3431f8328865c345366610f2e76588ed04cab088702fa0cd4dcdb5ac5c608d50d1c8d1ffafe93e415c0c7a23c3f63254a2952672d SHA512 b5d42c366b1efefe264ee4ce4b20b925a82131f2e7ca57c736f868fdf823d2d93f0d69381c5258faee668f5e12c7ef0e6a6781972b876a303b825c32953459b9
+AUX rocm-comgr-6.1.0-enforce-oop-compiler.patch 996 BLAKE2B c4c0bfe9bf55f2f4e8661f01ed1b2ec03f4c07691facad063cc03bda2599fcc94648549a829694b7e5f6d4b82d42f7c92e1ce8cea9e934f37b62f7beda4dd48f SHA512 97f850115b8cdd2c5a2091ca26cc40b9e13cfa86a7980f7730c55932b6db254580f86f267ce7a2b3af739210db55faa29e06e57bdbc11eaa9cfa08d3e4929ea9
+AUX rocm-comgr-6.1.0-fix-comgr-default-flags.patch 1967 BLAKE2B c71628e83827738d2458a69a27fb44fbcba44ca6633e9a6856406627b0b4451b996876cc8e86c46382f40006efe472488d2b81ed3571d48e18505eb4fe9b673a SHA512 c85715e427a10f92eb91d6cdb7bd4b455371694b1a87429978e82b9f5127e37710558795541a616395e29735ac57325f3c094ba8c40badb6612aea6865ac4ffa
+AUX rocm-comgr-6.1.0-llvm-18-compat.patch 2990 BLAKE2B cf3c2ca3933ad714de6d98404a9d97bcca98ba7536228ad7e1396c0e4a8cc6b88b7bba12857e599f96d9fde3d37033a9a9c7c123c230d4af3b5d942206af0941 SHA512 f36e2d6b16f78e93a8291f914d122dfd917aeb0d09e1545f44cb16ab0f064710d450b4e7aa24b6b2ee374c29821d464f878efcc1660e00456118c839e89b31a0
+DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
 DIST rocm-comgr-5.1.3.tar.gz 117155 BLAKE2B 40e415c4c7ae3e709dd50981299291f0fc1133f35310b4c86a86847d3bce5fd7685a3f4480f8f156873ca922921c1d4e1cb620fd33bd5cdc87f155af839f2bbe SHA512 5927250f5e03c32b7f270a1dbfe5221d349dfe32aba34143040da53d4e7eb83faa3073a43edabcff13e1fc977bc17088404523f2ab2ea95e207d2c00beb4249b
 DIST rocm-comgr-5.3.3.tar.gz 120414 BLAKE2B 29b9d466d74ef94165a2b9bea35eac4616f6b2fc529cdac3c830ee7dc08f219cb9e5d4f081658881c76633f12eaebb74d1a2ea30a76652231b8ee516f9988db1 SHA512 ba7b1ef214e3624168e438ed7fd94291a07508fe89d178c0b158bf22e0998d5a8e4d8f0a7f08f05ac108ef65f725db5764fd66353a85bc25000e572a4fdcb61f
 DIST rocm-comgr-5.4.3.tar.gz 120461 BLAKE2B c4eb79dd5a72a2b18e16841fc8cb9a3a33efb0c7b04a7585df9672d682bba6fa826ab8b37dba5febca3b8c5ee5aca30d8546e1fa69e77671e5c750e2a8c1f12f SHA512 1a25af99a0166d70ca6dc5df5a667068eaf583dccd74bbb18a2a5de3c1b769e0c1eb9a0c539e0cd88bc50bbbe53214a1d1b23fbdfd6fc5b6507c44da259815c4
 DIST rocm-comgr-5.5.1.tar.gz 127475 BLAKE2B dbcb6729b27c0b4a4be37f5e462d96b10c15a6a3b540a81a74a648fc45dc727ea5706db1a0f4583a31ac4cb5c9f0d9f4e258fa5ac792b327f4cb1dfe6d585937 SHA512 09174ef2ad21f62b197e439bb5b04a365233c360c57cc2ccf0ea3d53edfa8880dff4f127c6d6c1d430b63b6f7ea666705b14cadc2bccb89c0fefed943b0cf1c7
 DIST rocm-comgr-5.7.1.tar.gz 137923 BLAKE2B e215f51137fd0c4b67e85496bf289dc0afde6ebc9efb9416f5fc4cf312b2be9be26da35cb70965bf4857a0f1434d750bcc03ce83095173098487ef7805948735 SHA512 cdd2609b858d9503c30122a2d328d36baa8a930a05bcb6c38e30723909c492b4d47eaaf4884dbb7aa82053e7cda6c22ee1aa16fc5ba266e272d98ff772c5079d
-DIST rocm-comgr-6.0.0.tar.gz 142129 BLAKE2B 65d00a79ead48872e3b94e5239a07c476288c611aa3ce2311a345bec5f7d277dc67910fa5f4ef000a5e94e6bed148baa4b1c7fe2b1cfaae2cc39555d716668d5 SHA512 877d2042bdafa6b503ee8f24d3a9c4ac9e001a7884211df47b2237d8a5ead66ced0f352c7b76d96190cd407461f5434fb1a5a4508067e432eb93c0f2fd066053
 EBUILD rocm-comgr-5.1.3-r3.ebuild 2051 BLAKE2B 98d8ad8164c8a401961a9abb1a973e1123a049c4a3949114f3493d36f02cd5f2048554828cf5838c00c47a128e21420ba7cf6c3de29086b918e56c5fe79410f7 SHA512 8341569140712543b778a771a381933a9cd14c0a5dcf3393e196d0121eb14a01614bf2080df2cd1f5a51b5bb3f5fb55dae9b7bddc4954900a64d5af0443e3a0f
 EBUILD rocm-comgr-5.3.3-r2.ebuild 1943 BLAKE2B e286731895a9cb985eef52ab23fea988d11fc4294fc65c91b9dc81ec5af8c5a747ae699a6af878436e8260c77e94402593fccae9dd8fdd65f05c3da27087b82f SHA512 fd5a47cb1eb354078c9aa4f5fc27d05629a7f40984e9f166a36a5d47faf8ccf3321d8a326145e192c25cc685ed041e9c756b7e57598902acc07c743ea0c7cc3c
 EBUILD rocm-comgr-5.4.3-r1.ebuild 1892 BLAKE2B 3225c9fc2eb31f8810e1072ccf20681987ed6d8072f7bb0a1d661ab2eb327ad30afa0a6fd8f8299bd626f34cffd25e9f15d42a5e7fb6ac62f314755ce1ca3116 SHA512 265cd1523b8dc85a875a008cb8a2b6b3098cc07277199c3cccb749f4a30d22d8e71eefba1474aad18034b13002d734b46cec614f1fe56e67c4482dbeb8bc0079
 EBUILD rocm-comgr-5.5.1.ebuild 2022 BLAKE2B 7bc047bb17510907af10ce3763ccc6bd52d1bccb4264bd920936dd76d9e7040565b041ed4f6422ca858a40f8c1f073a8bcec5d9b93bea947e72aa48091cf3f6a SHA512 31024125b88958a422fec60cb35eb2aa7f3c9ec0862c2f218f8b6c7ce1ccc3515f3976de53d79715c6e3bcbb3fccc6ee4347013e711379702c88b1ebdee894bf
 EBUILD rocm-comgr-5.7.1.ebuild 2027 BLAKE2B 681d9335d5117a6db725a36f9d56b41c5987db306baacccfb7f31dcf3166ab6fba4c469c78f754a90385b53a827ca41100fa8428b5b6ab41e84e03b178f33f9f SHA512 49f0471a685b324bcef68ac534e76d4d44ec60abadc6ebfc293afb5bb457235a949c5213f2f0d21dfe25d33e5f366bb219a83c10a80dc99e50627af79be65406
-EBUILD rocm-comgr-6.0.0.ebuild 1951 BLAKE2B 7129f908ca36c54c3ffc69be5f4b58b55308d5a76dc9d1a1095379098d215726a4be033f28c27ec9938054d13f6c8e853206939717691c419654666ad5807efa SHA512 d470c4e665f0d0259fd508304d8770f3243ea721f4259a4267970d48ed08f6163e61e7f02caae553f29d110b24f3a0a61b7fce1c1e529f00af5ef5e41bf2e746
-MISC metadata.xml 526 BLAKE2B d2c4b5c4210cd4ae436bc205ec6c6d0e2690edc99250e508b64f3abbf0f7b4a61b27cb627d9453ff6432cd683fb7f51460b4e821ce7614880e68854121297db5 SHA512 5cf80a58a6791b404d33577fa1cd199791ad4348d0e18d2ba9d8e1665cfc5a19c7d37cfe265c77c060bc886f24ce28b592c6b7d541531faaf62e5440b732d2e7
+EBUILD rocm-comgr-6.1.1.ebuild 2403 BLAKE2B 1fa1bbbd80818a96d66418a1e5c575daa77055b4dd39f82579c6e902bbbff8e61158683ea1e449c2e831f0f367fcfcc6ff81c732221470c3f4915daf0717d70e SHA512 f28526ae247fb2161a2e6732817d49c5577fdda3ade0cc5498f3b17ed2c50666c4f7f7a342bdd595c01e4ba7c80d725fb32ee69d2ae63d6d48f0bf32f7be1fb9
+MISC metadata.xml 638 BLAKE2B d2396daa1a9e505ff3fc3b7a2465f4ca5c933ac8609c08732513c30ebb715f244681075b8b415b75a0d0c330144cb6fab483e6b4231b1144c3bf3bc5091693f3 SHA512 da41a365f6d75e8feabed3a54ca117a8406cabec215137751280ab5985ab86e178a14183e804af220b49b83d4084489c1ec1dd1d543aaa585d910b6636b866c4
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.0.0-extend-isa-compatibility-check.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.0.0-extend-isa-compatibility-check.patch
new file mode 100644
index 000000000000..e65400c792e4
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.0.0-extend-isa-compatibility-check.patch
@@ -0,0 +1,204 @@
+Load kernels when compatible by ISA, e. g. if AMDGPU_TARGETS is set
+to gfx1030 and some application was started on gfx1036, it loads gfx1030 kernel.
+
+Based on Debian patch by Cordell Bloor <cgmb@slerp.xyz>
+https://salsa.debian.org/rocm-team/rocm-hipamd/-/blob/master/debian/patches/0026-extend-hip-isa-compatibility-check.patch
+--- comgr.orig/src/comgr-metadata.cpp
++++ comgr/src/comgr-metadata.cpp
+@@ -923,23 +923,86 @@ static constexpr const char *CLANG_OFFLOAD_BUNDLER_MAGIC =
+ static constexpr size_t OffloadBundleMagicLen =
+     strLiteralLength(CLANG_OFFLOAD_BUNDLER_MAGIC);
+ 
+-bool isCompatibleIsaName(StringRef IsaName, StringRef CodeObjectIsaName) {
++struct GfxPattern {
++  std::string root;
++  std::string suffixes;
++};
++
++static bool matches(const GfxPattern& p, StringRef s) {
++  if (p.root.size() + 1 != s.size()) {
++    return false;
++  }
++  if (0 != std::memcmp(p.root.data(), s.data(), p.root.size())) {
++    return false;
++  }
++  return p.suffixes.find(s[p.root.size()]) != std::string::npos;
++}
++
++static bool isGfx900EquivalentProcessor(StringRef processor) {
++  return matches(GfxPattern{"gfx90", "029c"}, processor);
++}
++
++static bool isGfx900SupersetProcessor(StringRef processor) {
++  return matches(GfxPattern{"gfx90", "0269c"}, processor);
++}
++
++static bool isGfx1030EquivalentProcessor(StringRef processor) {
++  return matches(GfxPattern{"gfx103", "0123456"}, processor);
++}
++
++static bool isGfx1010EquivalentProcessor(StringRef processor) {
++  return matches(GfxPattern{"gfx101", "0"}, processor);
++}
++
++static bool isGfx1010SupersetProcessor(StringRef processor) {
++  return matches(GfxPattern{"gfx101", "0123"}, processor);
++}
++
++enum CompatibilityScore {
++  CS_EXACT_MATCH           = 1 << 4,
++  CS_PROCESSOR_MATCH       = 1 << 3,
++  CS_PROCESSOR_COMPATIBLE  = 1 << 2,
++  CS_XNACK_SPECIALIZED     = 1 << 1,
++  CS_SRAM_ECC_SPECIALIZED  = 1 << 0,
++  CS_INCOMPATIBLE          = 0,
++};
++
++static int getProcessorCompatibilityScore(StringRef CodeObjectProcessor,
++                                          StringRef AgentProcessor) {
++  if (CodeObjectProcessor == AgentProcessor) {
++    return CS_PROCESSOR_MATCH;
++  }
++
++  bool compatible = false;
++  if (isGfx900SupersetProcessor(AgentProcessor)) {
++    compatible = isGfx900EquivalentProcessor(CodeObjectProcessor);
++  } else if (isGfx1010SupersetProcessor(AgentProcessor)) {
++    compatible = isGfx1010EquivalentProcessor(CodeObjectProcessor);
++  } else if (isGfx1030EquivalentProcessor(AgentProcessor)) {
++    compatible = isGfx1030EquivalentProcessor(CodeObjectProcessor);
++  }
++
++  return compatible ? CS_PROCESSOR_COMPATIBLE : CS_INCOMPATIBLE;
++}
++
++static int getCompatiblityScore(StringRef IsaName, StringRef CodeObjectIsaName) {
+   if (IsaName == CodeObjectIsaName) {
+-    return true;
++    return CS_EXACT_MATCH;
+   }
+ 
+   TargetIdentifier CodeObjectIdent;
+   if (parseTargetIdentifier(CodeObjectIsaName, CodeObjectIdent)) {
+-    return false;
++    return CS_INCOMPATIBLE;
+   }
+ 
+   TargetIdentifier IsaIdent;
+   if (parseTargetIdentifier(IsaName, IsaIdent)) {
+-    return false;
++    return CS_INCOMPATIBLE;
+   }
+ 
+-  if (CodeObjectIdent.Processor != IsaIdent.Processor) {
+-    return false;
++  int ProcessorScore = getProcessorCompatibilityScore(CodeObjectIdent.Processor, IsaIdent.Processor);
++  if (ProcessorScore == CS_INCOMPATIBLE) {
++    return CS_INCOMPATIBLE;
+   }
+ 
+   char CodeObjectXnack = ' ', CodeObjectSramecc = ' ';
+@@ -963,18 +1026,23 @@ bool isCompatibleIsaName(StringRef IsaName, StringRef CodeObjectIsaName) {
+     }
+   }
+ 
++  int XnackBonus = 0;
+   if (CodeObjectXnack != ' ') {
+     if (CodeObjectXnack != IsaXnack) {
+-      return false;
++      return CS_INCOMPATIBLE;
+     }
++    XnackBonus = CS_XNACK_SPECIALIZED;
+   }
+ 
++  int SrameccBonus = 0;
+   if (CodeObjectSramecc != ' ') {
+     if (CodeObjectSramecc != IsaSramecc) {
+-      return false;
++      return CS_INCOMPATIBLE;
+     }
++    SrameccBonus = CS_SRAM_ECC_SPECIALIZED;
+   }
+-  return true;
++
++  return ProcessorScore + XnackBonus + SrameccBonus;
+ }
+ 
+ amd_comgr_status_t
+@@ -992,14 +1060,21 @@ lookUpCodeObjectInSharedObject(DataObject *DataP,
+     return Status;
+   }
+ 
++  int MaxScore = 0;
++  unsigned MaxScoreItem;
+   for (unsigned J = 0; J < QueryListSize; J++) {
+-    if (isCompatibleIsaName(QueryList[J].isa, IsaName)) {
+-      QueryList[J].offset = 0;
+-      QueryList[J].size = DataP->Size;
+-      break;
++    int Score = getCompatiblityScore(QueryList[J].isa, IsaName);
++    if (Score > MaxScore) {
++      MaxScore = Score;
++      MaxScoreItem = J;
+     }
+   }
+ 
++  if (MaxScore) {
++    QueryList[MaxScoreItem].offset = 0;
++    QueryList[MaxScoreItem].size = DataP->Size;
++  }
++
+   return AMD_COMGR_STATUS_SUCCESS;
+ }
+ 
+@@ -1011,7 +1086,6 @@ amd_comgr_status_t lookUpCodeObject(DataObject *DataP,
+     return lookUpCodeObjectInSharedObject(DataP, QueryList, QueryListSize);
+   }
+ 
+-  int Seen = 0;
+   BinaryStreamReader Reader(StringRef(DataP->Data, DataP->Size),
+                             support::little);
+ 
+@@ -1037,6 +1111,8 @@ amd_comgr_status_t lookUpCodeObject(DataObject *DataP,
+     QueryList[I].size = 0;
+   }
+ 
++  std::vector<int> QueryListScores(QueryListSize);
++
+   // For each code object, extract BundleEntryID information, and check that
+   // against each ISA in the QueryList
+   for (uint64_t I = 0; I < NumOfCodeObjects; I++) {
+@@ -1069,28 +1145,22 @@ amd_comgr_status_t lookUpCodeObject(DataObject *DataP,
+     }
+ 
+     for (unsigned J = 0; J < QueryListSize; J++) {
+-      // If this QueryList item has already been found to be compatible with
++      // If this QueryList item has exact match with
+       // another BundleEntryID, no need to check against the current
+       // BundleEntryID
+-      if (QueryList[J].size != 0) {
++      if (QueryListScores[J] == CS_EXACT_MATCH) {
+         continue;
+       }
+ 
+       // If the QueryList Isa is compatible with the BundleEntryID, set the
+       // QueryList offset/size to this BundleEntryID
+-      if (isCompatibleIsaName(QueryList[J].isa, OffloadAndTargetId.second)) {
++      int Score = getCompatiblityScore(QueryList[J].isa, OffloadAndTargetId.second);
++      if (Score > QueryListScores[J]) {
++        QueryListScores[J] = Score;
+         QueryList[J].offset = BundleEntryCodeObjectOffset;
+         QueryList[J].size = BundleEntryCodeObjectSize;
+-        Seen++;
+-        break;
+       }
+     }
+-
+-    // Stop iterating over BundleEntryIDs once we have populated the entire
+-    // QueryList
+-    if (Seen == (int) QueryListSize) {
+-      break;
+-    }
+   }
+ 
+   return AMD_COMGR_STATUS_SUCCESS;
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-dont-add-nogpulib.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-dont-add-nogpulib.patch
new file mode 100644
index 000000000000..526318f5bbd9
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-dont-add-nogpulib.patch
@@ -0,0 +1,31 @@
+From 179ec2e67bf882c6bccb27f81db3d80f7eb9946e Mon Sep 17 00:00:00 2001
+From: Jacob Lambert <jacob.lambert@amd.com>
+Date: Fri, 12 Apr 2024 13:56:42 -0700
+Subject: [PATCH] [Comgr] Don't add -nogpulib option for assembley action
+
+We can omit setting -nogpulib even without a -rocm-path=. option
+when calling the assembly action. This avoids the following warning:
+
+warning: argument unused during compilation: '-nogpulib'
+Change-Id: I66d512befbafd9382f050c45a0d3950985e8ae38
+---
+ amd/comgr/src/comgr-compiler.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/comgr-compiler.cpp b/src/comgr-compiler.cpp
+index 143ab4e4f3db..21b233fa94b2 100644
+--- a/src/comgr-compiler.cpp
++++ b/src/comgr-compiler.cpp
+@@ -1758,6 +1758,9 @@ amd_comgr_status_t AMDGPUCompiler::assembleToRelocatable() {
+   Args.push_back("-x");
+   Args.push_back("assembler");
+ 
++  // -nogpulib option not needed for assembling to relocatable
++  NoGpuLib = false;
++
+   return processFiles(AMD_COMGR_DATA_KIND_RELOCATABLE, ".o");
+ }
+ 
+-- 
+2.44.0
+
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-enforce-oop-compiler.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-enforce-oop-compiler.patch
new file mode 100644
index 000000000000..99cbf2f22ce6
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-enforce-oop-compiler.patch
@@ -0,0 +1,26 @@
+In-process compilation breaks compile_source_to_executable test, as it attempts to
+build .so as fatbin, and some options does not work with unpatched LLVM.
+--- a/src/comgr-compiler.cpp
++++ b/src/comgr-compiler.cpp
+@@ -1226,10 +1226,7 @@ amd_comgr_status_t AMDGPUCompiler::compileToFatBin() {
+     return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT;
+   }
+ 
+-  // This is a workaround to support HIP OOP Fatbin Compilation
+-  CompileOOP = true;
+   auto Status = processFiles(AMD_COMGR_DATA_KIND_FATBIN, ".fatbin");
+-  CompileOOP = false;
+ 
+   return Status;
+ }
+--- a/src/comgr-compiler.h
++++ b/src/comgr-compiler.h
+@@ -102,7 +102,7 @@ class AMDGPUCompiler {
+   std::string ClangIncludePath;
+   std::string ClangIncludePath2;
+   /// Perform out-of-process compilation.
+-  bool CompileOOP = false;
++  bool CompileOOP = true;
+   /// Precompiled header file paths.
+   llvm::SmallVector<llvm::SmallString<128>, 2> PrecompiledHeaders;
+   /// Arguments common to all driver invocations in the current action.
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch
new file mode 100644
index 000000000000..d885da08ddae
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch
@@ -0,0 +1,51 @@
+Remove HIP/ROCM includes ("-isystem /usr/include"), as they break inclusion of <math.h>.
+Add inclusion of Clang resource dir (e.g. /usr/lib/clang/17), as it is used in hip runtime like that.
+Remove hardcoded target to fix HIP on musl.
+
+Issues:
+* https://github.com/ROCm/clr/issues/82
+* https://github.com/ROCm/llvm-project/issues/92
+--- a/src/comgr-compiler.cpp
++++ b/src/comgr-compiler.cpp
+@@ -1028,9 +1028,8 @@ AMDGPUCompiler::addTargetIdentifierFlags(llvm::StringRef IdentStr,
+ }
+ 
+ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() {
+-  HIPIncludePath = (Twine(env::getHIPPath()) + "/include").str();
+-  // HIP headers depend on hsa.h which is in ROCM_DIR/include.
+-  ROCMIncludePath = (Twine(env::getROCMPath()) + "/include").str();
++  // Allow to include <include/cuda_wrappers/algorithm> (used in some hip files)
++  ClangIncludePath = @CLANG_RESOURCE_DIR@;
+ 
+   Args.push_back("-x");
+ 
+@@ -1051,13 +1050,9 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() {
+   case AMD_COMGR_LANGUAGE_HIP:
+     Args.push_back("hip");
+     Args.push_back("-std=c++11");
+-    Args.push_back("-target");
+-    Args.push_back("x86_64-unknown-linux-gnu");
+     Args.push_back("--cuda-device-only");
+     Args.push_back("-isystem");
+-    Args.push_back(ROCMIncludePath.c_str());
+-    Args.push_back("-isystem");
+-    Args.push_back(HIPIncludePath.c_str());
++    Args.push_back(ClangIncludePath.c_str());
+     break;
+   default:
+     return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT;
+--- a/src/comgr-compiler.h
++++ b/src/comgr-compiler.h
+@@ -95,12 +95,7 @@ class AMDGPUCompiler {
+   /// User supplied target GPU Arch.
+   std::string GPUArch;
+   std::string OffloadArch;
+-  /// ROCM include Path
+-  std::string ROCMIncludePath;
+-  /// HIP and Clang Include Paths
+-  std::string HIPIncludePath;
+   std::string ClangIncludePath;
+-  std::string ClangIncludePath2;
+   /// Perform out-of-process compilation.
+   bool CompileOOP = false;
+   /// Precompiled header file paths.
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-llvm-18-compat.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-llvm-18-compat.patch
new file mode 100644
index 000000000000..df008e4230d7
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-llvm-18-compat.patch
@@ -0,0 +1,79 @@
+ROCm 6.0.0 and 6.0.2 releases use mix between LLVM 17 and 18
+forked as https://github.com/RadeonOpenCompute/llvm-project
+which makes some libraries compatible with LLVM 17,
+while other require LLVM 18.
+
+Backports:
+* https://github.com/ROCm/llvm-project/commit/6cbc4dc91dfeb1cf2295cb350866e0b3a07dfee4
+* https://github.com/ROCm/llvm-project/commit/179ec2e67bf882c6bccb27f81db3d80f7eb9946e
+* https://github.com/ROCm/llvm-project/commit/ee123c3d1706bc4346511b1a9032020782576350
+--- a/src/comgr-compiler.cpp
++++ b/src/comgr-compiler.cpp
+@@ -205,7 +205,11 @@ bool AssemblerInvocation::createFromArgs(AssemblerInvocation &Opts,
+   // Parse the arguments.
+   const OptTable &OptTbl = getDriverOptTable();
+ 
++#if LLVM_VERSION_MAJOR == 17
+   const unsigned IncludedFlagsBitmask = options::CC1AsOption;
++#else
++  llvm::opt::Visibility IncludedFlagsBitmask(options::CC1AsOption);
++#endif
+   unsigned MissingArgIndex, MissingArgCount;
+   InputArgList Args = OptTbl.ParseArgs(Argv, MissingArgIndex, MissingArgCount,
+                                        IncludedFlagsBitmask);
+@@ -1041,11 +1045,15 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() {
+     Args.push_back("cl");
+     Args.push_back("-std=cl1.2");
+     Args.push_back("-cl-no-stdinc");
++    Args.push_back("-mllvm");
++    Args.push_back("-amdgpu-internalize-symbols");
+     break;
+   case AMD_COMGR_LANGUAGE_OPENCL_2_0:
+     Args.push_back("cl");
+     Args.push_back("-std=cl2.0");
+     Args.push_back("-cl-no-stdinc");
++    Args.push_back("-mllvm");
++    Args.push_back("-amdgpu-internalize-symbols");
+     break;
+   case AMD_COMGR_LANGUAGE_HIP:
+     Args.push_back("hip");
+@@ -1605,6 +1613,9 @@ amd_comgr_status_t AMDGPUCompiler::assembleToRelocatable() {
+   Args.push_back("-x");
+   Args.push_back("assembler");
+ 
++  // -nogpulib option not needed for assembling to relocatable
++  NoGpuLib = false;
++
+   return processFiles(AMD_COMGR_DATA_KIND_RELOCATABLE, ".o");
+ }
+ 
+--- a/src/comgr-metadata.cpp
++++ b/src/comgr-metadata.cpp
+@@ -1087,7 +1087,12 @@ amd_comgr_status_t lookUpCodeObject(DataObject *DataP,
+   }
+ 
+   BinaryStreamReader Reader(StringRef(DataP->Data, DataP->Size),
+-                            support::little);
++#if LLVM_VERSION_MAJOR == 17
++                            support::little
++#else
++                            llvm::endianness::little
++#endif
++                            );
+ 
+   StringRef Magic;
+   if (auto EC = Reader.readFixedString(Magic, OffloadBundleMagicLen)) {
+--- a/test/compile_log_remarks_test.c
++++ b/test/compile_log_remarks_test.c
+@@ -107,7 +107,11 @@ int main(int argc, char *argv[]) {
+              AMD_COMGR_DATA_KIND_SOURCE, 1);
+ 
+   checkLogs("AMD_COMGR_ACTION_CODEGEN_BC_TO_ASSEMBLY", DataSetAsm,
++#if LLVM_VERSION_MAJOR == 17
+             "remark: <unknown>:0:0: 8 stack bytes in function "
++#else
++            "remark: <unknown>:0:0: 8 stack bytes in function 'f' "
++#endif
+             "[-Rpass-analysis=prologepilog]");
+ 
+   Status = amd_comgr_destroy_data_set(DataSetCl);
diff --git a/dev-libs/rocm-comgr/metadata.xml b/dev-libs/rocm-comgr/metadata.xml
index c0566e4b512e..0fea85b33c9c 100644
--- a/dev-libs/rocm-comgr/metadata.xml
+++ b/dev-libs/rocm-comgr/metadata.xml
@@ -9,7 +9,11 @@
         <email>xgreenlandforwyy@gmail.com</email>
         <name>Yiyang Wu</name>
     </maintainer>
+    <maintainer type="person">
+        <email>lockalsash@gmail.com</email>
+        <name>Sv. Lockal</name>
+    </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/ROCm-CompilerSupport</remote-id>
+        <remote-id type="github">ROCm/ROCm-CompilerSupport</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.0.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.0.0.ebuild
deleted file mode 100644
index ff181f1b4615..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-6.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm prefix
-
-LLVM_MAX_SLOT=17
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/lib/comgr"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
-	"${FILESDIR}/0001-Specify-clang-exe-path-in-Driver-Creation.patch"
-	"${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch"
-	"${FILESDIR}/${PN}-5.7.0-optional.patch"
-	"${FILESDIR}/${PN}-5.7.0-lld.patch"
-	"${FILESDIR}/${PN}-5.7.0-disassembly.patch"
-	"${FILESDIR}/${PN}-5.7.0-metadata.patch"
-	"${FILESDIR}/${PN}-5.7.0-symbolizer.patch"
-	"${FILESDIR}/${PN}-5.7.1-fix-tests.patch"
-	"${FILESDIR}/${PN}-5.7.1-correct-license-install-dir.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	sys-devel/clang:${LLVM_MAX_SLOT}=
-	sys-devel/clang-runtime:=
-	sys-devel/lld:${LLVM_MAX_SLOT}="
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die
-	sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die
-	eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch)
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCMAKE_STRIP=""  # disable stripping defined at lib/comgr/CMakeLists.txt:58
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild
new file mode 100644
index 000000000000..a2492992ceed
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+
+inherit cmake llvm-r1 prefix
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/comgr" )
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/ROCm/ROCm-CompilerSupport"
+SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/${components[0]}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
+	"${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch"
+	"${FILESDIR}/${PN}-5.7.1-correct-license-install-dir.patch"
+	"${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch"
+	"${FILESDIR}/${PN}-6.1.0-llvm-18-compat.patch"
+	"${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch"
+	"${FILESDIR}/${PN}-6.1.0-fix-comgr-default-flags.patch"
+	"${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch"
+)
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+	sys-devel/clang-runtime:=
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/lld:${LLVM_SLOT}=
+	')
+	dev-util/hipcc:${SLOT}
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_fetch
+		git-r3_checkout '' . '' "${components[@]}"
+	else
+		archive="${MY_P}.tar.gz"
+		ebegin "Unpacking from ${archive}"
+		tar -x -z -o \
+			-f "${DISTDIR}/${archive}" \
+			"${components[@]/#/${MY_P}/}" || die
+		eend ${?}
+	fi
+}
+
+src_prepare() {
+	sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die
+	sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix)\")," -i src/comgr-env.cpp || die
+	eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch)
+
+	cmake_src_prepare
+
+	# Replace @CLANG_RESOURCE_DIR@ in patches
+	local CLANG_RESOURCE_DIR="$("$(get_llvm_prefix)"/bin/clang -print-resource-dir)"
+	sed "s,@CLANG_RESOURCE_DIR@,\"${CLANG_RESOURCE_DIR}\"," -i src/comgr-compiler.cpp || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="$(get_llvm_prefix)"
+		-DCMAKE_STRIP=""  # disable stripping defined at lib/comgr/CMakeLists.txt:58
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		comgr_nested_kernel_test # See https://github.com/ROCm/llvm-project/issues/35
+	)
+	cmake_src_test
+}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index b0997dfcbeeb..09eeb44805e7 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,17 +1,23 @@
 AUX rocm-device-libs-5.1.3-llvm-link.patch 694 BLAKE2B a67a1207bb23ceaa304f2fd59000a14a8bd232fd6eaf3510370f148b0bd18630ec4309a3d2ee2c5b8045114841a0548e840601abb153fb4adfc1209dd16b0509 SHA512 75f6fb5f3aab7f7951d110b9097a1521adb261f286b5e04867fd2753bbfcc29987440fd929c9dac0ac90fde98616ce7693c2b5041d4d07c437087ee17303a22e
 AUX rocm-device-libs-5.1.3-test-bitcode-dir.patch 1181 BLAKE2B 0358dfc81ed98acd2a2bb399b7d8aa72c2a0bf20da3c45ad02d5e1c46df7f98bc18efe28867725e0fc1df041c1f1147bc25a2a5aa67b18f53d859dbf66aa71c7 SHA512 a0ffdda4ab42978f3b09bab424f91267bfc267f751d489aaee9c6eb3979ae5efd8130129e4b476fdcfbc73b779d9aad79fda60a8f7a64e8a5b35516d8fe6979f
 AUX rocm-device-libs-5.4.3-Revert-Update-counters-for-gfx11.patch 6801 BLAKE2B ae3be5c1d8a7a84e8ddee2471628804365dd1d9b1ae3aa981b5e47015b82c115d5da5ea6fedcacc3ccf11c768af8130375493fdbcc9a53567e633cc57e7e750e SHA512 c28a08253025b150523282231c64e5d310206e6e406efdc2a0f39ce69b2f1663fed6991e27b2124eb3434c51efb8d172eceb752f366bc2aab7b3eb63ad9dfa35
+AUX rocm-device-libs-5.5.0-test-bitcode-dir.patch 1838 BLAKE2B f1fa6e0b69b5e4e6634cb92c7b9ad1f9621a1b639d27d8e4d15ceeeb79ba58cfc8a7bb17f354995d8e4e88b5a74aa09354b0b986c6e802b1d4eb58ba3905f1e5 SHA512 115b5ec119400e6cbc6293d3819bb1dbd67455c60ed7b8c63443603a1748c954e558d3ffcabe76c232f742ce52d6df9b3c647ce1289a78226fd1507e6497793d
 AUX rocm-device-libs-5.5.1-fix-llvm-link.patch 681 BLAKE2B 1f28e1c92295caec2b50d576830ba896b82c92fe93db9243e4f397c9fde2de090e3f7f8c13ec8a0371d95978807642b433f4dc8b1644595da7f7576fe6b12a35 SHA512 6205cdb17692b4ebbce9f6a0e910c50ed9bd628d1863716f98e87857002399a3edbec3b9c50291c453262d0c169ed62ada5889fb1c735af04fd97623514e1fb2
+AUX rocm-device-libs-5.5.1-remove-gfx700-tests.patch 975 BLAKE2B 7b35ce4d8db4374e532bb3b77cb26d944d36b992b4649351de75084d5914a91becb17159328c9dd325043a1add1418b64b14be9e8e93a009140668cbbf8e7b88 SHA512 08e473c0067e2567d7ccb85eb8e333653e150a9fbca87b51d47f552baec60952a9a9fcbf1b26ad54f3560d8c87eede04f2b6801812f2f080ee61b3600bfa2fee
+AUX rocm-device-libs-6.0.0-add-gws-attribute.patch 581 BLAKE2B 40a8b66e44109a0d32c69ee76078c6ae8e45c52b1c3b8fb510040d8c616fbb552c0bfe77d5406a4a632cc0aca112292df2a720a5aba6fde63ad6853af613b565 SHA512 36b8851722e1fdc20de4ebc5875111017c0c80ba34263526f1228d3eb8fbb80ff6b458fecd665be9121a7c083f827343833481c53b221050446486139efdee40
+AUX rocm-device-libs-6.1.0-fix-llvm-link.patch 1089 BLAKE2B c14aa8fe06d351ba5ec75ae78a4fdd6a8c06bc4a2fff64214f2c28e538d33a07ad986743b5f7278fbaf771841766a368f44a0da17815461891fc09de81346842 SHA512 7ff795ff0db46331c001e5bb7cc7c0e671038f41596d0c3ed6da817146d169d9577c238cb2ecca3998e8a21fff0840e81760f3dd549dfaf1dbcb89ef8d9340a7
+AUX rocm-device-libs-6.1.0-fix-test-failures.patch 3232 BLAKE2B ae76a41e48192bc5cc940a7769b9f264cda742eab52870eeba730403440aa52580dde5d3c735e79e261c6d0b7a5ddac96dc590e547f7fbe1a3f369d08ab38229 SHA512 10905ddca80c6013561849920382f9716ad7d72080241a84aca568dd4ae43845e22627d309f6423f994f068dd64af1db52d64896aa66a79e4c803c093d44dcda
+AUX rocm-device-libs-6.1.0-fix-test-failures2.patch 1492 BLAKE2B a75aa720c1573111280c6fc07c2f5fef4b152116081b6c9eb25844efa9412680c6301f6e3150bd0334265ff76db38ace8a21a9abd6db42692387f04b1d5534d1 SHA512 b265327fa21ecbabbaca2270d8a7022ca46f2890b597683b827848a3d503d26ac7eeb1edb292387694730f6e86dc46a69209d8266ea7aa156266e96052a198ed
+DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
 DIST rocm-device-libs-5.1.3.tar.gz 242862 BLAKE2B 68d66de897f461e9f876de5fe2214803d4c00665651dea6af0952f0ce579c6704a5ec41b08971fa613ade309a0a85cb611b56b592dc2a25e247183e634ea3378 SHA512 cc3dfb8d4b4841ba777355c537175259d0019159ff462358320674b85082cccd99f6462f60fee66228ddfb88fade043445c1bac62504aa1462ba61b7e2751de7
 DIST rocm-device-libs-5.3.3.tar.gz 245690 BLAKE2B 475c0d818b8b0f090a8daeca2910cd4002e4cdf505d020327f46eb5f864a26937a6a3dfe4ff7b188ebda0f936b1c396f2163bb27b9e2a62c5976e60fa60856ac SHA512 8f6f2fc1534e348e02ba30a25cfc6017f8eab768968b5d0344a5ea7d65c4f0a874072f9e53919c74545814330602ef7c190753c7ff019137230e02f58a5d3a5d
 DIST rocm-device-libs-5.4.3.tar.gz 246095 BLAKE2B eb749346c96d465a5f22831968ccbd71f02749e6aa0d9c2becc0f378641ca0f65c1a131bfd3ed226f838b4208091fcc920b1e31b427adbd69a42881898668e6a SHA512 67b904363a3cff6c15bbd032cbc72cb5cd5f82acaa68c74391dbcf415266e8f35486a496b69b69e1fc0721e0e4e21fb6a6b9c180a46cb59cdcf53916be846ca4
 DIST rocm-device-libs-5.5.1.tar.gz 245900 BLAKE2B f713b1f12c7be33a4854d79791f592b8e89e2bc463769ec8cdd807483f0e5ca93d7fc852b6cf41d5ad0401d07adc97de9fb1fa54b77af83f665e282d6c0a43e7 SHA512 0138ddc94ce4a81202bdafccbbecef8145c6ddf82c3a14d92bb80b2bed3d3b73898f84279cef89110c50a9cc51e32de1323cc11a1f97c5da4f7f843b393425d0
 DIST rocm-device-libs-5.7.1.tar.gz 248357 BLAKE2B 829704382e9420ad79724a250ccfd65278eb697498805297d1a52b8ea35dbff46e11514b681243d61bfac05b8a9734f0cf22d721603e48fe2f9864368222b0bc SHA512 8755d0584fa3b8239f5642b4fb8f5e8dea20bbaca2ff8883894d3583913e9a1fd1552492b36e8ceff092f795783b734e68b002ee0c93711dccdf8e72c528c27c
-DIST rocm-device-libs-6.0.0.tar.gz 248509 BLAKE2B 797a612f4b36b83643b15711bec32c1ceac73103b51d42abb890a241b8224b7c6de33bf88a9c6620db2af9be4641fc709b9610515203177482422c97d5b01044 SHA512 e9f2d7e86ec4cbcd0f471bf45d056c4a9272ee0ec3286a9aa42e819fa5d3ce52c9b12e9a4f575c409fe9b46253b8910f49d5ba0bae3694f8c38970658a19f706
 EBUILD rocm-device-libs-5.1.3-r1.ebuild 1184 BLAKE2B bef07c38844eb218c333cf2fb0014881aff83837092dc62aa29d4971e9782da6a38a7db2dd599f6c8aff0c2bd60c94550d72300d8ee2a6db4ea2688820035803 SHA512 814009470618c7cea132ba28d3aa27eda6a55d65646efa54fc3ce0aa11e247af147f175956d2f7466474d891dd5aef80fe9adcc6bf871352d6f7c20c7f802832
 EBUILD rocm-device-libs-5.3.3.ebuild 1184 BLAKE2B bef07c38844eb218c333cf2fb0014881aff83837092dc62aa29d4971e9782da6a38a7db2dd599f6c8aff0c2bd60c94550d72300d8ee2a6db4ea2688820035803 SHA512 814009470618c7cea132ba28d3aa27eda6a55d65646efa54fc3ce0aa11e247af147f175956d2f7466474d891dd5aef80fe9adcc6bf871352d6f7c20c7f802832
 EBUILD rocm-device-libs-5.4.3.ebuild 1250 BLAKE2B 6013dd693a8120b5eeac654c9bad195428c34059eaef1bd40eaaf856f2edf331d8a3726fa46c077fe0aa62919f3ba68f518cfd9441d23020a06c293cd45f1042 SHA512 df101563920183c6a255f1461e718e28a01b4db355e3807c5a3e7b948627337950105deb7f77a857d489d9591c959909ad1e1957e4f21e3dffba08ee14514469
 EBUILD rocm-device-libs-5.5.1.ebuild 1206 BLAKE2B 4e40b4f468a1f3f2bba04aff69de95796f4df079c737b17812a979531a70d62da394655e00d1956d2dd55248141b255a293c1e19fd189e0df3e168f2da9d4d1c SHA512 98a5d239e61f5690bed1af56f8d38f9e188d2f9a3e5c0409dab1afeda7b825b114037e5319daf650ba75916a15c16fef8bb3e61c63ef60255bfea95b4d34d44d
-EBUILD rocm-device-libs-5.7.1.ebuild 1200 BLAKE2B 73f4e2b7ddddec268593e20bd756deefeb6e6e4267a1598f7b705fc20614ef586124300a354253dedc3c21ebabc0824b0bfb393f73ed54130aa9ca27b72b9938 SHA512 8b07f529c2aed33a05675aa4d4f645f97da18bd3eaa8140535e1719fa130aa944ff81491bbd69a3815a448ca418a8270ef3a5ebc3fa6a4ebfce9dc3436ea3585
-EBUILD rocm-device-libs-6.0.0.ebuild 1218 BLAKE2B e05478acbc494ce5d28ffa6bbe8a17d9d81ae604216c2a0b7cfce92a0f1f1a221aa54f595c5f89ac106c3955f1361c0b64ceb2bfac8d7a449320f34abf179b12 SHA512 64744c196cfd11252431571ad77aca587fb94d9b7b3bbbd07b9b4082e0701227d3247c8d8f42158d92cdce2d632e5a1372bb18b4df04ddfa81cd3bba8a4bbf55
-MISC metadata.xml 378 BLAKE2B d4defdfb2ce3bab811d9c2ac75b92b7892d46d87dad9f89c26cde140b3b167b43bf4022128dee45e063e332d6dfafc3ee8d78b0112909a7ce2d4a4a44c6cfa14 SHA512 0732d51019f0d27ffb1ffea32d76cad8a6d82927cb8788ff983cdb8dcc472015dbe36ba568bda7459d0b32837e89e1a32064ab7dfcefd2b88458cbb4438f452a
+EBUILD rocm-device-libs-5.7.1.ebuild 1455 BLAKE2B 3185873cbed4c601d4d3b6b9142376a0af8c3d89718bf8e7a06215cfd9c25cefd956607f557cf721a3f9b68289b91212889d23888bffda7daf8d0c29b596c258 SHA512 f7db2da2818b9eaa4930dfac02e660e98a2b7dc5e326e1fde78acc98d5723a436052a628cf20254e5295a334980c9d350047503cb262ee4c9820d5ef889d170c
+EBUILD rocm-device-libs-6.1.1.ebuild 2249 BLAKE2B 0e118c5e35b8788affc6b20cbe2fd8473eeb8e1593c4e8b8a986cfcfe373cfdea367c267b0e4339dcb72759dadf75e742ddd696296576c7c61169c41f16440d0 SHA512 8a6a155224f845936279a0c33548d13253c66c9bc0c0b99399a82c69b611cebb76e2eea131dbcf74b6e6792e42c103f4e6f32582a2af25ccbd0567ec94ce6bea
+MISC metadata.xml 486 BLAKE2B 39c4a21b96ad471942a38d1c46b2600e3544729a87cd01c79606d495c595f271d5c04621ec581d2322686aca56de5d7c4b2b0d6125fc8db15b1236b2c093c8c9 SHA512 1a7d6570a687bb55877c6a5d9cbd7dc30a72ec0613b84e33be0982ff46b8d80d89e502e50364afdcc1022d7620fc10317a411b27c255caeafa2b45a85a43fd8c
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.0-test-bitcode-dir.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.0-test-bitcode-dir.patch
new file mode 100644
index 000000000000..2a307786edd5
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.0-test-bitcode-dir.patch
@@ -0,0 +1,37 @@
+`--rocm-device-lib-path` is needed to execute the tests because they are not
+installed to system yet
+===================================================================
+--- ROCm-Device-Libs-rocm-6.0.0.orig/test/compile/CMakeLists.txt
++++ ROCm-Device-Libs-rocm-6.0.0/test/compile/CMakeLists.txt
+@@ -30,6 +30,7 @@ function(add_compile_test test_name func
+      -DFILECHECK_BIN=${FILECHECK_BIN}
+      -DOUTPUT_FILE=output.${name}.${test_cpu}.s
+      -DINPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/${func_name}.cl
++     -DAMDGCN_BITCODES=${PROJECT_BINARY_DIR}/lib/amdgcn/bitcode
+      -DTEST_CPU=${test_cpu}
+      -DEXTRA_CHECK_PREFIX=${extra_check_prefixes}
+      -P ${script})
+Index: ROCm-Device-Libs-rocm-6.0.0/test/compile/RunConstantFoldTest.cmake
+===================================================================
+--- ROCm-Device-Libs-rocm-6.0.0.orig/test/compile/RunConstantFoldTest.cmake
++++ ROCm-Device-Libs-rocm-6.0.0/test/compile/RunConstantFoldTest.cmake
+@@ -16,6 +16,7 @@ execute_process(COMMAND
+   -target amdgcn-amd-amdhsa -mcpu=${TEST_CPU}
+   -Xclang -finclude-default-header
+   --rocm-path=${BINARY_DIR}
++  --rocm-device-lib-path=${AMDGCN_BITCODES}
+   -mllvm -amdgpu-simplify-libcall=0
+   -o ${OUTPUT_FILE} ${INPUT_FILE}
+   RESULT_VARIABLE CLANG_RESULT
+Index: ROCm-Device-Libs-rocm-6.0.0/test/compile/RunCompileTest.cmake
+===================================================================
+--- ROCm-Device-Libs-rocm-6.0.0.orig/test/compile/RunCompileTest.cmake
++++ ROCm-Device-Libs-rocm-6.0.0/test/compile/RunCompileTest.cmake
+@@ -16,6 +16,7 @@ execute_process(COMMAND
+   -target amdgcn-amd-amdhsa -mcpu=${TEST_CPU}
+   -Xclang -finclude-default-header
+   --rocm-path=${BINARY_DIR}
++  --rocm-device-lib-path=${AMDGCN_BITCODES}
+   -mllvm -amdgpu-simplify-libcall=0
+   -o ${OUTPUT_FILE} ${INPUT_FILE}
+   RESULT_VARIABLE CLANG_RESULT
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.1-remove-gfx700-tests.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.1-remove-gfx700-tests.patch
new file mode 100644
index 000000000000..0fb5e44e218c
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.1-remove-gfx700-tests.patch
@@ -0,0 +1,34 @@
+https://github.com/ROCm/ROCm-Device-Libs/issues/86
+https://github.com/ROCm/ROCm-Device-Libs/pull/89
+From 936a78464491c95c7cfffde08491bfe1a48c7177 Mon Sep 17 00:00:00 2001
+From: Brian Sumner <brian.sumner@amd.com>
+Date: Tue, 9 May 2023 07:55:03 -0700
+Subject: [PATCH] Remove gfx700 from tests
+
+Change-Id: I23d6639cb7c04246cc5be86d6e172e32546b3b90
+---
+ test/compile/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/compile/CMakeLists.txt b/test/compile/CMakeLists.txt
+index 9af0b1a..a789222 100644
+--- a/test/compile/CMakeLists.txt
++++ b/test/compile/CMakeLists.txt
+@@ -54,12 +54,12 @@ foreach(gpu gfx900 gfx1030)
+   add_constant_fold_test(lgamma_r ${gpu})
+ endforeach()
+ 
+-foreach(gpu gfx700 gfx803)
++foreach(gpu gfx803)
+   add_isa_test(asin ${gpu})
+   add_isa_test(atan2 ${gpu})
+   add_isa_test(atan2pi ${gpu})
+ endforeach()
+ 
+-foreach(gpu gfx600 gfx700)
++foreach(gpu gfx600)
+   add_isa_test(frexp ${gpu})
+ endforeach()
+-- 
+2.41.0
+
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-6.0.0-add-gws-attribute.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.0.0-add-gws-attribute.patch
new file mode 100644
index 000000000000..1aaecbb0c1e6
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.0.0-add-gws-attribute.patch
@@ -0,0 +1,22 @@
+Fix compatilibity with Clang-18
+https://github.com/ROCm/ROCm-Device-Libs/issues/96
+
+Backports https://github.com/ROCm/llvm-project/commit/688c78d85caf499957db175811f8b00c7c818f83
+--- a/ockl/src/cg.cl
++++ b/ockl/src/cg.cl
+@@ -84,13 +84,13 @@ multi_grid_sync(__global struct mg_sync *s, uint members)
+     }
+ }
+ 
+-void
++__attribute__((target("gws"))) void
+ __ockl_gws_init(uint nwm1, uint rid)
+ {
+     __builtin_amdgcn_ds_gws_init(nwm1, rid);
+ }
+ 
+-void
++__attribute__((target("gws"))) void
+ __ockl_gws_barrier(uint nwm1, uint rid)
+ {
+     __builtin_amdgcn_ds_gws_barrier(nwm1, rid);
\ No newline at end of file
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-llvm-link.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-llvm-link.patch
new file mode 100644
index 000000000000..7a08dc4a1d0d
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-llvm-link.patch
@@ -0,0 +1,28 @@
+https://github.com/ROCm/llvm-project/pull/68
+From 1c7e7f872980a5b15fb3d85f8780e78ce3b715b1 Mon Sep 17 00:00:00 2001
+From: Selene <lixueying@mail.bnu.edu.cn>
+Date: Wed, 1 May 2024 17:38:33 +0800
+Subject: [PATCH] Allow link to llvm shared library for current distros
+
+---
+ amd/device-libs/utils/prepare-builtins/CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/amd/device-libs/utils/prepare-builtins/CMakeLists.txt b/amd/device-libs/utils/prepare-builtins/CMakeLists.txt
+index 63661962860a..079dc08e3419 100644
+--- a/utils/prepare-builtins/CMakeLists.txt
++++ b/utils/prepare-builtins/CMakeLists.txt
+@@ -26,5 +26,9 @@ set_target_properties(prepare-builtins PROPERTIES
+   CXX_STANDARD_REQUIRED Yes
+   CXX_EXTENSIONS No)
+ llvm_update_compile_flags(prepare-builtins)
+-llvm_map_components_to_libnames(llvm_libs support core bitreader bitwriter)
++if (LLVM_LINK_LLVM_DYLIB)
++  set(llvm_libs LLVM)
++else()
++  llvm_map_components_to_libnames(llvm_libs support core bitreader bitwriter)
++endif()
+ target_link_libraries(prepare-builtins ${llvm_libs})
+-- 
+2.44.0
+
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-test-failures.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-test-failures.patch
new file mode 100644
index 000000000000..856b5cf7e392
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-test-failures.patch
@@ -0,0 +1,64 @@
+Modified from https://github.com/ROCm/llvm-project/commit/7c2188cbc193f2b4dd5394f17404b44340001f30.patch
+From 7c2188cbc193f2b4dd5394f17404b44340001f30 Mon Sep 17 00:00:00 2001
+From: Matt Arsenault <Matthew.Arsenault@amd.com>
+Date: Thu, 4 Jan 2024 19:34:47 +0700
+Subject: [PATCH] device-libs: Fix input file path test failures
+
+The test file input paths broke with the move to the mono-repo. Some of
+the constant folding values are host dependent, so update the values to
+what works for me now. Not really sure what else I can do about these.
+
+Change-Id: Ic764f637bb9532fcede9bfb9ce3886a2b7d467d8
+---
+ amd/device-libs/test/compile/frexp.cl       | 10 ++++++----
+ amd/device-libs/test/compile/lgamma_r.cl    |  2 +-
+ 3 files changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/test/compile/frexp.cl b/test/compile/frexp.cl
+index 780c541500021b..b3181ce87db711 100644
+--- a/test/compile/frexp.cl
++++ b/test/compile/frexp.cl
+@@ -5,11 +5,11 @@
+ // later.
+ 
+ // GCN-LABEL: {{^}}test_frexp_f32:
+-// GFX600-DAG: s_movk_i32 [[CLASS_MASK:s[0-9]+]], 0x1f8
++// GFX600-DAG: s_mov_b32 [[INF:s[0-9]+]], 0x7f80000
+ // GFX600-DAG: v_frexp_mant_f32{{(_e32)?}} [[MANT:v[0-9]+]], [[SRC:v[0-9]+]]
+ // GFX600-DAG: v_frexp_exp_i32_f32{{(_e32)?}} [[EXP:v[0-9]+]], [[SRC:v[0-9]+]]
+ 
+-// GFX600-DAG: v_cmp_class_f32{{(_e64)?}} [[CMP:(vcc|s{{\[[0-9]+:[0-9]+\]}})]], [[SRC]], [[CLASS_MASK]]
++// GFX600-DAG: v_cmp_lt_f32{{(_e64)?}} [[CMP:(vcc|s{{\[[0-9]+:[0-9]+\]}})]], |[[SRC]]|, [[INF]]
+ 
+ // GFX600-DAG: v_cndmask_b32{{(_e32)?|(e64)?}} v{{[0-9]+}}, [[SRC]], [[MANT]], [[CMP]]
+ // GFX600-DAG: v_cndmask_b32{{(_e32)?|(e64)?}} v{{[0-9]+}}, 0, [[EXP]], [[CMP]]
+@@ -30,12 +30,14 @@ kernel void test_frexp_f32(global float* restrict out0,
+ }
+ 
+ // GCN-LABEL: {{^}}test_frexp_f64:
++// GFX600: s_mov_b32 s{{[0-9]+}}, 0{{$}}
+ 
+-// GFX600-DAG: s_movk_i32 [[CLASS_MASK:s[0-9]+]], 0x1f8
++// GFX600-DAG: s_mov_b32 s[[INF_LO:[0-9]+]], 0{{$}}
++// GFX600-DAG: s_mov_b32 s[[INF_HI:[0-9]+]], 0x7ff00000{{$}}
+ // GFX600-DAG: v_frexp_mant_f64{{(_e32)?}} v{{\[}}[[MANT_LO:[0-9]+]]:[[MANT_HI:[0-9]+]]{{\]}}, [[SRC:v\[[0-9]+:[0-9]+\]]]
+ // GFX600-DAG: v_frexp_exp_i32_f64{{(_e32)?}} [[EXP:v[0-9]+]], [[SRC:v\[[0-9]+:[0-9]+\]]]
+ 
+-// GFX600-DAG: v_cmp_class_f64{{(_e64)?}} [[CMP:(vcc|s{{\[[0-9]+:[0-9]+\]}})]], [[SRC]], [[CLASS_MASK]]
++// GFX600-DAG: v_cmp_lt_f64{{(_e64)?}} [[CMP:(vcc|s{{\[[0-9]+:[0-9]+\]}})]], |[[SRC]]|, s{{\[}}[[INF_LO]]:[[INF_HI]]{{\]}}
+ 
+ // GFX600-DAG: v_cndmask_b32{{(_e32)?|(e64)?}} v{{[0-9]+}}, v{{[0-9]+}}, v[[MANT_LO]], [[CMP]]
+ // GFX600-DAG: v_cndmask_b32{{(_e32)?|(e64)?}} v{{[0-9]+}}, v{{[0-9]+}}, v[[MANT_HI]], [[CMP]]
+diff --git a/test/compile/lgamma_r.cl b/test/compile/lgamma_r.cl
+index 1e1984226cd55c..56d1ba15f761f2 100644
+--- a/test/compile/lgamma_r.cl
++++ b/test/compile/lgamma_r.cl
+@@ -66,7 +66,7 @@ kernel void constant_fold_lgamma_r_f32(volatile global float* out,
+     out[0] = test_lgamma_r(0x1.0p-127f, sign_out);
+ 
+     // CONSTANTFOLD-NEXT: store volatile i32 1,
+-    // CONSTANTFOLD-NEXT: store volatile float 0x419DE28040000000,
++    // CONSTANTFOLD-NEXT: store volatile float 0x419DE28060000000,
+     out[0] = test_lgamma_r(nextafter(0x1.0p+23f, __builtin_inff()), sign_out);
+ 
+     // CONSTANTFOLD-NEXT: store volatile i32 1,
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-test-failures2.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-test-failures2.patch
new file mode 100644
index 000000000000..c0559e9468f6
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-test-failures2.patch
@@ -0,0 +1,44 @@
+Modified from https://github.com/ROCm/llvm-project/commit/794ebeffcafbf6f4d86cb1bfd7a5a0d1d30f1fc7
+From 794ebeffcafbf6f4d86cb1bfd7a5a0d1d30f1fc7 Mon Sep 17 00:00:00 2001
+From: Matt Arsenault <Matthew.Arsenault@amd.com>
+Date: Thu, 4 Jan 2024 20:40:30 +0700
+Subject: [PATCH] device-libs: Fix native_rsqrt test failures for f16-as-f32
+ case
+
+At some point the code quality regressed for these.
+
+Change-Id: Ib5c4c1d093a6056dd6213ed6eaf157ad806101fb
+---
+ amd/device-libs/test/compile/native_rsqrt.cl | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/test/compile/native_rsqrt.cl b/test/compile/native_rsqrt.cl
+index 94ef375e4d522f..291cc6f32c3351 100644
+--- a/test/compile/native_rsqrt.cl
++++ b/test/compile/native_rsqrt.cl
+@@ -6,16 +6,21 @@
+ 
+ half __ocml_native_rsqrt_f16(half);
+ 
+-// GCN: {{^}}test_native_rsqrt_f16:
+-// GFX600: v_rsq_f32
+-// GFX700: v_rsq_f32
++// FIXME: Promoted case using full expansion
++// GCN-LABEL: {{^}}test_native_rsqrt_f16:
++// GFX600: v_sqrt_f32
++// GFX600: v_rcp_f32
++
++// GFX700: v_sqrt_f32
++// GFX700: v_rcp_f32
++
+ // GFX803: v_rsq_f16
+ kernel void test_native_rsqrt_f16(global half* restrict out, global half* restrict in) {
+     int id = get_local_id(0);
+     out[id] = __ocml_native_rsqrt_f16(in[id]);
+ }
+ 
+-// GCN: {{^}}test_native_rsqrt_f32:
++// GCN-LABEL: {{^}}test_native_rsqrt_f32:
+ // GCN: v_rsq_f32
+ kernel void test_native_rsqrt_f32(global float* restrict out, global float* restrict in) {
+     int id = get_local_id(0);
diff --git a/dev-libs/rocm-device-libs/metadata.xml b/dev-libs/rocm-device-libs/metadata.xml
index c47f589544e4..cbbf3a273306 100644
--- a/dev-libs/rocm-device-libs/metadata.xml
+++ b/dev-libs/rocm-device-libs/metadata.xml
@@ -5,7 +5,11 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
+    <maintainer type="person">
+      <email>lockalsash@gmail.com</email>
+      <name>Sv. Lockal</name>
+    </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/ROCm-Device-Libs</remote-id>
+        <remote-id type="github">ROCm/ROCm-Device-Libs</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-5.7.1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.7.1.ebuild
index 56af5a5be6b3..f86b432e076a 100644
--- a/dev-libs/rocm-device-libs/rocm-device-libs-5.7.1.ebuild
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,3 +47,10 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+src_install() {
+	cmake_src_install
+	local CLANG_EXE="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/clang"
+	local bitcodedir="$("${CLANG_EXE}" -print-resource-dir)/$(get_libdir)/amdgcn/bitcode"
+	dosym -r "/usr/lib/amdgcn/bitcode" "${bitcodedir#${EPREFIX}}"
+}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-6.0.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-6.0.0.ebuild
deleted file mode 100644
index 09ca777faf52..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-6.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-RESTRICT="strip"
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=17
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-devel/clang:${LLVM_MAX_SLOT}"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.5.1-fix-llvm-link.patch"
-	)
-
-src_prepare() {
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DLLVM_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild
new file mode 100644
index 000000000000..04fd989b95cb
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+inherit cmake llvm-r1
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/device-libs" )
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/llvm-project"
+	inherit git-r3
+	S="${WORKDIR}/${P}/${components[0]}"
+else
+	SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}/${components[0]}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/ROCm/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-build/rocm-cmake
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/lld:${LLVM_SLOT}
+	')
+"
+
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5.0-test-bitcode-dir.patch"
+	"${FILESDIR}/${PN}-6.1.0-fix-llvm-link.patch"
+	"${FILESDIR}/${PN}-6.0.0-add-gws-attribute.patch"
+	"${FILESDIR}/${PN}-6.1.0-fix-test-failures.patch"
+	"${FILESDIR}/${PN}-6.1.0-fix-test-failures2.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_fetch
+		git-r3_checkout '' . '' "${components[@]}"
+	else
+		archive="${MY_P}.tar.gz"
+		ebegin "Unpacking from ${archive}"
+		tar -x -z -o \
+			-f "${DISTDIR}/${archive}" \
+			"${components[@]/#/${MY_P}/}" || die
+		eend ${?}
+	fi
+}
+
+src_prepare() {
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="$(get_llvm_prefix)"
+	)
+	# do not trust CMake with autoselecting Clang, as it autoselects the latest one
+	# producing too modern LLVM bitcode and causing linker errors in other packages
+	CC="$(get_llvm_prefix)/bin/clang" CXX="$(get_llvm_prefix)/bin/clang++" cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	local CLANG_EXE="$(get_llvm_prefix)/bin/clang"
+	# install symlink, so that clang won't ask for "--rocm-device-lib-path" flag anymore
+	local bitcodedir="$("${CLANG_EXE}" -print-resource-dir)/$(get_libdir)/amdgcn/bitcode"
+	dosym -r "/usr/lib/amdgcn/bitcode" "${bitcodedir#${EPREFIX}}"
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index e17c2ec9074e..9779389a02c6 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -9,7 +9,7 @@ DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827e
 DIST rocclr-5.4.3.tar.gz 640557 BLAKE2B 9ab91bab7ffb06c9c0d1c2ae79533fccc597071dda289ac375e32eb2965c638a7029951d2a49d46eeead9d7d242fe3a0cedb3e444d877af1bbf0e2d801c91e11 SHA512 c1d1a2ca08c2d762a221c04d394469aa7aff46086151333b145e0db9a7c7eb3dbbf8b9693e50d816aa9a13c16b4ebacf5ff3d5d8ff3393a8a764728ef5172d3a
 DIST rocclr-5.5.1.tar.gz 634330 BLAKE2B e6383a6b6b09f274a944d66effd345e38a191ec73ee5c5240f8ec8bb62a4df97b80835ce57f8f78c3834602b9da425b49289b5c7cd7e4c7071147ff409c6a6c9 SHA512 4c12011d22a4f14d9e93250b2a38716eb973139afa1adbbbd51c0e0ed13c0b7c1f45a37c71ef937c5fdabf09e928d7913ca3332fc61b7a2c10d21421306a228f
 DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965
-DIST rocm-clr-6.0.0.tar.gz 1983453 BLAKE2B 2cf6ec7c3b0ec5dedeea94ff54af30662b781fc2eee22e3315094af61dc9d331eba33c1d9d463295848c5724e515a3137f9b189c1261273afad1a5f9d32226c2 SHA512 12e77a121150d8c25121b98bd7c6233c2568f9f4130bdbe6bc3ab225f14b8bea6a6bdc4ed497c0f999d3d3daabdca0de8caaa1b69911c11974b5d6f951734433
+DIST rocm-clr-6.1.1.tar.gz 2031034 BLAKE2B b0485bb015d31986f4988d1db0c029c826856e50b5bb1b58fac2097c14b3966668f1b8d41ec198889e27ac860497a8b3c081ec31d52390d5c9ff5db092bf7cce SHA512 86925e8b9a9e77b06a57daefbc7279887b4ef7c6a79c3717bc2f2d3bf29926281c60063fd17e21c65d7def520d9f579bf88f69051d053a38750ba968f69ca3fc
 DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0
 DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123241cb7025889cca2ef6814d9d5b5a2146a78703b171d20bcb432bc7a2cdd1f24ad349408c17816b25a66702e9f0f5345af9082 SHA512 391f0f244b7f02972df8cada821e69ee8d81d96b9cff3c14f1d0838da583d8fb136ec4bd5ee820f6dd261968e9eef5e9a5b10b7bb76b1b64625c399d79bcb03f
 DIST rocm-opencl-runtime-5.4.3.tar.gz 1005268 BLAKE2B f9398e4c2b0f045f1b5d8df9f31b7f2bef6a9201885aa6ee5fc5d71632cfde26a078d9a5ea38c3da12d3c187faf04c7bdcf1a8ecb9927cdba56b1efdfcdc44ee SHA512 f65d4622ce8721a6b91ab5b5b306d142ba507d3e631ac3ab0b76c5bc6d8d18455e02debd954c82e7eb609f232b509f1ec1a013dc2fad467c2c2ad31fdf15755d
@@ -19,6 +19,5 @@ EBUILD rocm-opencl-runtime-5.3.3-r1.ebuild 3630 BLAKE2B cdafd2367c4b222a43b434e8
 EBUILD rocm-opencl-runtime-5.4.3-r1.ebuild 4031 BLAKE2B c952245f6f6ad1910facd33a82d25b77f2b20cbbdf4c05ca7ce735ab913fc49bdc5cdc1e8fc7f944cc5574331305e2d96cbb9bccd17a7ec28c042d9bec91499c SHA512 2cf80ae9fa5dba61936216fe87274998deefa70d0f20613ad0bf048e29f35eb37f525f1682024a85ab4a4acd79b8d75ad586008c5032dc527b293e79d3bc6a01
 EBUILD rocm-opencl-runtime-5.5.1.ebuild 4002 BLAKE2B e784debbe6ca533290ca801cf965087e7e01d39c84a65ad2a738a672f3d330c7a28cc13fd5a8d6cbcc9520c9543cce9b762d480b6f3f4173006301c293af013b SHA512 38940e4b6d028fc8e713ec1641824776d0fab540f3e9e3011f6b377caf82a9b4d13ccd897605c01557975c1ec4f89285e944cee6b67bdbe56ddc300284d2df55
 EBUILD rocm-opencl-runtime-5.7.1-r1.ebuild 3119 BLAKE2B 672082b1bea0f6cd45f8c37181e731d60dec3844fa0a31aca555b7c6e154d4981d33d1140fc83b3f8c6fbc46b7a13b88c76278ea0c04463eb0f2b398a60b3bbf SHA512 7d12f85d62bfb48df3f7c0d705e5411dad21ffa71964f19b09f2623aa836ecd91fedb28ad1ee5790ca5c538139e6790b2154c66dccc67687decdd3fb62d92b18
-EBUILD rocm-opencl-runtime-6.0.0.ebuild 3119 BLAKE2B 272dfd88268d3457367bf9f19e4622949ceb41b1f20c9504545e1638331ece944aaec9b4eb60f9afd1bbdd409252be70d291fbccd351c2296dbaf08a7094201a SHA512 3cedae3db98286f85dcdb3db35bdfcc7f6ac8702471d4cd7115bc6672a2623924a0aba6fec1e528fb184b91e1bad99dfa6511739c54ebc7699be76f5563c756e
-EBUILD rocm-opencl-runtime-9999.ebuild 4098 BLAKE2B dbeebfc8fe71bb84507cb8f021deda11c4d3027ed4f21f4bed3f92c732e5d7122a44a42e4d25c8b2df59ec94a825654d508ca3f02559827ab1db2472b6240c9c SHA512 8ede58974bf967eb569621aed33dbc0d974247059818f72195affb645ca1d8e642f6605eaeb345604c0376df9eabe84402cc5d1e8e53feb74c7d8d337fa44579
+EBUILD rocm-opencl-runtime-6.1.1.ebuild 2695 BLAKE2B 2e2241518863f36222e755d61f8e5c25510c5a5250458fce110d5830898a36ae3e97a20fce61382d7ebf39346dee705b673dd0c1e4390e3ee44f7c23eff4d1b7 SHA512 edfb87e56c042000e41480771186a8e536e35a58cb2e57ef71f3d118501dcc85eb1025eba6a6af0b25d9c896329aa832d56f9b1037031c4279e5f21367dfa81b
 MISC metadata.xml 525 BLAKE2B 9af34c6be2bb5ff304e4d01810b810eb8a0639d1972325fad3b81c93aa4d060cbebddc9c06da702dd80f9aa98549720cf2bc674d5b11ef6f99ed30efe50d2110 SHA512 c50670dde49ec0d9d3acca19d37842ecf567429f455e1b37c5181e5d4361d829eff0980ba35096ef42c0789f8904d52425faf4a2aabf641142722957b626378d
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.1.ebuild
index b6912994ddb7..465e3a2ddc66 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.0.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.1.ebuild
@@ -9,19 +9,12 @@ inherit cmake edo flag-o-matic rocm
 DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
 HOMEPAGE="https://github.com/ROCm-Developer-Tools/clr"
 
-#if [[ ${PV} == *9999 ]] ; then
-#	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-#	EGIT_CLR_REPO_URI="https://github.com/ROCm-Developer-Tools/ROCclr"
-#	inherit git-r3
-#	S="${WORKDIR}/${P}"
-#else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz"
-	S="${WORKDIR}/clr-rocm-${PV}/"
-#fi
+SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz"
+S="${WORKDIR}/clr-rocm-${PV}/"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
@@ -34,18 +27,7 @@ DEPEND="${RDEPEND}"
 BDEPEND=">=dev-build/rocm-cmake-5.3
 	media-libs/glew
 	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
-	"
-
-src_unpack () {
-if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-OB		git-r3_checkout
-		git-r3_fetch "${EGIT_CLR_REPO_URI}"
-		git-r3_checkout "${EGIT_CLR_REPO_URI}" "${CLR_S}"
-	else
-		default
-	fi
-}
+"
 
 src_configure() {
 	# -Werror=strict-aliasing
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild
deleted file mode 100644
index 1ca30c8a10ae..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake edo flag-o-matic
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-	EGIT_CLR_REPO_URI="https://github.com/ROCm-Developer-Tools/ROCclr"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-fi
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/rocr-runtime-5.3
-	>=dev-libs/rocm-comgr-5.3
-	>=dev-libs/rocm-device-libs-5.3
-	>=virtual/opencl-3
-	media-libs/mesa[-opencl]"
-DEPEND="${RDEPEND}
-	dev-util/opencl-headers"
-BDEPEND=">=dev-build/rocm-cmake-5.3
-	media-libs/glew
-	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
-	"
-
-CLR_S="${WORKDIR}/ROCclr-rocm-${PV}"
-
-src_unpack () {
-if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-		git-r3_fetch "${EGIT_CLR_REPO_URI}"
-		git-r3_checkout "${EGIT_CLR_REPO_URI}" "${CLR_S}"
-	else
-		default
-	fi
-}
-src_prepare() {
-	cmake_src_prepare
-
-	pushd ${CLR_S} || die
-	# Bug #753377
-	# patch re-enables accidentally disabled gfx800 family
-	eapply "${FILESDIR}/${PN}-5.0.2-enable-gfx800.patch"
-	popd || die
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/856088
-	# https://github.com/ROCm/clr/issues/64
-	#
-	# Do not trust it for LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	# Fix ld.lld linker error: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/155
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	local mycmakeargs=(
-		-Wno-dev
-		-DROCCLR_PATH="${CLR_S}"
-		-DAMD_OPENCL_PATH="${S}"
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DEMU_ENV=ON
-		-DBUILD_ICD=OFF
-		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors
-	doins config/amdocl64.icd
-
-	cd "${BUILD_DIR}" || die
-	insinto /usr/lib64
-	doins amdocl/libamdocl64.so
-	doins tools/cltrace/libcltrace.so
-}
-
-# Copied from rocm.eclass. This ebuild does not need amdgpu_targets
-# USE_EXPANDS, so it should not inherit rocm.eclass; it only uses the
-# check_amdgpu function in src_test. Rename it to check-amdgpu to avoid
-# pkgcheck warning.
-check-amdgpu() {
-	for device in /dev/kfd /dev/dri/render*; do
-		addwrite ${device}
-		if [[ ! -r ${device} || ! -w ${device} ]]; then
-			eerror "Cannot read or write ${device}!"
-			eerror "Make sure it is present and check the permission."
-			ewarn "By default render group have access to it. Check if portage user is in render group."
-			die "${device} inaccessible"
-		fi
-	done
-}
-
-src_test() {
-	check-amdgpu
-	cd "${BUILD_DIR}"/tests/ocltst || die
-	export OCL_ICD_FILENAMES="${BUILD_DIR}"/amdocl/libamdocl64.so
-	local instruction1="Please start an X server using amdgpu driver (not Xvfb!),"
-	local instruction2="and export OCLGL_DISPLAY=\${DISPLAY} OCLGL_XAUTHORITY=\${XAUTHORITY} before reruning the test."
-	if [[ -n ${OCLGL_DISPLAY+x} ]]; then
-		export DISPLAY=${OCLGL_DISPLAY}
-		export XAUTHORITY=${OCLGL_XAUTHORITY}
-		ebegin "Running oclgl test under DISPLAY ${OCLGL_DISPLAY}"
-		if ! glxinfo | grep "OpenGL vendor string: AMD"; then
-			ewarn "${instruction1}"
-			ewarn "${instruction2}"
-			die "This display does not have AMD OpenGL vendor!"
-		fi
-		./ocltst -m $(realpath liboclgl.so) -A ogl.exclude
-		eend $? || die "oclgl test failed"
-	else
-		ewarn "${instruction1}"
-		ewarn "${instruction2}"
-		die "\${OCLGL_DISPLAY} not set."
-	fi
-	edob ./ocltst -m $(realpath liboclruntime.so) -A oclruntime.exclude
-	edob ./ocltst -m $(realpath liboclperf.so) -A oclperf.exclude
-}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index f14730bad1d0..9de4a07a416a 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,17 +1,19 @@
 AUX rocr-runtime-4.3.0_no-aqlprofiler.patch 1084 BLAKE2B dfc2b9bbea0360fdbbd04988f0dbed76e53d8d9f9d2a5217f154e02e39f7b78f3408edb0204a93b6b4e927103b2c041788bd6befb8475d3f4e333bdc6ad19a0d SHA512 f90b92eb547640bc8cf71d042f12a55504371e4c3e624b02435c026e7ae9d5885e23a2be3a0f5c443fc502b3a1c8a03fdb5efabaeaabe8be33a28aab3ac9d9ca
 AUX rocr-runtime-5.0.1-cmake-install-paths.patch 2744 BLAKE2B fbbecdefbfabcbe4cd7f029e10d6abed94b492f94157839336adf83e98efe5c0e93dbb20856ca6adab32cb315bbd7b6c397c8fc48b66ea784cdbb3becb5f718e SHA512 db7ee8b87b526991a62c3cbfd385e85d27e05ba9a7f4726e8060d7ad29917e154bdcd0715e61a08210dad4b6112c731dfcab9e9f7e809b74da2f74c62a1eab72
-AUX rocr-runtime-5.7.1-extend-isa-compatibility-check.patch 3006 BLAKE2B 91de5e4c427678aa8623c1663dd044a2fde1f46ff450d167f516fb618ccdfe71713f3309146766350de171b43ecdab82fa7cc89ccf9bf2481b7f0c6e724fa8dc SHA512 2646741d75829ca22a142f520635586312884617e1747e53b9fa1e0f226e5ab7353b99c905a8cc0d6eda9bd74fb763b5e38e66e1ca342375444744393268c18a
-AUX rocr-runtime-5.7.1-musl.patch 3609 BLAKE2B 563a831a23f8d9515cca9cafc67355e631714c1f3f1eb02de02dd463db3da29cf75b055a8d3cb123a50039540941739e77a16dbdf8d16253785bec31e1577ad5 SHA512 99939293225a1015c280bbf1a01ea8e4cf53c2370ad940fa3b73c87ba84f87d24cd635e7dec4b5b6c28e25adc5ff6ccd7bee4ddec53e6b10c21bc7d9ae6bf73d
+AUX rocr-runtime-5.7.1-extend-isa-compatibility-check.patch 3003 BLAKE2B 203b65af267302440a9814c458296e969aab41ae4e83945e34a814037f66e620c9070721df288f25e93b0267b2e17d2d6e710c4b0ba741b83692ce65fdbd90b0 SHA512 5e0ffccce059ca79426ad1082d63c1687a22830fd919b5b643ea0d733b11040c0484f5f95f052cd7832d87c836eec97f362e79b60021dc8e833855785734a2cb
+AUX rocr-runtime-5.7.1-musl.patch 3923 BLAKE2B 9cc1abc84be25fe6432c50c227ce65f11526b0c53ee3f08aea79f4d14679943a6a68b55e56c1f14a75ed9c43d3e2dac21b3cfdfe8dc44bc0e21bd6e09b79fa1c SHA512 b44d292bc6dd1178bbc7885812db22cc96fc9e05509f175b59bc7d453dee5d58bfe45073f86f2496322a24cbd2986972f80b6495947dfcaa6838641a36690df8
+AUX rocr-runtime-6.1.0-ld-lld.patch 561 BLAKE2B 93ec03a4d758791ab0a88f9d80cf1f522681cf3d0cf4f020aa1014848dc607045b628d275a25bf9830c3f1a19342ae96b9bb026ae7a9513d5ba193774526c29a SHA512 83ebcac0ada1b8406a2f7277be5f3db0c71777009cfc8996c6f9317deb1f3846a25387a956f45c6aedcb8ef04cda0814ec7c6dcf1b369cb98f9ba8f3e774022d
+AUX rocr-runtime-6.1.0-musl.patch 3589 BLAKE2B b690a5c63ccd7056e8fc6699d0905933b55fac3d1015fa486cacf5713d43386d57131efdf8ab6b04625b11548e0e2d831a2ee83a3c65f71cc6353e456e98d223 SHA512 bb947984e747a9b772700934be3047e906f19469459f250986a36bf0fd7f0e3acbaaa9961fc18ceef13655070affb8dc4642b4957556b9941084348d9c62e0df
 DIST rocr-runtime-5.1.3.tar.gz 720567 BLAKE2B bdf2d258ec607ffc69264d48ce82c36787757b7809397d643a24abaa852f3cc217a57210fba760d4d11ef8ce2922dc1ef275d3b47a4bebc5c7b204bbbb5b7c66 SHA512 d47523ea2fe32fee832ca19b56a091f52e16b366db1c571f87e5599514b826376d49281e79ff0936dcaf7349f9becbc8ae9b3e9472a9c3e14b62a3f98d541b35
 DIST rocr-runtime-5.3.3.tar.gz 809871 BLAKE2B 1a44e88c34fcebcea3351de812f2ac64a7b151303c5bfc4066920755c185731388afff89c705afee6010d262f68358a20b1c0197e8f23c22ab24409eb55fde0a SHA512 27efe57954575549703b31c4a632548bf3d82df0f01d5f15485d0bda7efa6ec2ad0a4a8710b8f240ff57296eb62d3796926e32d16dfe448b188d8264fde0ef8b
 DIST rocr-runtime-5.4.3.tar.gz 811062 BLAKE2B 4ee8ef49cdac7f6918db3aa96089852847d093aacc11ed7e7157a6eb512cf36a3d37396670c14ea24b16b1127c4547977390694d05bc6006ac48b40e707d6dae SHA512 29f13a1b16ef457071cc050227d57cda92992f416ebc074f8cd5a856d9bd76fd34ab2ccb53c21c3d798165282d44bba287ef44a9d1da327ee198e1facc77a4db
 DIST rocr-runtime-5.5.1.tar.gz 816175 BLAKE2B e588d98cbd0d9a753b950ba676d6cddeed8cd094f346b2f67a761ac2d760ba28e27d5baceecf13fff53c114bb8412c8a4d892886c304d36181d5b0b020b8088a SHA512 1cae2ae4f30a248fa27622ed8b77ce112b80aed9bc1b8fc4372143d4ef241f47295a77f9e978be1332f48c06a7cbcdfd478dbc8464028cb761480049ab2413fb
 DIST rocr-runtime-5.7.1.tar.gz 832009 BLAKE2B 67e4a64ee03b1f6edc43923c7ac44113ab58f78b032dc0a01952b2dd5b2ca37404044811effb9c8d83002ac4ea344a5d95ac62f3c66012bff2884ef55285cdb5 SHA512 a6547a104303032244d17b662a3eda48039732c215debb6178c0af8842c01c60f80989793420c101bd554e58332d215205da0c228dfc25538c56499f47dc6832
-DIST rocr-runtime-6.0.0.tar.gz 851206 BLAKE2B f45f72719e4146fc5c6755b34625de60900a84a7f97fc559d641409edbbda73132c9cf784d59c4ccfdc3f0a1902e379db68d565f92420a8128a04483c50831dd SHA512 18d79436a93b9f57ffa0d4db670e0f2b05c5b9826c9323c7c2f8c856f650a10e5c4b7f6e55e2750156f3859a289617ac40128cfb6fe25de918ee5d8e4b6a8095
-EBUILD rocr-runtime-5.1.3-r1.ebuild 1489 BLAKE2B bddcaa60234f530822d4f96ea90c4c178f91af3933c70fad0269287ba97d0a6243626dd88e2d31c62ac3dda7e6bc8abaf50836357d2d512befbbd0a0f2aaf112 SHA512 7a84de93ae70e158d7bb09318c38cc5e4251f5831ab07f0f022b35de87d2140e03f5ce8decc5aa80e67a0c436131753577aa52d1d7c62f0e419e3307e45b63e9
-EBUILD rocr-runtime-5.3.3-r1.ebuild 1305 BLAKE2B c0da341c96374676aeca634dfca42bbacb095b9dede470e5afec2f50f8b4889c09dca7ffed0d4ca6b99540cc306a1b97277fae53414dbb4861c5dd4b99e6b8c1 SHA512 b9e9874db0b956d9a987daf5c26aed6a283b2dd6b26998cc5e24488c223f61e9d73e35a5aa06a5f35e28ab48bfc4e7c1674175a90b29d98d7f1413f7e5d34a1d
-EBUILD rocr-runtime-5.4.3-r1.ebuild 1516 BLAKE2B e979a0fe77e9c811e7c24e1b357b3544e4439dcdda4c0b4e1817f2d628225a98ce6dd92f00b3b450169fe46f8e8c2d234c075d3a2134e1b78972a396c332eb40 SHA512 3b798668c823764eb2755ef934c36270f9f0a6d0403a2a81962280716ef02892d07c48e306b117ec8c15cf43f92ac998af2fa9deb30390360efefa30c2810128
-EBUILD rocr-runtime-5.5.1.ebuild 1305 BLAKE2B 53721d8a44f2325720ed0f096329a43f54128237ce9d6e1fed5bb2a14f64254d94cbea9f53539874f3b1b2360c8aa70187138eecff0d77f1a36f5fa884615225 SHA512 fc2317d2a91429d53cd1ecca30e455938850a512350538e8f4fbf8fecd7cb45055c82b65f7f62115040185e3689da83b36182b23f2096bea663cd23de525b270
-EBUILD rocr-runtime-5.7.1-r2.ebuild 1566 BLAKE2B b19f33db23b17d8719535781ebb933774b041bc79b13dc3c25c4f7f51c1ed159ba86d11c38c4ddbabeaa0b4020836354625b59d067cb914d8d64fc4d7844813b SHA512 8c9da7d2551cc54b6f5f12b53ed79d05076f99a0ad38a2ad5c07401b6894ca5a5fbb582d81a55498ab8527baa48b3bdab48628fef30ca977e690c2a00f25379d
-EBUILD rocr-runtime-6.0.0-r1.ebuild 1502 BLAKE2B 7d6bf1797f9b65251fc83789530b0e79875fc7f36e787c07c7b1f7d531821ced17eca651e8b98d55759411fc1b851a8506022cbcd5ba2664e865e7464f05a1f5 SHA512 d3b8b6b5dbcc8c86e145d1e8644d636e3d7263ec5546fdc0dd220c5883dbf17582bbdb8e405baf7ba8de52de0210a92f443c813ff10e8dda0d59b9b820b768ee
-MISC metadata.xml 515 BLAKE2B ccb566413bfb5e7027d1596b040f6c957dc8d58fc413859c4a08fbd484ab16d536948bcf24cdd1edd5bdc8a4951b5abe6adbb3da6fde37e5a9ba1bdcfd312827 SHA512 6d0f0ab69b8f04a9106d71003f17c00e693b42c03aa5c430ebb03f7ffb3ecb8f4b10128fd22462692b97870c23e85aa3f037433fa65c55a342d64038f0db5a93
+DIST rocr-runtime-6.1.1.tar.gz 903611 BLAKE2B 175e7267bfd9d70fb805135e765004cf2b43b2d66354f0cef857d417c8dac4ce7638ec1b90a1088324aa5f90ed8354c66b56846115368d68d622a215350d84dd SHA512 5e6e28dee29ef9df9d617f56038b2e52022738d5510833cd8e1738defe1049d0a957db4d9f63bbf55d8efca3a4ea349b95919dd1b6b35b9814ebba575a67af57
+EBUILD rocr-runtime-5.1.3-r1.ebuild 1522 BLAKE2B 2c1cada684235b8df5607ed5b231893ee8dea67c17b9c09d621a1da5c0f6109c025c7269aefedfcb645c978d8e875747b515e009f2c1a11942baa25ac5477fa5 SHA512 975e107ce7a8f3ce69bbc1e62758b8bed1fb985e83ec3513d0487b39062f11cc2cdcd3303e19ed8bce079b3eea24d05ac6dc7bc9761e304ecd8d5eca1a4d5149
+EBUILD rocr-runtime-5.3.3-r1.ebuild 1338 BLAKE2B ea4f2e9ec203d60464f9e54333f65f966cb3e60a9b075d94b68d28d6dec85935d6af65021ce33091f56d474d677509b34e90fa8f8eae0b7e6f590eb9c8155f87 SHA512 33317cb38c39421d1974c38b70c9b58c89dd602f4ed7a80585e2df08cad93cca7b9911bfd7207eabf995a52ebb9b647ee0c9d9f423eb8da4b09e5dd02c754039
+EBUILD rocr-runtime-5.4.3-r1.ebuild 1549 BLAKE2B 331d55c9204f77774d8bee7ea056367273ba3e3867b0ff8b0eb305dd2915d217c92d4d0183dca2df1848df15bd629542a9b893ffecee045ce8222dc141d7b962 SHA512 778832bcce9185113430aa17254245f193f1689c786f3cd0268104ea09b0b743722524750292f9c61ada4813e816039bddb92971598f02d361748bd5a270030f
+EBUILD rocr-runtime-5.5.1.ebuild 1338 BLAKE2B a65351876e310dd37f23b266836da7673659949d8c820c8d984b25d78d056aee519ac33bd6845dc47dd5bf53d95159086cb356d9d87f8b9f87c5b638c8939572 SHA512 f9087802ec8154d8f741c90a7fe554996531d721b140daaddc7708a533b8a3f3e23bd44edba8c81079e5981017a610442ef367444dbaebf7a522230675c023cf
+EBUILD rocr-runtime-5.7.1-r3.ebuild 1599 BLAKE2B 888ada488412b30170e5c00bf923ffd8bf6645819a323018bd7774b812ec4cee8b594fd9fdd8ff5b0e71cfd7c90ce9fa8e59fd5ab509c5115f1a0dc7cf5caa63 SHA512 5264f4a2759114e385d02199c47eb0c6d394f49cd51360a2ce5e9c69b98a22846771936f2b776acf50d9ece8c2464e75d8c2bed8587a172471427040caed7bf1
+EBUILD rocr-runtime-6.1.1.ebuild 1533 BLAKE2B 9ac67c36b8972c18566f3f891dd65f82627742597e8413d10c050a6a7516c99868a96a51138a039493f358db38d62c974661ec07b9e9acd45ce0e50b37f21eb3 SHA512 d35642542d43cb8f626ef318fde7b915f7cc60e43250fb96dd3b07557496f14e066586539a53ff4c9ec1bb85215b0ad4ae9f6eb5eead1f7ed384daddb0a17a92
+MISC metadata.xml 623 BLAKE2B bc808d06e4dd8c715a0abde57dba1fa02d563bed034e9cd4a8f50d78ed478ec1545aa0b42f6521ffa5c1ea57d456984c51af0cab39055201c4c04a4b46acc100 SHA512 d83b1e22d012536236067ac241b4b94f479e0adcd14a9e5647571f0550352e8d348965103183d51576e11414bb85714ded4222bfbb2a6464841b45e7644e8c2b
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-extend-isa-compatibility-check.patch b/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-extend-isa-compatibility-check.patch
index b12352e40c92..f0106abd6652 100644
--- a/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-extend-isa-compatibility-check.patch
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-extend-isa-compatibility-check.patch
@@ -45,7 +45,7 @@ https://salsa.debian.org/rocm-team/rocr-runtime/-/blob/master/debian/patches/000
 +        }
 +      } else if (code_object_isa.GetMajorVersion() == 10) {
 +        if (code_object_isa.GetMinorVersion() == 1) {
-+          const std::array<int32_t, 2> gfx1010_equivalent = { 0, 2 };
++          const std::array<int32_t, 1> gfx1010_equivalent = { 0 };
 +          const std::array<int32_t, 4> gfx1010_superset = { 0, 1, 2, 3 };
 +          if (Contains(gfx1010_equivalent, code_object_isa.GetStepping()) &&
 +              Contains(gfx1010_superset, agent_isa.GetStepping())) {
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch b/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch
index 0e8e53209738..13d731adb3a2 100644
--- a/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch
@@ -23,6 +23,17 @@ Bug: https://github.com/ROCm/ROCR-Runtime/issues/181
  }
  
  hsa_signal_value_t BusyWaitSignal::LoadRelaxed() {
+--- a/core/runtime/hsa.cpp
++++ b/core/runtime/hsa.cpp
+@@ -155,7 +155,7 @@ template <class T> struct ValidityError<const T*> {
+ 
+ template <class T>
+ static __forceinline bool IsValid(T* ptr) {
+-  return (ptr == NULL) ? NULL : ptr->IsValid();
++  return (ptr == NULL) ? false : ptr->IsValid();
+ }
+ 
+ namespace AMD {
 --- a/core/util/lnx/os_linux.cpp
 +++ b/core/util/lnx/os_linux.cpp
 @@ -111,9 +111,12 @@ class os_thread {
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-ld-lld.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-ld-lld.patch
new file mode 100644
index 000000000000..fb5d3d341967
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-ld-lld.patch
@@ -0,0 +1,17 @@
+Fix "symbol not defined" when linking with ld.lld >= 17
+https://github.com/ROCm/ROCR-Runtime/issues/204
+--- a/hsacore.so.def
++++ b/hsacore.so.def
+@@ -246,12 +246,6 @@ global:
+ 	hsa_amd_vmem_retain_alloc_handle;
+ 	hsa_amd_vmem_get_alloc_properties_from_handle;
+ 	hsa_amd_agent_set_async_scratch_limit;
+-	hsa_tools_scratch_event_alloc_start;
+-	hsa_tools_scratch_event_alloc_end;
+-	hsa_tools_scratch_event_free_start;
+-	hsa_tools_scratch_event_free_end;
+-	hsa_tools_scratch_event_async_reclaim_start;
+-	hsa_tools_scratch_event_async_reclaim_end;
+ 
+ local:
+     *;
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-musl.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-musl.patch
new file mode 100644
index 000000000000..7554c8c79ec1
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-musl.patch
@@ -0,0 +1,106 @@
+Fix compilation and symbol search with musl.
+
+Bug: https://github.com/ROCm/ROCR-Runtime/issues/181
+--- src.orig/core/inc/checked.h
++++ src/core/inc/checked.h
+@@ -58,7 +58,7 @@ template <uint64_t code, bool multiProce
+   Check(const Check&) { object_ = uintptr_t(this) ^ uintptr_t(code); }
+   Check(Check&&) { object_ = uintptr_t(this) ^ uintptr_t(code); }
+ 
+-  ~Check() { object_ = NULL; }
++  ~Check() { object_ = uintptr_t(NULL); }
+ 
+   const Check& operator=(Check&& rhs) { return *this; }
+   const Check& operator=(const Check& rhs) { return *this; }
+--- src.orig/core/runtime/default_signal.cpp
++++ src/core/runtime/default_signal.cpp
+@@ -57,7 +57,7 @@ int BusyWaitSignal::rtti_id_ = 0;
+ BusyWaitSignal::BusyWaitSignal(SharedSignal* abi_block, bool enableIPC)
+     : Signal(abi_block, enableIPC) {
+   signal_.kind = AMD_SIGNAL_KIND_USER;
+-  signal_.event_mailbox_ptr = NULL;
++  signal_.event_mailbox_ptr = uint64_t(NULL);
+ }
+ 
+ hsa_signal_value_t BusyWaitSignal::LoadRelaxed() {
+--- src.orig/core/util/lnx/os_linux.cpp
++++ src/core/util/lnx/os_linux.cpp
+@@ -130,9 +130,12 @@ class os_thread {
+       }
+     }
+ 
++    int cores = 0;
++    cpu_set_t* cpuset = nullptr;
++
+     if (core::Runtime::runtime_singleton_->flag().override_cpu_affinity()) {
+-      int cores = get_nprocs_conf();
+-      cpu_set_t* cpuset = CPU_ALLOC(cores);
++      cores = get_nprocs_conf();
++      cpuset = CPU_ALLOC(cores);
+       if (cpuset == nullptr) {
+         fprintf(stderr, "CPU_ALLOC failed: %s\n", strerror(errno));
+         return;
+@@ -642,11 +645,13 @@ SharedMutex CreateSharedMutex() {
+     fprintf(stderr, "rw lock attribute init failed: %s\n", strerror(err));
+     return nullptr;
+   }
++#if defined(__GLIBC__)
+   err = pthread_rwlockattr_setkind_np(&attrib, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+   if (err != 0) {
+     fprintf(stderr, "Set rw lock attribute failure: %s\n", strerror(err));
+     return nullptr;
+   }
++#endif
+ 
+   pthread_rwlock_t* lock = new pthread_rwlock_t;
+   err = pthread_rwlock_init(lock, &attrib);
+--- src.orig/core/util/utils.h
++++ src/core/util/utils.h
+@@ -74,7 +74,7 @@ static __forceinline void* _aligned_mall
+   return aligned_alloc(alignment, size);
+ #else
+   void *mem = NULL;
+-  if (NULL != posix_memalign(&mem, alignment, size))
++  if (0 != posix_memalign(&mem, alignment, size))
+     return NULL;
+   return mem;
+ #endif
+--- src.orig/image/util.h
++++ src/image/util.h
+@@ -99,7 +99,7 @@ static __forceinline void* _aligned_mall
+   return aligned_alloc(alignment, size);
+ #else
+   void* mem = NULL;
+-  if (NULL != posix_memalign(&mem, alignment, size)) return NULL;
++  if (0 != posix_memalign(&mem, alignment, size)) return NULL;
+   return mem;
+ #endif
+ }
+--- src.orig/core/util/lnx/os_linux.cpp
++++ src/core/util/lnx/os_linux.cpp
+@@ -65,6 +65,16 @@
+ #include <cpuid.h>
+ #endif
+ 
++/*
++ * d_un.d_ptr is relative on non glibc systems
++ * elf(5) documents it this way, glibc diverts from this documentation
++ */
++#ifdef __GLIBC__
++#define ABS_ADDR(base, ptr) (ptr)
++#else
++#define ABS_ADDR(base, ptr) ((base) + (ptr))
++#endif
++
+ namespace rocr {
+ namespace os {
+ 
+@@ -299,7 +309,7 @@ static int callback(struct dl_phdr_info* info, size_t size, void* data) {
+         for (int j = 0;; j++) {
+           if (dyn_section[j].d_tag == DT_NULL) break;
+ 
+-          if (dyn_section[j].d_tag == DT_STRTAB) strings = (char*)(dyn_section[j].d_un.d_ptr);
++          if (dyn_section[j].d_tag == DT_STRTAB) strings = (char*)ABS_ADDR(info->dlpi_addr, dyn_section[j].d_un.d_ptr);
+ 
+           if (dyn_section[j].d_tag == DT_STRSZ) limit = dyn_section[j].d_un.d_val;
+         }
diff --git a/dev-libs/rocr-runtime/metadata.xml b/dev-libs/rocr-runtime/metadata.xml
index 0e418bcc9837..5f0e6d6b486e 100644
--- a/dev-libs/rocr-runtime/metadata.xml
+++ b/dev-libs/rocr-runtime/metadata.xml
@@ -9,7 +9,11 @@
         <email>gentoo@holzke.net</email>
         <name>Wilfried Holzke</name>
     </maintainer>
+    <maintainer type="person">
+      <email>lockalsash@gmail.com</email>
+      <name>Sv. Lockal</name>
+    </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/ROCR-Runtime</remote-id>
+        <remote-id type="github">ROCm/ROCR-Runtime</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.1.3-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.1.3-r1.ebuild
index e7a6b4f59310..c6ead573fcf6 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-5.1.3-r1.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-5.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,6 +32,7 @@ RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
+	<=dev-libs/rocm-device-libs-6.0
 	sys-devel/clang
 	sys-devel/lld"
 BDEPEND="app-editors/vim-core"
diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild
index 2f9c72c2c2f0..50f9fd7ddbc1 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild
@@ -32,6 +32,7 @@ RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
+	<=dev-libs/rocm-device-libs-6.0
 	sys-devel/clang
 	sys-devel/lld"
 BDEPEND="app-editors/vim-core"
diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild
index 5ee12fb5d5ba..7e8bc2bfae70 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild
@@ -32,6 +32,7 @@ RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
+	<=dev-libs/rocm-device-libs-6.0
 	sys-devel/clang
 	sys-devel/lld"
 BDEPEND="app-editors/vim-core"
diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild
index 36f37da462ab..2ba50c9ad4d9 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild
@@ -32,6 +32,7 @@ RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
+	<=dev-libs/rocm-device-libs-6.0
 	sys-devel/clang
 	sys-devel/lld"
 BDEPEND="app-editors/vim-core"
diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r3.ebuild
index b22b60ffa24f..57ea514d66ad 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r3.ebuild
@@ -34,6 +34,7 @@ COMMON_DEPEND="dev-libs/elfutils
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
+	<=dev-libs/rocm-device-libs-6.0
 	sys-devel/clang:${LLVM_MAX_SLOT}=
 	sys-devel/lld:${LLVM_MAX_SLOT}="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-6.1.1.ebuild
index 374dcec97554..06778711004a 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-6.1.1.ebuild
@@ -3,25 +3,27 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic llvm
+LLVM_COMPAT=( 18 )
 
-LLVM_MAX_SLOT=17
+inherit cmake flag-o-matic llvm-r1
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+	EGIT_REPO_URI="https://github.com/ROCm/ROCR-Runtime/"
 	inherit git-r3
 	S="${WORKDIR}/${P}/src"
 else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/ROCm/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
 	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+HOMEPAGE="https://github.com/ROCm/ROCR-Runtime"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch"
-	"${FILESDIR}/${PN}-5.7.1-musl.patch"
+	"${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
+	"${FILESDIR}/${PN}-6.1.0-musl.patch"
+	"${FILESDIR}/${PN}-6.1.0-ld-lld.patch"
 )
 
 LICENSE="MIT"
@@ -33,8 +35,11 @@ COMMON_DEPEND="dev-libs/elfutils
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
-	sys-devel/clang:${LLVM_MAX_SLOT}=
-	sys-devel/lld:${LLVM_MAX_SLOT}="
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/lld:${LLVM_SLOT}=
+	')
+"
 RDEPEND="${DEPEND}"
 BDEPEND="app-editors/vim-core"
 	# vim-core is needed for "xxd"
@@ -53,6 +58,5 @@ src_configure() {
 	filter-lto
 
 	use debug || append-cxxflags "-DNDEBUG"
-	local mycmakeargs=( -DINCLUDE_PATH_COMPATIBILITY=OFF )
 	cmake_src_configure
 }
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 997768492e70..bd29fcff0219 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,16 +1,19 @@
+AUX kfdtest-6.1.0-libpath.patch 431 BLAKE2B ba078dda302bddc7431ce8016271d895e0104f3779681ec2d89756f2b43679a7085bd9477868283b127ebed8a40dcf406f8c2a70369e470ebd52d6affd9a3e9f SHA512 b86538013763552963b7667657a3b2d0c946d5b989bf73523308c191b48902deda6c7a097dbc53851e979fcd72e150dc38ded0ed9c1e22f16e1466becb456217
+AUX kfdtest-6.1.0-linklibLLVM.patch 1087 BLAKE2B d0d8bea523995a1bd82f813e09958875806eabba78c54daf299df9cc129fd043377241896ce5e829676c6ba2fe3055b0eebb76478b6c9c80d8f76ebfb745159b SHA512 3c5ed615c2e3a6abc45fb931f25596d6d5d83de096f1057f24cdac2d7efbbfea58d369eb0b1eefa93fa67efb46600d8df20be4924efac3a73cd8fcec1cbcd491
+AUX kfdtest-6.1.0-skipIPCtest.patch 955 BLAKE2B af2c2f59acf24415746bf6d4179589b7c2e3e4c6292fccd2b2ebd9400f76543da8cc6d963a5e0fb62c407710d9c39fcd8f5a7d086eeb57a3c34ce8048a1e3bbe SHA512 286b0226a2e75de5a2d882c85bd9a4e5014683a5a95c11a9ee9d06f075af1ce15b276e570d2bd02e3ba9a572ae8f8bbea2fbeda9804312218cc2f34ccb636b58
 AUX roct-thunk-interface-5.7.0-functions.patch 335 BLAKE2B 590ee1b8f412836c9fae0e10d7acd91842f6dd9aa87dd40a7a8ea48596dc2a1aabf2dea69cc2924fa0b4467d8238bde42c58ac95415fc0324133ea4389f413a8 SHA512 a1961fb2d0636bdb1720abdf433ef4d0f5f69f48784efc45ed77dc8cdd7bc2433dc9aaec0ef9105db12e4d6a8a57d50ee1ffa7b0d42990be1d88ff668f7b15ba
 AUX roct-thunk-interface-5.7.1-musl.patch 1878 BLAKE2B c2103b5b8d76e3a637b79bb701308d7c1b2f6def76206e5a1e3841c12e92bec19a6e9a596238709ee4413072530dd984f7910be6bfc394622b34a93ad5cf1c9e SHA512 b5da199e15eb01a087bbc3600a7df5971029594a778ebfc71185320a662f0681a65fd55ad71ba3089e6a72745dfa1de5f637cb96fe8ab3510869e9fb272f5819
-AUX roct-thunk-interface-6.0.0-functions.patch 309 BLAKE2B 98644ddc99416d99da0c671e4b70607cb360831fd0f2a64f38e6f2f2c008d9c6b2fa24a1ac525cbbbdffabf918eaf84ce0c10db7a383e05ac30f6e999c6913f4 SHA512 136b42cac9dfb209594b6b88c4abd501e98d48dca1bd573443e414ab7098cfcac3789cecb3b625e8ed91d0d15fe1ef13668bf4da9f89d808838de9d348eba99f
+AUX roct-thunk-interface-6.1.0-visibility.patch 868 BLAKE2B d32fcc6a230af549b73db30183fcb2339fcd3bc68dfbf1f7dce0e35361a674f77cba58ef485c3212de43e95c5eabf517386c6b7a289e57ed38b5d6e21e191939 SHA512 6c540e70c53a602477943ff9a26d5eab3d02d8a3c8577b1e39d5baf5a3703de70073e1d0db5083d03460bdd1e2d2fff2cf6356e57d7e392ce4d4dac6bae74900
 DIST roct-thunk-interface-5.1.3.tar.gz 3178689 BLAKE2B c46af7bc60772beaa9a214a86a634290cfd7952589f70736c0c2544c0459eb4fdcc65030d897dbb67bfbaae545f529ac647397df3fcfeddeb5d5e05a283cfd6b SHA512 746a04e667ce242160d6e2519594fc93b205520dae28678859fbd40c3c641082aa6219c04c8e2b58289763a5244dd6336b56c2e2016ba671c5e5a6fb9ca5caea
 DIST roct-thunk-interface-5.3.3.tar.gz 646773 BLAKE2B 48632cad576ceccede0ee62663f226cbedba8374d8962028fd729a7b8e7eb75bebcb2f8ce06a838de15a388caea3d6dcb150db80f8d45a91675997b4f80625e6 SHA512 4a8730d16a0d240a43d5e22092325b0731d133733af0aac6c6893763d1ffb1a04a0c045d988835079581e097fc7c9e383f41ba84daa105c032d3a653b6b2c6b0
 DIST roct-thunk-interface-5.4.3.tar.gz 648897 BLAKE2B 9eefc5f417280a98c7c6b6d611d0d87fa52abca94f67bf5ecc10d84bb86433b5ff502f76aa6724245c7cf9d82b5c16c10943275e8d41f0053484765df5a901db SHA512 1787526515ec708edc398cdba308a8dfa32c2579524a6856a6f336cb7bfee8f9a00d67f1b489993c7454d1d88885032ce85ac752b4a15aaedef910f147aed3b5
 DIST roct-thunk-interface-5.5.1.tar.gz 649617 BLAKE2B 54ecae486e5d8b99363947a93b38bb80f6b129bbacc1b3152d58e44cf093e44254075cdc49f6d0f474a04c5e2a1f3945399a744892ac1e5c1fb3ff38fd02370c SHA512 359ce5c7d8fce1f6100aac236efd24d35ce8098732bf89225e7c07a4731452388b5213eda8767a8d7723afa2041033bbcb287dcb00e88a0df9494acf70f8ebaf
 DIST roct-thunk-interface-5.7.1.tar.gz 665529 BLAKE2B 407601d45976ad66e85999c53bcaa62fefa2ea823e1d3296a9aabe8b6a9c915776344de4499fcf6f9ee80193201308b27b387a7225aca5d2cc7e294143eefacd SHA512 c0dc449c8b713ac543f6cd6c876ea0f160dcb1a5c4a52a2b1364fcae0039e9fe195e4223a2644d7d3a7fbc2a48166e798d15b9088e2097b65974e2ba5e48bdcf
-DIST roct-thunk-interface-6.0.0.tar.gz 665726 BLAKE2B 634165c1dce2d4e2f635688ea54c0eb3dd0cf0a0ae84fbbf22f07f62675ad77daea168b16c73e7b4912a46b8507d414119310f31bf110475e27d4629209067d9 SHA512 136a512273823738a3a85330158099b33084018485c94cb20244d61b5f6932949d32eba1fe77512b0933f0269da2f5bcec4cef5b503dc810140a9c080cf65e0f
+DIST roct-thunk-interface-6.1.1.tar.gz 666377 BLAKE2B b30d733fb769f7169e97b8a28eaa61c84205aec06b55d662d24f159a3c84190f3252f090413769e56eb621abc789fae521cb7b26d7cdac952ff1e4e120707bc9 SHA512 2c579606d2ced9f8b5e32841db745819771b7d6ce0cef90b818e3710470e30c7715540125d99ed5ea13c4e672d5af6d8ad2dd5975ef76cab7ba993d86cf74eb4
 EBUILD roct-thunk-interface-5.1.3.ebuild 1107 BLAKE2B c8d1aad9be55420235043628caa570cfa5f9164c6a3d20c7d90a6cac385ad2c886c44a89f2d9181742f9c284067b0d0b078fb2ea04e44ac9f1a145505f4b9971 SHA512 08bce5619f4e5e163b23928c0088e7f022d0f9f95bfba4b4e237a74ade30a327bf3cf954590f9d788ab7a16dd4f90ff53bd3e87011866af1d68a200bbeeceb7f
 EBUILD roct-thunk-interface-5.3.3.ebuild 1107 BLAKE2B c8d1aad9be55420235043628caa570cfa5f9164c6a3d20c7d90a6cac385ad2c886c44a89f2d9181742f9c284067b0d0b078fb2ea04e44ac9f1a145505f4b9971 SHA512 08bce5619f4e5e163b23928c0088e7f022d0f9f95bfba4b4e237a74ade30a327bf3cf954590f9d788ab7a16dd4f90ff53bd3e87011866af1d68a200bbeeceb7f
 EBUILD roct-thunk-interface-5.4.3.ebuild 1107 BLAKE2B c5523fd9ba5475faf5b8bb4ea35a100f4049a8b008c3dec048e03b8e14b394f28b8b5515f7b93c94774c75304e2df7ef745e9538eae5309c6faa569748d32551 SHA512 dfc0e032b61667c9171900f36bc7f18df0e67635e8988d91a8041c298053d9c977adf123af2326e7986bbe00f45ea3ec3e3630ff0993279cfd7becbb5492fc36
 EBUILD roct-thunk-interface-5.5.1.ebuild 1055 BLAKE2B a2341ff457f5ee2754ee8cb63a68b90ee67074946d39ab064fa8838b8fa5d0239f330b2751d233c3038b3988a40486d9df7715df0fd26a6677c5789982679c1f SHA512 49819d214fde8e77f8ca051d9dc44af03472a17e0509aa92812a416bff9008577d3a5bbf96fed12315ce3bd1655641f71ac721d2440b7031927e883475c648fe
 EBUILD roct-thunk-interface-5.7.1-r1.ebuild 1149 BLAKE2B 31bacc1a1123eac6afe14c9dacf150cf64c8ac85b46e7f4ad386b9e3d8b06b6a2264210f021123218c42c74c87a849f34327baeb648ffd5269276f31302a7151 SHA512 f58abcb15dcbf13d0ef5c148430e2de70345831ad693fa2c2fca2e586e5625a8252c6a57f9ec0d2a75c4f92ba7267acffd985cbc91d8ba157a3e13a952fecf76
-EBUILD roct-thunk-interface-6.0.0-r1.ebuild 1149 BLAKE2B 6b2697ae965530cee6d036a370376ded734acadf93970bb4ef6636cbb0245b122e5153a462496395fad1d41daf1e4901c5c21b5464824e81a249997ab61a79e2 SHA512 249cc0a47b0cd2c59c5c2e4e946973154b18aaf9d9c2ac4c68dcd08b4b289080e52baaa2290f60c5ae29dbf3f4256f56e4b35a3f267514e06403914b994a97e9
-MISC metadata.xml 674 BLAKE2B ceb6cc04ddd9f957a765c89bfe83de382412c5d04bce87e3fa9c0fdfe72fa2d24e597aa47287488463fa34d85a91556d2b7ea073b19c341a48045c9e7f51f9f3 SHA512 8cb0feb4d6ea9d3de4a45a9be0de498b5ebb36a779af03e58f5c04593082e5bd618614c1daf2707f3bb1de019bf88292605669e2be48d9bede6e708c39aae7e2
+EBUILD roct-thunk-interface-6.1.1.ebuild 1865 BLAKE2B dea59c6a6f34bded83edffaebdbea338857050ec782c87a29e0bcab40a20782f383f029b782776ab4f8e11c8e56e6d41a62ef88485be281cc442239d7af2abef SHA512 bc61c903a352b5ea1a5f453fe0aa37361e028af2b277bce9a300a52dbd34aa3dd26ae9a9286acf4e569a4175ebdccaf98cf215a20ae9a039e1343a7cf81d8a84
+MISC metadata.xml 661 BLAKE2B c019c853506c550339b18a7f1ab57fd5f2876309823bab923ef07f7f997d820c2664ae5c0c1d2e29c2ccdf613f96cdaf85d92a3734aeb105c392847aed73c76b SHA512 194cdad18f2be9fb4d895ff75b4ce9c6a59443caad443061ea70a8cc4778ec13ca35273c8018ac1d00c7ecd146302ee4bf856ad653a174a1ad281d235b6e12e9
diff --git a/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-libpath.patch b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-libpath.patch
new file mode 100644
index 000000000000..1d7d73ad7a8a
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-libpath.patch
@@ -0,0 +1,13 @@
+The built hsakmt library is right under BUILD_DIR, not BUILD_DIR/lib
+===================================================================
+--- a/tests/kfdtest/CMakeLists.txt
++++ b./tests/kfdtest/CMakeLists.txt
+@@ -117,7 +117,7 @@ else()
+ endif()
+ 
+ if( DEFINED LIBHSAKMT_PATH )
+-    set ( HSAKMT_LIBRARY_DIRS ${LIBHSAKMT_PATH}/lib )
++    set ( HSAKMT_LIBRARY_DIRS ${LIBHSAKMT_PATH}/ )
+     set ( HSAKMT_LIBRARIES hsakmt )
+ endif()
+ 
diff --git a/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-linklibLLVM.patch b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-linklibLLVM.patch
new file mode 100644
index 000000000000..61d8b99bf335
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-linklibLLVM.patch
@@ -0,0 +1,31 @@
+https://github.com/ROCm/ROCT-Thunk-Interface/pull/102
+From 6d7d48bb6843405aac2777388edf4c7c2a6f9dc3 Mon Sep 17 00:00:00 2001
+From: Yiyang Wu <xgreenlandforwyy@gmail.com>
+Date: Tue, 30 Apr 2024 13:35:08 +0800
+Subject: [PATCH] Allow linking libLLVM dynamic library rather than separate
+ components
+
+---
+ tests/kfdtest/CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/kfdtest/CMakeLists.txt b/tests/kfdtest/CMakeLists.txt
+index 9d1172e..ccad7f4 100644
+--- a/tests/kfdtest/CMakeLists.txt
++++ b/tests/kfdtest/CMakeLists.txt
+@@ -154,7 +154,11 @@ include_directories(${LLVM_INCLUDE_DIRS})
+ separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS})
+ add_definitions(${LLVM_DEFINITIONS_LIST})
+ 
+-llvm_map_components_to_libnames(llvm_libs AMDGPUAsmParser Core Support)
++if (LLVM_LINK_LLVM_DYLIB)
++  set(llvm_libs LLVM)
++else()
++  llvm_map_components_to_libnames(llvm_libs AMDGPUAsmParser Core Support)
++endif()
+ 
+ include_directories(${PROJECT_SOURCE_DIR}/gtest-1.6.0)
+ include_directories(${PROJECT_SOURCE_DIR}/include)
+-- 
+2.44.0
+
diff --git a/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-skipIPCtest.patch b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-skipIPCtest.patch
new file mode 100644
index 000000000000..cca728dad601
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-skipIPCtest.patch
@@ -0,0 +1,20 @@
+Issue: https://github.com/ROCm/ROCT-Thunk-Interface/issues/103
+===================================================================
+--- ROCT-Thunk-Interface-rocm-6.1.1.orig/tests/kfdtest/scripts/kfdtest.exclude
++++ ROCT-Thunk-Interface-rocm-6.1.1/tests/kfdtest/scripts/kfdtest.exclude
+@@ -63,6 +63,7 @@ PERMANENT_BLACKLIST_ALL_ASICS=\
+ # failures can be found
+ # NOTE: If you update this alphabetical listing, add the corresponding JIRA ticket for reference
+ #
++# KFDIPCTest.BasicTest are not compatible with upstream amdgpu kernel module
+ # KFDQMTest.GPUDoorbellWrite fails intermittently (KFD-318)
+ # KFDQMTest.mGPUShareBO (KFD-334)
+ # KFDHWSTest.* (SWDEV-193035)
+@@ -72,6 +73,7 @@ PERMANENT_BLACKLIST_ALL_ASICS=\
+ # KFDDBGTest.SuspendQueues (SWDEV-417850)
+ # KFDDBGTest.HitAddressWatch (SWDEV-420281)
+ TEMPORARY_BLACKLIST_ALL_ASICS=\
++"KFDIPCTest.BasicTest:"\
+ "KFDQMTest.GPUDoorbellWrite:"\
+ "KFDQMTest.mGPUShareBO:"\
+ "KFDQMTest.SdmaEventInterrupt:"\
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.0.0-functions.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.0.0-functions.patch
deleted file mode 100644
index cbea737c4b4c..000000000000
--- a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.0.0-functions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/libhsakmt.ver b/src/libhsakmt.ver
-index 15c2916..c04cefe 100644
---- a/src/libhsakmt.ver
-+++ b/src/libhsakmt.ver
-@@ -81,6 +81,7 @@ hsaKmtWaitOnEvent_Ext;
- hsaKmtWaitOnMultipleEvents_Ext;
- hsaKmtReplaceAsanHeaderPage;
- hsaKmtReturnAsanHeaderPage;
-+hsaKmtGetAMDGPUDeviceHandle;
- 
- local: *;
- };
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.1.0-visibility.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.1.0-visibility.patch
new file mode 100644
index 000000000000..d907d2f13e41
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.1.0-visibility.patch
@@ -0,0 +1,26 @@
+https://github.com/ROCm/ROCT-Thunk-Interface/pull/102
+From 8385d8795b994f31e00e651dc4f41e18d82ff968 Mon Sep 17 00:00:00 2001
+From: Yiyang Wu <xgreenlandforwyy@gmail.com>
+Date: Tue, 30 Apr 2024 15:07:12 +0800
+Subject: [PATCH] hsaKmtCheckRuntimeDebugSupport should be visible for kfdtest
+
+---
+ src/debug.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/debug.c b/src/debug.c
+index 932e829..67c32c8 100644
+--- a/src/debug.c
++++ b/src/debug.c
+@@ -268,7 +268,7 @@ HSAKMT_STATUS HSAKMTAPI hsaKmtDbgAddressWatch(HSAuint32 NodeId,
+ #define HSA_RUNTIME_ENABLE_MAX_MAJOR   1
+ #define HSA_RUNTIME_ENABLE_MIN_MINOR   13
+ 
+-HSAKMT_STATUS hsaKmtCheckRuntimeDebugSupport(void) {
++HSAKMT_STATUS HSAKMTAPI hsaKmtCheckRuntimeDebugSupport(void) {
+ 	HsaNodeProperties node = {0};
+ 	HsaSystemProperties props = {0};
+ 	HsaVersionInfo versionInfo = {0};
+-- 
+2.44.0
+
diff --git a/dev-libs/roct-thunk-interface/metadata.xml b/dev-libs/roct-thunk-interface/metadata.xml
index 9af2c0cba14b..67fd1c7363cb 100644
--- a/dev-libs/roct-thunk-interface/metadata.xml
+++ b/dev-libs/roct-thunk-interface/metadata.xml
@@ -14,6 +14,6 @@
         <name>Proxy Maintainers</name>
     </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/ROCT-Thunk-Interface</remote-id>
+        <remote-id type="github">ROCm/ROCT-Thunk-Interface</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.0.0-r1.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.0.0-r1.ebuild
deleted file mode 100644
index eb0384989522..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.0.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl"
-DEPEND="${RDEPEND}"
-BDEPEND="x11-libs/libdrm[video_cards_amdgpu]"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0.0-functions.patch"
-	"${FILESDIR}/${PN}-5.7.1-musl.patch"
-)
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.1.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.1.ebuild
new file mode 100644
index 000000000000..8f599ac5ce48
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_SKIP_GLOBALS=1
+inherit cmake linux-info rocm
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/ROCT-Thunk-Interface/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ROCm/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/ROCm/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+	x11-libs/libdrm[video_cards_amdgpu]"
+DEPEND="${RDEPEND}
+	test? ( sys-devel/llvm
+	dev-cpp/gtest )"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-musl.patch"
+	"${FILESDIR}/${PN}-6.1.0-visibility.patch"
+	"${FILESDIR}/kfdtest-6.1.0-linklibLLVM.patch"
+	"${FILESDIR}/kfdtest-6.1.0-libpath.patch"
+	"${FILESDIR}/kfdtest-6.1.0-skipIPCtest.patch"
+)
+
+test_wrapper() {
+	local S="$1"
+	shift 1
+	local CMAKE_USE_DIR="${S}"
+	local BUILD_DIR="${S}_build"
+	cd "${S}" || die
+	$@
+}
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+
+	if use test; then
+		export LIBHSAKMT_PATH="${BUILD_DIR}"
+		test_wrapper "${S}/tests/kfdtest" cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+	if use test; then
+		LIBRARY_PATH="${BUILD_DIR}" test_wrapper "${S}/tests/kfdtest" cmake_src_compile
+	fi
+}
+
+src_test() {
+	check_amdgpu
+	TESTDIR="${S}/tests/kfdtest_build/"
+	cd "${TESTDIR}" || die
+	PATH="${PATH}:${TESTDIR}" ./run_kfdtest.sh
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index e8498268c87b..83137560cd86 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -10,7 +10,7 @@ DIST simdjson-3.9.3.gh.tar.gz 2643869 BLAKE2B f2e0f8d13a234c7ee639a57333b66a4643
 DIST simdjson-3.9.4.gh.tar.gz 2646588 BLAKE2B c0f0e5d6af2342d338ea7fbe033af2715e4317cd81818fca9dfcc04cb25ffe1eb08683f04d43162305d317178b14ed5f78e8ffa115ed02c7af41b8646c4eae76 SHA512 6fa940ad60b7560d1865806195428ae17f0daf19de803bdb7bd93b0704490994ec3cddc09c9d91f2e70036c6cb34153cdc5c998e7ebee2e4504f6a23944e25c1
 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 EBUILD simdjson-3.6.3.ebuild 2332 BLAKE2B cfb050fa5fe9a2b74827ef1a9efe5405adb332236b293f021b9a0f85da76b5b2101ac0d561a1d5651112df08b96630048e9a5f08d5473bcd66e871fd69026f20 SHA512 7abbfc31053a3f54a0fe59db9d94572567408c3425a7cea0d9c22b6da78dc4112d63ff5d7f188b8b52605aa9cb5f89ccb7c0367f9235c77e9cc5c1615404d704
-EBUILD simdjson-3.9.1.ebuild 2385 BLAKE2B f9be2e9c133672fbf90a45604999b4252b727b25fa6621766670b8ecf5e506b94f387b89c713099603d1ac9ad00697240cc92c824f0d7f6a41a9033541804a79 SHA512 86f6968c66f014facdbf3897f963b8ecf3c975403c66d797d5a1d83881f2b489c135336654ec0e153ec3820939c7a460789bc93d7e91995171315d0e5adc45d9
+EBUILD simdjson-3.9.1.ebuild 2383 BLAKE2B 37f1d129e44f955d3566d83f9bd2ec4227cc3949dad9bec06459ab0152629b28a73e60607de0b623aabcc01ed563226db995b7704070be9f2f0ef8af8f01fdf3 SHA512 6b23fb1013dd34c6e6314f53710a1f12abe1bd7869d628e8080490f1b31a40aed78cafd03102c21e87da5762ebc918d0c13f351dc73427e7d34977ae28e13b74
 EBUILD simdjson-3.9.3.ebuild 2386 BLAKE2B b72abcecbd25a448b0e11dda74dde6a698d23bf3f5ee00ca494f1d335706199eaea0522934d59eb1b0c36c372d44100defe689d0600b506dc2944d46a912fca9 SHA512 564dfc942f35b143da0077ea107119ebbb7ccb68ebd370eb0e8173da54dc5aad817c482ddb326ebe242d057f95dd2b58edb1c98f5d24cde3260e1e4a9fcc8f52
 EBUILD simdjson-3.9.4.ebuild 2386 BLAKE2B b72abcecbd25a448b0e11dda74dde6a698d23bf3f5ee00ca494f1d335706199eaea0522934d59eb1b0c36c372d44100defe689d0600b506dc2944d46a912fca9 SHA512 564dfc942f35b143da0077ea107119ebbb7ccb68ebd370eb0e8173da54dc5aad817c482ddb326ebe242d057f95dd2b58edb1c98f5d24cde3260e1e4a9fcc8f52
 MISC metadata.xml 417 BLAKE2B fa60b19f3372b1794fa5d83a0767e1eaed6569bf314cd74bb14baee7aee454c83ae0268cebd46bee877dd46472e735ee23136983f991d63d7ff3d64f0b7bb258 SHA512 a3afde0d4740ffc6e8f26c5d937d141bdec24f59082a89232962e1d75513a51cb050d1b93b439450051f05281f206e06a5052f67037d685a95ee4e28e7ece113
diff --git a/dev-libs/simdjson/simdjson-3.9.1.ebuild b/dev-libs/simdjson/simdjson-3.9.1.ebuild
index 03dcee295b1f..0702c1b700bf 100644
--- a/dev-libs/simdjson/simdjson-3.9.1.ebuild
+++ b/dev-libs/simdjson/simdjson-3.9.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
 SLOT="0/22"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="+all-impls test tools"
 
 BDEPEND="
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index ef092b5ff11c..03b0f3c2d150 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/lablgtk-sourceview/Manifest b/dev-ml/lablgtk-sourceview/Manifest
index 0ba94ce3927d..e970bb365e1a 100644
--- a/dev-ml/lablgtk-sourceview/Manifest
+++ b/dev-ml/lablgtk-sourceview/Manifest
@@ -1,7 +1,9 @@
 DIST lablgtk-3.1.2.tar.gz 1042626 BLAKE2B 355ff285248129a063c041d3e64db33424ddbb71774128d7be980b8bd0b54cfa54b9d50b1c2f8527b8f6563836189ad72d30e4421b22d5938b888e61ada55056 SHA512 c63a492160f36685f65cb6bc0e72ff4939005acb2c65c56c0d9ba8f2112a618f24db84765e7b4416e49024048a36895028cfc5ef2c3e298dd4a309e902e34af5
 DIST lablgtk-3.1.3.tar.gz 1043246 BLAKE2B 639b1a7610ea420cbae893eb40fd0a20a7605ecc89e832387f3137a002fd4989342ca842c1c7e9057454e0b6cfac9099c5788b5ea14fa452bde54bacb18aeac2 SHA512 a14e07145a2844ebb039d7af459e2fac61888c27925ed14e508698f622aeb5ec3b0694f2b87fb7b5383d8979791a3e6fe8425f4bb509effe838d0a09dd9c50b9
+DIST lablgtk-3.1.5.tar.gz 1045721 BLAKE2B 5f677d2ac1a39f23e5c3b66f6239540e369ec6916eb87f980543a7ea6c723b5126882fd4f9673f8a76171d0e83de236b98ae9068956f86a0a37cb836c353b9e5 SHA512 750f57ea2ccb0534123596aca04a4ba12bbf67bafb521a7978e6acc8027b2b3b822d373bf3fabb4018640c5e2d5bc3d5a336e91ceb8ff037b1f7a048440df03a
 DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
 EBUILD lablgtk-sourceview-3.1.1.ebuild 626 BLAKE2B 106126d50a42aee6179df814978205a2d047f9609edd9684d95bacf861049f5471bc84f6b8120aee4c65a9847e304cc04f4c7b00893e9aad91df07ba2f0d7513 SHA512 c5ba2b12209b5163e5699713d87c3bddff04dd0100a4395182801ff5f8053ac83a3ee49488a53f82e9bacc5de97283f8e7e21f99f63546d563f797b94e9cb782
 EBUILD lablgtk-sourceview-3.1.2.ebuild 754 BLAKE2B d93dc5fae2cb9b4c48a61ff7cde40398d61ad08a99146d6706b1c5652aebd20781bd26a1f880fe49dd5b4d340d71968c3f25f89092432bc24f3190a4636624ae SHA512 78d298b8ed7e37d51327c88c63cff7c1efbad471250c8091310987f89c8be25b9abd97ddd38cb2ea728061a2824fdfc111ae4e0f7d81d104afaef3491863799e
 EBUILD lablgtk-sourceview-3.1.3.ebuild 667 BLAKE2B 7a26f1f1693aa1d99c1b7c877e7e63ee8acc98ac011b86feab2eb95a639ba4e2706ba88e3fe22c224bfe46bf0f68cef8eff2b10006657b4c106e19eb1ea74d84 SHA512 8fa2964c5c2d29f984a1f317dcba3b78686ed447df8b3a19fe855ac6312d550b473e20e854260944c3fceb68a699b2debf56ca142d653acbca75aac350abcac4
+EBUILD lablgtk-sourceview-3.1.5.ebuild 646 BLAKE2B 3b9b052dbf72805b27bd8b5d857ca560246a17299e7deec87d4b71cbced0dabe317c6c186b05de814b376ad4cac5142c0423e2f961e951069f823f115f9389cb SHA512 e8c23734e334c5862223a0ec9be36f758553e67cfa726b30a1303f5ae299d4155fe8d4cc22e9d34531ced1c41fea0778d5c2427aa44e6ae4f8988ff8fdccd75a
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.5.ebuild b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.5.ebuild
new file mode 100644
index 000000000000..74dd08f4ef45
--- /dev/null
+++ b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DUNE_PKG_NAME=lablgtk3-sourceview3
+
+inherit dune
+
+DESCRIPTION="OCaml bindings to GTK-3"
+HOMEPAGE="https://github.com/garrigue/lablgtk"
+SRC_URI="https://github.com/garrigue/lablgtk/archive/${PV}.tar.gz
+	-> lablgtk-${PV}.tar.gz"
+S="${WORKDIR}"/lablgtk-${PV}
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="3/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	>=dev-ml/lablgtk-${PV}:3=
+	dev-ml/cairo2:=
+	x11-libs/gtksourceview:3.0=
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	dune-compile ${DUNE_PKG_NAME}
+}
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index facd70f6aef3..4604ebdbc660 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -6,10 +6,12 @@ DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7
 DIST lablgtk-2.18.13.tar.gz 1073083 BLAKE2B d3be54b0194e8b67b66eee9663d121e9007f6eb1d04cf322f83dfc5ddd5c3a27ad6f19204429ea5941d9cfe97ac9583af41ae713de5552b5d11245e4216ad5c1 SHA512 41deafbf8bbb9d15950d74a053e21c65aa0d2d4044a41d048f197e744a82ebbe159d43f67092fa19a8385bf0f7da0250ef2f0a532a0810e88f695d6f1fef4c48
 DIST lablgtk-3.1.2.tar.gz 1042626 BLAKE2B 355ff285248129a063c041d3e64db33424ddbb71774128d7be980b8bd0b54cfa54b9d50b1c2f8527b8f6563836189ad72d30e4421b22d5938b888e61ada55056 SHA512 c63a492160f36685f65cb6bc0e72ff4939005acb2c65c56c0d9ba8f2112a618f24db84765e7b4416e49024048a36895028cfc5ef2c3e298dd4a309e902e34af5
 DIST lablgtk-3.1.3.tar.gz 1043246 BLAKE2B 639b1a7610ea420cbae893eb40fd0a20a7605ecc89e832387f3137a002fd4989342ca842c1c7e9057454e0b6cfac9099c5788b5ea14fa452bde54bacb18aeac2 SHA512 a14e07145a2844ebb039d7af459e2fac61888c27925ed14e508698f622aeb5ec3b0694f2b87fb7b5383d8979791a3e6fe8425f4bb509effe838d0a09dd9c50b9
+DIST lablgtk-3.1.5.tar.gz 1045721 BLAKE2B 5f677d2ac1a39f23e5c3b66f6239540e369ec6916eb87f980543a7ea6c723b5126882fd4f9673f8a76171d0e83de236b98ae9068956f86a0a37cb836c353b9e5 SHA512 750f57ea2ccb0534123596aca04a4ba12bbf67bafb521a7978e6acc8027b2b3b822d373bf3fabb4018640c5e2d5bc3d5a336e91ceb8ff037b1f7a048440df03a
 DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
 EBUILD lablgtk-2.18.10.ebuild 1971 BLAKE2B b3d752ceb332d17afd8eb4bae3d5a68c7308a18c7c21e29a8248aa9acd2bb3886a31974ec21044d84db5e492838c434f323d13db1fe10ea1683d11927acc4022 SHA512 71f35efe0415be4d9b728317b3bcdd47464bec4427a1f96fe66ea31ca343d5d826c3ec7267db25dc01dec52516d70f09e414f420fe8f2255b3af43b5be18965d
 EBUILD lablgtk-2.18.13.ebuild 2066 BLAKE2B 56c886db71ae142260ac25c225280c107e0cd544dfb22c73eed1907cc9626f4d925b335bb17eafaa04d8eb5dbfd9f152d34abd990c04f65aace1314852136e22 SHA512 a21a0e43d2a9d799f5b4c56656cdc5dacf57bd35c4edd90aa17f1b0665e894a64a28a2d05c52b647255fd8eb9fd3be1db203b14116cac849ea1d48c77e54159b
 EBUILD lablgtk-3.1.1.ebuild 703 BLAKE2B 63b744a767e6f1f238434a5e8457c0c01066992d4ced47b839e623b3a9535a15e3285b466a5477a01a17d10a4a0abb135b2d40e202288f89944029c3881e9719 SHA512 cfb13c7b8a4661174c84f6f5966b56bd6ff3c11e18b28149922329d9f8c9eb5ae4d8cc0811bfdf8f53f04b8f66f54118f457d53852bffa755c89e3ffe0612cb0
 EBUILD lablgtk-3.1.2.ebuild 809 BLAKE2B 240985d82a7da9d69c117e6d5c61d3d3e8538bc9de5684d267f5d5983bdac0a335b13e8ff66314ab38dcd94204c93175a9b2f887ac35afa1c8a96f3e8c33e32e SHA512 376d0c3f2026f8b434fd1bf2f2854df478149398680988dcc97ac859702567647ae3769db823f54eeb130de425f2add64cc29255d303460406e8807fea3c762a
 EBUILD lablgtk-3.1.3.ebuild 722 BLAKE2B 7b9681ad60d6266b944276be67594d4a178c691109ab2c6728ffbaa9b92fa1339e05b8baa1fd633ded3c7ad2a9824075dcd865d353f7cb008a9e91bfa7fd4d60 SHA512 35a33886cc5ca9fc15776ce83e7af41d781b34756cd1c35a69cceb0e3d6a87e59eaf79cbfbd2907be2506aaf3f451d6c622728ef298c87dfd0f5aa7bcc7fcd19
+EBUILD lablgtk-3.1.5-r1.ebuild 723 BLAKE2B 5e16a0f76b398ee4fa298779571534311f33849b21cf8fd45403d7e04135305a146a051acd57e53dd217823a7a81becd580e77ef47308faa035036083920aed4 SHA512 91d668d44350863d55c648105136a7a02e44d2de9daa944fb5a0e5b1f911865166484395d8c0c403c645d51203315dc53d2457b6610eae9cff0347742a98d594
 MISC metadata.xml 698 BLAKE2B d5627c5262d040d6166667a9f6bf72406e8a2b07e2195c1238feb274e12c318359d61c4e88fdb0c264b7b97feb8be37f3cb16993d4912ec0d74dee85b3f859d5 SHA512 307ade15dfc4f152bcee4542f05d0b36f76b0e8de48737a77d0629fc08b6be2ba9117db7a990859f1258f3751602e0caccb2aede6366e21369e282de88fc037c
diff --git a/dev-ml/lablgtk/lablgtk-3.1.5-r1.ebuild b/dev-ml/lablgtk/lablgtk-3.1.5-r1.ebuild
new file mode 100644
index 000000000000..17b27b6831ad
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-3.1.5-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DUNE_PKG_NAME=lablgtk3
+
+inherit dune
+
+DESCRIPTION="OCaml bindings to GTK-3"
+HOMEPAGE="https://github.com/garrigue/lablgtk"
+SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="3/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt sourceview"
+
+DEPEND="
+	app-text/gtkspell:3=
+	dev-ml/cairo2:=[ocamlopt?]
+	dev-ml/camlp-streams:=[ocamlopt?]
+	x11-libs/gtk+:3=
+	x11-libs/gtksourceview:3.0=
+"
+RDEPEND="${DEPEND}"
+PDEPEND="sourceview? ( dev-ml/lablgtk-sourceview:${SLOT} )"
+
+src_compile() {
+	dune-compile ${DUNE_PKG_NAME}
+}
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 045c308d2fa5..fd3ee73b5751 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD llvm-ocaml-15.0.7.ebuild 2576 BLAKE2B 19ad7bcc099299b50cee2551d0998ef748cf46081605459355a9d11b5882a3a26559892321f47d67f927a422ed1dc34332f9d9bee82da3e151dc9edec58f458a SHA512 3366ae720bb79421c253c28946c5281152d3573416fb9c7967327bd2d2b418f01887d63e00ccc1d5f5008d1f05280f270fe15be3e8d2b812c782d881778e8417
 EBUILD llvm-ocaml-16.0.6.ebuild 2510 BLAKE2B 129a25c76d02640a151bd2ba8b1542e34bc4b0adb5aac797f96f7f888b8939ae33dcda9eb1f2ec31eae81575ac3e32995b9e99de3540f3fdc8e085b0185200ec SHA512 250285a57be6d7cfbddd4a9ff4ab8bc25e2813441da263bfef1a7a4d11658b6ed9a3d280ada7b1e45c5cb472e6647eff260926672089e7e445a12be6a5344bdb
 EBUILD llvm-ocaml-17.0.6.ebuild 2510 BLAKE2B 129a25c76d02640a151bd2ba8b1542e34bc4b0adb5aac797f96f7f888b8939ae33dcda9eb1f2ec31eae81575ac3e32995b9e99de3540f3fdc8e085b0185200ec SHA512 250285a57be6d7cfbddd4a9ff4ab8bc25e2813441da263bfef1a7a4d11658b6ed9a3d280ada7b1e45c5cb472e6647eff260926672089e7e445a12be6a5344bdb
-EBUILD llvm-ocaml-18.1.7.ebuild 2466 BLAKE2B 7480f9140cbdd2ec337cd08924013f1f9751bc34c3223b3f5be441e4d06d131f74aca0cb0115c71ebacb3909240e42d4608dddf98bb6f69e371d5e86e19141f5 SHA512 b7c05d3be29399eb9fb4267537a450daf00b7d8f6bd2be472e5802d4072e3a805db8d5f4fa2830ec46655170a7f2fc1119825327b2d4008af8364772fc215f65
 EBUILD llvm-ocaml-18.1.8.ebuild 2466 BLAKE2B 7480f9140cbdd2ec337cd08924013f1f9751bc34c3223b3f5be441e4d06d131f74aca0cb0115c71ebacb3909240e42d4608dddf98bb6f69e371d5e86e19141f5 SHA512 b7c05d3be29399eb9fb4267537a450daf00b7d8f6bd2be472e5802d4072e3a805db8d5f4fa2830ec46655170a7f2fc1119825327b2d4008af8364772fc215f65
 EBUILD llvm-ocaml-19.0.0.9999.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
-EBUILD llvm-ocaml-19.0.0_pre20240608.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
-EBUILD llvm-ocaml-19.0.0_pre20240615.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 EBUILD llvm-ocaml-19.0.0_pre20240623.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-18.1.7.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-18.1.7.ebuild
deleted file mode 100644
index 84bd71875fac..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-18.1.7.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-utils 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
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	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}"
-
-		# 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-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240608.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240608.ebuild
deleted file mode 100644
index 36b3716c0372..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-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
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	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}"
-
-		# 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-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240615.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240615.ebuild
deleted file mode 100644
index 36b3716c0372..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-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
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	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}"
-
-		# 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-perl/BSD-Resource/BSD-Resource-1.291.100-r3.ebuild b/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r3.ebuild
index 0d2aa49f9189..34dfc29ccc23 100644
--- a/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r3.ebuild
+++ b/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl module for BSD process resource limit and priority functions"
 LICENSE="|| ( Artistic-2 LGPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/perl-ExtUtils-MakeMaker"
 
diff --git a/dev-perl/BSD-Resource/Manifest b/dev-perl/BSD-Resource/Manifest
index 22f997c9dc37..dc3872c45a78 100644
--- a/dev-perl/BSD-Resource/Manifest
+++ b/dev-perl/BSD-Resource/Manifest
@@ -1,4 +1,4 @@
 DIST BSD-Resource-1.2911.tar.gz 68183 BLAKE2B 463eccf52301bd89df8d98b604a01ab1870ecc825753ee72f84900f43ed77e70b1e3b9f162a4a7ee6a940933da3a5bfdb3f12a55a85e24886d076668f2f9263d SHA512 d0032d41c7c0468ed1c6d8f57b885f6cb97a5039d754c8cb60b2067daedaf53bd15fb6561a3d0f828df16dfa5417f663b8065ba65f4fea16dc9262728b3b6b85
 EBUILD BSD-Resource-1.291.100-r2.ebuild 576 BLAKE2B 4e762afb19070fb8e5ebc32bc4acf7110e5c9c3b46af905f29832ba6069f8f588b9a84460b6d0f0e1a4643af61042f955910ead541b7092be353a94c993fc71b SHA512 4c5d51db52e9181bedf834d1ab0b2fbdb838e6820d8810200775feaf6fbc564b4930f04884448a70271dd52c87dbc8c2054f60c9267cf726916ecc504a2c7adf
-EBUILD BSD-Resource-1.291.100-r3.ebuild 500 BLAKE2B 9806401ae50654de8dc877ff76eccc2cc55e1081d43b531468591eb5208864f8cadd85c22fdaceeb98245e18e50fd2ec0777d80b664466575c2593b2ac266011 SHA512 a016a3731173b42eb26c790a941255c25733a090d75ae8eccaef856980268bd70ab4fa2824f9e825514acb0fecb86a3e3e30e2cb38cafcd04ad19b9e6978398d
+EBUILD BSD-Resource-1.291.100-r3.ebuild 499 BLAKE2B bc5f6a58ee88a6a945c518371f44599147a4e503ce7dbab8e8baf81091727ef09fb98d8fe22483be1c7991507ca1b69d6bcd45cfe17f65652deaf04e34da2ed8 SHA512 7c35e2907f3e054001bb4555b813ae0cdb579fd5a70393f7302b17b927cd7c3f413a325f2f2e40b636d03cbbbc54ba362a77d0111ae170bbbca40df06693bf08
 MISC metadata.xml 397 BLAKE2B cbe8471da5b08e836c85d46584908d410fe1e7d9feabaa3a9bd0cf2ed55789355b72e9fd91d0a5e197a0a88864d8cd984a08a81f5109647667540fb9a6e0b730 SHA512 73012517a67d235ac9442120cdfe0510c3531d5b268a42a681dcd93b378a9efff61352f893aa016318cef11dbbdccd2f35ec7fc92c8325ed77f377445ff9dcfa
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 59027fe0d2f0..f78eb76ac16a 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-python/Faker/Faker-25.9.2.ebuild b/dev-python/Faker/Faker-25.9.2.ebuild
new file mode 100644
index 000000000000..bef66c8c66a9
--- /dev/null
+++ b/dev-python/Faker/Faker-25.9.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
+	epytest
+	EPYTEST_XDIST= epytest --exclusive-faker-session tests/pytest/session_overrides
+}
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index fd8d21508faa..735f533e9120 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,5 +1,7 @@
 DIST Faker-25.8.0.tar.gz 1760950 BLAKE2B 89b18875ae2c3934423d4e7ce9d0da048830f73384db73589372791c6a1798254e3cab54b566ecfbe3263c44edbe12f2c3e7e0d6cbb004e6fc09e9b2e12f7e89 SHA512 88d0c073b48e0df050d3601d97223d64ccf04ad57d59cb37e26a40211633b04301000e7ce12a124e97b32b63225b440f5b44e1d6197f9c8999f7dd0b579a075e
 DIST Faker-25.9.1.tar.gz 1762549 BLAKE2B f331ba11899f0711a74aa4c6a3f883113c00ef16960816b26163be2355bfd1aeda1e01fb5ff430d5f34f99a21e74195d8cdd1fb44fb23e3870a6592242564ab9 SHA512 191ccf0cccdf125cabf2af20cf74681d3aa28038eb2551f7e1cd3a285b17e2fc1d8b245888c44d9a1f66b1f9a5ddc1847ff2e421ef9fb8732efeb56e0957a898
+DIST Faker-25.9.2.tar.gz 1762726 BLAKE2B 75e11d91eae914a8093e448802924e2bc63815317a36870909709648389dc4d55fa1951b588a7fa6ed1cf1468724158abc16342465156d00e66f1febb545d47c SHA512 6f1272b64bc973f3e9f32bff589aedf8db35ae3c90ea9d459babaf47e327cf26199f05a5cbc888c13aced41722e91335b8c34685b9bebda4a939aad89098bbd1
 EBUILD Faker-25.8.0.ebuild 955 BLAKE2B 7826768e6ace4bbc12c8f92803fc43b1880fef99e94709a153c773c94776ce3b38667567d1b4d656093590fa41017d6613539a990ed212fdeb92651412cff418 SHA512 f7ea917259bfeaee02fc3783da2c66272dcc4b0ffc36c8ddf50d118847ababb3b7cfcc9d0dc73392e4a0d48b2d8876bcb4edb064639b19e6597528b0d808d75a
 EBUILD Faker-25.9.1.ebuild 962 BLAKE2B 227cfcc4d918f9864be11062ec03c15f6f5f3c472de2ec4ec498993d719ba4766f2e23bc53a026e9619d72e42e694740a5452e484a7d7d1cb28c54941fac8150 SHA512 60962511b62659de7c15483d8b06dffac32c7c248c1b425192f8dbecfa9b811a76576798c230af8f3b7cea828936613a42f13ff1b83677b678af503f47a2623d
+EBUILD Faker-25.9.2.ebuild 962 BLAKE2B 227cfcc4d918f9864be11062ec03c15f6f5f3c472de2ec4ec498993d719ba4766f2e23bc53a026e9619d72e42e694740a5452e484a7d7d1cb28c54941fac8150 SHA512 60962511b62659de7c15483d8b06dffac32c7c248c1b425192f8dbecfa9b811a76576798c230af8f3b7cea828936613a42f13ff1b83677b678af503f47a2623d
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7f375c74900b..3903003fc5cc 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index 94a36ca992f3..a5f9b0d502cb 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -1,11 +1,5 @@
-DIST Nuitka-2.3.3.tar.gz 3668441 BLAKE2B 0e661948185490a4e47e71eca8c2cecb116bdea1f3ef2d0a477bae33bcfe5612d262e5fb8c3c9b0e192c8c41c3eee019dbb96a429eb072f05b0b5aeaae46a0f7 SHA512 1ea8f644f84d28bf4720f0fdc49204e93607a233c7e921eb006d1c09d6893d299d67d623ced0cd0b57bbe5056d108155f43e1de3d481c5c18f392dca321e9c4b
-DIST Nuitka-2.3.4.tar.gz 3702705 BLAKE2B b67718cf4258a22e6f1d66abeaa293fb134a1726d03b40e7e00f5948765786afb92a317b718c4832be59f3821e5ce744755e06baf171180ca3c98a7cfd9cff0e SHA512 8794da550c31d488763c9c40304232b050a9647481f387b1d4ac1e3adadd794332004ec1152e650fb37725b2c0ecd00faedb5b0f1c4958fc294a61c28602e01a
-DIST Nuitka-2.3.7.tar.gz 3701490 BLAKE2B e898d23d3bee8d390a81798d3c351e2c208e7e8831a9dbaaa3de848fbad11f71aa5698f1dbe8f8a7b6a78baa9ce74f95c9be5c1c59054873d4091f5e5167b942 SHA512 5fc22f5f530a63a90fe3387d9c337008331a6099f2810ad9513d99fc7ef2c91c7780bd3fded111c9ca0cde63519fecc91a08f15eb0dbddefe0605e631520e682
-DIST Nuitka-2.3.8.tar.gz 3701221 BLAKE2B 5138f9ba5975b4aeb16fa6821d9a1660e122994ea5f53e2b4bafd2199bfdcc9dee9aab7d43ad8457e87c68da965bfb891102b140d33eca392bb2630823a23a56 SHA512 6c69bc4fbfd8f5ecbcebcbfac6a822871044baf806f9472eea8569f2aa17cb9ee4af84a9fd133e1fe17f32d8d1ab26206721eb5121678d9f50f9fd88b231ccb9
+DIST Nuitka-2.3.10.tar.gz 3702002 BLAKE2B 6aa0a890d1db4f245686c87152855ff23c71726d34025bcd41fe9fb639ff78002396f7400aafbee59249b1a06238fd5384bdfb48e5b961580020cd7f02ce4e4d SHA512 757c332afe2099fdc4708ea83776657d669811d2215360bcdbd4b6d2765fabca81a533d8bf7122c570318d3363cb2a3b1f511f4b6fa28abbc6a3d046fb7ff23d
 DIST Nuitka-2.3.9.tar.gz 3701334 BLAKE2B 8e86496330ddcbab61a875c173bcaa8acee74b4942efe7e0947c2e2536605bd8ba7eab59533766a0d308c446a577456ed398c703d71b58e9d53bba8fcc484c00 SHA512 6039580292d3cbb3adb2ad504c996f83beaa583336cbdcfae92c8310ffaabd8b9510451c2ceffb6a4c26f82e8e9c112468670eb8b5cdaae96ed152f3f9337272
-EBUILD Nuitka-2.3.3.ebuild 1110 BLAKE2B b092bfe4db9bebe649cd0b5c84a9b608d8c99511d4d73c94952b215fe09981e60e033f3e47ba5eaa7332914d6b47629f1584e00b95818d9c2e956ff1675ff410 SHA512 ce843edbc7c36c9a2603e39808862188d33ed93d4cafb5c5ace041da50282c312709cbf0806bb18a828344f241d69b8d5e331b9c24d78f6fa313769283161ebd
-EBUILD Nuitka-2.3.4.ebuild 1110 BLAKE2B b092bfe4db9bebe649cd0b5c84a9b608d8c99511d4d73c94952b215fe09981e60e033f3e47ba5eaa7332914d6b47629f1584e00b95818d9c2e956ff1675ff410 SHA512 ce843edbc7c36c9a2603e39808862188d33ed93d4cafb5c5ace041da50282c312709cbf0806bb18a828344f241d69b8d5e331b9c24d78f6fa313769283161ebd
-EBUILD Nuitka-2.3.7.ebuild 1110 BLAKE2B b092bfe4db9bebe649cd0b5c84a9b608d8c99511d4d73c94952b215fe09981e60e033f3e47ba5eaa7332914d6b47629f1584e00b95818d9c2e956ff1675ff410 SHA512 ce843edbc7c36c9a2603e39808862188d33ed93d4cafb5c5ace041da50282c312709cbf0806bb18a828344f241d69b8d5e331b9c24d78f6fa313769283161ebd
-EBUILD Nuitka-2.3.8.ebuild 1110 BLAKE2B b092bfe4db9bebe649cd0b5c84a9b608d8c99511d4d73c94952b215fe09981e60e033f3e47ba5eaa7332914d6b47629f1584e00b95818d9c2e956ff1675ff410 SHA512 ce843edbc7c36c9a2603e39808862188d33ed93d4cafb5c5ace041da50282c312709cbf0806bb18a828344f241d69b8d5e331b9c24d78f6fa313769283161ebd
+EBUILD Nuitka-2.3.10.ebuild 1110 BLAKE2B b092bfe4db9bebe649cd0b5c84a9b608d8c99511d4d73c94952b215fe09981e60e033f3e47ba5eaa7332914d6b47629f1584e00b95818d9c2e956ff1675ff410 SHA512 ce843edbc7c36c9a2603e39808862188d33ed93d4cafb5c5ace041da50282c312709cbf0806bb18a828344f241d69b8d5e331b9c24d78f6fa313769283161ebd
 EBUILD Nuitka-2.3.9.ebuild 1110 BLAKE2B b092bfe4db9bebe649cd0b5c84a9b608d8c99511d4d73c94952b215fe09981e60e033f3e47ba5eaa7332914d6b47629f1584e00b95818d9c2e956ff1675ff410 SHA512 ce843edbc7c36c9a2603e39808862188d33ed93d4cafb5c5ace041da50282c312709cbf0806bb18a828344f241d69b8d5e331b9c24d78f6fa313769283161ebd
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/Nuitka/Nuitka-2.3.3.ebuild b/dev-python/Nuitka/Nuitka-2.3.10.ebuild
index 274aff9ae3b5..274aff9ae3b5 100644
--- a/dev-python/Nuitka/Nuitka-2.3.3.ebuild
+++ b/dev-python/Nuitka/Nuitka-2.3.10.ebuild
diff --git a/dev-python/Nuitka/Nuitka-2.3.4.ebuild b/dev-python/Nuitka/Nuitka-2.3.4.ebuild
deleted file mode 100644
index 274aff9ae3b5..000000000000
--- a/dev-python/Nuitka/Nuitka-2.3.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 flag-o-matic optfeature pypi
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-build/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-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/nuitka.1 doc/nuitka-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" dev-util/patchelf
-}
diff --git a/dev-python/Nuitka/Nuitka-2.3.7.ebuild b/dev-python/Nuitka/Nuitka-2.3.7.ebuild
deleted file mode 100644
index 274aff9ae3b5..000000000000
--- a/dev-python/Nuitka/Nuitka-2.3.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 flag-o-matic optfeature pypi
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-build/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-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/nuitka.1 doc/nuitka-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" dev-util/patchelf
-}
diff --git a/dev-python/Nuitka/Nuitka-2.3.8.ebuild b/dev-python/Nuitka/Nuitka-2.3.8.ebuild
deleted file mode 100644
index 274aff9ae3b5..000000000000
--- a/dev-python/Nuitka/Nuitka-2.3.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 flag-o-matic optfeature pypi
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-build/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-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/nuitka.1 doc/nuitka-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" dev-util/patchelf
-}
diff --git a/dev-python/a2wsgi/Manifest b/dev-python/a2wsgi/Manifest
index f4dd1d5ae91c..be4071ee3da3 100644
--- a/dev-python/a2wsgi/Manifest
+++ b/dev-python/a2wsgi/Manifest
@@ -1,3 +1,5 @@
 DIST a2wsgi-1.10.4.tar.gz 18186 BLAKE2B 7f184c1621dd28e75c12e85b85ca4ed0b1b55d59c79797429bc188feec0ee0105e77c3613b1c2f94e1561f71fdcbabae99218e2c007ab095dd68b0502d112444 SHA512 6c050dcaca4dab0793afb267d7cbcb4faca362495c46ab9f0b52c9f2f5a1ab7dfd6fa0c543b5eaa18ddca6a789093591653f023ac9c127602138db390ae1c975
+DIST a2wsgi-1.10.6.tar.gz 18660 BLAKE2B 3f512bb37b03d7716559734e0653cdd7c7d77653495f15e8d172717016a3940e8e52a875321d675b3bfc4ebc41596d839a445ccb45c551d717e3f317b59aa955 SHA512 7b648865c759746520cf81502aabdcd9e19ddc1f270341d080d2422002f9e633be9ad837e06aef073a1d47ed4253b7e65eadbb1a76de89e571c498a5939c41a7
 EBUILD a2wsgi-1.10.4.ebuild 844 BLAKE2B 3ae0cf613017227b86527b68796b860d60ff65e1e83493606b1c2507f9d9a65dcd928d5e5843decd0ec6c8f831a95f0e02ee5a53e600b367eb2bacfafebbf59f SHA512 e04c6668f0726883f6ef18fe007a91a7bfe3addb59c1477ace8c6b0e50d1aff8adee44bdd840b33a5d4d74689eeb02709703a11f954cd37dce103ff3fcf2849a
+EBUILD a2wsgi-1.10.6.ebuild 1045 BLAKE2B 347609d0863fbdbcae5e53c1680f7416544b71a5875ec7d573de24cabf7a35c08f80ab3b8beb3ac3c9510f821a1085357794ba30f6af8fff65473ba30e841b87 SHA512 5bbf49c536b710fcc17d406e7ad130cdffe5cbaa844f1883c2a58f7dcc9f6412f59dfd2d4e2a0c3a3f934c786051d5ea2c61d86832260fa2853e36872da5261e
 MISC metadata.xml 392 BLAKE2B 17f9cfa46eeac0752f6e27d004a04173528f5033dee30ba31bb9b0d86231b3311937e0765cba3cae0fcc8b9653654c9b53bbc009f15140db0b38496856b9c27e SHA512 828436206a1e9b01df9da1546ffc8e6bc614e71708ad8a806dda9ab2dad80c86e539c37496a0c2525f0370e9ead3131bbde69f235da83331cd5097985981006e
diff --git a/dev-python/a2wsgi/a2wsgi-1.10.6.ebuild b/dev-python/a2wsgi/a2wsgi-1.10.6.ebuild
new file mode 100644
index 000000000000..cb62c73b79f4
--- /dev/null
+++ b/dev-python/a2wsgi/a2wsgi-1.10.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Convert WSGI app to ASGI app or ASGI app to WSGI app"
+HOMEPAGE="
+	https://github.com/abersheeran/a2wsgi/
+	https://pypi.org/project/a2wsgi/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		<dev-python/asgiref-4[${PYTHON_USEDEP}]
+		>=dev-python/asgiref-3.2.7[${PYTHON_USEDEP}]
+		<dev-python/httpx-1[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires baize
+		tests/test_asgi.py::test_baize_stream_response
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio
+}
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 6bda9b9cfbb6..640f8f57ea5e 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,4 +1,6 @@
 AUX alembic-1.13.1-pytest-8.patch 2119 BLAKE2B e03335427447649b710f5fc9daf1c62ecd0fb7452e301d49e74a0f8c2ce4d4a2eb7800e1e020b67c813fafe4ada27c28ae66c1f9b40f4db37dbeb9ae4ab2be33 SHA512 77146e56c15bcd04130bb68cb8a96cc25c221db9bb884215ea5f5b45e93708ee6cad639fc1db686c960cd265f3bee274784362be9409a50ffc0fc889162d5c24
 DIST alembic-1.13.1.tar.gz 1213288 BLAKE2B 12c01f60a564c3021b3d2ae61f220822a0ca644af5097b72a826f48d04225c441f580204680674410e6e2570b5c7ee24053024863162d7d43bc423a86cddcea6 SHA512 2a5826461bec22c2efc244dd8394d34d39ed6e3511a32e8e460057ab34f9e559d28dda4ea7e34ccd30628e889a3cb37cb156596e37dba748c12a0195d78aa678
+DIST alembic-1.13.2.tar.gz 1206463 BLAKE2B edff3a244fa37556cd656e60940d94e7df75b6c67aa4199b673851b5b06e84dbf51e53f2ac9781465aa923c0019fcd33a9c3b4da90d64f583956e390ca1f5fa7 SHA512 c4952123ba00403bb030606c736dab8d5494b01662d02914fb0d10d0c1d99b27a97cc4a800cdfa32d53870031c46e351f97815e337c71f3a0a824b6403bd75cf
 EBUILD alembic-1.13.1.ebuild 1196 BLAKE2B 4857f35f823a1741b0334e7f46a20476322e5cdd91fdb108ec8ee084e6954a4fb377c770b9d9de59379f912968841384021e40a5fa2cfc5c9c33f8a13d7db581 SHA512 d89304e4b9a6381c8ccd1c6e088df7aae03505d9d3794868bc05aeec3e920627483fd32c2296555ede93f310a619053f04d339f9be5a2eb565ff8d35cae269a6
+EBUILD alembic-1.13.2.ebuild 1062 BLAKE2B 53255b066cdc9a0f0f6f656f1255f9db9911c5167d23de18f762cba6f203523f3a87a2375d33752285e9ec10efedf9f4343cb9a7b12805a55aac37cb6b098709 SHA512 326ebc9001902109b3a7bc4cef661b5ac6c0fa8031422b5270ac53c16ed6a32af14b0e1520337ed49f90d474ec22d16328f7779aaa29d8c243c951fdfa5e263c
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.13.2.ebuild b/dev-python/alembic/alembic-1.13.2.ebuild
new file mode 100644
index 000000000000..cf8af9852135
--- /dev/null
+++ b/dev-python/alembic/alembic-1.13.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+	https://github.com/sqlalchemy/alembic/
+	https://pypi.org/project/alembic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		sys-libs/timezone-data
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# setup.cfg contains -p no:warnings in addopts which triggers
+	# datetime.utcfromtimestamp() deprecation warning as an error in py3.12
+	epytest -o addopts=
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/beniget/Manifest b/dev-python/beniget/Manifest
index ae9bf9bf65a4..3ac0f9344810 100644
--- a/dev-python/beniget/Manifest
+++ b/dev-python/beniget/Manifest
@@ -1,3 +1,3 @@
 DIST beniget-0.4.1.gh.tar.gz 16353 BLAKE2B ef7de5eb15b59de10c56057b22e718ca7284d251a98ff1f8dbe31bad2e1bc7ca3c22c2794b1cae8b4c5fdf2a4b91ac6f9a3a0bef3c3aef51fbe6a93341333e31 SHA512 bd2b7beda41953be9b4052b539ae9812a370702874602175bfca66deebbc569515b9a59c750dc4898a6cb9f4a1d49f8ff15c1288035aaf72940cdd439eaace43
-EBUILD beniget-0.4.1-r1.ebuild 729 BLAKE2B a6f5102203299919a41e4845f9490e4078d83ef196e0745dc1f721ab5ddf0156fb4fbf5ab006f28464d7c12b9119671e360bc8dfdfa80b1b0960f899009e5a11 SHA512 b1db66b290a9c5c5098be0b189e295585c9b967ddc356a5395c622856325e1a173e7b0e0458095241a25e689afe8cb79a6fab196804deb442ddea0ea32a5ce5e
+EBUILD beniget-0.4.1-r1.ebuild 729 BLAKE2B 112c8a3d5acdf93a8ea81f54156f4da20160dcf4f526093f7cac9be7320e553a01136ff2030b073d9c0e6f74375a962412d9ef041296eca879e7110908b5f3fb SHA512 b1194b9897299c46008254531ca7c7d5b8735561e2e7bc61fb131945d1a67fe26ed5c34eb74a2a949b63860b50ec63f8d7c31e50dbfa01003275f4c624baafd7
 MISC metadata.xml 378 BLAKE2B eb443e862f02368c1521515425eb99835a1b9505ea959705f1fd4e5e02b764ad900dfeb96d849f3110bf154ae3d2bd0e5033e89edc1df0a7e18c085fab77e2c6 SHA512 87c1d109aceda4601ff65cf5f355c36e82a7e5ee7772d77bfac4277620f96644006186278bedffcadd5af75e692b0e22e0e6df76e8303c9218818a54aff06bb9
diff --git a/dev-python/beniget/beniget-0.4.1-r1.ebuild b/dev-python/beniget/beniget-0.4.1-r1.ebuild
index 2724ad10c0f4..217cf3a0f466 100644
--- a/dev-python/beniget/beniget-0.4.1-r1.ebuild
+++ b/dev-python/beniget/beniget-0.4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e10acb5b2e59..aebcb9b14733 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,8 +2,12 @@ DIST boto3-1.34.122.gh.tar.gz 817093 BLAKE2B ecc91833d5d8b7ae33c2fe435e33bc8fa23
 DIST boto3-1.34.127.gh.tar.gz 820740 BLAKE2B ddfb7802440a01af27059daed4bc7cd3797eb192004a0e7b78e1e56a8ff479206b4835a79bcac1db273c2936fb8dfde0ba16bebe8cbe1befeb188070bf46b2c7 SHA512 b139ad68a4ce29e84e0fa1618b97c4aea13b668521921712df74256ad61c21d2077ea216dfb4102d8f9910a8119b24509aa10a504d746bdb410fee1cecc0461c
 DIST boto3-1.34.131.gh.tar.gz 822851 BLAKE2B cc4b06ca1785e62314308efb7d9ffa6e10a40fe48bdd3e31f9f12490a57843ad528685d04ea9ec40cf2203acc0ee0a9fb58ee272837c9a637f44c2716f60de7a SHA512 79cd8718c6d84cdcdcadfcde80368addc095770624806eb8cfa981852c2a8ebcc8074533ec8f8e24b01a3aed241afccb6f49fdce250ae07f630d8596931778e3
 DIST boto3-1.34.132.gh.tar.gz 823417 BLAKE2B b78d25f597f3035653a5af46fc865b5840f81f0a9355fe100957cabdea2ea961b2b73e6d5dd5dc376a88148a5257a2956eda6bf99d376da9fc73d391acc0f2bf SHA512 c94c99f9e1f87766bb7dc88f852c121e9ce5c042132a9ec5495128f73f70ff5e90c93774f9cc2d2926e47e028fc771feac49e61a7f280868b3a19ede0d7050d1
+DIST boto3-1.34.133.gh.tar.gz 823981 BLAKE2B 3a0d10f1154930d09236552b8978403ed5c35627faa608e70fb11d70badf547e2924f0e8183b323fb7cc59bcf5b83ab1ad9f38cdc024d317aaad58af3abb6b20 SHA512 7e46f72c1e1ef18f89379b4a430ecdbc00c15d8dd733b2b303d69d1ddf8a34b416fe37fad846bfc8fd868403589a59232281c84ec7207332e868a54bafc90668
+DIST boto3-1.34.134.gh.tar.gz 824465 BLAKE2B 0a39dbafb278296a28c2077a92c0145e4b4c00d46aebf1deecf4406e71e1a0e733c1bd7c119bd66b2d127725861e8f5821725d1ac97135a854ce9e841eb2f601 SHA512 739b86b258d3bfbc1a950bf2ab641cb8a27f21b0d1ee9fab69917f715e0f6c3394a29653e6ff078a0cbb105b001e66424fe59cda72938cfdcb28c324ee01e9ca
 EBUILD boto3-1.34.122.ebuild 1198 BLAKE2B c863be0c9348383129a919e79acbc6962b7c3973f77f68c85df6944a7658a2b39a44a91d904b7fee34ffb849e904e7bf6a503ca35a56085f2b04f40cbb70d4d4 SHA512 10a7f8345e1dc13766f1a15a127a885a42f7750f15c53b25fcba2ef033083192b7381cb53cd7be6c8c876bc1422f615578f730efca83c71ece042593282043a6
 EBUILD boto3-1.34.127.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 EBUILD boto3-1.34.131.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 EBUILD boto3-1.34.132.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
+EBUILD boto3-1.34.133.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
+EBUILD boto3-1.34.134.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.34.133.ebuild b/dev-python/boto3/boto3-1.34.133.ebuild
new file mode 100644
index 000000000000..2c733040b7a3
--- /dev/null
+++ b/dev-python/boto3/boto3-1.34.133.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+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() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.34.134.ebuild b/dev-python/boto3/boto3-1.34.134.ebuild
new file mode 100644
index 000000000000..2c733040b7a3
--- /dev/null
+++ b/dev-python/boto3/boto3-1.34.134.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+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() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 4dc55c202cd9..4539110b2a4c 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,8 +2,12 @@ DIST botocore-1.34.122.gh.tar.gz 13066937 BLAKE2B f22af79873b5574ae4b2b9041568cf
 DIST botocore-1.34.127.gh.tar.gz 13112261 BLAKE2B e883f0a1e29178667678132195aea9666a124456e731e1b158eed895c125fd614e5671639766f7ad46c2e6b16c4156ff5e42594bc04e49bf25380c91cfcbe264 SHA512 48ca2179c24bb219202e5029dd62350a6fc5c64707762f0f33282e542dbc2227bb146376afa9e6b9eb1e45e3c801208a142bef4827d5036eb4724299c826d534
 DIST botocore-1.34.131.gh.tar.gz 13129943 BLAKE2B 916360c6a9526edcfd338718f80556e59d54692aac13f38490e49457edd59016d264a5acbfeb6298af494f09f9c385e16347a9bf7f144c5a11afda2df188aeed SHA512 9bb788ac8e8a2ec7be999acafef88ccbb4e693ccb315efe5655b80cf3f6629eebccbdac6f201550d2f75e476d83c5a800f1add6c71e2fe5b3d503da313f6d3d3
 DIST botocore-1.34.132.gh.tar.gz 13131027 BLAKE2B 044d1ad5d843a8fa924ba71d66e025cf81ff7c0f1b6d47bb52d0b38ea9a25617218b9789449bbee782010daefa328e6d7327e7663133bc624143c71749876a00 SHA512 b029fdebeb9cce956bbe012b2145131368e93a9d255f9253ce0780d1b311061b8ce3353e1d3a083616dec299e1d8d4c829f58f1414781971c0122ee43d80c869
+DIST botocore-1.34.133.gh.tar.gz 13132822 BLAKE2B 156ffc12d6f880fb3bea95c08eabad14c6b0f53e0ffa53410a20b8d96ccb2147d0ee7efadcd4d281f2551dd12567d40868f17187f0e2c0d1061835f0ff20a685 SHA512 36b0b9c9234e226090d552713c0de0a7cd5265e35225a9af156ab3443c456b03967cbd0a60ceb87c746e0a14d33eda303b9c8bc9814a28bc322d5517aa7dc00a
+DIST botocore-1.34.134.gh.tar.gz 13136754 BLAKE2B c89a5d72f5777587cd3246e33100d271a8e937f2fea516e2772e31edb1f6065502b3342aa72e4739ca8e5a581401657009b870f7259ea7b94a1af7203961af8e SHA512 2e1d3041fca06293c77d94bce8be74bc2a4625659bd37f513a8ae836472c67c0f2166cb03f77821166b2323c51b09305ef2f83aaa68f08f53f01801794837f78
 EBUILD botocore-1.34.122.ebuild 1477 BLAKE2B 784b43f060f0702808a3894fdab7a15dd4b4feeffc3c1ab2fe24cca762b2dc1310f40ae5b2941db5c4aa9c4ff8b69d858520826027a50ce975d25150132b4d56 SHA512 e86970ec900929641794d61e02f26bc7e7c8af803095dcc5c8fbedac9d79275c596176f2b492061289056c7d29ebbaa6e64344148f22b6349ac4420ab5038dca
 EBUILD botocore-1.34.127.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 EBUILD botocore-1.34.131.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 EBUILD botocore-1.34.132.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
+EBUILD botocore-1.34.133.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
+EBUILD botocore-1.34.134.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.34.133.ebuild b/dev-python/botocore/botocore-1.34.133.ebuild
new file mode 100644
index 000000000000..ba6cd2a5d2a2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.34.133.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+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
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.34.134.ebuild b/dev-python/botocore/botocore-1.34.134.ebuild
new file mode 100644
index 000000000000..ba6cd2a5d2a2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.34.134.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+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
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index cad432fbdba0..1e6a91cb3c0b 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -3,9 +3,11 @@ DIST cfn_lint-0.87.7.tar.gz 4077539 BLAKE2B d7382b8112332821988854f719a2965749b5
 DIST cfn_lint-0.87.8.tar.gz 4136317 BLAKE2B eb0c30ff83ea9eca80b0a5e2a364e9d013bae2edc245fff61e1a77ff969a23314b2f918a061f03dff6aded543563f1c318ffb389eb4a8cf1da4a142892b0f31b SHA512 044e9f5e88b4264c5782d25f4216e328cb4cc6b09441790fc150c0162393505f2f874cf8992b870772091970557aa6fa5d1991e35c61253c33f75d7f17070ad3
 DIST cfn_lint-1.3.3.tar.gz 2474929 BLAKE2B d5c8685e48739b178a1ab222b90a31626fffc9dfa91e9fbac6554d33d559a675ef50a2670c00a750aeac057777d29ac6a95526829862794ac289d30d53e268ec SHA512 726e96d4b5fa7e3446382cd8050dc99dce1cb848f7a11f5d1795c5a1a408b1d9e9148f7e3aea7887ebb361b1fd597c434ca0fbbf6a31631d8ac021aaf522427f
 DIST cfn_lint-1.3.4.tar.gz 2456919 BLAKE2B 31df1d53b01831310abd84ba83f262307c12fba20af6e6fb372a95b0d0ae9bffb690ded617a53cb0efc929e41bff9a51c6caadf246446eeaaa0e505a3d546eea SHA512 436e22c582a179cd667e5a8ae165f4cd3c4faf4ba78ec278adfa70b4bfea105f6a5c922326e3002ff0eed4365d87b1d7f1ee12bd7a55e605b7c59c09a492433d
+DIST cfn_lint-1.3.7.tar.gz 2469769 BLAKE2B aa059688cee5dfc35ea76a0d771e3c3d370780d6bacef2f524f60a408b572eb92a23367141cbe195afff0e0599102b4fc05354e2bd9d712f936db32f47a4bf91 SHA512 77dbc087c91d75946838567dd95d4fbd32131e07020d8076748154ae1b2cbeea1f348e650534279fa573732dc22691e65e0e542f539156b0af59ff5422396ffc
 EBUILD cfn-lint-0.87.5.ebuild 2040 BLAKE2B 3433bdc70808b67fabab42d70ead74e6e024f9dbf09e2a8aaf6814789edada5ff4508b580a0284facc6e4fdf8a7b3e3700a17edec42dfe72fb38fa955c67ff47 SHA512 eea1fd48f1012633408f84512a87d856461ffd1fa7710687a2db2e5fb715fbfd36c53e73dd92c3c8cff37d322c8367554e65c802342d18a7b241a1d4b073397e
 EBUILD cfn-lint-0.87.7.ebuild 2043 BLAKE2B 02f4a43649563ef965302d40bff0f6b8bed6acffdd2f3aa54670816062f1b5dc3cf26112d8ca31d002acc00f850cf3d19c8b75f948b4bfdeb46bd1d8f45ea568 SHA512 f24a5e9e4fbb1bf94117513d19ff04f2e26cf4da1cc57aebc6ae3da509ec5e4bc3c01ecfc254a1f1b7b1cad6a2aa16ca6c8e0fcb3d33af8fa6e359c1eda60932
 EBUILD cfn-lint-0.87.8.ebuild 2043 BLAKE2B 02f4a43649563ef965302d40bff0f6b8bed6acffdd2f3aa54670816062f1b5dc3cf26112d8ca31d002acc00f850cf3d19c8b75f948b4bfdeb46bd1d8f45ea568 SHA512 f24a5e9e4fbb1bf94117513d19ff04f2e26cf4da1cc57aebc6ae3da509ec5e4bc3c01ecfc254a1f1b7b1cad6a2aa16ca6c8e0fcb3d33af8fa6e359c1eda60932
 EBUILD cfn-lint-1.3.3.ebuild 2110 BLAKE2B ac9b693bc6097b01441e4b90e8112b26b5773a6ffd11c97177b5672250bb3f0755eca45b2943f119e565bcaaf1b64ab179d59157470538b0d350dd96799e978b SHA512 1cb9bb4e70ffbcbac8de8e0a0af9d265553f179e38b303eb3ed848c679e3a47fb6015458dd9746f5328876a715b1bc7f32a38697d9e6433a6909a38c97dbdec4
 EBUILD cfn-lint-1.3.4.ebuild 2110 BLAKE2B ac9b693bc6097b01441e4b90e8112b26b5773a6ffd11c97177b5672250bb3f0755eca45b2943f119e565bcaaf1b64ab179d59157470538b0d350dd96799e978b SHA512 1cb9bb4e70ffbcbac8de8e0a0af9d265553f179e38b303eb3ed848c679e3a47fb6015458dd9746f5328876a715b1bc7f32a38697d9e6433a6909a38c97dbdec4
+EBUILD cfn-lint-1.3.7.ebuild 2110 BLAKE2B ac9b693bc6097b01441e4b90e8112b26b5773a6ffd11c97177b5672250bb3f0755eca45b2943f119e565bcaaf1b64ab179d59157470538b0d350dd96799e978b SHA512 1cb9bb4e70ffbcbac8de8e0a0af9d265553f179e38b303eb3ed848c679e3a47fb6015458dd9746f5328876a715b1bc7f32a38697d9e6433a6909a38c97dbdec4
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-1.3.7.ebuild b/dev-python/cfn-lint/cfn-lint-1.3.7.ebuild
new file mode 100644
index 000000000000..fef826927bf5
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-1.3.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+		# different graphviz version?
+		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 9fae79bcba83..56fbd2636242 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
 EBUILD clang-python-16.0.6.ebuild 1203 BLAKE2B 7baa638bb302b5b97aea34e62d28035f6e2e7aab0bd626bae94d9b3ba9e776316a81003b55ae8a71008b13a664569c8587df927c5f925591addc99a2b4381832 SHA512 a2b00fe7edaf1cb1bb48c0e93555fbea3ef929f16d168b27e1ec1e3f38989e3220e6df1ab847ac2020faa7d44d957c6af7ec0723418e248677a40e29c071ddb2
 EBUILD clang-python-17.0.6.ebuild 1203 BLAKE2B 13f87c2782967c4fded88a60220b87e9f9f50d9c37543f30ab2b9ae94cdc5f53d2b1fb422e13450df50ecbb0e36f2a531705fd75f021f265e67f67dd08c85eed SHA512 8abd5bdb175a8c24c542dbcbc73617f075e50a555d9da698ae3139414c2fc11b9ee96d42af0829432c0d2f9d3c820683a2ef5946fdc4332f3d06e40466bbb38f
-EBUILD clang-python-18.1.7.ebuild 1205 BLAKE2B 609f06035ee58685b352f56b62925947fc3cb15f4ca04749256d4d49735443ddc6338c7121157bb722c9a45a60311c262a90a4bbe0ec280c8c6833df210c3b27 SHA512 4b07e79adeafb345896316114ec20ad2443e9b63d28181fe36d44285ed067e2ee73e04425aee255032699bef5e65cced1356967b7dd6f7fd221cbbf03d922057
 EBUILD clang-python-18.1.8.ebuild 1205 BLAKE2B 609f06035ee58685b352f56b62925947fc3cb15f4ca04749256d4d49735443ddc6338c7121157bb722c9a45a60311c262a90a4bbe0ec280c8c6833df210c3b27 SHA512 4b07e79adeafb345896316114ec20ad2443e9b63d28181fe36d44285ed067e2ee73e04425aee255032699bef5e65cced1356967b7dd6f7fd221cbbf03d922057
 EBUILD clang-python-19.0.0.9999.ebuild 1170 BLAKE2B c6bb0527431ced05965e35f2f3d0d0c05db4f27c4286d28cc36c0bc0e2e1c704018650840ab6cb7fbb62cb0acc22bc0472f5dd61a4c4c49a8dabdcb14dc35043 SHA512 bda343468b925bea4580582a163413f6ab45354698c2d3ed818d638989f3cd11248fedef0b7da469d1bfe5fa388304718cd091ca0120ee56da0173e582bc58be
-EBUILD clang-python-19.0.0_pre20240608.ebuild 1170 BLAKE2B c6bb0527431ced05965e35f2f3d0d0c05db4f27c4286d28cc36c0bc0e2e1c704018650840ab6cb7fbb62cb0acc22bc0472f5dd61a4c4c49a8dabdcb14dc35043 SHA512 bda343468b925bea4580582a163413f6ab45354698c2d3ed818d638989f3cd11248fedef0b7da469d1bfe5fa388304718cd091ca0120ee56da0173e582bc58be
-EBUILD clang-python-19.0.0_pre20240615.ebuild 1170 BLAKE2B c6bb0527431ced05965e35f2f3d0d0c05db4f27c4286d28cc36c0bc0e2e1c704018650840ab6cb7fbb62cb0acc22bc0472f5dd61a4c4c49a8dabdcb14dc35043 SHA512 bda343468b925bea4580582a163413f6ab45354698c2d3ed818d638989f3cd11248fedef0b7da469d1bfe5fa388304718cd091ca0120ee56da0173e582bc58be
 EBUILD clang-python-19.0.0_pre20240623.ebuild 1170 BLAKE2B c6bb0527431ced05965e35f2f3d0d0c05db4f27c4286d28cc36c0bc0e2e1c704018650840ab6cb7fbb62cb0acc22bc0472f5dd61a4c4c49a8dabdcb14dc35043 SHA512 bda343468b925bea4580582a163413f6ab45354698c2d3ed818d638989f3cd11248fedef0b7da469d1bfe5fa388304718cd091ca0120ee56da0173e582bc58be
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-18.1.7.ebuild b/dev-python/clang-python/clang-python-18.1.7.ebuild
deleted file mode 100644
index 9b3ee513e023..000000000000
--- a/dev-python/clang-python/clang-python-18.1.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-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/clang-python/clang-python-19.0.0_pre20240608.ebuild b/dev-python/clang-python/clang-python-19.0.0_pre20240608.ebuild
deleted file mode 100644
index 7f3de6814bbb..000000000000
--- a/dev-python/clang-python/clang-python-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-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"
-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/clang-python/clang-python-19.0.0_pre20240615.ebuild b/dev-python/clang-python/clang-python-19.0.0_pre20240615.ebuild
deleted file mode 100644
index 7f3de6814bbb..000000000000
--- a/dev-python/clang-python/clang-python-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-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"
-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/doc8/Manifest b/dev-python/doc8/Manifest
index cb3a7809abac..10098aea9799 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,3 +1,4 @@
 DIST doc8-1.1.1.tar.gz 26514 BLAKE2B 847e34081f4e00698cbe3ca9b7325de2995c45bd02b2f443459050a2801a5b476222c345c4ba06463fc6ff489c3c59e5b6e7abbd7b98af740f09d5b04771a4b2 SHA512 7ec21c2483f7ebf2a7e1fef6677c6051ac253da6014354a968b8a107d8097f986b6b162850561fd6a103e93d157b2c849554aabe2484a49c4a3726c8e2083a89
+EBUILD doc8-1.1.1-r1.ebuild 830 BLAKE2B 61ff54ca08add9e1f3d9623c473cccd0dcef303e3e70f708a36a5fcd407899389a0ddb29523b4ebcd9a0c3f505a82f15b7f8b960b4530925328176474d6107fa SHA512 2a92c460e4fcde4ecccb31c110c35c88b32e6cb8a2a6dd87b1148499072a6d8c94ebad95b3c3304402be19a6083af79f97b71b5e4642f6df464a2feae3104436
 EBUILD doc8-1.1.1.ebuild 792 BLAKE2B 5eb5d529d1bbd4d39e97ab6a0cd1071e22540921e6bfb28ba8ca97961edc7a3b07f7e59e89bb66f7de94887f2ef8d4f0f6f9e00ccd695d9617d274918be8b32e SHA512 a6776376dddf870f2fc090424aa8c6b5935e1759a00349aa888fa0be1571fa50528de27cd3c3d98da6b02ed1b4223285ae69bde534782191747948ef17949571
 MISC metadata.xml 497 BLAKE2B 6e5c2f8a487d967892a471d045fcb0acfb2c4681375c352837820237110cfc8ea193c395730552cadeb09ca66316e91e99785aae821a184c619b32d7d8908b47 SHA512 a626b4ecc4cb4cdd2e0a095a2a26a3d0346e4c47608188fd6138517631d99a0f4c2e5ae8be453ac709dd43c2e4acc79b0ec7f37dd6e00125ebe23c99697658d0
diff --git a/dev-python/doc8/doc8-1.1.1-r1.ebuild b/dev-python/doc8/doc8-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..5cab3caa8c81
--- /dev/null
+++ b/dev-python/doc8/doc8-1.1.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="
+	https://pypi.org/project/doc8/
+	https://github.com/PyCQA/doc8/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/docutils-0.21[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+# setuptools_scm_git_archive is not actually needed here
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 3557bb51233c..114dfd1b98e2 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,3 +1,4 @@
 DIST doit-0.36.0.tar.gz 1448096 BLAKE2B 15558a39ccac031ddf3a429aa585bc6e1d49c2e7572df29979ca66d1025fa5d7a917f6cc5bcfd21f2749e4ed7e7885b0865ec67b6fa32817e1518d47da9ead97 SHA512 d4caa31701755c7f59213dde0f89fd3616c0c01b7f06245cbfd9f1a315d503e62f3556c3b86685cd0ebfcffcc9cae0987ca150f037aa7b3cd960439a1191be42
 EBUILD doit-0.36.0-r1.ebuild 1519 BLAKE2B 83e578d2f603a5b5a081662d27ee83d19f5119856afd8fa44bed54d743a1d76a9bda4494e4893d40a104fff26322ed5dbbd61400c1c7c2e353dee61a33801759 SHA512 bc5af4ce5b9c62fb677ec0ebce6fbefadd3405b71e52e440455bc06b5bf94d05f6e5ac7060a37042fac84d1b942bd8b06043ecd8752983cc006a77886f80831a
+EBUILD doit-0.36.0-r2.ebuild 1560 BLAKE2B c3d78eee1a4a06342fe2106fecb4e4dd5c8c761e91784f23ae42fde7670a989359ab6be763e6dd914a8301a324cc9a67e0c08c035cd06fd264e178dcd1f187b1 SHA512 b36fd545a32aa548fc94ce1cbe3617b9ba7ec5b4f02132ddf475b1f6e7144f0aeb421e8cbaddb3849595b6b3fc76d4c57f07f1d90d88003c83fc08eede468aa4
 MISC metadata.xml 568 BLAKE2B add52a6e7986bb88b9dc87d2f03c4ec3716ae7d5e2402556b7a3137b8267ca2cad0ae3324d628f3127afde36513414029c0f567a9683dd9b11b1a287ff5e3a7d SHA512 e772c9ccd8133fd73dcf04733facf60ef7c2f1559b83e5024faeea4d5fd7799c42a28be6c9b8676ea9b6d68969ca5be633320e8cb7dd8d1f0dca35e819eaebc7
diff --git a/dev-python/doit/doit-0.36.0-r2.ebuild b/dev-python/doit/doit-0.36.0-r2.ebuild
new file mode 100644
index 000000000000..37fc353b936c
--- /dev/null
+++ b/dev-python/doit/doit-0.36.0-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1 pypi
+
+DESCRIPTION="Automation tool"
+HOMEPAGE="
+	https://pydoit.org/
+	https://github.com/pydoit/doit/
+	https://pypi.org/project/doit/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/tomli[${PYTHON_USEDEP}]
+			dev-python/tomlkit[${PYTHON_USEDEP}]
+		)
+	' 3.10)
+"
+PDEPEND="
+	>=dev-python/doit-py-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${PDEPEND}
+		$(python_gen_impl_dep sqlite)
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinx-rtd-theme
+
+EPYTEST_DESELECT=(
+	# test failing due to impact on PATH run in a sandbox
+	tests/test_cmd_strace.py::TestCmdStrace::test_dep # #836164
+	tests/test_cmd_strace.py::TestCmdStrace::test_target
+)
+
+src_prepare() {
+	# Replace custom theme with builtin for documentation
+	sed -e '/html_theme/s/press/sphinx_rtd_theme/' -i doc/conf.py || die
+	# Remove non-exist modules for doc generation (#832754)
+	sed \
+		-e '/sphinx_sitemap/d' \
+		-e '/sphinx_reredirects/d' \
+		-i doc/conf.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp bash_completion_doit ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins zsh_completion_doit _${PN}
+}
diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest
index ed662d82b310..97ff6c9410a9 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -1,5 +1,7 @@
 DIST pip-24.0-py3-none-any.whl 2110226 BLAKE2B 6a0c8c9796cd574ef1d709de40a8530a15e50158143e332b79e5ad3edceda6ce93c5ef4df49b169062598618dcc6967c2115ac2c10b05abf345318204f1eeffc SHA512 5d7462a584105bccaa9cf376f5a8c5827ead099c813c8af7392d478a4398f373d9e8cac7bbad2db51b335411ab966b21e119b1b1234c9a7ab70c6ddfc9306da6
 DIST pip-24.1-py3-none-any.whl 1823006 BLAKE2B ca5282b1100243cc4e391ce30d5ae7d4978987e46323b7e151c87457c4ab762f909c88ae3cb72015d09bf7c1243ddb6ad791e991093713431961962fc6fdde83 SHA512 84e8318896294e5750f30a3fa55833e5e5c802066091802e05ff94fe139c825f3fe0fb5014b899f0afd844ad1129e8d04b9fedd74a7f46a1c248dac546ab16f8
+DIST pip-24.1.1-py3-none-any.whl 1824282 BLAKE2B dc8b4938002bc8ededf5f3fb5f47492b529cb846f145308d5392c04778417f7e85527064e791c4dec4bfe6fc407bcc4d7ad26ff84e0f4c436dce5db8d9ec1f25 SHA512 591c0862ca7469a00a4a0220ca9acbd4834394abb0abcd44bd071a1b392b46029d618c2219e327cd43bacdd5d62f0f47d88454d60d4028f0ba7cd02ce3e648bf
 EBUILD ensurepip-pip-24.0.ebuild 645 BLAKE2B d761664589da3ba0fb44ca1b2561916feb7a8b9b29478eff1f5fd2b0eaef46e1543f5bb9d11b56d8eb6a9a01a3bbbe0b51020e9adc6fd0a0149a9e249b4cf87a SHA512 84d9e6a945940cd614b9a458555f55e5fefafdb746587a33161359e4cf72813bb23885069745196fc6476b0331c7c5e1280f5979f985790dedb71bab2139f9d7
+EBUILD ensurepip-pip-24.1.1.ebuild 653 BLAKE2B 480b6e624b9f00f1863dba43ff47a53d454b570b2715301c560e66380b658129a5bd630a40746aca173f4813b4227eac96f1076c3fc6e5fdcad8aacd6bc39f86 SHA512 168c500efb22504acbae0923000e822a4ae5bcf10157b60088649e952838017050e452b784d97f774b3e7c739d5c8a30c23593f8e8519500878af069b6ffd7b7
 EBUILD ensurepip-pip-24.1.ebuild 653 BLAKE2B 480b6e624b9f00f1863dba43ff47a53d454b570b2715301c560e66380b658129a5bd630a40746aca173f4813b4227eac96f1076c3fc6e5fdcad8aacd6bc39f86 SHA512 168c500efb22504acbae0923000e822a4ae5bcf10157b60088649e952838017050e452b784d97f774b3e7c739d5c8a30c23593f8e8519500878af069b6ffd7b7
 MISC metadata.xml 309 BLAKE2B 197e5620aab85ff590270ae6838c9188cd699943af4c9c3eeb7de92c2e9390c082eec603e63bc2bba39477586f19e58da2e5fe2d5ffe9b59b87ae5386c939df1 SHA512 c678bc8fb62f6e6850939ebff56962503bb03393572cfff7e5f7d38e8cf5ca71d8e38e402355c5f963fb718eed24bca463d7c63fede5cbb550f6f32a9c06af9e
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-24.1.1.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-24.1.1.ebuild
new file mode 100644
index 000000000000..85e9351f85b0
--- /dev/null
+++ b/dev-python/ensurepip-pip/ensurepip-pip-24.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared pip wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/pip/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	!<dev-python/ensurepip-wheels-100
+"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 4bf708dcffc3..1789f2a28638 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,7 +1,9 @@
 DIST setuptools-69.0.3-py3-none-any.whl 819530 BLAKE2B 6ecef64755181255d935e234f77db3a4a9ce6426621d5d95196f55820a6bd62ff6bd3efcbf2e66221501b0c7c5296a35f80d275c59a8075392a0e802ee6713f1 SHA512 20c68e4f279a133f33ac85885b2c7e05b68c8c2faf15c9bb251229a6668c5c6b54c4065c54a0b711dae36d7fd161d3dc34218c579e739a2b2c573b85ccc79820
 DIST setuptools-69.5.1-py3-none-any.whl 894566 BLAKE2B a9d24f51240fd528f87642e8765a4a72ae9e03e936acec3e26edd1c5b40127f00dee53db2dd171404778c2e2910d095b5de49e0af3d2f7a67d8edd52d16a0a45 SHA512 d212edd21ab99f50c2daf6080c68a3cc0eeed566f10e91f857e7eeb86513f33e9cde25b975db1030110c3b1714cfbfd4d3c9e2937b4a5ff2bb8971e605ecee85
 DIST setuptools-70.0.0-py3-none-any.whl 863432 BLAKE2B 02b441da8254fc228f2d266b96d26b207271341e9291ffedcfa06f1ccd6a64777658ad83efcc142bd6fc0ec91a21c16cfb6e5b9a8792ea3d46d8c5a23c97b081 SHA512 fde01a0c1ef77e7aa0544663f44d3735ad11430bab57906027e1a260c0d8e0d0b873fcefaef956c1d3992879b5908384b759742e4b726804d42cc681da374a7b
+DIST setuptools-70.1.1-py3-none-any.whl 883347 BLAKE2B f0e9c3b3ee278942b72ebf470279841f648e7852d355841dab27d28551ee09fa1ed6a77e02c5c808a820810a134dffdc28038938c0e2003011f966e6d5799428 SHA512 81ebaa3c39d599ae3975ec5848ca03491188de10c62d0a01923ded1cb4d08dbbbb3be9ecee501cfe16d88726ec0899ad8f36f7c7b289f1f90c5bec403b5049c1
 EBUILD ensurepip-setuptools-69.0.3.ebuild 610 BLAKE2B 30d5981f264556c7910d7d2984d37173e3f2b30fc4c08a041e3e4bbf57ceeae35b02582112fc7b190320fccdf55f25e59d9966fa75bfe39fa23fea1986954a14 SHA512 6923031a97ac255e828fecc00f7c7ad99828a0aab5fe17ee3855462a0e8ec422d96cad81b6e938c2d0fc4eed197a22dd38b31c0e38c2e99c5854f171c8a706b9
 EBUILD ensurepip-setuptools-69.5.1.ebuild 610 BLAKE2B 30d5981f264556c7910d7d2984d37173e3f2b30fc4c08a041e3e4bbf57ceeae35b02582112fc7b190320fccdf55f25e59d9966fa75bfe39fa23fea1986954a14 SHA512 6923031a97ac255e828fecc00f7c7ad99828a0aab5fe17ee3855462a0e8ec422d96cad81b6e938c2d0fc4eed197a22dd38b31c0e38c2e99c5854f171c8a706b9
 EBUILD ensurepip-setuptools-70.0.0.ebuild 611 BLAKE2B 18a927f2d734ccb15db9274b285463fdde3ede4a3dab67d9011a7fa128813d66db3bf87466b1fb99b626b2d982c9dc27a20159d852bdb0008d462031fb1a6725 SHA512 e4244990eaab27a8611074e66e896137d932916dbbb0a760f97057662c66e7f31d509aaef276304b67d96d4dfeaef53fd37bb768bc2e2b58123e18f1448b16bd
+EBUILD ensurepip-setuptools-70.1.1.ebuild 618 BLAKE2B 127ebf8ffb8c4bacd0032dcf268755c43c05c498e506b4e8904440460b06e6614456c40696b3e4aa5a74fda69340c07fa50700c0c8f704e3c2df1c831329b992 SHA512 ab22161ed8de46abcb525f9cc308bc4ba1d905125010734a1510f53bb9c440a24967f35730e7c30253f5d9f1d2320d9b6bb5804c907fefda0eee59a0338cc96a
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.1.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.1.1.ebuild
new file mode 100644
index 000000000000..97aca4a61872
--- /dev/null
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/setuptools/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	!<dev-python/ensurepip-wheels-100
+"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/enzyme/Manifest b/dev-python/enzyme/Manifest
index 95cb4899b576..9b9f01118123 100644
--- a/dev-python/enzyme/Manifest
+++ b/dev-python/enzyme/Manifest
@@ -1,7 +1,9 @@
 DIST enzyme-0.4.1.tar.gz 47953 BLAKE2B e81faf1c0b3316511706c2a31f56cdc2230fbce468017134692f1892439c4aa043c5537b78fd267b83d84a1811e2c015aa37d724813da5864f14ae04a9fd961a SHA512 62a85c076a7eb320249a507dcc9dd26572e3a9b9643e0a960ed114a80c75213e6e5028a726fbcdd0c2c46c53af980a69828a54a66af9a17af3210273376395b3
 DIST enzyme-0.5.0.tar.gz 27623 BLAKE2B f472883d44eb5e30250a3d5742b7610cebbdeee363c94f543107c9b1661558e9df9e17b14f670fe98d36c30a6179af9470b550ad696679ca7b52c17f8c832020 SHA512 fa8eadbb9cc5bcc18362496342b8d3f42398ed77ed42a51bf186665a4664050f6ef0dcfbbe7e4d5cfe2f0e1c5f19981a87780b3f8c1e2eeeaa47eaf7c0b55d5d
+DIST enzyme-0.5.2.tar.gz 50543 BLAKE2B 87b45ac4e7e61b8c05aa9e8dc8c41a419850bff7bc5dc7532b2a9045c8871cd1d7241b00c6137200ae4d736d7fe83a1989adafa1865e106eb92e77d5284fdcf3 SHA512 f85d5ee536f2a60d401bc57640b6c989ec94b325dcc6b2a70c27deab2b7336b0fd6cdd3d93790128d6fb3fa72a783dd7814da8ca3665da19593c065af2b07131
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
 DIST test1.mkv.yml 156640 BLAKE2B 9afc0d99de3a8ca6f1df3b9302f6e57ab8003bd49e82e9b49aac60b04a7ae5197cbc34f20c806e95dbdd91311e1103075992549d2b8ef49479870a8ecd9dd1be SHA512 1b17e98ddf36ae5df5ee7cca331c960683770e7af7451950483541fb720416b0eccd77e2b6a9a83081996020c1db77d19cc849d30dcdb8623c75a92048ef98db
 EBUILD enzyme-0.4.1-r3.ebuild 969 BLAKE2B 3a10bd7c04b438316f037976c37d4c0056439d43e6ad68968772ece91b7d3da87dd2c70e923c5aa0cf67ef85d42e9a7fe8c11a64b7b5279f622d8816b193fb6e SHA512 22627ba6e3239440638c393b117206646a7498586db2f4e47757195112d37be1af11ce3c1b220ef058dd7d3e8a7e2112a4f30595e6978095eaa1bebd3789a047
 EBUILD enzyme-0.5.0.ebuild 1103 BLAKE2B 92cf3abc1e30926fa83658780514be98e2380f04b24ea8e0c167df35db3122d5bb3173ac44140a5e12bf654359cf510394b6d8ec26662877a7c201864f7c897c SHA512 1601f346a8972a2ab18dcb9189e7618096d9f11d6b8c2bb8a4e896ba3d84a4b2293aa9415aa5f9a0c34ecc992771fee2f94fa195832729a432b5add0491cfa45
+EBUILD enzyme-0.5.2.ebuild 840 BLAKE2B 3c2034933c42b1095cd14ada53b5b1e3ea85e226dcc926ca01a2c053df3416676ede0a8025a5ff34ea4bf9977a2e12917f55c1bc8b07e7661dd97884302373d8 SHA512 33d6e3d121e41586c905398ff0afa0435e24b332a29a6b9dc1a6129dfbc9ba962eb3e028fa5639050ac5b495f4af1b15c1fb206c0939435e2f3ff79967ee4853
 MISC metadata.xml 440 BLAKE2B 3f051b5dc8cd500fae1124b781826f0b30663ca76d80597715696af5a6651bab1514fbb28cbe174d0cee8e9969170dbfe7b2ab7ba43146218a184e46ce1ef4c3 SHA512 ee850689e22f4f1699a0ff1ec00c248cd1abdd5137d9cfcdb5ecfbb6cc75a1bf59fee1897b484db72947762d56ee01968eb97c667bac4f04d5b56bd08d7546f9
diff --git a/dev-python/enzyme/enzyme-0.5.2.ebuild b/dev-python/enzyme/enzyme-0.5.2.ebuild
new file mode 100644
index 000000000000..32c744ae4adb
--- /dev/null
+++ b/dev-python/enzyme/enzyme-0.5.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE='xml(+)'
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python video metadata parser"
+HOMEPAGE="
+	https://github.com/Diaoul/enzyme/
+	https://pypi.org/project/enzyme/
+"
+SRC_URI+="
+	test? (
+		https://downloads.sourceforge.net/matroska/test_files/matroska_test_w1_1.zip
+	)
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		app-arch/unzip
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+
+	if use test; then
+		mkdir -p "${P}"/tests/data || die
+		cd "${P}"/tests/data || die
+		unpack matroska_test_w1_1.zip
+	fi
+}
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index 131f25651fff..7b4368f64475 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -1,5 +1,3 @@
-DIST flit-3.8.0.tar.gz 139496 BLAKE2B 85ee9fb13af35bf6716713bd7cf3f5893cd729826ad362aa5ec22077f9b4d16db4d785f183dee37c725b771188f31f2cf38c8e4aedc3af25a3efdc8ff1460bc6 SHA512 08170ee710857fcbfc1f72dbb94c535d70a2477c7598eacacc9a0e2f90f4fe11f4d910f1fcc11de210a6b50d89049e5835127090c6acabb00c69a821919e68cc
 DIST flit-3.9.0.tar.gz 141104 BLAKE2B 4ca268c49a34817756dea5fe7d2bd2fa15fe8f4247bcdea50765d56c43fd9c89292f45ae2a68d6f210d994ed1bce159121aba02e769f22940c548baf3e212afe SHA512 3cbca4530fe463e27fb43130e0d00681e63434bdd552bd61b4a2f3b7967729d9d9a49c69b1a2380ed99bcca1e66a38e592f41cbe38a471d3e7297ab00cdabc29
-EBUILD flit-3.8.0.ebuild 1455 BLAKE2B 3fdfbeeca3d9f139a27b9121d53e478bbd09226138bc3d4465aca4cfcd9241d1a709e028176bfe3e5845cf084425f9ce7665b57aabebd08e2eb5b537edae452a SHA512 9965a8da95dab82663d6667f60537b5a9c9ba38a57cc51c9ac9a7642b4012749f7cf45218c1b5bf899bee792592696501857623ee362b8761aca25b440afa739
-EBUILD flit-3.9.0.ebuild 1456 BLAKE2B 41561b32fe219368e1be7b66f282fc3776878c52138130f535ba8a0264f8da08446bee47441114a9d26892c9904151bba2d2cefabd3481d64eb5b549f6601aa5 SHA512 b4675a29a4608eef04a6eb94750f0a0dee33d4bf787b7adfd52961af442fcd88c8a7760777d504d9970d5aa6c2a7a0368384ae081b344891dee5170127bf4136
+EBUILD flit-3.9.0-r1.ebuild 1372 BLAKE2B 6b41720020b6926481f10d1b4dcca7e798ce7d2d45dd42c4bf450e8cb60c547ca7bea4490762284cf26557fdedf63cadd345c4a59e037a855d7458944937ddc8 SHA512 8e2597a2cf4e734574623405125fe53cf7fe7ad5ff3ad9bc163d767d8103549d0f88fb63522b2012fc88e08fc55bc27caf98344ffb33668aacee548c766602df
 MISC metadata.xml 467 BLAKE2B 534a82783fa3ff1642fc8400689549e75223fa01b175f4ac164d4a636a4c9eaef5bdd9fdd339ffc30239436449788b4d01ebc5e3609034d440c01a5c699176ea SHA512 ad8f3f98a35aa88255bafa81ea9cb109e14b8a544b053cff3f1325dfda3c4c6343a5060353c43a08e030e80a60186eb7dae248d7f6739ea95a7e72e747b1b194
diff --git a/dev-python/flit/flit-3.8.0.ebuild b/dev-python/flit/flit-3.8.0.ebuild
deleted file mode 100644
index 96da544a396c..000000000000
--- a/dev-python/flit/flit-3.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/pypa/flit https://flit.readthedocs.io/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/flit-core-${PV}[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	sys-apps/grep
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# requires Internet
-	tests/test_config.py::test_invalid_classifier
-	# failing due to Gentoo pip patches
-	tests/test_install.py::InstallTests::test_install_data_dir
-	tests/test_install.py::InstallTests::test_install_module_pep621
-	tests/test_install.py::InstallTests::test_symlink_data_dir
-	tests/test_install.py::InstallTests::test_symlink_module_pep621
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/pygments-github-lexers \
-	dev-python/sphinx-rtd-theme
-
-src_prepare() {
-	# make sure system install is used
-	rm -r flit_core || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/flit/flit-3.9.0.ebuild b/dev-python/flit/flit-3.9.0-r1.ebuild
index 249a8b03166e..572497166710 100644
--- a/dev-python/flit/flit-3.9.0.ebuild
+++ b/dev-python/flit/flit-3.9.0-r1.ebuild
@@ -18,8 +18,6 @@ RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
 	>=dev-python/flit-core-${PV}[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
 	dev-python/tomli-w[${PYTHON_USEDEP}]
 "
 BDEPEND="${RDEPEND}
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index f651c25fddfb..932da21dfc9d 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,3 +1,5 @@
 DIST gast-0.5.4.tar.gz 25346 BLAKE2B c7161737367c2a3335d9e51af1dc09934ea16694d497cb151ed713b3372666456b5dcc2c595294c7162035af29d454bad5c8fb677030de9235c52d5ff8a3f05b SHA512 a288e2ecc15af2a5d50cb34979995f936e88cdaa4427f809b69015cb6ba98eaffd7ea9eff2dc61dae6f6c2d7d9c5cc6e3e9a5565bd7b1dd308cd39f56087c67d
+DIST gast-0.5.5.tar.gz 26733 BLAKE2B bc309969ace97920b7278fb329ecaa050090df3b9624d70350ce16bb090dbb0f4474407c34457abc2d1b8e728671c0e886ec46b2c94237b678575be34d593e98 SHA512 7325c9096f99f43e2d791f39acd7e655724e23c9cd93a838ae703377eedd23190af0f52ae07330323b90ef95bdcf6d032d39030823749557fecd9d00321a4163
 EBUILD gast-0.5.4.ebuild 507 BLAKE2B 4137fc77c6b9ab0637d300f635ac5617361150b36493c133c4664abf4d8e6218d61b7aadf027d95663aa21e83352e263e4e73e8bc421a973e1635ff2d0323bd3 SHA512 ed267bcec64c63d117461af01a7b63f7658b5e6459588b623c8caaf394d22176085e3b6873b14ba7468e1ec743919e2ab57e54772ffe08a0f6bdb537cb78fe84
+EBUILD gast-0.5.5.ebuild 560 BLAKE2B 4eb4e8f641093570d17a630a0edb5e1ffb5b4e2a72bf17eb3dc488718dc632954e7589729e9cf813e40e90a00e38e5f3c5be412c79508a2575bfa18e1acb3d51 SHA512 5c1f3e068063666a8717b79983e440e8a2e2def7ac26951e640c2967c455841940edd9c3d971cefaf7f8e3b122e11554706b37f71d16184c39ddd0a5a0bf9f1e
 MISC metadata.xml 739 BLAKE2B 6a226f9d712552a98ff4e7562da4097bb307fc7641085f45aed3f8610fefcb01e8458e96a5e46af30e3e01574415149269dcf5222229290225dd5f02543959b0 SHA512 02f9b1a30219372f6b769158ff9fb096a74f7d8ee6b67f5f9ad23ff382ce450767867a4074e04b1d5ac77e1987c3e9b661630e7626b68f8b5270032d7684161d
diff --git a/dev-python/gast/gast-0.5.5.ebuild b/dev-python/gast/gast-0.5.5.ebuild
new file mode 100644
index 000000000000..4747a4e751f1
--- /dev/null
+++ b/dev-python/gast/gast-0.5.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
+HOMEPAGE="
+	https://github.com/serge-sans-paille/gast/
+	https://pypi.org/project/gast/
+"
+
+LICENSE="BSD PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+distutils_enable_tests unittest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index e8f7e863d1f7..34b8c8e58fa4 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,9 +3,11 @@ DIST hypothesis-6.103.1.gh.tar.gz 9463631 BLAKE2B 7c7df97ff5702103c3e02d664732cd
 DIST hypothesis-6.103.2.gh.tar.gz 9463865 BLAKE2B d14882642edf53354a6cc8bdf4fb8ac3a5e93a6d5387186e2bd442447710a3e0e84dc61dee6febb690e85552ec3642df58fb731287a6ffd4fc59bd0c69f4f6a9 SHA512 e18ed2ee70541bf992aae784bed59e4e9b1cd784f2bc35573d3a375fcc749bd0a756b7a2a494a16a04ffca386034bab6f99ae0e25ddb18542af0754df081a359
 DIST hypothesis-6.103.5.gh.tar.gz 9465630 BLAKE2B c85fa7a5fb62db9903fc8c1641b2e58628bab96561239d4df00202475272da817139d7aa3de68ad064bfdb65a8effade71e2f1efb550f1792028b4f79193f572 SHA512 705383cdf6f9e9fc69dd5e967adef13e7712be207f7ff58368d9f03bb2e41009e1853d01db6beb19c8b65f44d33123932e1d2cf1c7a09e31498ba05234c48798
 DIST hypothesis-6.104.0.gh.tar.gz 9466479 BLAKE2B 9cf9f28d3ad739a40062369a37ea423df4b10101d43c54e62ab395bbce970f6500aa09f2bebbb55145488a979616407cd7b35f28336d6657e585782de72ebe9b SHA512 5823ed6ac3461bc6612e93cbeb74453cef902add4c8db09a98459ac056c8689382cbb007a035c27f215057a635e74bda7e32835d442e218ccabd6c477bbd3ae8
+DIST hypothesis-6.104.1.gh.tar.gz 9466716 BLAKE2B 5ddefd5199bfb22ef8c2c2ae995de5353e7d067f044788f4cd9423cfa4674ff1c5a05760d686f4b4dd5fe9afb2b4ba1cdb38aa7d590575f79d75c460adde63ab SHA512 a9eef39e3cc8fde806cb860f47190239a680c3203ca0228450a7c999ee9618964e201c05a994835e5513f7945b3a5f830fd9fa941d4cfdf4793e5e2fb266df47
 EBUILD hypothesis-6.102.6.ebuild 2514 BLAKE2B 1ad3d2518c490ef10d8e2fba0719e5ae4d11c1f44a82e1ebb6fc679aec161ed981b386225070090ea825fa154ee1896062db01e9d8d8c0daab1128cbdec7aa03 SHA512 b6116a2392ca288b55936a9e1d57231f64d08eada7a18d65d8f764b01a71afad967ff35102aaf528ac96cebebf344442d0334c4a499c02b43a5d82942b97e9fa
 EBUILD hypothesis-6.103.1.ebuild 2522 BLAKE2B e17cd7e595def59d5b8c35d6cd2c1af05e8febc9e0484db1030a9d86cc99e41757e51b9a6789c27d080bb5d59ea74c701a88bd8f423e6bbc63ea24b2a6de636d SHA512 05df0864941735b7d4d342ddaad53bf27689063a90a3f3bf7b2e8d4521243a6c3964bfc1935d466b99c505c122c2dd342c8532f048ab8fead90d185e3f7f1c87
 EBUILD hypothesis-6.103.2.ebuild 2522 BLAKE2B e17cd7e595def59d5b8c35d6cd2c1af05e8febc9e0484db1030a9d86cc99e41757e51b9a6789c27d080bb5d59ea74c701a88bd8f423e6bbc63ea24b2a6de636d SHA512 05df0864941735b7d4d342ddaad53bf27689063a90a3f3bf7b2e8d4521243a6c3964bfc1935d466b99c505c122c2dd342c8532f048ab8fead90d185e3f7f1c87
 EBUILD hypothesis-6.103.5.ebuild 2522 BLAKE2B e17cd7e595def59d5b8c35d6cd2c1af05e8febc9e0484db1030a9d86cc99e41757e51b9a6789c27d080bb5d59ea74c701a88bd8f423e6bbc63ea24b2a6de636d SHA512 05df0864941735b7d4d342ddaad53bf27689063a90a3f3bf7b2e8d4521243a6c3964bfc1935d466b99c505c122c2dd342c8532f048ab8fead90d185e3f7f1c87
 EBUILD hypothesis-6.104.0.ebuild 2593 BLAKE2B 434f71f7fad97f9e06d3e0a459d8d724c7000ea5ee8712f382c9c8f3746550159b272d208d926d389d87c8198452c410197e55a5e8cb5fec33c8a38719d6bf6f SHA512 5447fcdfaaaa7f15efa13eabee95232a4ac40c248ad5a3c9c7c26846e1868ac1ddd62bd3c6cd8375f7a5cb3ad322ee9dbd737699069ee7f1df2bcfcfcde84aa1
+EBUILD hypothesis-6.104.1.ebuild 2593 BLAKE2B 434f71f7fad97f9e06d3e0a459d8d724c7000ea5ee8712f382c9c8f3746550159b272d208d926d389d87c8198452c410197e55a5e8cb5fec33c8a38719d6bf6f SHA512 5447fcdfaaaa7f15efa13eabee95232a4ac40c248ad5a3c9c7c26846e1868ac1ddd62bd3c6cd8375f7a5cb3ad322ee9dbd737699069ee7f1df2bcfcfcde84aa1
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.104.1.ebuild b/dev-python/hypothesis/hypothesis-6.104.1.ebuild
new file mode 100644
index 000000000000..d401f55b2788
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.104.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 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-22.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.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+EPYTEST_XDIST=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,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${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/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
index a4933eabc649..ce5ae905f278 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1,7 +1,9 @@
 DIST importlib_metadata-7.1.0.tar.gz 52120 BLAKE2B a43a1f0724b3197f51c055d36d31700d67b3bcae849fd648c7cd1ac158a410fdf05a27f2c7003a30e566f86ec5dcbf7cf386ebe4e0ed0a1ce2e89e280ab9e1d3 SHA512 e75db6da03c251acc690ceef6ab2b668acfcf5499032cff370a574b31a5fd7afcbf9756bc20e44e6e649767c1609c7ebb40203aa6406ec5341f27fba886d208e
 DIST importlib_metadata-7.2.0.tar.gz 52330 BLAKE2B ae781c9f161ebb52c862352aa460d071cce7c410747bb3ed0a3e7a1166aeb2a071ea0d17171b52e11ab6b60e6580f81b82a6c49a028e5bffece9720e628198e1 SHA512 0e39394b6e91970bf6777a5242ffa1d91524798eb2c8c365fa66099d52e5071f0daae39aebe03e2f5d2533e671792ddd1a342a2f10690df565ef39e251b3d0d7
 DIST importlib_metadata-7.2.1.tar.gz 52834 BLAKE2B e0225aab9ce4dc1049628bdc36dc62db975759f5e963842005ff11dde775a58aa9ce4e479073e8f427da6c00f2836d017ea2f7e37953c090fe36a8e49da5425c SHA512 553cf9e490f2a0f5587ebe8c10ae28f1d692c15b60537f73d07e4e2ee78d6e6de72275ab4f9f1fbe8994dabb525f0004afbd5d232b00f1cb9e2b01f2c8c14e8a
+DIST importlib_metadata-8.0.0.tar.gz 52667 BLAKE2B 5ca77157938dcced0c32a526e760a2d29bae5c34fa5a8f5711f3746278a9843ca85d82405eafe18821b5f7956bf75cdb2b619db903be8de96d60462b4af7fb62 SHA512 07245e6ba3f47ecc7ff4201b2dd24e6970317fe7ef0a39d74a66de180269f480c09e12601738c7c11e720a2e7c78347871ff83700c7f796a01fb1a12c8e46ff6
 EBUILD importlib-metadata-7.1.0.ebuild 1409 BLAKE2B 40fa82029d088d926cf55627552ec35c87c3f55d1d484f621a963e2eac254af36da29f12426272eb1a75f928094bf346aca202c6facb24d3812b115679d6989a SHA512 13007ef3e4e4d1caac3dffb2f80bab464edaf2baf85f8eef785ffe84a0f7e0cbe862067994c8f9639e60028e2e96a2553fda7a20e4454831f977ab0fe16a25cd
 EBUILD importlib-metadata-7.2.0.ebuild 1417 BLAKE2B ea90c07b3046918980c8a47f301adef126fdc93f0d009a7d5ca6acdce537e41821be09b8a85037544f9ad91d1c09f41cc2fd6c39cbaa1cdcddcb0bddc464d96b SHA512 ac7bec60ab437fd253e6936c03a1328aaf81fba59472335e2d41765bd2be25c0e86db5493289a4f03fe31b1f23db1c7e85c766f3e80dccff97ecca54f72ee513
 EBUILD importlib-metadata-7.2.1.ebuild 1417 BLAKE2B ea90c07b3046918980c8a47f301adef126fdc93f0d009a7d5ca6acdce537e41821be09b8a85037544f9ad91d1c09f41cc2fd6c39cbaa1cdcddcb0bddc464d96b SHA512 ac7bec60ab437fd253e6936c03a1328aaf81fba59472335e2d41765bd2be25c0e86db5493289a4f03fe31b1f23db1c7e85c766f3e80dccff97ecca54f72ee513
+EBUILD importlib-metadata-8.0.0.ebuild 1417 BLAKE2B ea90c07b3046918980c8a47f301adef126fdc93f0d009a7d5ca6acdce537e41821be09b8a85037544f9ad91d1c09f41cc2fd6c39cbaa1cdcddcb0bddc464d96b SHA512 ac7bec60ab437fd253e6936c03a1328aaf81fba59472335e2d41765bd2be25c0e86db5493289a4f03fe31b1f23db1c7e85c766f3e80dccff97ecca54f72ee513
 MISC metadata.xml 540 BLAKE2B aa3ac97002fae5cb12dd2a8bab724322fa7a2ccea0b8b8b7e46a9e27e9566493b12a795e47724b703a74387b3805e925cc0b042a020e2a2e7862f74455b87809 SHA512 bc20e7317e1ea93d3d06666830bf32e00be6d50b1b8fb47d8092b3a80078a575e04c2cdbf9b78a17dbd1af23ae1d75766e62005ebf2942359ddd71867e8d9a12
diff --git a/dev-python/importlib-metadata/importlib-metadata-8.0.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-8.0.0.ebuild
new file mode 100644
index 000000000000..b6c5249283cd
--- /dev/null
+++ b/dev-python/importlib-metadata/importlib-metadata-8.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="
+	https://github.com/python/importlib_metadata/
+	https://pypi.org/project/importlib-metadata/
+"
+
+LICENSE="Apache-2.0"
+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"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/jaraco-test-5.4[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}
diff --git a/dev-python/jsonschema-path/Manifest b/dev-python/jsonschema-path/Manifest
index 80f16c92086f..6dc853e8ae4b 100644
--- a/dev-python/jsonschema-path/Manifest
+++ b/dev-python/jsonschema-path/Manifest
@@ -1,3 +1,5 @@
 DIST jsonschema-path-0.3.2.gh.tar.gz 39521 BLAKE2B 871bb33c7839a3b9bf66e145c239cd6715cfaa2ae782f28b77de83228136af5259e1757856e47f0ac26f46572911553510a153f4f48e3b1d2a813160eb65c143 SHA512 e49b32c4609238d2808938976bd0022f86837e9d7d296a137d42f8e8c80d20d20fdd23a07b898063536290b36bd72df0abef64b65997a66cb3fb9c403cc275d3
+DIST jsonschema-path-0.3.3.gh.tar.gz 40104 BLAKE2B 00f3551f807a76ca59d7dca55d28dc86f36f94ad03be52376a67f29936a1215e50dc5d4af33aabe29026913737e9f453d466450122411297f714e3557fe06d2e SHA512 846d476285b4c89d0241d18be09eb7c12df855f7b28f0d3ea9942a9d23977f3c051b93a1281f6f5323c2c4bc9c86fe82b5eae1bce647f58d9d2acce65d4f54a8
 EBUILD jsonschema-path-0.3.2-r1.ebuild 1125 BLAKE2B 7c002869ed29845946eb3cbfbe18edb24df78c11979219cf5eeb965b1e92f3bb6ddef127d221b61ab1684cf984ec5263fb652cd5bf12e8f3e5a03541c93fcd74 SHA512 660b58dd5dc4c931cd0405bcecd2513abc6e34b679ef6dc1eaa19c839406136c786cbd452651b53a3846c55749204252cfdbb64ed168a6b996ecd226a4b530ce
+EBUILD jsonschema-path-0.3.3.ebuild 1130 BLAKE2B de771b65231b94f4f2d8c4ce3d0d94ac80c4e7c24f22b91b3e903e666871ae94e324b6d94bd83c72b27686e514598fb84378d463136629e8d3b851525bf0f522 SHA512 6bfbf75067d9a155913af58723ff7ecc09895e8bcdd6549d47e1a3adb9846ecd4139c75aa7e247b393ae69ccc063e68812ab8911fce2bec612aac17ec986096e
 MISC metadata.xml 404 BLAKE2B 1ca43c4b4650286727d5676f4179f99daa52efeeeded543e3453b91033fb68e6639851b1149a93f28b2fec501acc9623bcb2cd2f58d9df59db505a7ce730807c SHA512 0e041011c6459c256ef992aecea2ac5782d608855da7ddf15340e2a66f89c4542078563dd560a03cc5b13df5c85858c4796d74f39f5a9d257d131f758d5a1bd3
diff --git a/dev-python/jsonschema-path/jsonschema-path-0.3.3.ebuild b/dev-python/jsonschema-path/jsonschema-path-0.3.3.ebuild
new file mode 100644
index 000000000000..ee7d7a29e156
--- /dev/null
+++ b/dev-python/jsonschema-path/jsonschema-path-0.3.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSONSchema Spec with object-oriented paths"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema-path/
+	https://github.com/p1c2u/jsonschema-path/
+"
+SRC_URI="
+	https://github.com/p1c2u/jsonschema-path/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+# requests seem "optional" but they failed at properly making it
+# optional in poetry, sigh
+RDEPEND="
+	>=dev-python/pathable-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/referencing-0.28.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	# remove random pins due to caret operator
+	sed -i -e 's:\^:>=:' -e 's:,<[0-9.]*::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 4caa50254f38..72d2840200b4 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,5 +1,7 @@
 DIST jupyterlab-4.2.1.tar.gz 21505297 BLAKE2B 10f3ed9a3f223623b7414f24791dfe488bc5b94a1bef8c4dae462c246c03fc265254516d39452c79a9226a44afd0fb0a8d3a1b5958f8fd34b125b79c0694e85a SHA512 0235d1561a043c75613289204242c349dcee55ae2c30e4fb3dd04ac4ca5bc13d57d13926603e46a64dcc46aeb3cbc8b5eaad56c3824760ac54e62d20d6eb2b8c
 DIST jupyterlab-4.2.2.tar.gz 21505687 BLAKE2B 3a55aa4cb51c3c8972b44793c1f65c9a773c284d3248c31b0e5e4b1ec26531cecd3504cd7e226a9e237a0783b823b71539f1ebb90a195271f9853267c367b64c SHA512 2e93bcdb0948d1db05e7053582e6a427c1f7133fbb96aa0a7205b6d6eb14e050dde1076807cedc1231e27fd9729acb7a88dff3e6369a8b300b73e093783efcd7
+DIST jupyterlab-4.2.3.tar.gz 21505072 BLAKE2B 8cc9aaed2fb848ecad6fb408968d66583ed69752cd8b5f62e19949b7aa5180d66950802649c137feddeab9e26f5ecb0394b7fdba751a4d784d00625d9b750fd3 SHA512 4ed3dd40ee43a05c8393531b87f568f3ffab43f20d1e8c8ad96c90bed4f67d6c83ab0a2664098cd5e39580427e03f4170eb4d91e9b8cc924b70f977db3cdc7de
 EBUILD jupyterlab-4.2.1.ebuild 2710 BLAKE2B 1fec0b44c47ba7e432ba224b8d24a190933b4b0b84add72d5a1ed71e3e3456957cc93f6a3e012bab67ca97dfdc89656e72098eae942b9a9455e5e76743be5524 SHA512 0fd02aa6a288e137d529c14720fecaa4e5e66ff66d02c9e1f87a4c213b7be811a9035bfeea2b590131064d6b223eaac3fac0866b9a26fde094dff838daf5e810
 EBUILD jupyterlab-4.2.2.ebuild 2765 BLAKE2B 18508727647b6c8a027dfcbe6f4930e17d466a5e300093a58a05e571feb4b2b5b35a0ee1e42bdd5793ff7e81a1dfc74436493dbe8417279092c4a7fadce009bb SHA512 1ad2ee34bab187e5f6ae22b0032456a490ad7f22def66af2a2c50f890688921917a0e712a5063112203d35fcd06ea38f71b8b339045f7d4a5131ed6d1b526520
+EBUILD jupyterlab-4.2.3.ebuild 2765 BLAKE2B 18508727647b6c8a027dfcbe6f4930e17d466a5e300093a58a05e571feb4b2b5b35a0ee1e42bdd5793ff7e81a1dfc74436493dbe8417279092c4a7fadce009bb SHA512 1ad2ee34bab187e5f6ae22b0032456a490ad7f22def66af2a2c50f890688921917a0e712a5063112203d35fcd06ea38f71b8b339045f7d4a5131ed6d1b526520
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-4.2.3.ebuild b/dev-python/jupyterlab/jupyterlab-4.2.3.ebuild
new file mode 100644
index 000000000000..70f94aa414ed
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-4.2.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi xdg
+
+DESCRIPTION="JupyterLab computational environment"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab/
+	https://pypi.org/project/jupyterlab/
+"
+
+LICENSE="BSD MIT GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/async-lru[${PYTHON_USEDEP}]
+	>=dev-python/httpx-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-6.5.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-server-2.27.1[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
+	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-40.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
+	' 3.10)
+	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	net-libs/nodejs
+"
+
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-cache[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# These tests call npm and want internet
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
+)
+
+EPYTEST_IGNORE=(
+	jupyterlab/tests/test_announcements.py
+)
+
+distutils_enable_tests pytest
+# TODO: package sphinx_copybutton
+#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index cfbb4d1875c7..92533ba4afaf 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD lit-15.0.7.ebuild 913 BLAKE2B 38afb1ee0c64d7480ccf1c84c6c1ae0e1ff5f75a0b52272b68d50717a338f143214329245bd650e107d8091ffe1bef6b29293a4b47d147122ea6cea64b448b92 SHA512 fc58e9f0ba65f388830a4e935f448126eb61f2dcf6fa40750e6feaf8a5943fb259bd3c1db3877767e4ba9ade75f6204de8a33c14630176a34fa097e522a0a051
 EBUILD lit-16.0.6.ebuild 921 BLAKE2B dcfe57279dff5c6d80fdf5fc115c76c8ae5af3c8c7fa5da0f1c5592a3428b5a3ecd5c5feef4635c139d4d2d7a7edba53d07a53ba6525b778767c906daf6fd252 SHA512 d5c0943678b3e65cdb148bac517e1ce9700ff8a65c63796e0d4640a28d1086c7bb95f9b6c2d6507c379521cc320108b12f7c4165b4c8c4ff10d56ade2a90a438
 EBUILD lit-17.0.6.ebuild 1022 BLAKE2B c0c1efc62ae127c2abaeb2a7ef4f436d0aca737aeb2dcdb1475eabd8eb08801b916ba7e9687b111e5bcc42ae826981a4c1bda87d935b48876f26ac265186de34 SHA512 4d287525c33b812f748a6f6ff71a26c0607f9e8707299648d7eecc090fe26d4b6c8af6fb338450455c0b2bfac2c6ba06a4008a17c3f5007ee8e473e233941a8b
-EBUILD lit-18.1.7.ebuild 1035 BLAKE2B 72c71b240c838db20d73d99d7cc77c342df723b8bcf91e04a656e6801a12747d31bffb8727693cad71be83a5ad4e1b6c9fd1c848d26078b9bcf5b031add660f3 SHA512 139b11fb31709cd7bb98862176624ff1abae6fcc2d6e6712249a3da97203cdfe6b588121ab5b1d8b589c7c70b93d0bc17e1bc7358c3b92c67a5bcd586ad293c7
 EBUILD lit-18.1.8.ebuild 1035 BLAKE2B 72c71b240c838db20d73d99d7cc77c342df723b8bcf91e04a656e6801a12747d31bffb8727693cad71be83a5ad4e1b6c9fd1c848d26078b9bcf5b031add660f3 SHA512 139b11fb31709cd7bb98862176624ff1abae6fcc2d6e6712249a3da97203cdfe6b588121ab5b1d8b589c7c70b93d0bc17e1bc7358c3b92c67a5bcd586ad293c7
 EBUILD lit-19.0.0.9999.ebuild 961 BLAKE2B 80f2289924953263c1c30b9f4e019f707ca6deed804a8c5b980a14701478d700dc1b24944f5a964bfe94174ffb34cd9c864cee70c02cfa3b1b4c025fc8317188 SHA512 ef6e43057ac2e4a2ab482fe48cfb432ab155a23e0d64bbc0d9e451fd00da3c9f17dda4f18ccd2554ab4ac2d5eff2b0df7ce57c2b61cb5145454d9e86eb089e92
-EBUILD lit-19.0.0_pre20240608.ebuild 961 BLAKE2B 80f2289924953263c1c30b9f4e019f707ca6deed804a8c5b980a14701478d700dc1b24944f5a964bfe94174ffb34cd9c864cee70c02cfa3b1b4c025fc8317188 SHA512 ef6e43057ac2e4a2ab482fe48cfb432ab155a23e0d64bbc0d9e451fd00da3c9f17dda4f18ccd2554ab4ac2d5eff2b0df7ce57c2b61cb5145454d9e86eb089e92
-EBUILD lit-19.0.0_pre20240615.ebuild 961 BLAKE2B 80f2289924953263c1c30b9f4e019f707ca6deed804a8c5b980a14701478d700dc1b24944f5a964bfe94174ffb34cd9c864cee70c02cfa3b1b4c025fc8317188 SHA512 ef6e43057ac2e4a2ab482fe48cfb432ab155a23e0d64bbc0d9e451fd00da3c9f17dda4f18ccd2554ab4ac2d5eff2b0df7ce57c2b61cb5145454d9e86eb089e92
 EBUILD lit-19.0.0_pre20240623.ebuild 961 BLAKE2B 80f2289924953263c1c30b9f4e019f707ca6deed804a8c5b980a14701478d700dc1b24944f5a964bfe94174ffb34cd9c864cee70c02cfa3b1b4c025fc8317188 SHA512 ef6e43057ac2e4a2ab482fe48cfb432ab155a23e0d64bbc0d9e451fd00da3c9f17dda4f18ccd2554ab4ac2d5eff2b0df7ce57c2b61cb5145454d9e86eb089e92
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-18.1.7.ebuild b/dev-python/lit/lit-18.1.7.ebuild
deleted file mode 100644
index 75b7c01e4ef3..000000000000
--- a/dev-python/lit/lit-18.1.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-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 ~loong ~mips ~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() {
-	# flaky test
-	# https://github.com/llvm/llvm-project/issues/72022
-	rm tests/progress-bar.py || die
-
-	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/lit/lit-19.0.0_pre20240608.ebuild b/dev-python/lit/lit-19.0.0_pre20240608.ebuild
deleted file mode 100644
index d862b4f8cd03..000000000000
--- a/dev-python/lit/lit-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-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"
-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() {
-	# flaky test
-	# https://github.com/llvm/llvm-project/issues/72022
-	rm tests/progress-bar.py || die
-
-	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/lit/lit-19.0.0_pre20240615.ebuild b/dev-python/lit/lit-19.0.0_pre20240615.ebuild
deleted file mode 100644
index d862b4f8cd03..000000000000
--- a/dev-python/lit/lit-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-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"
-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() {
-	# flaky test
-	# https://github.com/llvm/llvm-project/issues/72022
-	rm tests/progress-bar.py || die
-
-	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/parse/Manifest b/dev-python/parse/Manifest
index ed8b552f670e..184720f81a3e 100644
--- a/dev-python/parse/Manifest
+++ b/dev-python/parse/Manifest
@@ -1,5 +1,5 @@
 DIST parse-1.20.1.tar.gz 29122 BLAKE2B b201f0cc491c964909bf0e4f0b406922ad7dcc0f1e232785efdf434e4c7643aaff53ac46b24c893eaa262d35021fd86001541fcb5e289a10e5163e7c2626e02f SHA512 6aee92558496e9eca2fc1647131671dd88934687fbb23a04a99213b7885f4da776235cd380a7ea237b5f5b018522f92b6d702bd58858a0957a2213baca0e2a5c
 DIST parse-1.20.2.tar.gz 29391 BLAKE2B 974633d8e7f910acdd1d06a85f863bee848e8203595e4cb6ce20b925dd69d058c71ac7cee7b6649663b12a78278ab626768baeef944e9fb3f1d47e7c565923cc SHA512 c609a66b0fdbc090c1b7aa2a6c681d3c4e0ea23410046bc7f6082d3f35b554d85278fd91320df11d5c0f87e66b978b4509a5b26d676e80e311988fba58fff6a4
 EBUILD parse-1.20.1.ebuild 455 BLAKE2B 42ec96ae7e520dbcc0dc0c286b08f348d51f18a17868716fbb2c9bc25f3c36532da883ae0008706cec252fd951870965f86cc246491d1791f4d64cc65ad77ced SHA512 953e13e73788515fc6d0085822cd952e9293f448043c0996a47bc1ef5a81333c70b418bf9d9632ecd7168d6ef6e8eed993a199b557e94200912f257b5acd75f7
-EBUILD parse-1.20.2.ebuild 460 BLAKE2B be9b7e5b9e644fd52cf41eacc65dea00b05c42e6c94d888d88ed975c9d6a9b891dba8a123e3e0f738ab4a7ae17396c51b3adda5ffca7d269404a9929b5b69345 SHA512 33718b1b31b7e3296d36860e1388396e53c58ff82862e243ca580ccd87b6f3b7618267f782b38a776f45d0bee42f001ea3a0571300de2cfa7367d6f3424dd8b1
+EBUILD parse-1.20.2.ebuild 455 BLAKE2B 42ec96ae7e520dbcc0dc0c286b08f348d51f18a17868716fbb2c9bc25f3c36532da883ae0008706cec252fd951870965f86cc246491d1791f4d64cc65ad77ced SHA512 953e13e73788515fc6d0085822cd952e9293f448043c0996a47bc1ef5a81333c70b418bf9d9632ecd7168d6ef6e8eed993a199b557e94200912f257b5acd75f7
 MISC metadata.xml 396 BLAKE2B 42ba6e57fc13212435a73e964b285263bcf59113036917323c9d1f8f9b7a6c2154026023f8f5e5860ea883756f0faf374330eab21492f023aacfcef2e0e59a78 SHA512 b3c05ef4031f719e4349f165a9457d1fefb6bcd39167e99d1ccbe2a7c72b14b1541c16f4cdd334f670fe46c8c5a88ff875e8f57d33cdb6b85cab0fc7fae6b750
diff --git a/dev-python/parse/parse-1.20.2.ebuild b/dev-python/parse/parse-1.20.2.ebuild
index 664ce6fee31c..3848625e961a 100644
--- a/dev-python/parse/parse-1.20.2.ebuild
+++ b/dev-python/parse/parse-1.20.2.ebuild
@@ -12,6 +12,6 @@ HOMEPAGE="https://github.com/r1chardj0n3s/parse/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest
index e8a61080742d..99f7411b7784 100644
--- a/dev-python/pdm/Manifest
+++ b/dev-python/pdm/Manifest
@@ -1,3 +1,7 @@
 DIST pdm-2.15.4.tar.gz 2614984 BLAKE2B d405db3a1e3e678bf27b0edc91434c7c78da902f2b7615dd8debd47db020817fe80a16562efca875e8ec3b2a39355c9bf5362f48c40a032c41607222951e9a01 SHA512 b15490723f3052b3cd8ed2d000c3b1a3c7fbd77c5f0bbcbb1dee8c74d5266f6835e395878eb7eaf8dff28c11daeb15ce60db9fe49c847ccb5bee2a7f211021df
+DIST pdm-2.16.0.tar.gz 2618359 BLAKE2B 224f6cb0f2bbcd7cd236e062e51e461c0bbe26333df5e01da8a9b326c6382b48fb8f32aa761040be873e5af0e3dcc8d87ea2a7ad9123ea730dc19fce3952b915 SHA512 6ee787dfd309e9cd8ca125e2d7bb6c7cb1055aec8e7f4ad7dbeeec0b1330105d3632c0e5c66071473d66e4b5bd1e80209654b44dc849a5309fa228ab07ea8a89
+DIST pdm-2.16.1.tar.gz 2618476 BLAKE2B f32de9aafbaa1050e9373921bc50643c21b43775e7737f5717914f8bc65de7ad126d7dadf94ae55e7848596db1b6b0c1ffa9cb1d9ada914dc2be85cc71ac404f SHA512 8b244c67421ed5b3eb3b6958da38abf776cb8fe7eb5b9de646027fc14d15ecf74f90a128d4a4405cedd775294df3b13f76d606c2cfc86b222ede1c2134f63f84
 EBUILD pdm-2.15.4.ebuild 5013 BLAKE2B 3e4724269ce8d786119f1d40207a462417561dba310287fe7065546a7a2a03b9feff56b3b260e0fc12a04977cf4cab54db33a222f6395930b494a7581749e336 SHA512 90ea127f5eb738d0d3a859b5910230848694f31411a4d431ad470100ebeeb16a24440b1c54d80c45c5efb7ccbe04b69c6e9f86aeadca671d121c5fb864e4185d
+EBUILD pdm-2.16.0.ebuild 5013 BLAKE2B 3e4724269ce8d786119f1d40207a462417561dba310287fe7065546a7a2a03b9feff56b3b260e0fc12a04977cf4cab54db33a222f6395930b494a7581749e336 SHA512 90ea127f5eb738d0d3a859b5910230848694f31411a4d431ad470100ebeeb16a24440b1c54d80c45c5efb7ccbe04b69c6e9f86aeadca671d121c5fb864e4185d
+EBUILD pdm-2.16.1.ebuild 5025 BLAKE2B 66c126214ca71347a235a3fd9278792e8121078f7ba3da21d47e78e7f0ea3891e000c81e46411db322dab0a5bd38723dd23308b7d252f5bb0768770b99b48791 SHA512 086c94bfff0c2e704f1cabc57059d984be344f108821c7f0211c87848a6a9f1582afa0f1a06754e11662866edb26bd943de1e1b1ef69e1747bf903f82de5b40a
 MISC metadata.xml 474 BLAKE2B c1471e124a955920e30f73dfa43a87999c30c2bb9615590f601befcc07f7d939ec68908e67c7345fca4cb0f0524d33507aeac9936fa30d449d1dde17094048d3 SHA512 a07256061dda5a8cf8b0e15205ac36651a4e5b594fdedbfe16d1d3264e1ac42847d1dc222d2857232ac5206d67feda432751695d85d0c4c7b03fd7228db8b1ab
diff --git a/dev-python/pdm/pdm-2.16.0.ebuild b/dev-python/pdm/pdm-2.16.0.ebuild
new file mode 100644
index 000000000000..5daeb246e11a
--- /dev/null
+++ b/dev-python/pdm/pdm-2.16.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
+HOMEPAGE="
+	https://pdm-project.org/
+	https://github.com/pdm-project/pdm/
+	https://pypi.org/project/pdm/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/dep-logic-0.2.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	dev-python/truststore[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/hishel[${PYTHON_USEDEP}]
+	dev-python/pbs-installer[${PYTHON_USEDEP}]
+	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+	>=dev-python/unearth-0.15.0[${PYTHON_USEDEP}]
+	<dev-python/findpython-1[${PYTHON_USEDEP}]
+	>=dev-python/findpython-0.6.0[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/shellingham[${PYTHON_USEDEP}]
+	dev-python/python-dotenv[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
+	dev-python/installer[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		'tests/cli/test_build.py::test_build_with_no_isolation[False]'
+		tests/test_project.py::test_access_index_with_auth
+		"tests/test_project.py::test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV[True]"
+		tests/cli/test_others.py::test_build_distributions
+		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
+		'tests/models/test_candidates.py::test_expand_project_root_in_url[-e file:///${PROJECT_ROOT}/tests/fixtures/projects/demo-#-with-hash#egg=demo]'
+		tests/models/test_candidates.py::test_find_candidates_from_find_links
+		tests/cli/test_build.py::test_build_single_module
+		tests/cli/test_build.py::test_build_single_module_with_readme
+		tests/cli/test_build.py::test_build_package
+		tests/cli/test_build.py::test_build_src_package
+		tests/cli/test_build.py::test_build_package_include
+		tests/cli/test_build.py::test_build_src_package_by_include
+		tests/cli/test_build.py::test_build_with_config_settings
+		tests/cli/test_build.py::test_cli_build_with_config_settings
+		tests/cli/test_build.py::test_build_ignoring_pip_environment
+		tests/cli/test_others.py::test_show_self_package
+		tests/cli/test_publish.py::test_publish_and_build_in_one_run
+		"tests/cli/test_hooks.py::test_hooks[build]"
+		"tests/cli/test_hooks.py::test_hooks[publish]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-pre_build]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-post_build]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_publish]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_build]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_build]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_publish]"
+		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-build]"
+		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-publish]"
+		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-build]"
+		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-publish]"
+		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-build]"
+		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-publish]"
+		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-build]"
+		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-publish]"
+		"tests/cli/test_venv.py::test_conda_backend_create[True]"
+		"tests/cli/test_venv.py::test_conda_backend_create[False]"
+		tests/cli/test_lock.py::test_lock_all_with_excluded_groups
+		# hangs on interactive keyring prompts
+		tests/cli/test_config.py::test_repository_overwrite_default
+		tests/cli/test_config.py::test_hide_password_in_output_repository
+		tests/cli/test_config.py::test_hide_password_in_output_pypi
+		# junk output, sigh
+		tests/cli/test_others.py::test_info_command_json
+		# why does it try to use python 2.7?!
+		tests/cli/test_run.py::test_import_another_sitecustomize
+		# fails in tinderbox (bug #928964)
+		tests/test_project.py::test_project_packages_path
+	)
+	[[ ${EPYTHON} != python3.10 ]] && EPYTEST_DESELECT+=(
+		# test seems hardcoded to 3.10
+		tests/test_project.py::test_project_packages_path
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest  -m "not network and not integration and not path" \
+		-p pytest_mock
+}
diff --git a/dev-python/pdm/pdm-2.16.1.ebuild b/dev-python/pdm/pdm-2.16.1.ebuild
new file mode 100644
index 000000000000..5fa4acad09a3
--- /dev/null
+++ b/dev-python/pdm/pdm-2.16.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
+HOMEPAGE="
+	https://pdm-project.org/
+	https://github.com/pdm-project/pdm/
+	https://pypi.org/project/pdm/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/dep-logic-0.2.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	dev-python/truststore[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/hishel[${PYTHON_USEDEP}]
+	>=dev-python/pbs-installer-2024.4.18[${PYTHON_USEDEP}]
+	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+	>=dev-python/unearth-0.15.0[${PYTHON_USEDEP}]
+	<dev-python/findpython-1[${PYTHON_USEDEP}]
+	>=dev-python/findpython-0.6.0[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/shellingham[${PYTHON_USEDEP}]
+	dev-python/python-dotenv[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
+	dev-python/installer[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		'tests/cli/test_build.py::test_build_with_no_isolation[False]'
+		tests/test_project.py::test_access_index_with_auth
+		"tests/test_project.py::test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV[True]"
+		tests/cli/test_others.py::test_build_distributions
+		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
+		'tests/models/test_candidates.py::test_expand_project_root_in_url[-e file:///${PROJECT_ROOT}/tests/fixtures/projects/demo-#-with-hash#egg=demo]'
+		tests/models/test_candidates.py::test_find_candidates_from_find_links
+		tests/cli/test_build.py::test_build_single_module
+		tests/cli/test_build.py::test_build_single_module_with_readme
+		tests/cli/test_build.py::test_build_package
+		tests/cli/test_build.py::test_build_src_package
+		tests/cli/test_build.py::test_build_package_include
+		tests/cli/test_build.py::test_build_src_package_by_include
+		tests/cli/test_build.py::test_build_with_config_settings
+		tests/cli/test_build.py::test_cli_build_with_config_settings
+		tests/cli/test_build.py::test_build_ignoring_pip_environment
+		tests/cli/test_others.py::test_show_self_package
+		tests/cli/test_publish.py::test_publish_and_build_in_one_run
+		"tests/cli/test_hooks.py::test_hooks[build]"
+		"tests/cli/test_hooks.py::test_hooks[publish]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-pre_build]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-post_build]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_publish]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_build]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_build]"
+		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_publish]"
+		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-build]"
+		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-publish]"
+		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-build]"
+		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-publish]"
+		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-build]"
+		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-publish]"
+		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-build]"
+		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-publish]"
+		"tests/cli/test_venv.py::test_conda_backend_create[True]"
+		"tests/cli/test_venv.py::test_conda_backend_create[False]"
+		tests/cli/test_lock.py::test_lock_all_with_excluded_groups
+		# hangs on interactive keyring prompts
+		tests/cli/test_config.py::test_repository_overwrite_default
+		tests/cli/test_config.py::test_hide_password_in_output_repository
+		tests/cli/test_config.py::test_hide_password_in_output_pypi
+		# junk output, sigh
+		tests/cli/test_others.py::test_info_command_json
+		# why does it try to use python 2.7?!
+		tests/cli/test_run.py::test_import_another_sitecustomize
+		# fails in tinderbox (bug #928964)
+		tests/test_project.py::test_project_packages_path
+	)
+	[[ ${EPYTHON} != python3.10 ]] && EPYTEST_DESELECT+=(
+		# test seems hardcoded to 3.10
+		tests/test_project.py::test_project_packages_path
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest  -m "not network and not integration and not path" \
+		-p pytest_mock
+}
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index ab9315124f88..b230deee9b49 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -3,8 +3,10 @@ AUX pip-23.3.1-no-color.patch 1767 BLAKE2B b81a4b814e2e84e7c0424870d1a86ba7fde91
 AUX pip-24.1-test-offline.patch 2995 BLAKE2B bbaa9b6410b350cecfaf1422c252c166ac931a550896d153f174e6b351372e753762af621716b37f5480d34f51440be11bc7c4ff2dee4a84328d8e9ebe03bb09 SHA512 8af459ba1c6a732a694537473b08377c17c996c2e50bae50f3fbb5ceb0376fa29e72055d887e179e8dd22df400886f9bd101f577dae59956b6a132a878bda23b
 AUX pip-24.1-unbundle.patch 8156 BLAKE2B 014d05bd6e5bb39a4b8a591948bba0760878b28fc757d3d091f226aca0bfc663de558d7b75651907d47951205d5804a7e3986c8631b805926a025658cd34895a SHA512 d78f521a27d1cb12012c622f1d13da7b19a2406204cba6a1ce149feb988a94421bc9883caaeda48e71bc26bb7c4845aef7c90aeb6f39bc474bf5f1ab1d694e43
 DIST pip-24.0.gh.tar.gz 9398156 BLAKE2B 17a7ed9e15e9b8efa0d3e3c5586dc446958b62cf9ba52155a0d1ad97a3e212ee7a08a0e88a592718fc3d542eb8f434155a75cb98d90c008904bd8f59bd2b40b6 SHA512 0c2ecb2ecde4f155c83468d35bc4f52f37efffc16821ae7c706d035e1e8cc3709b41cb10f8140ff09205e8bbdba2c76128ad76d1cbd18401328b619228e834df
+DIST pip-24.1.1.gh.tar.gz 9190972 BLAKE2B 1ce876d2767c1c36bac3237c17a3aced9dd5a335a7b522c70cee1e155bc0b47256db74c6835aab5f58133ebcde0daeb8e6eb217b06f76418c355034cbe736cf6 SHA512 523e7273134b68252693ba7a032e7992c72075aebd2bcd895fbd90ad28d76f98b13ea1a7df0b6da1802650782ae977868177f740dc6f0a2eaccb95915c27b318
 DIST pip-24.1.gh.tar.gz 9188658 BLAKE2B 4a43ff0199d811dd30461e376f655a447f3f706a48dd97fe1d0ccf630f558e72209ccd06d98949a1541cd6b2942a816db23ce8aaa7fbbf9aef429502fb91ab92 SHA512 c60ab329fe91202ff64b5f0f90209085fbf8db0f0a05f0703f952ad69e39e2e3edb5dadc006a3f317cdd4ba4fb5abe56dfbd22792249a2d139702eec272186d1
 EBUILD pip-24.0.ebuild 4559 BLAKE2B 6f34aa0dcd0c78b53d63c0dd523ec1b397186e8d9efc90781812d94e96138630653a896636931d2095c59065065b9140d104ebb9cf178858de0e5985aca4e05b SHA512 587b9eb40e71ee078d74853dfb0694ae2733fed6f54fb4ce48f410113179f15c55d17efc47e8ad0dc70d704302d731240ba0aad77c40450daecffc522d6f0320
-EBUILD pip-24.1-r1.ebuild 5832 BLAKE2B 7625820ef16033727e20f5814895a25834d8f2cebabe234fabd8efe2a9f6c70f18ae3f3b3fa937602cd1f2d49ada36e5fed569f96d3951d20e70bf57650a09e5 SHA512 0813f4577eaa315d81c968e91035973c572f7dd7136a616d9539f6b237160d008c510c90134ab3efafd4819ffe551769c160265dbb5e92a0e6849b858de8ccbf
+EBUILD pip-24.1-r1.ebuild 5839 BLAKE2B d70aa1453b8f7394294ca5fdbf3f97c53baf0aee7946f842b638416b0b6a6beb553dff60faf6ba3484684d04d82aca0b823ab6c5645e420b324aaefed13a2505 SHA512 faa9cfec1984eef2d942632b4fc643ff79c668610c5b31ad05f905ae520eaa3f5a4e77674a60b52dedfa88610b5b13113a0c3d4a202420fe1453059f0d9b52a9
+EBUILD pip-24.1.1.ebuild 5839 BLAKE2B d70aa1453b8f7394294ca5fdbf3f97c53baf0aee7946f842b638416b0b6a6beb553dff60faf6ba3484684d04d82aca0b823ab6c5645e420b324aaefed13a2505 SHA512 faa9cfec1984eef2d942632b4fc643ff79c668610c5b31ad05f905ae520eaa3f5a4e77674a60b52dedfa88610b5b13113a0c3d4a202420fe1453059f0d9b52a9
 EBUILD pip-24.1.ebuild 4075 BLAKE2B 6cb7c20cfdd759fa1dcc80fa25421db1e0d2e885228a0eec231d4ef138a8ae9c91b418fe4fcb7f7e32a2804b22972bd41ecc025aad4b689f80753d8cacf83f9f SHA512 85f2640255282b964deab13ee3a59ce5856f90459a8271e52726322477cf5f98b632dda49eadf39b1dfc22a2a4740e2191a97515f7503d7484839b5f43d5fe1e
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-24.1-r1.ebuild b/dev-python/pip/pip-24.1-r1.ebuild
index bc64b4aa107e..439924ebd199 100644
--- a/dev-python/pip/pip-24.1-r1.ebuild
+++ b/dev-python/pip/pip-24.1-r1.ebuild
@@ -26,7 +26,7 @@ LICENSE="MIT"
 # bundled deps
 LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
 IUSE="test-rust"
 
 # see src/pip/_vendor/vendor.txt
diff --git a/dev-python/pip/pip-24.1.1.ebuild b/dev-python/pip/pip-24.1.1.ebuild
new file mode 100644
index 000000000000..439924ebd199
--- /dev/null
+++ b/dev-python/pip/pip-24.1.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# please bump dev-python/ensurepip-pip along with this package!
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{10..13} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="The PyPA recommended tool for installing Python packages"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/
+"
+SRC_URI="
+	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+# bundled deps
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
+IUSE="test-rust"
+
+# see src/pip/_vendor/vendor.txt
+RDEPEND="
+	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.8[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.8[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24.1[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-hooks-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.32.0[${PYTHON_USEDEP}]
+	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-69.5.1[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-8.2.3[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/truststore-0.9.1[${PYTHON_USEDEP}]
+
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/ensurepip-setuptools
+			dev-python/ensurepip-wheel
+			dev-python/freezegun[${PYTHON_USEDEP}]
+			dev-python/pretend[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/scripttest[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			test-rust? (
+				dev-python/cryptography[${PYTHON_USEDEP}]
+			)
+			dev-vcs/git
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/pip-23.1-no-coverage.patch"
+		# https://github.com/pypa/pip/issues/12786 (and more)
+		"${FILESDIR}/pip-24.1-test-offline.patch"
+		# prepare to unbundle dependencies
+		"${FILESDIR}/pip-24.1-unbundle.patch"
+	)
+
+	distutils-r1_python_prepare_all
+
+	# unbundle dependencies
+	rm -r src/pip/_vendor || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from pip\._vendor import:import:g' \
+		-e 's:from pip\._vendor\.:from :g' \
+		{} + || die
+
+	if use test; then
+		local wheels=(
+			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
+		)
+		mkdir tests/data/common_wheels/ || die
+		cp "${wheels[@]}" tests/data/common_wheels/ || die
+	fi
+}
+
+python_compile_all() {
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
+	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
+	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return 0
+	fi
+
+	local EPYTEST_DESELECT=(
+		tests/functional/test_inspect.py::test_inspect_basic
+		# Internet
+		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
+		tests/functional/test_install.py::test_double_install_fail
+		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		# broken by system site-packages use
+		tests/functional/test_check.py::test_basic_check_clean
+		tests/functional/test_check.py::test_check_skip_work_dir_pkg
+		tests/functional/test_check.py::test_check_complicated_name_clean
+		tests/functional/test_check.py::test_check_development_versions_are_also_considered
+		tests/functional/test_freeze.py::test_freeze_with_setuptools
+		tests/functional/test_pip_runner_script.py::test_runner_work_in_environments_with_no_pip
+		tests/functional/test_uninstall.py::test_basic_uninstall_distutils
+		tests/unit/test_base_command.py::test_base_command_global_tempdir_cleanup
+		tests/unit/test_base_command.py::test_base_command_local_tempdir_cleanup
+		tests/unit/test_base_command.py::test_base_command_provides_tempdir_helpers
+		# broken by unbundling
+		"tests/functional/test_debug.py::test_debug[vendored library versions:]"
+		tests/functional/test_debug.py::test_debug__library_versions
+		tests/functional/test_python_option.py::test_python_interpreter
+		tests/functional/test_uninstall.py::test_uninstall_non_local_distutils
+	)
+	local EPYTEST_IGNORE=(
+		# requires proxy.py
+		tests/functional/test_proxy.py
+	)
+
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/functional/test_install.py::test_install_sends_client_cert
+			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		)
+	fi
+
+	case ${EPYTHON} in
+		python3.10)
+			EPYTEST_DESELECT+=(
+				# no clue why they fail
+			)
+			;;
+	esac
+
+	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_XDIST=1
+	epytest -m "not network" -o tmp_path_retention_policy=all
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	newbashcomp completion.bash pip
+
+	insinto /usr/share/zsh/site-functions
+	newins completion.zsh _pip
+}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 08d1b5ccfac2..3d3c4e24c2c8 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,5 +1,7 @@
 DIST pybind11-2.11.1.gh.tar.gz 756445 BLAKE2B 66ad933ffcd7fd475121f0b7488e13b914cb090d0ed511b96070e2849dcc537fb55e865b72fe06da6c5d1e3ed8e438799c5b0b60cbdc71e5713530174bff3be9 SHA512 ed1512ff0bca3bc0a45edc2eb8c77f8286ab9389f6ff1d5cb309be24bc608abbe0df6a7f5cb18c8f80a3bfa509058547c13551c3cd6a759af708fd0cdcdd9e95
 DIST pybind11-2.12.0.gh.tar.gz 771004 BLAKE2B df95d12cd005c85434ba8a4d80740f437f3f9433b0fbc9e6e1e5bf840281d5cb8295500b6510474a91b45201323b19079743ca927f7d1be2c1dc0dca89833e9c SHA512 c20247a4dccec310307174a26a79f9a98dd7ae7c84a48ad61c61589b02ef74caac26c2945de602cbe38b0bea65fc9985f1cc37f9e2322cae2f824dee98d602f1
+DIST pybind11-2.13.1.gh.tar.gz 789821 BLAKE2B b1634878a9a772d1200c79a5e7554a16a9ec76a57cbe4fc6fa86c70f9e383ebeb2b2ced7006392dbb1196144fb02f2415ff511e2b041a6fa3fe63b7c511c98f9 SHA512 97d7a2892af67adad16b6ff0fb3e6324c88d1dd931dfa0d34cf6d181baec05ed791f0980abf2174db22aabaa382fd5b5f00cb287cf6477a4786c999f29719717
 EBUILD pybind11-2.11.1.ebuild 1305 BLAKE2B 60bdb063e9efb295ac3d49497b199cd9b9dedd23e3891ec9c96c6e2867e89c1cee9c16f3a34a4772813a850c74484fefd9c2dd53a072a84025b894546a0b237c SHA512 524695d724d859ea333de8975c392792c4ed685212204ecf72020af767d1cff6fdc307ecbd8e433af3627a76b2c7a5a41e83b13e313041fdd474df73880fb19c
 EBUILD pybind11-2.12.0.ebuild 1458 BLAKE2B 59b0a968da4155d2450df3b609101e431a70f2f958d7bfdf7a2be64dbb1aa50416fabe41d7dc06b882cda0ddd23dceac47d7c0700a0466bb6b02a1dce9d2da98 SHA512 b5a7bb5ae2eefcc144b337241eb14316d292fc975ab20a0166b159ec43828dc613498a568517f663f835a18e26da9f25410d07fe1a197874e4e6f9e7c36e5ee9
+EBUILD pybind11-2.13.1.ebuild 1465 BLAKE2B 81845922d037bda3da1b69b431cc132bca8df05b12ec282937ec39d0e8a93816730d647e217a9b5b1ad38415ddfb058a40089268712734cfad47c23bf52938ea SHA512 a7cee54af4f1bfe6d55e3c8ce35f34e59f77bcfd5ec1504e882e068000ee432ed078ce7f9c4ac14d230e06c2f65b95559115810a54ad63fe6978cf8f13b26f5c
 MISC metadata.xml 475 BLAKE2B faf317a1197850acb0d16546a303bd50ee1bfe6fc3aaf592e6c147c6612fd20b809f1c911d79ca9a356cfa0c4166d2b155fcbd593f8b55e0d7dd75ff6444073b SHA512 5779adcc9f25c15fd999aa6c91d3144fc14535270e57925bfb8ac67f45448c144a142af2ea9a321ec6ffbf568713f663cef85a0be3d4a056e58b1782a5fc9a41
diff --git a/dev-python/pybind11/pybind11-2.13.1.ebuild b/dev-python/pybind11/pybind11-2.13.1.ebuild
new file mode 100644
index 000000000000..8a44efb8c4fb
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.13.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="
+	https://pybind11.readthedocs.io/en/stable/
+	https://github.com/pybind/pybind11/
+	https://pypi.org/project/pybind11/
+"
+SRC_URI="
+	https://github.com/pybind/pybind11/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+BDEPEND="
+	test? (
+		<dev-cpp/catch-3:0
+		>=dev-cpp/catch-2.13.9:0
+		dev-libs/boost
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DHAS_FLTO=OFF
+		# https://github.com/pybind/pybind11/issues/5087
+		-DPYBIND11_FINDPYTHON=OFF
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	cmake_build cpptest test_cmake_build
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	cd "${BUILD_DIR}/tests" || die
+	epytest "${S}/tests"
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index cb5673c85a8f..e232b0f10645 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,4 +1,7 @@
 DIST pydata-sphinx-theme-0.15.3.gh.tar.gz 2393144 BLAKE2B 69755220c6099921d57eefc926106c0fe8127fd9c9a47f74050113abb78b997fe60fe50cc01e8a6f926eb7261c34628fae4b6f624ca713031feb4dbb3ca5aa29 SHA512 bba767a92855aefb81139887a515de7917704a447ea223a43067e8e301e0f0ade008dfcf2751c0e9e147af9768bf4e25af7f767c325f07b057f7f4b353e56d1a
+DIST pydata-sphinx-theme-0.15.4.gh.tar.gz 2396654 BLAKE2B 34293e53fe17568e65118702f1c55eb6cc0bca0d17fbc168fac0b495de581f094046bf775480ae608b711f2136c131e02163b2eed84dafa080e6ebc1b4eb96a5 SHA512 5cdedfa182a75c0735773627bbe738f31b36bc812051d4848676b33acf3b2a55d2bd59b1171c4deb4e7c29e8968bcade1f1abfa901c3c4dc8caeaf9e47cbba28
 DIST pydata_sphinx_theme-0.15.3-py3-none-any.whl 4631638 BLAKE2B 261b08b159cf073e896f27fbedc3375cdd7181b2dd6f85264530d34b9cdccdaaaf175f6f7c349768014bfb373ffbaaaf1071b85de6e3805cf992e656cb04ddb5 SHA512 6bed169c5ae65027f7e5d8903062e0be910bb69409aa061cf8c17be3632d90d189a8dde49a8d760f747308a5e1891237bb36a70430cfd6f3d9207274aa8d8bf2
+DIST pydata_sphinx_theme-0.15.4-py3-none-any.whl 4640157 BLAKE2B cb4e067e1acdb8364e498c00f3f8d549a16fc90675511dca65968828002422a8048818fdf3881f9ca33e7368758501b096dd9c968498a273cf2f353ea9868d3c SHA512 0d5e22952e11f683be4e14e597f488a2716877d1d064fa9c52985fcfd6dabcd5ae7c48143a3ebfd26f6a1f933b18e69f5d938afc99a9bfb475a80f94b34c82e7
 EBUILD pydata-sphinx-theme-0.15.3.ebuild 1376 BLAKE2B 09995387898b80321b4fb428f5b7082147d300455654efad53dbd86d1a47e2f954854143e91787ef2ad32dc671e47c0367dc4b27c497ec0405aebf97011aa721 SHA512 f175287285caa54e4e7da822be0ea86f7802d174acf921b6300feb876e1cc7ded6ff0c561b75767ae47cf7bb16b2abdbec68f0e052958642102e5197e12e3074
+EBUILD pydata-sphinx-theme-0.15.4.ebuild 1384 BLAKE2B cb46a4aa0209fe7990a208e076e644b939809b9ee09d5e24dae67fd3657055aa5c363275f2de7cfed8fb37257822e0decf2ee37161c6f1f3de21a9ecfb5533a6 SHA512 3f61580cb17e5de950ab2b75c8cfc7b1afcc770b5d57c5d96234b2d587f820aa2f144653bc3048f5661e8cd3213723d21619aeebaad4b0e5e0c2d6ab7b96a620
 MISC metadata.xml 532 BLAKE2B 397b44fab769346cc170d5627dc663adbe29b780cbabc3d7643d5bda6ff89d6fbe6e6f55da69e93b8b20ddee16856612063b442125a16e035803e50f5aae924f SHA512 9de912fb51a153d508f3a12a3eb7ef3cd926089452bd6bfb822ae4a797d8aeb9ac68973ea7bebf3095f546dd288fdf651710ca8536f19907ac69f622ca3b0550
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.4.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.4.ebuild
new file mode 100644
index 000000000000..03360786b8cc
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+MY_P=${P/_/}
+DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
+HOMEPAGE="
+	https://github.com/pydata/pydata-sphinx-theme/
+	https://pypi.org/project/pydata-sphinx-theme/
+"
+SRC_URI="
+	https://github.com/pydata/pydata-sphinx-theme/archive/v${PV/_/}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(pypi_wheel_url)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/accessible-pygments[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# pygments version mismatch?
+	'tests/test_build.py::test_pygments_fallbacks[real]'
+)
+
+python_compile() {
+	distutils_wheel_install "${BUILD_DIR}/install" \
+		"${DISTDIR}/$(pypi_wheel_name)"
+}
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 560e9a2f2a18..c16f26b4732e 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -2,6 +2,8 @@ AUX pygame-2.5.2-error.patch 3723 BLAKE2B 3a3196e5eb4fa24f7246c05f016d78a94b40d6
 AUX pygame-2.5.2-gcc-14.patch 1422 BLAKE2B f633ec57ac672ebe0eb0e8404f27152ed732815296f9a06439e4385e7bae4ae55f2c13f166a954c05e19e2165da82b1ec089e1e3e2befff912fbba779c4970f3 SHA512 0dee5a832cceb65fd5ab9fae8ee81c982be5eea63e02bd3a463bd1d7f1af2877bfa68d7a53659574eed926ee54dbcc3d9cbd6c63bcadd181f0ec628ea7d63b0c
 AUX pygame-2.5.2-numpy-2.patch 5216 BLAKE2B 3fbafbbd16b0f2d82c640bc5f86658d00a27631d7b1b80d1576ab300d78047d9f82e836754507d7b3f08692430f76117c3e0e00b7d60e58ae125c4cba31f2911 SHA512 a80f12490d900ad5f8da17fb1e5b6decbcd09df609ff3ff8b40fa0dd828f63a430ca16b836e8dfa82890e7bd3e6c2baf7991a16303e65dbf38d010ff21129ae7
 DIST pygame-2.5.2.gh.tar.gz 5970857 BLAKE2B 523874926a8fd868f5674ed2997a44decb928fcfe246d551249ed7320a0e908ce46d00f459d187726edf74a4c1038cd56821f6466559fb7d24aa75d16769cbfe SHA512 b54e9b80951c8a9e75666621aafc26874c6dbdab27330146f7217346c76be5627a5464a0102a5968eca0dbd7cced4b2143cd2ff1b6227e3e17e5634854b27f19
+DIST pygame-2.6.0.gh.tar.gz 5970025 BLAKE2B 2a7616982675d8d9a5f306bae709e97e87d4f602f12ea553ca4779f858fb88bf92ac2a4e0f8f63ac52096e1829d2f7805edee919d7e96b7764db72e9cb7f4034 SHA512 bdf36314bd2179ab30942efab4e4cb65eff023b6951d1705a46d7cb4b89095e76bf4dcd04e714224355705d3e44283213fbb807973b3b241bf128b78c80044ae
 EBUILD pygame-2.5.2-r2.ebuild 2309 BLAKE2B c7e5a39aa5d59a947d51894b6968368199a5ba2618b337efaf7c565320ba3056e82c3d203c7b7a20cba9047afcfa32ced71504c9f010618fe40de7db14da816d SHA512 73c27c978a6eefab8405cc7360331e24739369b4661048f1c3df36d02ea6f3857c4939f0d798ab127a6ccabf9bbd8bdde5276efa46223892b52879174af6dc62
 EBUILD pygame-2.5.2-r3.ebuild 2482 BLAKE2B ef0a9b12c04b62a54c65fc134cea699262f152fdf679eb73a29ad9bd0ea44dc2e2dfaa8196b8f2e661714ca2ad2a7314f0bc9f43fc6fdf92cf7b78d307facd9e SHA512 54324f64a69d91326ee58400edd69ec36359e1c98e1729d5ee380a8967dffa2d0fc81a318e2ba1ef701864909b96549d34613d0e1efd3a1f5988a213d2eb4750
+EBUILD pygame-2.6.0.ebuild 2130 BLAKE2B 484eb6b60dc5959520024929b82d6ed6071bc9bd7cdd0d1c8759a581ece2b54f378334c79325598e0114feb2e9ed591ab69d1e59c701f8f9235a27286fd93d95 SHA512 0b84cd52507ec2ac3ddb72e8541a46a894f050a0ab547c5210ceef1e273613addfebce42edfad7b00964a35294dacd2f1e1e4a551e74a49b239ef326715f2e8f
 MISC metadata.xml 363 BLAKE2B a942b91aded22ec850a7b075703ce4037af9f0a61155717ac455f7d2b7779cb6f5f953b2ad8d61d7cc5254307951a20dd3edb9853e21d907e1999f7570a6b821 SHA512 15403754c9b13f9b2d8c5e7615ae0ca9359b5079e22eb5a7049424e414ebbdd8a06f6324c31594636324414e35ca34bec977b7dded9f9ea14027497b5097b060
diff --git a/dev-python/pygame/pygame-2.6.0.ebuild b/dev-python/pygame/pygame-2.6.0.ebuild
new file mode 100644
index 000000000000..e802a92ed82b
--- /dev/null
+++ b/dev-python/pygame/pygame-2.6.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="
+	https://www.pygame.org/
+	https://github.com/pygame/pygame/
+	https://pypi.org/project/pygame/
+"
+SRC_URI="
+	https://github.com/pygame/pygame/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="examples opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/portmidi
+	media-libs/sdl2-image
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+	X? ( media-libs/libsdl2[opengl?,threads(+),video,X] )
+	!X? ( media-libs/libsdl2[threads(+)] )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)
+"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig
+"
+# util-linux provides script
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# some numpy-related crash (not a regression)
+	# https://github.com/pygame/pygame/issues/4049
+	sed -e 's:import numpy:raise ImportError(""):' \
+		-i test/pixelcopy_test.py || die
+}
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py || die
+}
+
+python_configure_all() {
+	find src_c/cython -name '*.pyx' -exec touch {} + || die
+	"${EPYTHON}" setup.py cython_only || die
+}
+
+python_test() {
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	script -eqc "${EPYTHON} -m pygame.tests -v" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# https://bugs.gentoo.org/497720
+	rm -fr "${D}$(python_get_sitedir)"/pygame/{docs,examples} || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index 70057ecb9228..c2edbec945a7 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,3 +1,5 @@
 DIST python-socks-2.4.4.gh.tar.gz 31998 BLAKE2B c3aa137ff679790420ded9644987eed23695c82a5621c420350ad52ca8121215326575f4c389912fb646151fc84187bfab38674ff6dc2a2f3587c4662f51c0f6 SHA512 a357fbd16cf653555bb624103732041efa80b1ae21a6347fdcb609de3cc58227ac053d21b62124fd77b21a16b19a2786bc1a8c33cc3b50dcffb3023bd6704f57
+DIST python-socks-2.5.0.gh.tar.gz 32293 BLAKE2B 20eaa8b27d695116f9d03bfa1807496c789a43804c06f441f7961d928095d169f9b581120c29d188e0eda39d15b517012647e6f6f682a29c260179dca422b0dc SHA512 d59a3eb851c80556e08513ae417a109da6670b81858df365818ca187d14b57719ee86c6a65d9e8a8366ad3c7a2516a10cabcbf9895d8456b5f188c80dae74eee
 EBUILD python-socks-2.4.4.ebuild 1294 BLAKE2B 5a13604cc85c00260e85aa7071aff77dd9506eb71282aa6affe537a41a5049192ea0474247fec262a90910e5bff2f19bbba30d653f8094adb217befc8705b86b SHA512 b045e40cd5ab134fddaabc38c6b4ab1e8a144114f50c723e914a66af80e04c1295bbd6a309169dbd90dfe395a7d427ff3925a8c986b1aca90d0cc62cadeee656
+EBUILD python-socks-2.5.0.ebuild 1302 BLAKE2B 118b6c164a7964e80547e00366ad949c22a5606e80e689668882a54a46b33309985a43af508cac32dcab6e8915d68fcc222e5d708b6c5f60c079d6197791463f SHA512 c51989f92d15e015b697f14b537f1066ea99a5b9c8cd4ba702cf589d431e2b16211dfbe00af10642b4b9946bb8bd24cf65dcb3b5aad7b779af20b70ba996ad26
 MISC metadata.xml 380 BLAKE2B 2209abdbafd26baae585840e774843c37e0c6103fa93d75e8c1ddbc8dd1b96f269a3e76f14c39a55294d4d642d7fbe9f87c6b1a0b64152c671590a9e0a6ef959 SHA512 ccbb1a5c9fd05ae1da346f4f92efe156921f7adf9f5544635a407ba4a8154c896bda2e445e05e70a8e46c2829b8d4a38d3bf5d73804a3641c811acd2be62099a
diff --git a/dev-python/python-socks/python-socks-2.5.0.ebuild b/dev-python/python-socks/python-socks-2.5.0.ebuild
new file mode 100644
index 000000000000..4bfe898288dd
--- /dev/null
+++ b/dev-python/python-socks/python-socks-2.5.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
+HOMEPAGE="
+	https://github.com/romis2012/python-socks/
+	https://pypi.org/project/python-socks/
+"
+SRC_URI="
+	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# curio is not packaged
+# asyncio is the only backend we have, so dep on its deps unconditionally
+# TODO: revisit
+RDEPEND="
+	dev-python/async-timeout[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.18.3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-trio-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/tiny-proxy-0.1.1[${PYTHON_USEDEP}]
+		>=dev-python/trio-0.16.0[${PYTHON_USEDEP}]
+		>=dev-python/trustme-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/yarl-1.4.2[${PYTHON_USEDEP}]
+	)
+"
+
+# Test markers exist to exclude trio etc if needed
+distutils_enable_tests pytest
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index 0b881675ea05..8b90521fce26 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,3 +1,3 @@
 DIST python-quantities-0.15.0.gh.tar.gz 91327 BLAKE2B b75371e99b0f270d97cf6e9b80df1e7a0afa8ae8eb5d18750196e9b874737d58d3e3189ef9fdca4b312d24a19b406fe21f7eb304f0c1f11987873528190ca2e4 SHA512 987fb30d25a7b14e681d6eb963fc2cc68f954d017eca256739e897062249fce606adcb3224e3c8f0d371e49904caef7171a9a8ba4a7e60baa2fe063004846439
-EBUILD quantities-0.15.0.ebuild 842 BLAKE2B f85ed18a52c7fd942db2d8363bdeb7c83323256bae992bfca07733ec873a8f8e89a00d2355fa2699bee260e9d05eaafe7306997485c6c23a0f3c3334333ef2a0 SHA512 baf49378db478d967bc0d841604efbc4f3891034cf6df1478e285fd5af565a8ac40eb8221b0f41bd1e85486e70fcb8166d76a206a6385a97d68ef33bb83d8e04
+EBUILD quantities-0.15.0-r1.ebuild 1000 BLAKE2B f6590a89cb04ad2117df7455dfab4fcc4af9333cb26488e4b3dc0829e165849ee80d0fc3922f0877b0a7f5a8aa7951edfbe0249f75d9466bc6c223b4b4762f1c SHA512 b355b2beb0649913d2995b7215a03803bfad49d6c12b76bbcb5bf5e1f7e6d089dd86cab19c6041b85b5ae9c185db16a845a4036f4e3b96487a30d414b80305ba
 MISC metadata.xml 645 BLAKE2B d6965f033a9f7b6e78c5b2dcadda6a036ec1becac8cdd4bf3a7d2a7d0739cca4b51c29f874eebedc963d5a54d1906dc18a8ba628e44b4d3d12c81c91f6f97b29 SHA512 d2f88066eb81f72611dd94b323c9d42dbdb02d0953cb43a06b991bc7b134cff85d86979aabc155dee463645ab984127bdebfa7ca125ba36febaea451dad39143
diff --git a/dev-python/quantities/quantities-0.15.0.ebuild b/dev-python/quantities/quantities-0.15.0-r1.ebuild
index ae62dc2986da..7a00fb00b973 100644
--- a/dev-python/quantities/quantities-0.15.0.ebuild
+++ b/dev-python/quantities/quantities-0.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,8 +24,11 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 
+# >=dev-python/numpy-2 is not currently supported,
+# see https://github.com/python-quantities/python-quantities/pull/232
 RDEPEND="
 	>=dev-python/numpy-1.20[$PYTHON_USEDEP]
+	<dev-python/numpy-2[$PYTHON_USEDEP]
 "
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/redis/Manifest b/dev-python/redis/Manifest
index 1ba7a539bc53..5f90f6bcc583 100644
--- a/dev-python/redis/Manifest
+++ b/dev-python/redis/Manifest
@@ -1,5 +1,7 @@
 DIST redis-py-5.0.5.gh.tar.gz 4775177 BLAKE2B e092692ca8070d811ccd953be2749859094baef610858fcc7f28fd18ec51e643cb0a003ddb5734e8066252e9beb49bdf633983906bb4615c0e8309389343aa2f SHA512 014c5bd9e7604cf757d990b1a0ad2d3c876822b1ee5b372eaa18cf26b5bf61bcdf6bd2d5e3f5eaa9e73de5dcc6a7ad11835856cb12c995a539961244e54c16fc
 DIST redis-py-5.0.6.gh.tar.gz 4775649 BLAKE2B 7d6a7c10da592aed05fe70b1f0001697984c34244c29567755a13f0cb0d61db927f1392dd100212c88c63de52afbad2a9f17024d9af11f500db13386d080be2a SHA512 ae430e3c261bd8240bf1c736e28d066c685bb674dd6c2aabbf57bfa436027af31e59c2583777625ab3e1aa94f9b55a8e6513a94399c3aaec7e46b1128de8dd42
+DIST redis-py-5.0.7.gh.tar.gz 4775787 BLAKE2B 72060bd2101ba5b16ab5823ec6ed16fdc6714546f4be2a0c89871f9f1a3f2cc0e11075071507f9f89eb9b21a7ab4844e04c37f698d62a37e94ca93aa0ad5762a SHA512 dd46459eb1331f0ef844b12e65aed548aaf744d0c5581c9bc3f4450be4e4a5ba77130ba905a57a8ce87b5d0aa22495d34ddab01463d276797e1d277c949502a6
 EBUILD redis-5.0.5.ebuild 2717 BLAKE2B 5b30f28bfde630c04ea66476eb24aa60e87a621f9a8ec79a56ae678f94b00889cd12e72517d955e4251c3344fe14b550830cbf727b699fb54d46e00588fb92d8 SHA512 e4be9929feaf403a170837916196a46cf140ad75130c5d6ebecc62e282307f1f5c07c009d0f8df48f9344c998457f970c1641c2c2fc6c06e329575c704ae3b27
 EBUILD redis-5.0.6.ebuild 2723 BLAKE2B e4e9c34dbadf07efea78d11ebf767988315435a1590cae381de64df8d5ac58874a395d1bd20ec58116831f03b9c2636df5407e130b5d26bab9a0d60963120d11 SHA512 817b28f81e66935a77214c6a9b77f60c20a316fc5ccdda62d019ca132c17dd35ed2dc5206987299199bd0291d67357480d7ecbd1f0e9ccbf8d5359fac6400d10
+EBUILD redis-5.0.7.ebuild 2723 BLAKE2B e4e9c34dbadf07efea78d11ebf767988315435a1590cae381de64df8d5ac58874a395d1bd20ec58116831f03b9c2636df5407e130b5d26bab9a0d60963120d11 SHA512 817b28f81e66935a77214c6a9b77f60c20a316fc5ccdda62d019ca132c17dd35ed2dc5206987299199bd0291d67357480d7ecbd1f0e9ccbf8d5359fac6400d10
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis/redis-5.0.7.ebuild b/dev-python/redis/redis-5.0.7.ebuild
new file mode 100644
index 000000000000..13bcaada0bb4
--- /dev/null
+++ b/dev-python/redis/redis-5.0.7.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1
+
+MY_P=redis-py-${PV}
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="
+	https://github.com/redis/redis-py/
+	https://pypi.org/project/redis/
+"
+SRC_URI="
+	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+		# require extra redis modules that apparently aren't packaged
+		# on Gentoo
+		tests/{,test_asyncio/}test_bloom.py
+		tests/{,test_asyncio/}test_graph.py
+		tests/{,test_asyncio/}test_json.py
+		tests/{,test_asyncio/}test_timeseries.py
+		# apparently available only in "Redis Stack 7.2 RC3 or later"
+		tests/test_commands.py::TestRedisCommands::test_tfunction_load_delete
+		tests/test_commands.py::TestRedisCommands::test_tfunction_list
+		tests/test_commands.py::TestRedisCommands::test_tfcall
+		# TODO
+		tests/test_commands.py::TestRedisCommands::test_zrank_withscore
+		tests/test_commands.py::TestRedisCommands::test_zrevrank_withscore
+		tests/test_commands.py::TestRedisCommands::test_xinfo_consumers
+		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrank_withscore
+		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrevrank_withscore
+		tests/test_asyncio/test_commands.py::TestRedisCommands::test_xinfo_consumers
+		tests/test_asyncio/test_pubsub.py::TestPubSubAutoReconnect::test_reconnect_socket_error[pool-hiredis-listen]
+	)
+
+	# TODO: try to run more servers?
+	epytest -m "not redismod and not onlycluster and not replica and not ssl"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	if has_version ">=dev-db/redis-7"; then
+		local extra_conf="
+			enable-debug-command yes
+			enable-module-command yes
+		"
+	fi
+
+	# Spawn Redis itself for testing purposes
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1 ::1
+		${extra_conf}
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index e7a30df89076..961befa12a2a 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,4 +1,6 @@
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-4.2.0.tar.gz 3688649 BLAKE2B 83a35524fa82260ed6b4b6999d5b7903f54e0bdd7e008f3ed53200da8a43807c3d34920f9c7211c4277a560699e894fb12074a530c85adfba0538adaa5812294 SHA512 5dbab548dfa4b0eebb19c0702975b540244693ca30faf7a7bf88e7e596d2a9acd4047f0dddc5433da4da385282ab74f17b66a09394eefe07797c3d193ed38cb5
+DIST reportlab-4.2.2.tar.gz 3690306 BLAKE2B 1f778d25cb02f918758db13f27e380db4d0082c79c534699840e760a54ccb40c1d8bffc51b66de1f79030458ab9d48df7464a40a0a154382f1d02534696f7701 SHA512 4dc7a414ea32a741f660f523d14605fb46410d844d3be60b9f6d39642c0a7ad6162fa4b7448eba650b087a31e40e0ff7fc0bb5eb416dbbaeb104c416285a438d
 EBUILD reportlab-4.2.0.ebuild 1127 BLAKE2B 503b9ed3377c96144a1d2009dfdcae6bcfd3c29bda506eefdee43547120c1d5e44932211f4366b1b3e6916d7580cd06d6313b96e49a595528b29cbbb330cbe0b SHA512 da9103540bf34a5973dae249c147ba3d6368c6050efcd55ec17dc136c56205d470fee4e8a98ab20830af68027053fc22a777ae4a08d45172bd1aed6f9b9d4d37
+EBUILD reportlab-4.2.2.ebuild 1134 BLAKE2B 47f6e583f345f56b663cb5e3125d05b66fa0ea82f390f541fe22d18628f520e18e89dc3144fc2f31d04f584d872069c8452eb70fbf429294c4b474217a6c88da SHA512 68892c18860148e495d5fba6d90c6c705adf85c6d5c69f6e67daf34d30a0fe4bf86c0d0ba7b0f256a3b0ef8d170c8f6dd1a128d2a7649781203ae09488148a67
 MISC metadata.xml 1913 BLAKE2B e088a4a5ee1ca40351c04d8ee825fb783679c8c4ac5ba7c513975e546f7f90f4777a7d9b312a4bb2ce97db5695fcfcf913610b02a9780ffc86143ee1845ee281 SHA512 84422b0f54f169b4342bb5842935a57dd7721d8d6e41f4fece4ce0cf20ee70a764fa1914371e47ed9437bd40243ec22c93f20c167a48ee6ba9d9cfbf3e7c1fe8
diff --git a/dev-python/reportlab/reportlab-4.2.2.ebuild b/dev-python/reportlab/reportlab-4.2.2.ebuild
new file mode 100644
index 000000000000..b4156a20745e
--- /dev/null
+++ b/dev-python/reportlab/reportlab-4.2.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/
+"
+SRC_URI+="
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
+"
+BDEPEND="
+	app-arch/unzip
+"
+
+distutils_enable_sphinx docs/source
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+src_configure() {
+	cat > local-setup.cfg <<-EOF || die
+		[OPTIONS]
+		no-download-t1-files = 1
+	EOF
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py --post-install --verbosity=2 ||
+		die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/seedir/Manifest b/dev-python/seedir/Manifest
index 4dfa0700508b..7718eb092755 100644
--- a/dev-python/seedir/Manifest
+++ b/dev-python/seedir/Manifest
@@ -1,3 +1,5 @@
 DIST seedir-0.4.2.gh.tar.gz 3096194 BLAKE2B daabdf1f5bb202ab454bea376c6e14dab2eb9c964a3bf87349c3ac6075bb8ed201b66082518aff01cb4515e89026a02c662da5e9a5f43c5d0ea21556cda07e90 SHA512 8d16ae1ba020268f9587742cacbc55ecc1d218f36955c625f64829940396c908d0498ee6bf50d560f87b10488dc6daa5698681e10e1699d20d958b3cd58f14c4
+DIST seedir-0.5.0.gh.tar.gz 3099344 BLAKE2B 27ee50e6dfd91a67bb80452b3065c4183341933ef09de4ec298490264bb66601146a50a0b7550ef37bb332acdee1f2e45c31b8eca6e33f4f7e59b9d8f127f565 SHA512 e6c257787e65c24697e76f75308dc5e8c2f919205a4922aa1bb66673000e2c784959ebe45a7ccd826d3ee1fea03fe0a6a64f6c90321c76d1e36ab68ba3962361
 EBUILD seedir-0.4.2.ebuild 649 BLAKE2B 4ca5cd08c5744a336a12da219a2f82f5ab935ee4f43c727802878dac493c82a220ebe08b20285a1539011384710f8bf565c6fb583626294676316ac5391b755d SHA512 141217d2b686f693ab7a9cf6412720544b07092318be77d4d6e6be694277ef77b227ca2e4a23ed6ce40dbd21996e75459587847d3ca209795105057b25aef941
+EBUILD seedir-0.5.0.ebuild 650 BLAKE2B 4b5d7b40bd05926cb1fc38b0a09c42ad06f0f5f3e64832ce9bf9e122e4661c73b723431d091a408da0b8aaa49e9b0b72fc9b388f618ea146be32a2e894fc923d SHA512 799aaa2272d8f9154cdb0cd01f8849e12a62b01a8ade5ae97d9fbd55a87ef2e165001a0ce0b9614f71a97bf6ee55a02358b8e9b7b1465fa4e716fe47aaa14b66
 MISC metadata.xml 393 BLAKE2B fa479c17b0ecb4807f85e82e871d8f3690c7b0aab9a6c53b3609c84771d3d5a0e8b0769ec35ee51d533764440bffaaa679fda6401a95813ab7c76f81d6f84897 SHA512 913ba255b6ae25b437d99ced1bd8aef70f8dcc17b947be4d1ce10738a88c6ab35cce66dfdc2193d73881011f1e5e976e7b43c1faaedf312a429401e02f0dd9f7
diff --git a/dev-python/seedir/seedir-0.5.0.ebuild b/dev-python/seedir/seedir-0.5.0.ebuild
new file mode 100644
index 000000000000..9e633a43d02a
--- /dev/null
+++ b/dev-python/seedir/seedir-0.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Package for creating, editing, and reading folder tree diagrams"
+HOMEPAGE="
+	https://github.com/earnestt1234/seedir/
+	https://pypi.org/project/seedir/
+"
+SRC_URI="
+	https://github.com/earnestt1234/seedir/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/natsort[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 04a1f1551727..dbd5e7d9a5dd 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,7 +3,9 @@ AUX setuptools-69.5.1-py313.patch 1170 BLAKE2B c94591a2c0c8e8b03ab7285934b42e85b
 DIST setuptools-69.0.3.tar.gz 2219609 BLAKE2B 1a5e7896c7ea82d51b0aa4794435b9899cef871f6ae43d22ae5e08c57d87b70641f3f2abfcc29956a3de515f90b112fd61d3daf793474b4cf33f8567e3a38f4a SHA512 11df934931f4b73f7e07ea5713479593c6baa134d423556b2ae7aff0f1e5bdbdee1f5b516131adb169c838231ceb0293441fbf275ef7030dabecf74122565b6d
 DIST setuptools-69.5.1.tar.gz 2291314 BLAKE2B 3756dd587136c7e688bdfecf4c0434c0e799f50f9a9a95750d41cb75e26b613b3dc178f43a9e0d21f17c42a7c4ad7461e7986966aefb814e3d0ff05178c82542 SHA512 81f4a5184976a0d4aa070261bb56458c54ec6a479786fa469e98cb336e9a1691b281ae771abe41bc5398fac15b2dd039c07cf014ee00572f46908ce6830fcb6a
 DIST setuptools-70.0.0.tar.gz 2265182 BLAKE2B 436189fbd614473c42a08da75837c5bb2f6fb6bc03bfc9b99db22810fa043fb071c2344659125439d507d10354d42ea5b703e91c0572caad90f5d805eca9ee8d SHA512 13a5ac09401165dc36d2a365c0ea236c01153374c002b062c4b403a537157ce86593848e93e3c26f5c81f5783e43e6aa96d813f9a39a55732ea3911ddc5c337a
+DIST setuptools-70.1.1.tar.gz 2292324 BLAKE2B 9d489117a80ef9cefab6b730680a614d990f338aa54579928bafbe3c87dbb5e4db8527b8a0b6c1090bcd3504be97cc69a9ce979e593d0634d9b66b66bccb25e5 SHA512 63452aa1e1d1dea6ad622a21fcc9334bc3603e45de9a1485f79776e02a0fb3b0a0a8b3e886af73845c3c373348c7021f2e06a5665676e9015ee9855441512136
 EBUILD setuptools-69.0.3-r1.ebuild 3979 BLAKE2B 58d78a82ac5a3fb98a2844dc3b95cb7880c1b9acfa56f9125ce5aeb5ab334a21596a3a7b43ad4e776fb58ab7f91ac706a82dce176b6c971ebb7200374e69a8e6 SHA512 883c1919f2ba8ae92f1f2c78d99fdc786824765ffe6eac3e09f5c4105c22e2b1299a457f729c629d1bb5a9303b25499f9eccd177707b5a88fbe56ccb6ffe1d6e
 EBUILD setuptools-69.5.1-r1.ebuild 4636 BLAKE2B 9aebfc1c5861b64058a9f5ef14ad0cef531c39f6d85e90c25cfc4553fd3d60a29842cd3b26e33cd1c3dcef4d6b3cfa8873ae423beb01a0448fc7b1450081142d SHA512 f80f437a0501918010ea99fd130860ecd82de2c95b49a7a7db83c07eba82e2a36c0b3808fddfcaf16b659f435e8db394caf8663a3a7bc14c16d43ce03f6466f1
 EBUILD setuptools-70.0.0.ebuild 4649 BLAKE2B 17e47a7fb15219ed058b259330db282c8ee803805f8c6f447060676384aae4311cbd8a537ae89caefa5725c6d1c88bcee51864fab82c068ab6df21cc26df3e16 SHA512 11dcfed4ea59444c2fc32b3e99bea725da481a84cf4bead50749acc0c2531b9ae7a402b20b8f900f4e28708f7643e4c74fb72c73e0f310f17f5826f898b0ab06
+EBUILD setuptools-70.1.1.ebuild 4886 BLAKE2B a88047889dea65f5b734d2462e97e252fa082635fee3cb271a758778857fc425343dcf706c660be13ca21611a4c090aacc80f2baf993e11420cccaed61bb8b1c SHA512 5ec6cbc3b1a78fa4fbfec439028ce4136df308381d71566641b772772e7f1404879e12d5c11cea4541755a0cc3b5c026561cad03e392cbcb33eb8813efd2958d
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-70.1.1.ebuild b/dev-python/setuptools/setuptools-70.1.1.ebuild
new file mode 100644
index 000000000000..215844da5d0d
--- /dev/null
+++ b/dev-python/setuptools/setuptools-70.1.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# check */_vendor/vendored.txt
+RDEPEND="
+	!!<dev-python/setuptools-rust-1.8.0
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
+			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/tomli[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+		$(python_gen_cond_dep '
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+		' 3.10)
+	)
+"
+# setuptools-scm is here because installing plugins apparently breaks stuff at
+# runtime, so let's pull it early. See bug #663324.
+PDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
+	)
+
+	distutils-r1_src_prepare
+
+	# breaks tests
+	sed -i -e '/--import-mode/d' pytest.ini || die
+
+	# remove bundled dependencies
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_build_meta.py::test_legacy_editable_install
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_editable_install.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		# fails if python-xlib is installed
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# TODO, probably some random package
+		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
+		# Internet, sigh
+		setuptools/tests/test_integration.py
+		# flaky
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_transitive_extra_dependency
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_distutils_command_dep
+	)
+
+	case ${EPYTHON} in
+		python3.12)
+			EPYTEST_DESELECT+=(
+				# TODO
+				setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_distutils_command_dep
+				setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_transitive_extra_dependency
+			)
+	esac
+
+	local EPYTEST_XDIST=1
+	epytest -o tmp_path_retention_policy=all setuptools
+}
diff --git a/dev-python/sqlglot/Manifest b/dev-python/sqlglot/Manifest
index 5914ee556bc4..ad82bd3936fd 100644
--- a/dev-python/sqlglot/Manifest
+++ b/dev-python/sqlglot/Manifest
@@ -19,10 +19,8 @@ DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d7
 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d
-DIST sqlglot-25.0.3.tar.gz 18736092 BLAKE2B c5123ff152c58797903821173fc2ef26fc1c94565dac23542bf7d92157d91747cba0ae0dbd64051dee5308a5f4e817edb93dc6efa5337d13cbcd2e8caccf7e09 SHA512 31ec6b9e75507905124986f3531ba930ccfbeb6eea0f9b81f4489c67b889d07d9fe3e8705f6df0f222a8417189109ee5676906f58537656d66ce122f2907ba40
-DIST sqlglot-25.1.0.tar.gz 18812668 BLAKE2B 3ee5606393ad188ac634f4f070e3b3f8ec91a2f9d28cc9c9a0bde7c83083e4a7cb2f6d6831e1c3e3dcddf8909b8d5d8b2e4e8759965b09999b71730e2a4f7cd8 SHA512 82471aec2cdf8a2a0f88cd367d9d08f8d69ff204847ac74b2bfede6df3ca513a9e9d0d584b1932582073821095d0aa4bd691f1ebd9a2794bda29ec65341677be
-DIST sqlglot-25.2.0.tar.gz 18902605 BLAKE2B 8cd7be70ac09a362a359a214ecca79ab0353a8e0ad8418a2b2c3610400b09cc482288feea6207172233686cf2bb7dce4c3c07960697f9da78b17b04afdf7665d SHA512 0f2b81b9375c69823aca73d427af2a4cb0a47fe716cd1541b04011bf6d3b6f34c7c85b88d224fabcc660c503eccadec13282853d5f553cd34261a2de7f1067eb
-DIST sqlglot-25.3.0.tar.gz 18924667 BLAKE2B e000f52bcec9deb21e92faa22b657b407bc9a620af98a3da003342d55e1b09fcd5c3e96ab4d02b4ecb70939266b594e04b329c8369a8656838da77a956dabb2a SHA512 ac26bee312480bf833509ec69353e80b0b7123e1fc3c6bf8b6272023ee5224b5febc73310d7c1a7fe5ff0019161b7e802c9b4445abb6c2ef8c9cb365c35cf8ee
+DIST sqlglot-25.3.1.tar.gz 18941155 BLAKE2B b8b7b9aae0fd80c2e4079a9d80fb6db4fdf4ae0332293e1a2e04b383b5225759d72b9e98e8f5d827621ad6546243f14a2e349f304a0df95594ce0e3838a21471 SHA512 65fc5da06c2a9ddbb8c33df861b6dc54a16eb369dd3fcae7557a9be7cf4a2639ef51d236d622fe89a20189e1a3680782b9b9050117313d81afafad936a46925f
+DIST sqlglot-25.3.3.tar.gz 18979036 BLAKE2B 33f7f29585d25e69e19df43620c1aab69fad1d82725ce86d58d70b694096b2ea4e710815e55569049fe3c68c614bb1deabe5b48d06065ccba24e4d7343296d07 SHA512 78f6c3a346b8377984a4611e8fa368794b08ad21e2b2da59d529066374af5f468acce5bd279963c480120ca1e7f6521807c0841ae75eabf05cfbfb916d5def5a
 DIST syn-2.0.41.crate 246016 BLAKE2B 9d389f2e2a0acb4c84c309456e8ffcc88c5d4d541535ed136832d7a6054dde45a598bb68e8a6f3062ca2a96e1ceae947d54b3aec9bad65b0c51d6733aa6c80db SHA512 6bbaf69ca783025dfb81ac3612ac60bfbed31b2d87792909b35c12892dadebdaff2ddf9463105e536b671dce5870610ab90fe29471284bbd3014dca8d6993f1a
 DIST target-lexicon-0.12.12.crate 25156 BLAKE2B f3803596c75f6c89438592a1176c3748fc2c0524d7d50a20056de1cd26d40c572b05bafcdf6dd702752864bea37c8b4f28f96dadc12a5b3bb1d279b25e489f85 SHA512 6147295c43ba1b7b087a3c5ab51534b2985e4e77e5e15687978cfb9d07e21c4fd9bc7191576d6cabd268d08a44dc733c4a957e59dba8b948c2055d8bb433aeca
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
@@ -35,8 +33,6 @@ DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1d
 DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
-EBUILD sqlglot-25.0.3.ebuild 2602 BLAKE2B 2ebe12c252293a3ff60948e560fb6a49f93e202003fd3a94870eb874cf6be356807cdd62413bc26ae2f01757b913a396d988a856f938d5685162b639fa3ab8f9 SHA512 5386d1a924752114b0c24079e25bc6b4da42b65aacea2e7f8dccce8acb460940dbdc10238ed3e205d76c3ffc4fe5ec69bec0c1d4109f63bc220c89b02ae3e3b2
-EBUILD sqlglot-25.1.0.ebuild 2602 BLAKE2B 2ebe12c252293a3ff60948e560fb6a49f93e202003fd3a94870eb874cf6be356807cdd62413bc26ae2f01757b913a396d988a856f938d5685162b639fa3ab8f9 SHA512 5386d1a924752114b0c24079e25bc6b4da42b65aacea2e7f8dccce8acb460940dbdc10238ed3e205d76c3ffc4fe5ec69bec0c1d4109f63bc220c89b02ae3e3b2
-EBUILD sqlglot-25.2.0.ebuild 2602 BLAKE2B 2ebe12c252293a3ff60948e560fb6a49f93e202003fd3a94870eb874cf6be356807cdd62413bc26ae2f01757b913a396d988a856f938d5685162b639fa3ab8f9 SHA512 5386d1a924752114b0c24079e25bc6b4da42b65aacea2e7f8dccce8acb460940dbdc10238ed3e205d76c3ffc4fe5ec69bec0c1d4109f63bc220c89b02ae3e3b2
-EBUILD sqlglot-25.3.0.ebuild 2602 BLAKE2B 2ebe12c252293a3ff60948e560fb6a49f93e202003fd3a94870eb874cf6be356807cdd62413bc26ae2f01757b913a396d988a856f938d5685162b639fa3ab8f9 SHA512 5386d1a924752114b0c24079e25bc6b4da42b65aacea2e7f8dccce8acb460940dbdc10238ed3e205d76c3ffc4fe5ec69bec0c1d4109f63bc220c89b02ae3e3b2
+EBUILD sqlglot-25.3.1.ebuild 2602 BLAKE2B 2ebe12c252293a3ff60948e560fb6a49f93e202003fd3a94870eb874cf6be356807cdd62413bc26ae2f01757b913a396d988a856f938d5685162b639fa3ab8f9 SHA512 5386d1a924752114b0c24079e25bc6b4da42b65aacea2e7f8dccce8acb460940dbdc10238ed3e205d76c3ffc4fe5ec69bec0c1d4109f63bc220c89b02ae3e3b2
+EBUILD sqlglot-25.3.3.ebuild 2602 BLAKE2B 2ebe12c252293a3ff60948e560fb6a49f93e202003fd3a94870eb874cf6be356807cdd62413bc26ae2f01757b913a396d988a856f938d5685162b639fa3ab8f9 SHA512 5386d1a924752114b0c24079e25bc6b4da42b65aacea2e7f8dccce8acb460940dbdc10238ed3e205d76c3ffc4fe5ec69bec0c1d4109f63bc220c89b02ae3e3b2
 MISC metadata.xml 611 BLAKE2B 10bf684677182565c9932d51ed9b3b9c80d376d6db945bd7b0dd0d9a19a85dc0d10cb169ff2048ae5f7f73d0f438d259b6231c13c525b5374ec99377f4ffdd10 SHA512 2b26d0f77962807052b94ad78addcfdce9859042af3be34df267dc6e70b6231dd779563935fd21955cd8646fd0cce3fee8c939387ac8056194a0b777743dd2ae
diff --git a/dev-python/sqlglot/sqlglot-25.2.0.ebuild b/dev-python/sqlglot/sqlglot-25.2.0.ebuild
deleted file mode 100644
index 3ecfcc322a3e..000000000000
--- a/dev-python/sqlglot/sqlglot-25.2.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-CARGO_OPTIONAL=1
-CRATES="
-	autocfg@1.1.0
-	bitflags@1.3.2
-	cfg-if@1.0.0
-	heck@0.4.1
-	indoc@2.0.4
-	libc@0.2.150
-	lock_api@0.4.11
-	memoffset@0.9.0
-	once_cell@1.19.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	proc-macro2@1.0.70
-	pyo3-build-config@0.20.0
-	pyo3-ffi@0.20.0
-	pyo3-macros-backend@0.20.0
-	pyo3-macros@0.20.0
-	pyo3@0.20.0
-	quote@1.0.33
-	redox_syscall@0.4.1
-	scopeguard@1.2.0
-	smallvec@1.11.2
-	syn@2.0.41
-	target-lexicon@0.12.12
-	unicode-ident@1.0.12
-	unindent@0.2.3
-	windows-targets@0.48.5
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.5
-"
-
-inherit cargo distutils-r1 pypi optfeature
-
-DESCRIPTION="An easily customizable SQL parser and transpiler"
-HOMEPAGE="
-	https://sqlglot.com/
-	https://github.com/tobymao/sqlglot/
-	https://pypi.org/project/sqlglot/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="MIT"
-LICENSE+=" native-extensions? ("
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-LICENSE+=" )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-util/maturin[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	# remove fragile timing check
-	sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use native-extensions; then
-		local DISTUTILS_USE_PEP517=maturin
-		cd sqlglotrs || die
-		distutils-r1_python_compile
-		cd - >/dev/null || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Tests require pyspark or duckdb which aren't in the tree.
-		# Pandas would be a requirement normally, but it gets ignored by proxy.
-		"tests/dataframe/integration/test_dataframe.py"
-		"tests/dataframe/integration/test_grouped_data.py"
-		"tests/dataframe/integration/test_session.py"
-		"tests/test_executor.py"
-		"tests/test_optimizer.py"
-	)
-
-	# make sure not to use an earlier installed version
-	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
-	rm -rf sqlglotrs || die
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
-}
diff --git a/dev-python/sqlglot/sqlglot-25.3.0.ebuild b/dev-python/sqlglot/sqlglot-25.3.0.ebuild
deleted file mode 100644
index 3ecfcc322a3e..000000000000
--- a/dev-python/sqlglot/sqlglot-25.3.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-CARGO_OPTIONAL=1
-CRATES="
-	autocfg@1.1.0
-	bitflags@1.3.2
-	cfg-if@1.0.0
-	heck@0.4.1
-	indoc@2.0.4
-	libc@0.2.150
-	lock_api@0.4.11
-	memoffset@0.9.0
-	once_cell@1.19.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	proc-macro2@1.0.70
-	pyo3-build-config@0.20.0
-	pyo3-ffi@0.20.0
-	pyo3-macros-backend@0.20.0
-	pyo3-macros@0.20.0
-	pyo3@0.20.0
-	quote@1.0.33
-	redox_syscall@0.4.1
-	scopeguard@1.2.0
-	smallvec@1.11.2
-	syn@2.0.41
-	target-lexicon@0.12.12
-	unicode-ident@1.0.12
-	unindent@0.2.3
-	windows-targets@0.48.5
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.5
-"
-
-inherit cargo distutils-r1 pypi optfeature
-
-DESCRIPTION="An easily customizable SQL parser and transpiler"
-HOMEPAGE="
-	https://sqlglot.com/
-	https://github.com/tobymao/sqlglot/
-	https://pypi.org/project/sqlglot/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="MIT"
-LICENSE+=" native-extensions? ("
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-LICENSE+=" )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-util/maturin[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	# remove fragile timing check
-	sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use native-extensions; then
-		local DISTUTILS_USE_PEP517=maturin
-		cd sqlglotrs || die
-		distutils-r1_python_compile
-		cd - >/dev/null || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Tests require pyspark or duckdb which aren't in the tree.
-		# Pandas would be a requirement normally, but it gets ignored by proxy.
-		"tests/dataframe/integration/test_dataframe.py"
-		"tests/dataframe/integration/test_grouped_data.py"
-		"tests/dataframe/integration/test_session.py"
-		"tests/test_executor.py"
-		"tests/test_optimizer.py"
-	)
-
-	# make sure not to use an earlier installed version
-	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
-	rm -rf sqlglotrs || die
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
-}
diff --git a/dev-python/sqlglot/sqlglot-25.0.3.ebuild b/dev-python/sqlglot/sqlglot-25.3.1.ebuild
index 3ecfcc322a3e..3ecfcc322a3e 100644
--- a/dev-python/sqlglot/sqlglot-25.0.3.ebuild
+++ b/dev-python/sqlglot/sqlglot-25.3.1.ebuild
diff --git a/dev-python/sqlglot/sqlglot-25.1.0.ebuild b/dev-python/sqlglot/sqlglot-25.3.3.ebuild
index 3ecfcc322a3e..3ecfcc322a3e 100644
--- a/dev-python/sqlglot/sqlglot-25.1.0.ebuild
+++ b/dev-python/sqlglot/sqlglot-25.3.3.ebuild
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index 95e82557184e..75aa83e69ae9 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -3,5 +3,5 @@ DIST tenacity-8.4.1.tar.gz 45426 BLAKE2B e5cb1ed5a93a28a5733b7c25f95a5d9c4d4e341
 DIST tenacity-8.4.2.tar.gz 46206 BLAKE2B b7829d5eecb29e9fe8ec0e01c68bb9381182c93602d86ad3b8aa746aa4d809d733d72480d8a3a3eb793d46f5c091672202109db2eb34e05ec5204d32c32d3995 SHA512 64e56d27ade71116309327cc6a1f04a9fa54c9e1b867cdfbe294799be3707259bdf63d676259235c629ef10b9a9c2850f80bfab5863cec0a019bff779b48e892
 EBUILD tenacity-8.3.0.ebuild 598 BLAKE2B 4b05acdf59ce38c8cfdc45e43522567204580f079b17b8a25b48fcd01e8a851560fd3b3cef939fc9262226dce7da6d58493e3339a1345fdf233e828e94ebf086 SHA512 13e643dba3b3aef847283c45a4f556e69c3b1b203501c0f42936cf0cb56b5592d1c58a4140b2361fe9f8de81b74dc83366ad9948fc8e2e7d5debc301abfe6c03
 EBUILD tenacity-8.4.1.ebuild 879 BLAKE2B 50868f26addbd964800f8ac725bd4c95df4ba0cf7692720bae15ca7a494bb6e8f949e36a940f9e5c1d4a671dfe66af9b0b69ab7cd39ffd6122399f194db5f4bc SHA512 859f70a9b195969eb28f5088798312171897ab44f33fdc9c45b4b7ba7317873e843b1a2537f22061ce1006419d6aa9ed29671f4cb6bb5fd01e8d865b2edbcc23
-EBUILD tenacity-8.4.2.ebuild 879 BLAKE2B 50868f26addbd964800f8ac725bd4c95df4ba0cf7692720bae15ca7a494bb6e8f949e36a940f9e5c1d4a671dfe66af9b0b69ab7cd39ffd6122399f194db5f4bc SHA512 859f70a9b195969eb28f5088798312171897ab44f33fdc9c45b4b7ba7317873e843b1a2537f22061ce1006419d6aa9ed29671f4cb6bb5fd01e8d865b2edbcc23
+EBUILD tenacity-8.4.2.ebuild 886 BLAKE2B 964472ed0355c8720e8b2d9e0f36ed58f1d87d74cc2c1d1d078a32c06c5c5ff7be70797cb7926f0632b6690f0a4238b6f49a1953532327c9d339c7ccd2374996 SHA512 5b43ad4fc6f2b82f31b766f4b1ab875c937514f0387e6825b5266d5064e8ada6b04ee2736f22a92ddb4b881c71219bf39d69979decfebd2f3efbefcae30f472f
 MISC metadata.xml 856 BLAKE2B af0d5417912404af6b5be19c32d150db197d27b55681871cbd45f983d1caf8b8ba7c8c44936b1465ecf00b4d185552399d0023bbfc16e84451e4fbf006eefcab SHA512 1fe2c8617bfaeba198a8b5430c2b38acf60f17c29fc89599d198037310589b4a5bb1170919e2f57c3e27951288d06ab281ec5a55ae64e6a0a33296a89be17839
diff --git a/dev-python/tenacity/tenacity-8.4.2.ebuild b/dev-python/tenacity/tenacity-8.4.2.ebuild
index d2558578d37c..9cd539371a91 100644
--- a/dev-python/tenacity/tenacity-8.4.2.ebuild
+++ b/dev-python/tenacity/tenacity-8.4.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/truststore/Manifest b/dev-python/truststore/Manifest
index b0b243f0e02b..726b7597102d 100644
--- a/dev-python/truststore/Manifest
+++ b/dev-python/truststore/Manifest
@@ -1,3 +1,3 @@
 DIST truststore-0.9.1.gh.tar.gz 26720 BLAKE2B e5bf3905367f75cdfd9314f1c544f004e62c2ddcde97f83bfe5ddc2d7606d44df5fc352811c8c42423be2da46e5f7b9642a2aeebe61436669c4cd9265ddbec96 SHA512 38567198a3b0d4e9c0b3df72674f3e1fef0614ef0afa80bd7276f98c2e7ef2dc00cca92184b80a1dfe535c5d2508ebdb775e389576c2f07536838f67de1958ca
-EBUILD truststore-0.9.1.ebuild 1152 BLAKE2B b160e063034b642599cd1ee537307bfa8af1becaabd8554bd7adbc5a849fbb8fc6ffc6ba5593a1012b6f255afa5ef0adc55168a063827ce1fdc048a49551d8c5 SHA512 67ad43fc24b2fa27f113d50ad6d59cfb07e578f02053df0d82495e9dca78543ca83274f99a8c8031c1f90786ca3249e0e3027bd75575a95c27a13162eee80f37
+EBUILD truststore-0.9.1.ebuild 1159 BLAKE2B 407e1355b49fe4ddf4a21c2a6674ab78278084aa6e650d3b84ccc4cf4eecb59472473b751c89373c906870ac16165b00f9492e7f888750ca0248d958fba4b15c SHA512 477a46e7f74f60feb4358f0de86f07a59a1a59e28d30e0ed40e1d2345f8b1d9e2f3c04042cf4b5e7a60672cbb8bb93c7400a255171566670f73db1825a1bf145
 MISC metadata.xml 378 BLAKE2B 26c6338dabc3baee4f0a61e4d64b538bd90ca5389b7da7321c92d3063f62861f7100871318d8c7ed1d4ade26196e87c966a91c872b1308f8b8ae1bd23451d118 SHA512 8fc959454ce19667c97ef288ed1851d3dc78eedbf71d23873f8dcadecccc2e15e99957c8838cf10b94b44422ff7484c58a249c1911ba3b18344f587151b51e8b
diff --git a/dev-python/truststore/truststore-0.9.1.ebuild b/dev-python/truststore/truststore-0.9.1.ebuild
index 08bf9344aee9..eb5ec242e731 100644
--- a/dev-python/truststore/truststore-0.9.1.ebuild
+++ b/dev-python/truststore/truststore-0.9.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
 # The vast majority of tests require Internet access.
 PROPERTIES="test_network"
 RESTRICT="test"
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index a75f735b05a6..7b62d7f219e8 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -6,6 +6,8 @@ DIST uv-0.2.10-crates.tar.xz 49410344 BLAKE2B d1e921cac3e9ef07fc9055fa6ff463776e
 DIST uv-0.2.11.gh.tar.gz 1188556 BLAKE2B 9d22cf0bc202635c0631eb15dc955d19c4c65f1baff31391e62962837ff91611479bb9190cbcd15655dd92366ce58c8b13bfea369812c68fb6a56cb11883d745 SHA512 124f4d866307ff0ac522c5780995d6f4be3ae95a35ff4615937511b2d658eb4444005fa49905f1886fc22fe35e7882efbe5fbd87752d457e441c462639d8506a
 DIST uv-0.2.15-crates.tar.xz 48793072 BLAKE2B 5988199d887f371f275a6ee40415743823c73a164a3dcf0c2d384e644d75625305e503543aa6027df0aefafcfc434c1a5da7ed9bea5760a3b83f4aef2f097545 SHA512 8ccf76686df81b0b704322e35e22ff95b8bf9aa4b417365e25ca77d50463095975de75959580cf2465404da7abcd88c6bc2aad5c9633110d55d5534ddeac97b2
 DIST uv-0.2.15.gh.tar.gz 1227841 BLAKE2B 712b0a2180631ce6c8e1d8e1bbd714efc9f97a31e92c295142826f53b1c740b922f80c05d1ab802eca684220252cad699cbece5679e7cc855e2ca34b45cac2d6 SHA512 c54e78c665f61dc649f11fc0a0d49d422c6f06115453512d98de593736b0789843d1c5431d93e5af1541f02031a4c650b7233d23016d70eab1e384672919068c
+DIST uv-0.2.17.gh.tar.gz 1289550 BLAKE2B 7353c4dea4d86b6075fe1afc8af433abc11bdb1a05fa554933be802f155943eac0fb6c18116907444ad68dd2aff359009f7a810e30f8c9c5df52be198ab28a27 SHA512 424580e2353fd45909dd5941aed3b217657c70ff389590a4e15339ec6ecf8bb30fe8cf2324fc901bfcfe04de4a61979616d205f26c4ca612122182a602db0810
 EBUILD uv-0.2.11.ebuild 2227 BLAKE2B 5a10ac4cf8bebf95d9a42a8a95d76b228592c3c09d8c6afbda89804e61e3410e6042eba71f52b7b9f6cc649916d4110cffe411034d0e8e2678c3216b19a3b27c SHA512 913e959a32a91e906159704c50ef4fad4c89224726bae361faaf79bbe52f34d054366c033be0340dacae15b6da4c27423e7f0065ab9abf86b114970b082625d8
 EBUILD uv-0.2.15.ebuild 2207 BLAKE2B bdaf77bf2e02056bffddc7f5c11cdf674065b82d4ab2a74c2a854c6a322b7b0107de0d4aa2345b91d5fedb2c24dc5617b27c669db21fc9cb10ff17b8868a9fda SHA512 65af2aea962df0a311e5114429e219566bcc1377c511d2ad347103af9ac45afb98ddacd0c69b98324cba19794d1982e29f383933d9e6b28f3420f28ebe8a68c1
+EBUILD uv-0.2.17.ebuild 2208 BLAKE2B 618a08927a14701b8226d1b339dd9a69e0f46c2eec04060238e231cc63b6ae6bec5d98f9c07bca166cd228cac281401c5655b4c0619e9b188344f37ea824e8f7 SHA512 9eb80c8c4760f41fecee0e2e8660d21caeb7094dc15ad564f5270642eda80d8282898dc6e35873ea23e436b572d3a0ab8f3b6d34aca6b0e33a8aa818db4e67ab
 MISC metadata.xml 336 BLAKE2B 4b5933e24e3e9450dde5da099185dcdf3afb5916b55cffa7c2f3f6fac77e439197cbe4ba529a87f83442d8f87d238e8abef06dc052ce9a62659060ffea9fdb47 SHA512 9910fd10ebbc395b9c330774b74798c9ffdba3bb368347658380a22e01d6dc9d1961ea50fbfb4a904c9db84b94c713c054e418a7294425b86ff41a607fd3e310
diff --git a/dev-python/uv/uv-0.2.17.ebuild b/dev-python/uv/uv-0.2.17.ebuild
new file mode 100644
index 000000000000..078345dc1fbe
--- /dev/null
+++ b/dev-python/uv/uv-0.2.17.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;b4435e2f3af10dab2336a0345b35dcd622699d06;pubgrub-%commit%'
+)
+
+inherit cargo check-reqs
+
+CRATE_PV=0.2.15
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-DFS-2016
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+BDEPEND="
+	>=virtual/rust-1.77
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/vorot93/tokio-tar/pull/23
+	# (fortunately uv already depends on portable-atomic, so we don't
+	# have to fight Cargo.lock)
+	cd "${WORKDIR}/cargo_home/gentoo/tokio-tar-0.3.1" || die
+	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	# work around https://github.com/astral-sh/uv/issues/4376
+	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+}
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index 2085769e5453..1fd06c94155d 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,5 +1,7 @@
 DIST voluptuous-0.14.2.gh.tar.gz 43866 BLAKE2B 9c76f7271afe6f2c7150efed3be7b30127ad8096f21aecadd864766f593a5ab7a64f2b2dc65e2b233ca3fcf32c941cfeb1a96ba1a30f5727ad36ba09db3dafb8 SHA512 18a52c3d1feba1efda0cc91407b21938a7261ae9e7768e62ddc553c0cb9bf8ffa6448b39c476bc94a1aefb8f75b724da5ee2ffc8b6a729cb23accead7db40814
 DIST voluptuous-0.15.0.gh.tar.gz 44044 BLAKE2B a782ac9868cbbebd000f44f17aa21cd2493989bb0a900fd74b11a75dee882a27f554f5f8c27503ced48d5e981c642e81e9eae2eace3a04f26b7d946ff77478c5 SHA512 4666aaad66721e930500633483d1ea88a0230b00b1ba9dc7c3fe3c208fec7c14855471e7d9e77342f466c70ed6755eda95a384aad069f702b05d266c6d78b672
+DIST voluptuous-0.15.1.gh.tar.gz 45838 BLAKE2B aab9c8bc8e46c2633c14be186fe94bdf68ccd9a7c4d95829311515220d4155b3c80c9983670646a63b7323614090aef441eea67dc6fd8c0064e92fe1fc4d3962 SHA512 aabd4c873b0714f1da3b6f99dbff3c526f3caab7cbc4346a1f7828c8c97d788051ff962babc8936e8659aaf7e270f40156f3a5fa37acf157792ec485dd726050
 EBUILD voluptuous-0.14.2.ebuild 606 BLAKE2B 928b1a23f64d662d3b0e8d31f292e527faf3961e785ef47834debb8e6c0f67b49d48098701bee91fa6e34a9d7e4e8aa8612f614eb53264327836f5b322916ba7 SHA512 ff7fff767e154f58882e552faa256973d3e9141fdd78115741d6334c5f5174ade4434f3988eb706b87eef2865b2ba385ad59e7bdfc7452c2f3970e10c1847c10
 EBUILD voluptuous-0.15.0.ebuild 610 BLAKE2B 4cd565c8350bb7efd563557ed6af07284206476fb076c836abb7367240b160b53aa2a2c445f92e6463e2f618096229178bdd7790dac934255342c67c46a271fe SHA512 4c4ec3c1df97931700ab3ef4a4708d5e012f3c566e6891e196b3d82e1672ae7d6679efb04359f5482d39f285f8bef1faa4eeef8bdf4fce0b52922db840eb4567
+EBUILD voluptuous-0.15.1.ebuild 610 BLAKE2B 4cd565c8350bb7efd563557ed6af07284206476fb076c836abb7367240b160b53aa2a2c445f92e6463e2f618096229178bdd7790dac934255342c67c46a271fe SHA512 4c4ec3c1df97931700ab3ef4a4708d5e012f3c566e6891e196b3d82e1672ae7d6679efb04359f5482d39f285f8bef1faa4eeef8bdf4fce0b52922db840eb4567
 MISC metadata.xml 716 BLAKE2B 1298492f8a89ce4babc23481dc56da06e4d9007546ed2804fdf42906f6d90d3b1327ee2d54724fa3621a387429544931d30a0334312a68a17edaeba735c9d7b8 SHA512 80636ea29257b1ff070427dc759f9d0abf02ba2037676725627308c69a1e9bc49353c09507523a739c3f07a4cb284e2df76d3935f4f9dadb64005ad7204ddf60
diff --git a/dev-python/voluptuous/voluptuous-0.15.1.ebuild b/dev-python/voluptuous/voluptuous-0.15.1.ebuild
new file mode 100644
index 000000000000..162398826769
--- /dev/null
+++ b/dev-python/voluptuous/voluptuous-0.15.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python data validation library"
+HOMEPAGE="
+	https://github.com/alecthomas/voluptuous/
+	https://pypi.org/project/voluptuous/
+"
+SRC_URI="
+	https://github.com/alecthomas/voluptuous/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 716c6d95687f..44154f9ff396 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/async-pool/Manifest b/dev-ruby/async-pool/Manifest
index 2343dccdae52..dd2483b190d6 100644
--- a/dev-ruby/async-pool/Manifest
+++ b/dev-ruby/async-pool/Manifest
@@ -1,3 +1,5 @@
 DIST async-pool-0.6.1.tar.gz 10671 BLAKE2B f9dd19d15a2c1076b8c899d76c5e8ec6d5f98da82c2c574e701d098286027579c6e1728510801c9b471a864ea0533a4df68f13fcc57d75e4d92b464186e37740 SHA512 8221ccfdfe5a21b80f963da360efab682627346b7384870edbd8b53d71906dd6a471cf7b0e5d0bd995263089ce7d1a05278bf84cf7feec52a7360e106eba6016
+DIST async-pool-0.7.0.tar.gz 10850 BLAKE2B 9426f0a04d282a5808b92b9d177979118583e13fc22bb91466fdf41538fd4f26794710dfc5cf014de0fdb04be175a0cbe515e021a7923b8c17fe78fd4f075a96 SHA512 00a6a2bae6a82d69768a778cc21eff260ccab6b8843963aa1ec0d646a3b25c07879cf3292a8905049b1ba125913b19162cc66826d66c3e45499e8c33720f5e13
 EBUILD async-pool-0.6.1.ebuild 877 BLAKE2B c264861dbf41d4ec03855381d7c9783f8457ef3cf1e60c66b18c21107c1a7821150312a7389509b784124d26e2f0527b6c8e39d48233ad0ed534783308d14420 SHA512 cb806e579b51378243332a9e3e63277d8d10b0a6f15fc4681d666b0c7585b299162ec618f6f567224a52a7ac67021e95de27f9d1f817ccb246d17ac8a76b6442
+EBUILD async-pool-0.7.0.ebuild 877 BLAKE2B c264861dbf41d4ec03855381d7c9783f8457ef3cf1e60c66b18c21107c1a7821150312a7389509b784124d26e2f0527b6c8e39d48233ad0ed534783308d14420 SHA512 cb806e579b51378243332a9e3e63277d8d10b0a6f15fc4681d666b0c7585b299162ec618f6f567224a52a7ac67021e95de27f9d1f817ccb246d17ac8a76b6442
 MISC metadata.xml 346 BLAKE2B 5e6c7553c8af7ab2b27fc11762b4b17fc7a34e39851c6c52136ad9c56228e19141d12c418c752a4a7a01b6d1f0fa8ad19bbccb84e485b3ab6811dde39ce60fe4 SHA512 fbe2e33898a365b26d44efe83d36432769ba67e348eaf2077da10dbea3b1b6466d75a9892788fa02e7b9fbdb7b89eeca9759f8f201cdf660ab2c12f1d0110ad1
diff --git a/dev-ruby/async-pool/async-pool-0.7.0.ebuild b/dev-ruby/async-pool/async-pool-0.7.0.ebuild
new file mode 100644
index 000000000000..4a6044261d69
--- /dev/null
+++ b/dev-ruby/async-pool/async-pool-0.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A singleplex and multiplex resource pool for implementing robust clients"
+HOMEPAGE="https://github.com/socketry/async-pool"
+SRC_URI="https://github.com/socketry/async-pool/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/async-1.25:*"
+
+ruby_add_bdepend "test? (
+	dev-ruby/sus-fixtures-async
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid test dependency on unpackaged covered
+	rm -f config/sus.rb || die
+}
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 831afc2541c2..7e78d167a829 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -5,5 +5,5 @@ DIST dalli-3.2.8.tar.gz 73367 BLAKE2B 1680fda0d272d135f8e88a0ea2e16a08cd1027808f
 EBUILD dalli-3.2.5.ebuild 1203 BLAKE2B bfb81d0688532d7f62877c0957b7a5cc06c4ba8e54842b267ed7f2bb8d41ca01c25cf85ed819aea287b7300df9bcdf40069077e33f525981aab8cc2242fc3b36 SHA512 181bd9419243aa6d5b93c8ff9b8df1f43a790f46a7071a4dd3f23125c459d78339ac240afecf1726aad494581b245794555498a70c49ac385325204e88f30996
 EBUILD dalli-3.2.6.ebuild 1212 BLAKE2B ffa04018a31a44160bdd8161ba00c1b40be26e6bb1db6e021c19ff6d7f09e970d9d7e2275b30198623d231d49b82eb7404fbfb746db55210058dca905ec3d2cf SHA512 b5bc8364dfd785d8ccdcd7986b655031f2d1bb3e01dc3704270bc9820986074292178860e37a41db0e80b2b4786e2a1dde4fe99ca72df327303b5d0414e19078
 EBUILD dalli-3.2.7.ebuild 1216 BLAKE2B 76a443e2768a3f97cdb8ea7aa52001bb8d182252b6feb276a8e0e33f248e56a095d47b0a2234756c0ced8bc242343bae7c35c3d6652ff8f69be27be52faae25b SHA512 d236897d1aea6edad805e02037b0f2436e487fae3efd633dba298bc9a7b5c00ba243e5739e4831ffe01fc7c2241a334e19d565eff9cbe81d4f342df5c0ed5528
-EBUILD dalli-3.2.8.ebuild 1216 BLAKE2B 76a443e2768a3f97cdb8ea7aa52001bb8d182252b6feb276a8e0e33f248e56a095d47b0a2234756c0ced8bc242343bae7c35c3d6652ff8f69be27be52faae25b SHA512 d236897d1aea6edad805e02037b0f2436e487fae3efd633dba298bc9a7b5c00ba243e5739e4831ffe01fc7c2241a334e19d565eff9cbe81d4f342df5c0ed5528
+EBUILD dalli-3.2.8.ebuild 1223 BLAKE2B 4f4134b093a19b493ad8aba9285e81740e7482aea4e1e37b2a68f4e8c2a532c578216b70cbe0142439787fa4f3b752d26fd5f9b6a0bc05e3f2279729a36071b4 SHA512 6ac4e9f28902304f8f9a10e88d051e35ff9c77ab56ddb5b6c94f95e07dbbdd4871a64241d3b1df88d61040c8bbc18f194c3c76575b1e63c205f253e6cbd03e10
 MISC metadata.xml 347 BLAKE2B f1e7c89c18e4fb1a02714796274401469ee66687a98d56445ed894024667a9bb277d0d1c1f6cc4ddfd90c3d3b3cd2f826bad7dda8fc5f3d6111b8326865228bd SHA512 7645efc96c6c7d275946260d28055c704f3fb45674e864b60a4a60e7265c8c61e82105373a243ecad18101c850ec47ea3c9a5a2a0538b4f9c99232ba1fa36c6e
diff --git a/dev-ruby/dalli/dalli-3.2.8.ebuild b/dev-ruby/dalli/dalli-3.2.8.ebuild
index 41af68f1391e..a60d07836d51 100644
--- a/dev-ruby/dalli/dalli-3.2.8.ebuild
+++ b/dev-ruby/dalli/dalli-3.2.8.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
 SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4[ssl(-)] )"
diff --git a/dev-ruby/net-ftp/Manifest b/dev-ruby/net-ftp/Manifest
index e7531f57f9c6..ddf3f40f23ae 100644
--- a/dev-ruby/net-ftp/Manifest
+++ b/dev-ruby/net-ftp/Manifest
@@ -1,7 +1,9 @@
 DIST net-ftp-0.3.4.tar.gz 28020 BLAKE2B 2962f61c17b4314a044d3a80c62693948d1241f783b6f948a056ca34b8f076c8357dc150f04e09a245236b402c6e711e02f6a3717b60aa816a6ca419cfa1ed08 SHA512 1f289b8b0481abf66bbe000cfdc08d8f32559d02ccee186159696e1b563aecc1178d975946d969064bdb8abf8f76d50b5d5bde0423e12bf2ba0b757796c9b046
 DIST net-ftp-0.3.5.tar.gz 29007 BLAKE2B 4c7c9154f41333151b8249f38cdf1baf3e7cc4cbdb3e5f27cba1f2f97be463b16ede73b6e49b3e43bd591ece6784d102919c4028af636bddc34ac3e03f889b82 SHA512 551aa99200b4ee629a07f1107f1aee0f896bbed8bc88aba49103db244081cc28dbdbcc21cb0df60588b721aec9e22007ac5749d2485bb534c38621df28c04adf
 DIST net-ftp-0.3.6.tar.gz 29698 BLAKE2B 91b21e2e886a7b5ee103faae8eb34110dd86a491e82f954853020f8a7eea821fabcde4337da082736d9d12cacc3aece6d6d31d709f7c6aa9c5d2661b857a9895 SHA512 97f2158f2213b37d882157faecda669ba0553cea59fe489379fa9be27a5c86fddd112fbef35c77cdb8a852682d43e47d8596a8bea359f5d6c779c82932050559
+DIST net-ftp-0.3.7.tar.gz 29763 BLAKE2B 611a5397f5f77a1698498b031e99f67ad840d168e68d1d7fbdab26114ba7962d444718ac3601c743e602e48447027a2b76550bfd427972311d591b5565316dcc SHA512 5e20a154905cdb3a223da537588b96c4407944896551b1550299be4271a030206f83ba77cc2f4f12bcac713fd800376975541ec90300dd19a03bf4bff0e12338
 EBUILD net-ftp-0.3.4.ebuild 849 BLAKE2B 8f671bbae701e7de2b9e3a5cccd80b672ceed16aadb1c558c9c467dd24d90976b040a43e9cc8b12f8ee8da5a4375fff03d7a2118bd7e28d196b4f88f8931476f SHA512 f5a174d5482c66151d1e7b9d0729b171073ca84dfc6c49e1c905bf396fc97130975999d8a8150d23ce8f04c25c472c4a4b6774bcb4cfedb0ea7ceff0c6c2670b
 EBUILD net-ftp-0.3.5.ebuild 857 BLAKE2B ba3ed94db2532a4e2d4fa4f0981b3320ae02447b0f1eb73f1c1ea77cd2814d512b2927313468cdd046c32589c5a311e86a1bc9dd407efa198578254f8eae9ef7 SHA512 e74a703af8e2dc6aaba964540095f787e750f95e0f865180e1514b83ab8316aa876be20499333779d52b4ce376244612fb6261b7d4a13ce43d4dd257fcafb766
 EBUILD net-ftp-0.3.6.ebuild 857 BLAKE2B ba3ed94db2532a4e2d4fa4f0981b3320ae02447b0f1eb73f1c1ea77cd2814d512b2927313468cdd046c32589c5a311e86a1bc9dd407efa198578254f8eae9ef7 SHA512 e74a703af8e2dc6aaba964540095f787e750f95e0f865180e1514b83ab8316aa876be20499333779d52b4ce376244612fb6261b7d4a13ce43d4dd257fcafb766
+EBUILD net-ftp-0.3.7.ebuild 857 BLAKE2B ba3ed94db2532a4e2d4fa4f0981b3320ae02447b0f1eb73f1c1ea77cd2814d512b2927313468cdd046c32589c5a311e86a1bc9dd407efa198578254f8eae9ef7 SHA512 e74a703af8e2dc6aaba964540095f787e750f95e0f865180e1514b83ab8316aa876be20499333779d52b4ce376244612fb6261b7d4a13ce43d4dd257fcafb766
 MISC metadata.xml 339 BLAKE2B 3c2418dd7ddec0598782ad012aa5a33ec70d5179cbe0eaf602a65865f2d516366410f1c5117e2a7f4f7b03003fe77b4ee2cb888dcfaaab08631dd7b1a8d3b99b SHA512 caec07b9c960c4f24e06adb37e4705caa5a13f5a7ff388c11b15953efda289dcddc47e84864e082f26b0b720d299724fd0ffc9d556ea6a7cae1dd3242bfcd1df
diff --git a/dev-ruby/net-ftp/net-ftp-0.3.7.ebuild b/dev-ruby/net-ftp/net-ftp-0.3.7.ebuild
new file mode 100644
index 000000000000..506af331b8a7
--- /dev/null
+++ b/dev-ruby/net-ftp/net-ftp-0.3.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-ftp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Support for the File Transfer Protocol"
+HOMEPAGE="https://github.com/ruby/net-ftp"
+SRC_URI="https://github.com/ruby/net-ftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend "
+	dev-ruby/net-protocol
+	dev-ruby/time
+"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index d4e953aac6b5..72a6053538e4 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -4,10 +4,12 @@ DIST nokogiri-1.16.2-git.tgz 11014186 BLAKE2B 8b34c586f3326278299786fec8b7513f61
 DIST nokogiri-1.16.3-git.tgz 11014282 BLAKE2B fbda2a863374e25a9dae0e7ab145419b759e1ec615a8e87418825ed1d188801d535be87bb9e36bb717062080bb2a9f7cb179fdb311dd4dda61b019a41d4df6b8 SHA512 e86d5d2cb47720b9f2e72ced13e07e6d9a2bda808e05d9d151ffba92820e148bb6cd8cfe148d15247b13c23feb2abe64942f2665431e66dc821b9655425df8e3
 DIST nokogiri-1.16.4-git.tgz 11014494 BLAKE2B c07d75af189a8f897b885c111bb43258d039c31c8134df4dff65162fb5d3c24c48ec1194af24d816d8c5cc405b8384ae6430ffdce0a8687504f1de2b784b70dd SHA512 76a179fa7c907d5ffd548e472b9d03d02ba1afbd80c58f8c2760a0e342c2d3db75bd973e7a2f3751c671b68dd63ea3da95a6631f4963e18f85d5c5e7b9b877f4
 DIST nokogiri-1.16.5-git.tgz 11014565 BLAKE2B 0158c23c1479a4c05074906afbb1f7507814f73702bf6c4f5dbf90d130ad61cbd89e9be2957c59dc3a2f5bf1023d625c7c435220e168d76dbc524d314175cd52 SHA512 822acaf88f838e4b2b1840187e62d9d4424a0e552a850a2349541c114f58f3ca1ca83df2d1d1323275bb6847b79ea4afc87b6282c8ebc56094f1eb8b57dda217
+DIST nokogiri-1.16.6-git.tgz 11014594 BLAKE2B 5a2becbbaf52d753569d778fcf2c84b521a30aa52abeb923970dbc8abea56277b807e70538032edfb883552c9385b7c225885cdbab111462f51a741a0b8d3bd5 SHA512 c90e0dcd9c90980344551a5b660e15cbdf1f42a139c123f936c728952f0d8d07f8ca4810cf6f8dd51070bff66398dca3cb29ed60f8e2242930233dd594efe843
 EBUILD nokogiri-1.15.3.ebuild 2702 BLAKE2B 8934088d9edfb342b53b74f5fcabf397cf9cdb050c5c8d5ebac1686a15070ae4c1d22d3320de67ac0d055d18384f177353ffa05683e0ba17663c1cba2ae2f9e7 SHA512 3add6c7af7cc8bee29064e8fed1cea2237b401381f6451f5b5938728df1f60046ea4e342cad334630a5e00ccc54fe39a31d8c59a8f10051a56c3219c83e62f9a
 EBUILD nokogiri-1.15.5.ebuild 2725 BLAKE2B 6591c0f404c0c06fa1e832b18dd5839871d0c9b82f3f7a010f37040b598685cbe5d638b2f71bbc0f2e06496919633e4715e0a5a0ba94bfffa94e069800061156 SHA512 7ade4f7015c07f15fad0ae776cb06e9acddf0f3b8e1e0288b614adca1ea03d7506fd8a9471b6a419d2e5e11ccb76274d6b5472332c1c772ed43b982aab677185
 EBUILD nokogiri-1.16.2.ebuild 2725 BLAKE2B b4cb761c77111b4f3abf8bd0626c9f866ac6e5aa6edf078f43173d9c79eeb1293e7fb90479825c0ac93650a9ec2de0b290985bdbb876507130ac83652ce206fc SHA512 778595850b73d5d9639f03bda58e7f5b94a764275768916f28e2b6c19c81cb61a1c722672627bad92e3ce7b4fb6849448fa511c0b32405453194216416060292
 EBUILD nokogiri-1.16.3.ebuild 2727 BLAKE2B 61241258e2b01fbfdb35676fc482a093afabf1d9f0cade0a0391a5aabd19c37e6d85e1ae4853cefb60a6cc70a180c69a53d574ed2d4090d44cc0c394ff1cbc96 SHA512 7f231f67cf38a765a44dc89dd7862f8754be8c143db2a74d32d16ff690f8941a931c1ad5314d1588e61fc6164318a90bb73193d333420d05ad7a8055e8bb8d0c
 EBUILD nokogiri-1.16.4.ebuild 2734 BLAKE2B 905c3c8b0fee9cdd41e8c54772d5395ffc4e5e742ae02b8863bf8b0ba088cd325f51b725d704fd9d6930141b89606dcccd1674faacc6f6c4ee6160026fd33046 SHA512 0acbd5a3c24ad15bd4352f2c14cc385217e4ba090ee5d1898502399ac009c6dff29e5db45d924325924fa70be9a3435f1d6d4a9b5e37e682a24ab3cf37603534
 EBUILD nokogiri-1.16.5.ebuild 2734 BLAKE2B 769f6000919abf9652b5d368aaeb1c7c2f811f9661e89a2d692245263d091659fecd16410fb49fead25babe906e78d8b90140757a1891be2ea141649b527c347 SHA512 06583b2ec6ae6b3f14eee0bd9d29bd85cc9ec4cd1216deb397cf8f91b87c9adf79f79f7091765ce5e226590ce8fcf984f11c858bbc9f941f314c14ee4811d722
+EBUILD nokogiri-1.16.6.ebuild 2715 BLAKE2B 20e9705fd38ca9b623e12de65857ff505d5dafc440fb262b77003d7dc854ce9f700c09cdcbee21e0c5adabf7205df12db235eb9ec76fd32f5324c57f5b5ce477 SHA512 beb7b749b0b4246e968eeb7c268b2f143402e4759d205613696f7e4d000394723805040ecd581a3f5efb7f90051101ca06d9ce70c1ba3d9987ab985d5d3f65b8
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.16.6.ebuild b/dev-ruby/nokogiri/nokogiri-1.16.6.ebuild
new file mode 100644
index 000000000000..219482043eff
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.16.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://nokogiri.org/"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.12.8
+	>=dev-libs/libxslt-1.1.39
+	>=sys-libs/zlib-1.3.1
+	virtual/libiconv"
+DEPEND="
+	>=dev-libs/libxml2-2.12.8
+	>=dev-libs/libxslt-1.1.39
+	>=sys-libs/zlib-1.3.1
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.8
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest dev-ruby/rubyzip )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 \
+	RUBY_MEMCHECK_RUNNING=true \
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/sus/Manifest b/dev-ruby/sus/Manifest
index 41eb7b9de834..fe9b2c56e992 100644
--- a/dev-ruby/sus/Manifest
+++ b/dev-ruby/sus/Manifest
@@ -1,9 +1,7 @@
-DIST sus-0.21.1.tar.gz 29580 BLAKE2B 9a30950b4ad9da13af48c50a96951ba9f9cace97fac3a603de5acfe489dc8c8d4581b064f2452c9bf5da96da4db8f488df42f89a2113dd924c8ba8fcf8fd9230 SHA512 73db74f791f47a898840db65cf9c2f98b92f3d2a5319828f26dc55c8aef8e0932060c1075f5010b3c2b887891c1467a3828728f78a84297725d851966093ce9e
 DIST sus-0.23.0.tar.gz 30932 BLAKE2B 8f08e167368c54814b674e42ab5855f06387646774b93551fd67b7b4b7eb3313aeaa82369d2346325d2214c5f134875b9730579559450519ddb49eb62b70ad40 SHA512 ee1815d70692154abef962d41cca7037b0fa1419861ff08518a0b1153e43e308c351eb21ca32b017b30fb30fbc1a3bd707681b2a59e4a74137642c36080dddbd
-DIST sus-0.24.6.tar.gz 31923 BLAKE2B 793c8e6213ff210ff5080239f89646f3b2dfcdaca96c876ee51b210eaa68f583f3c9694afb2e2089fee46940868bee8e6db2c1d03acd4ad7b5d0a7736295da29 SHA512 6b661e0467cde29a7a192df3608ff1b629c558ea55b99c0bec40ce36b2f2876a796f7424722d6c221704edc9939a6da73cddd73a7f076287907494e027a01926
 DIST sus-0.25.0.tar.gz 32018 BLAKE2B ae19948f8f786e6cab1b97d2d7d05db01f61eccf8c872445ab8c240c8b0c856d9548917c0299a9c876a362a3138682fcd7d49903eba939473da66e7f383cd89d SHA512 c0c8337efe193ef3c8a5ea88a0d4cc7ad06c095f1f32efb437d98f6fdeb49a9f403b49b9ca61e3b305799dc53d088a1e2c41c007df6c548ac37e9770536a55fe
-EBUILD sus-0.21.1.ebuild 833 BLAKE2B 09df66af0b12aa45d93ade9e667917401286f7d5f412b920a821592f7c51e34fbc565c3595983ebac9958178e79f14a0f8c649445d83f6693635595ac0811a20 SHA512 bda298d53f329c850a8ef2b18162a1775c71cb84562c7fc4a03f8d2aa250e1fd7d26e434277f8ce49b102c7ac2f8e308d348e4fc9fb24263990f8908066e96a7
+DIST sus-0.27.0.tar.gz 32228 BLAKE2B cc9835b23341ace34f2ded75bbb61a210991691ba507322f0c0b986de91a846429237e1fa7b06868c499c8f68c69d5bf4482becbedb9a8db519960fb07128d9a SHA512 30ea64379e1e157d359b5faa2710014292457de68587a0408f67077af19fc035e57d5c4bc0cdbd1ab7af5223dc81bb9262a34a94d9c0b0560030d61dbc93dd35
 EBUILD sus-0.23.0.ebuild 826 BLAKE2B 7d0144dedead9f5e32f95dcd65ef4744197e11e24e41a715e72ea4914634fb61fb6e8adfac34c559244002474373bcce2dbc94bc939b53769bb482c21be1f76a SHA512 f472c659a0095382e614fdb75e664d0b5b909017c46f9870b75092e892995abbb0688b0c1ccb4139134f0885c28be994c585904fe4fb543fd145551d3774723e
-EBUILD sus-0.24.6.ebuild 827 BLAKE2B e76436d84309d4f14aa57ff8c0ca4f812b2a3b2d820774215a64b55563e2679ed4a33cdff9deacc8bec47d7987e77db4e3b9fbb8f54083b59fba44a8a02008c8 SHA512 0958989f1c919cb40ef4b4760cb38dd8cb9c6d8277ee05073a71cbd8467efbe002e4812e6b6b6064f13af43b12af9424993df60eeb74674ffcdab76b0cd45059
 EBUILD sus-0.25.0.ebuild 827 BLAKE2B e76436d84309d4f14aa57ff8c0ca4f812b2a3b2d820774215a64b55563e2679ed4a33cdff9deacc8bec47d7987e77db4e3b9fbb8f54083b59fba44a8a02008c8 SHA512 0958989f1c919cb40ef4b4760cb38dd8cb9c6d8277ee05073a71cbd8467efbe002e4812e6b6b6064f13af43b12af9424993df60eeb74674ffcdab76b0cd45059
+EBUILD sus-0.27.0.ebuild 827 BLAKE2B e76436d84309d4f14aa57ff8c0ca4f812b2a3b2d820774215a64b55563e2679ed4a33cdff9deacc8bec47d7987e77db4e3b9fbb8f54083b59fba44a8a02008c8 SHA512 0958989f1c919cb40ef4b4760cb38dd8cb9c6d8277ee05073a71cbd8467efbe002e4812e6b6b6064f13af43b12af9424993df60eeb74674ffcdab76b0cd45059
 MISC metadata.xml 339 BLAKE2B a89a738b1bc39d01b68a8ff2f6ea0b7edbb35c6c9cad01b7762e2ee4e99b00bd72b87752832fb2a09017836a648334aefaf3009d6912917e490c13557427f963 SHA512 bcc9d407a5fb5159fc2910fa0eab40d3654d78907a0b1812351adf85cf577d3cef53550ebcd86aa40ddc6c03714df97469615dccab9ec4388728ab1106cf6cd0
diff --git a/dev-ruby/sus/sus-0.21.1.ebuild b/dev-ruby/sus/sus-0.21.1.ebuild
deleted file mode 100644
index 55097f2442bc..000000000000
--- a/dev-ruby/sus/sus-0.21.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="readme.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and scalable test runner"
-HOMEPAGE="https://github.com/ioquatix/sus"
-SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	# Remove the sus configuration which enabled coverage checks.
-	# Its dependency is not packaged.
-	rm -f config/sus.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} bin/sus-parallel || die
-}
diff --git a/dev-ruby/sus/sus-0.24.6.ebuild b/dev-ruby/sus/sus-0.27.0.ebuild
index ba4876aa8a22..ba4876aa8a22 100644
--- a/dev-ruby/sus/sus-0.24.6.ebuild
+++ b/dev-ruby/sus/sus-0.27.0.ebuild
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 9dc61779ef76..4b60f89de91e 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/pdfannotextractor/Manifest b/dev-tex/pdfannotextractor/Manifest
index c8b89c0e81b1..3641fee33709 100644
--- a/dev-tex/pdfannotextractor/Manifest
+++ b/dev-tex/pdfannotextractor/Manifest
@@ -2,5 +2,5 @@ AUX pdfannotextractor-0.2-javajars.patch 368 BLAKE2B 7a36af59d018a7682b1ef7ae297
 DIST fontbox-1.7.1.jar 188471 BLAKE2B 88d2880e12bf99a2536b2ae21073e3f5eebeb8620e38158c971bcdd39da4f787fc9fca170183a2604ece8032cc3f3b379a763ebab472635b5b3feba1cad41855 SHA512 083d861ed254f92a66f9025ff63acd939ac93fc045d6c266b77b49ee8df483d8b93d8a75b25ec48bb9dc648cd6b49d8ef15858f1db1a2f367311331fc4a505a8
 DIST pdfannotextractor-0.2.tar.gz 28922 BLAKE2B ca488a815762cdc9b3ee3dd240e21d105862a93e5d4cf0533a37ddf8e65ed1dea331dd5ddb4a4df33f757740bfa23ebb20a44ad69281c23d986cf596f9f4ea72 SHA512 8cbbc2cbfa71f9390955d9b9d563d6f936265d6f1216aa0d627fdb5867938cf6ca4e5a3dd80980376558ef1839cf38fd48697b26c743a3c4fca58d68b27632e5
 DIST pdfbox-1.8.17.jar 4099777 BLAKE2B 05f777efd07f8189c6e0b2fd26d29b86e91e97c5a3351cf59e333d9a6c9b5512a856dacb469f643ebf6f607021217a63d214ad7632cf6d66a2e837d68d975b45 SHA512 44cd1f3d471d068b86e8bd06662365da34bb7d21e2a3080d9bc9bb0241661e61c2505294eeb40fc6983bdc2481ce09e60398b72a2a3d9b1ccaeec1536f428021
-EBUILD pdfannotextractor-0.2-r1.ebuild 1712 BLAKE2B 5bced5f1d8d5d28005d5116590d73e786104016aa0c0979f14a5d5389cd6755dd4fdf2a71dd66b8452544f81f1417b37b67b165a22215ff780dbb66186304bf2 SHA512 51762764de41c76f4c2b2796e2607d25d9bab8982a4bafa39630fa3429cefad6e44286a93db7fd66887b8d12c91d228038bc4d72ca2967b9647399d71231b96f
+EBUILD pdfannotextractor-0.2-r2.ebuild 1730 BLAKE2B bf2fe951c02ad3c9b832732b328dff73602334eadbe43ec9764416107a337b95cf043f5b70677cd1753dfc35b97422f36ef645a0ff3a3df86ede1e0c205d81ab SHA512 ac8cbf500653b60ae01cd1786ab6958ab3fae0b31a7095a80808b8ae861160da54ab8b6ba422f1e1b2b2a63de612ad8a897539578e8995ae9b68542c81a820be
 MISC metadata.xml 342 BLAKE2B f5ec5c53b9555b55c7f93f127a94bdabe9e5a533314652c00ee451d09e8e6528467764e0d4704390468b5c013f1b8c8516bbc81f6d100b08dbb7b8c6597fabfb SHA512 8c94253ae9aa1b42786d46d68f1763237e50fc766fc13f989d170a11b1701085de909415d748b0df6c0161c1d7de5dbee5db38fb71aeb38ef5c75a746a3a61c8
diff --git a/dev-tex/pdfannotextractor/pdfannotextractor-0.2-r1.ebuild b/dev-tex/pdfannotextractor/pdfannotextractor-0.2-r2.ebuild
index f00e284e201a..2e8ffce4d1fc 100644
--- a/dev-tex/pdfannotextractor/pdfannotextractor-0.2-r1.ebuild
+++ b/dev-tex/pdfannotextractor/pdfannotextractor-0.2-r2.ebuild
@@ -24,9 +24,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x64-macos"
 
-CP_DEPEND="
-	dev-java/commons-logging:0
-"
 COMMON_DEPEND="virtual/latex-base"
 DEPEND="
 	${COMMON_DEPEND}
@@ -34,8 +31,8 @@ DEPEND="
 "
 BDEPEND="app-arch/unzip"
 RDEPEND="
-	${CP_DEPEND}
-	${COMMIN_DEPEND}
+	dev-java/commons-logging:0
+	${COMMON_DEPEND}
 	virtual/perl-Getopt-Long
 	dev-perl/File-Which
 	>=virtual/jre-11
@@ -43,9 +40,6 @@ RDEPEND="
 "
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	commons-logging
-"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2-javajars.patch
@@ -69,6 +63,7 @@ src_compile() {
 src_install() {
 	java-pkg_dojar scripts/pax.jar pdfbox.jar fontbox.jar
 	java-pkg_dolauncher ${PN} --main pax.PDFAnnotExtractor
+	java-pkg_addcp "$(java-pkg_getjars --runtime-only --with-dependencies commons-logging)"
 
 	insinto ${TEXMF}/latex/pax
 	doins tex/pax.sty
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f08d0ea6a0af..2b9d0c897235 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index 1c4c02b31a58..43b80f0a5ba4 100644
--- a/dev-util/Tensile/Manifest
+++ b/dev-util/Tensile/Manifest
@@ -10,12 +10,16 @@ AUX Tensile-5.4.2-use-ninja.patch 1164 BLAKE2B 41d6dbb68fa41b53d230afd06af95acb0
 AUX Tensile-5.7.1-expand-isa-compatibility.patch 1632 BLAKE2B 807df38c99852b58801cb84bccf8cdd28b5575a460130e4463b483fb875f7adfb1d7902a47ca7e9f8735285bfaf3aa1a422595e57ec616faf2af423892301384 SHA512 3cf82928780532d32dfd0680a0ea8d8b990055186795ddc6d93a85941eeb9f0968979fe33fc4155f79413c54b8809d52eb3327624d51c187bfb8cd8bfef66bd4
 AUX Tensile-5.7.1-fix-msgpack-dependency.patch 1069 BLAKE2B 888447b0e8d3b2314c104b7cbf85fecc7645e681fdd91e325197f016274f3f7bd5c6f0e9a84c84a17ee31611c661a15a5fbf203814a932bfe5bda731af1ee766 SHA512 39198a95351584b1693c714cbe571012e8ad49aafda4c68ba2fe252685314d40213d6c23bae39834cc98207a58fe5881aae08e6bdedfbab63b9e2acf26ee79dc
 AUX Tensile-5.7.1-gentoopath.patch 2284 BLAKE2B 36f55d7eefe595395c108671d55a07cb8bd4d8d8c21944edb53465e32076d99cd23c38709993408694d54022c2e9362dd2c1943423b99e4829d2d5a663c1aec7 SHA512 5f5f96ce2ffa7b9e18a2ad82ebaa419537586356602de0feddf5884de3ecbf358d19cc2f59f2c6d883e18de9c029a901143d98ed2c48bb70fee3d7d8501f622e
+AUX Tensile-6.0.2-expand-isa-compatibility.patch 1355 BLAKE2B daf73107efc31a4585c44627de3d2de8f6ba390da1ea47aea0f87613e11ca0c6332b2e8b9935d67c1c10b80bb373c33eff3d4d73f33500d7eea2c00a7bb02c86 SHA512 5e624082eac08f940cb01d4c33664c34eb0d79ec6a66ffe82700c6e4edc931c95ed5e990d2cfbfa66497c35a85a63620c06ad0dd3202476211bf723327b52545
+AUX Tensile-6.1.1-fix-msgpack-dependency.patch 1221 BLAKE2B 8b3b1f2b94f0a5dfb5e4f4e973410a536c2d3bb306b7d0669fdf2d47d85ce54e2f34eb009843b99234f8bfdd42f20eb940c52db23a8099169d949bb4e3decf1b SHA512 02ca22defae159f13da6e717a94e2708c476012ed370ab46df54f529ae31079b5700afeed7b68a0f63a1d763edfb9ea2898b4ccc98de4fcf540e161aa06c3fbf
 AUX Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch 422 BLAKE2B 791a8041667c29f2cd06d036e6f54530fc88ac4afff9bd2f3f5dd6ab3a6daa6b52ba7459c156e12dae02bd918f740d1e1d22bd6bc7e26bd14269a5ffd877aa13 SHA512 a738be31fd735bf3d8ff17d844771e6113f9868c1d73f1eecd75e1ecfb5d04c743c9463a1e599712b9bc0d7877d8d90fa38fbc7a266add8b61e7fb575693eb4f
 DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25d897dbae3f7a40ece61d655c8f016d9d1c804b586b4e0e75661e20c517f5937a61d5ead25a545f0ce2e4a178bcbb3e7be SHA512 0154d8e14d335f4ecd86e5db335289f8662cede7e5d4b93bf6c56d8e48c1d7d0457271c078c9abbbca1f4aa91f028f6ce6a89efb783ba0207d0f39fd5de8a42c
 DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a08395a5f7a58deebe74d9868e8f7044db5ae2f3907196adf16dc6abeba0f1f47f5cce5c8900891276daff8e4ad614cf3b94 SHA512 4405cb6de65c1da1fd93910fc901402a24e996ff04eccadf483c25d8eb518e03ea9bbf00e372dd5fe377696e71c39355603095f3c5fc1e26d311ed15d8e3b734
 DIST rocm-Tensile-5.4.2.tar.gz 14413805 BLAKE2B ca1c13785164439f6fe83f16b36b7a0b06a63b70b9f0741d77b0fff98f38d1e1c7e9a54ef61897e6eb0a4eaf52ec9e5f14f42a7e6fd657f26306afa3de0c74a2 SHA512 d99736a202c7353979e732941199b4b20e53ff2b6c19a7175609440a840aa5624bc53a8013c435f31ac37933527771521ff02137c1c8fd53c5317eca8533be80
 DIST rocm-Tensile-5.7.1.tar.gz 12396002 BLAKE2B ec2c2bc3f07fe22abd800b642c998ea80b9e4e2d0d28c4763d574dbd2fcb14c735223ddc7571d4ab3a48f0bd819cc835c16df9882049c5bf56f25ef729e6d654 SHA512 8f356f36cfec74ee9b000d1180cf52077dc5c595e5c5a40792fc3eb13f3139980c7440f9bc912218f946cf8137e2481d23fe39f110511c1bb55fe85a933ffd36
+DIST rocm-Tensile-6.1.1.tar.gz 12675289 BLAKE2B dfe3698d7dda14d5b20a6fe1ef6535ac9737ac330b71678a3a94e939adc2350e2dcf33e58c711ee90dae543efba59fe210bfa39fc69b63910ec4537db3f209bf SHA512 cf8b014b1ff7cd5d45236b8a9a6f5604b02e34a9245a163c672847b535d565151bf7e3a5127601681e80e6fe26964a0e544594044efe2fe68e39b0f1128f96e2
 EBUILD Tensile-5.1.3-r3.ebuild 2811 BLAKE2B 77f941574f7586da7f8122c126ede4288004ca1a31860e12bdb22d340c7e9b017871bc362e698f8b797c3699965babd332742ff2832314aeef96324ea06142c6 SHA512 0275dfcec4c5b417444a5ebbff9eb1e896db69ca735ff082aa863e1aa6da12ea4b227d59d8794bf1d512d6a965d9ce1768418db830c2f27a3baf528f3f60b687
 EBUILD Tensile-5.4.2-r2.ebuild 3348 BLAKE2B e92698536854d4157a2b408b781cdec49e0c9caedacca8ee5902d976867ec8712d721adacb9973178cffe96de4d5de44cbcf70bb58494958663e9dc4c101452e SHA512 985b6dbac41eeae088247a11adb387043afff952ea7f1e87a24eb94f81f18970ad9360bbf0a683bee26234afaf698da108e75a39eeda7ccb386ec9607c0359a8
-EBUILD Tensile-5.7.1-r2.ebuild 3496 BLAKE2B 5dce5371520fd9f491b69f147a845baa42d212c07e2ff7f71f1f5a33cdc4290e888fcc1e79f19115841316161f601c335f3fc7b123b2e219fbb2cebe4c065fec SHA512 93007f1ca76a0a9961f11cff3c3eaedd62591d7063e334b2002f61770fbf9abeecc836b59331128dfc69780456ae89f3fa54f85c561f1289150207f0d243e856
+EBUILD Tensile-5.7.1-r2.ebuild 3534 BLAKE2B eb31593d71f596d1f2c23f453fba30e8c723da3095291e46e3290e47e044e510cf57235b0b9ddafe79189b59efd1df928f2f8a7f6cc535865170740b91b94f74 SHA512 d576777ac8e31dfc7930efa2e9b16dca9c9eeca921b92cf299f8c42ab10c41463c88f6b928659b0e4056fda38e7aa5daccec3ab1996b30dbe997ee693391f79a
+EBUILD Tensile-6.1.1.ebuild 3554 BLAKE2B 721027444a768c8e4d4330acc7fea8ee85882af8a45d8576cdf2f03c68bd1e241e0f750819f32855370e3a7b11a433f83f272f0b4f30c33e39d7a0eb67b872fd SHA512 207e7a8f659c6aff1be8d5202fb99ac2ca09023247e5e5ff0827fd001bb95aaf4ab7eb12b97e5b44fb676827fa6e407093ad9eea46f41ff7766867a774ee6469
 MISC metadata.xml 478 BLAKE2B 4931f453630761d3272371d09065c23cd9fea6e9a80f3b78a07e672e5d2e891c2ad7661883e1cb1f41e89fb2cd725a7189937c7b3cc7fc39b23ef0caaf0b3ce7 SHA512 d57284ff50913d95f092a5b8e4e566d0d6668b56afadfeb2e7003f2af6ed2106f14df82be880b2ea71dec29b614c5cb286a085098fbe8eed16e8bd3588149be6
diff --git a/dev-util/Tensile/Tensile-5.7.1-r2.ebuild b/dev-util/Tensile/Tensile-5.7.1-r2.ebuild
index 94b4aac75b1b..64902c86549c 100644
--- a/dev-util/Tensile/Tensile-5.7.1-r2.ebuild
+++ b/dev-util/Tensile/Tensile-5.7.1-r2.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
 		dev-python/pytest-forked[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/joblib[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-util/Tensile/Tensile-6.1.1.ebuild b/dev-util/Tensile/Tensile-6.1.1.ebuild
new file mode 100644
index 000000000000..c8debc3456c3
--- /dev/null
+++ b/dev-util/Tensile/Tensile-6.1.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+ROCM_VERSION=${PV}
+LLVM_COMPAT=( 18 )
+
+inherit cmake distutils-r1 llvm-r1 prefix rocm
+
+DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="client test"
+REQUIRED_USE="client? ( ${ROCM_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	client? ( dev-libs/boost )
+	>=dev-cpp/msgpack-cxx-6.0.0
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/joblib[${PYTHON_USEDEP}]
+	=dev-util/hip-6*
+	>=dev-util/rocm-smi-4.3.0
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/joblib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0-output-commands.patch
+	"${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch
+	"${FILESDIR}"/${PN}-5.4.2-use-ninja.patch
+	"${FILESDIR}"/${PN}-6.1.1-fix-msgpack-dependency.patch
+	"${FILESDIR}"/${PN}-6.0.2-expand-isa-compatibility.patch
+)
+
+CMAKE_USE_DIR="${S}/${PN}/Source"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix),g" \
+		"${FILESDIR}"/${PN}-5.7.1-gentoopath.patch > "${S}"/gentoopath.patch || die
+	eapply $(prefixify_ro "${S}"/gentoopath.patch)
+
+	pushd ${PN} || die
+
+	sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \
+		-i Source/cmake/FindROCmSMI.cmake || die
+	sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \
+		-i Source/CMakeLists.txt || die
+
+	# ${Tensile_ROOT}/bin does not exists; call command directly
+	sed -e "s,\${Tensile_ROOT}/bin/,,g" -i cmake/TensileConfig.cmake || die
+
+	local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\""
+	sed -e "/HipClangVersion/s/0.0.0/$(hipconfig -v)/" -i Common.py || die
+
+	sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" \
+		-i ReplacementKernels.py Common.py ${PN}.py || die
+
+	sed -e "s|os\.path\.dirname.*$|\"${EPREFIX}/usr/share/Tensile/Source\", end='')|" -i __init__.py || die
+
+	popd || die
+
+	sed -e "/package_data/d" -e "/data_files/d" -i setup.py || die
+	use client && PATCHES= cmake_src_prepare  # do not apply patches again in cmake_src_prepare
+}
+
+src_configure() {
+	distutils-r1_src_configure
+	if use client; then
+		local mycmakeargs=(
+			-DCMAKE_SKIP_RPATH=ON
+			-DTENSILE_USE_MSGPACK=ON
+			-DTENSILE_USE_LLVM=ON
+			-DTensile_LIBRARY_FORMAT=msgpack
+			-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		)
+		CXX=hipcc cmake_src_configure
+	fi
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	use client && cmake_src_compile
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto Tensile
+	pushd Tensile || die
+	python_domodule Components
+	python_newexe Utilities/merge.py ${PN}-merge
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	pushd ${PN} || die
+	insinto /usr/share/${PN}
+	doins -r Configs Perf Source CustomKernels
+	insinto /usr/$(get_libdir)/cmake/${PN}
+	doins cmake/*.cmake
+
+	if use client; then
+		pushd "${BUILD_DIR}" || die
+		dobin client/tensile_client
+	fi
+}
+
+# Test suite fails to start without this
+python_test() {
+	export ROCM_PATH="${EPREFIX}/usr"
+	epytest
+}
diff --git a/dev-util/Tensile/files/Tensile-6.0.2-expand-isa-compatibility.patch b/dev-util/Tensile/files/Tensile-6.0.2-expand-isa-compatibility.patch
new file mode 100644
index 000000000000..7a72d833bba0
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-6.0.2-expand-isa-compatibility.patch
@@ -0,0 +1,34 @@
+diff --git a/Tensile/Source/lib/source/hip/HipHardware.cpp b/Tensile/Source/lib/source/hip/HipHardware.cpp
+index ffa4f0f..f894366 100644
+--- a/Tensile/Source/lib/source/hip/HipHardware.cpp
++++ b/Tensile/Source/lib/source/hip/HipHardware.cpp
+@@ -24,6 +24,8 @@
+  *
+  *******************************************************************************/
+ 
++#include <cstring>
++
+ #include <Tensile/AMDGPU.hpp>
+ #include <Tensile/hip/HipHardware.hpp>
+ #include <Tensile/hip/HipUtils.hpp>
+@@ -55,6 +57,20 @@ namespace Tensile
+         {
+             hipDeviceProp_t prop;
+             HIP_CHECK_EXC(hipGetDeviceProperties(&prop, deviceId));
++            // coerce to compatible arch
++            int gcnArch = strncmp(prop.gcnArchName, "gfx", 3) == 0 ? std::stoi(prop.gcnArchName + 3) : 0;
++            switch(gcnArch)
++            {
++            case 902: case 909: case 912:
++                std::strcpy(prop.gcnArchName, "gfx900");
++                break;
++            case 1013:
++                std::strcpy(prop.gcnArchName, "gfx1010");
++                break;
++            case 1031: case 1032: case 1033: case 1034: case 1035: case 1036:
++                std::strcpy(prop.gcnArchName, "gfx1030");
++                break;
++            }
+ #if HIP_VERSION >= 50220730
+             int hip_version;
+             HIP_CHECK_EXC(hipRuntimeGetVersion(&hip_version));
diff --git a/dev-util/Tensile/files/Tensile-6.1.1-fix-msgpack-dependency.patch b/dev-util/Tensile/files/Tensile-6.1.1-fix-msgpack-dependency.patch
new file mode 100644
index 000000000000..7a3b1884c074
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-6.1.1-fix-msgpack-dependency.patch
@@ -0,0 +1,31 @@
+Gentoo uses "msgpack-cxx" as library name and adds important
+MSGPACK_NO_BOOST compile definition when msgpack-cxx us installed with USE=-boost
+--- a/Tensile/Source/lib/CMakeLists.txt
++++ b/Tensile/Source/lib/CMakeLists.txt
+@@ -98,24 +98,9 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK)
+ endif()
+ 
+ if(TENSILE_USE_MSGPACK)
+-    find_package(msgpack REQUIRED NAMES msgpack msgpack-cxx msgpack-c)
++    find_package(msgpack-cxx REQUIRED)
+     target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1)
+-
+-    if(TARGET msgpackc-cxx)
+-        get_target_property(msgpack_inc msgpackc-cxx INTERFACE_INCLUDE_DIRECTORIES)
+-    elseif(TARGET msgpackc)
+-        get_target_property(msgpack_inc msgpackc INTERFACE_INCLUDE_DIRECTORIES)
+-    elseif(TARGET msgpack-cxx)
+-        get_target_property(msgpack_inc msgpack-cxx INTERFACE_INCLUDE_DIRECTORIES)
+-    endif()
+-
+-    if(DEFINED msgpack_inc)
+-        # include C++ headers manually
+-        # External header includes included as system files
+-        target_include_directories(TensileHost 
+-            SYSTEM PRIVATE $<BUILD_INTERFACE:${msgpack_inc}>
+-        )
+-    endif()
++    target_link_libraries(TensileHost PRIVATE msgpack-cxx)
+ endif()
+ 
+ if(TENSILE_USE_LLVM)
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index 60a7cddd5a2d..68e37543a4c9 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -1,5 +1,6 @@
 DIST gcovr-6.0.tar.gz 1054940 BLAKE2B 1947950d06926cf48d456e6bc389db46cfe4c7ed0395da1ebdb75aa1ea4b85f3cea536d77a4ddca5621885daaaf54462160592a5a384247f12ad3ed5c299b0b7 SHA512 3b4d30417b5000d2d28bc156dc9db43ba62cf8756aa5a9619391457d0042dc8eaf1743c5defdaabffb6b423bf2fcf8172b3e6c8795419758abc1acf4853de4bb
 DIST gcovr-7.2.gh.tar.gz 2800014 BLAKE2B e334688f129868d9affe0fa5c5280eb7dd4c57825bec31f32d529c579f622e7c60985f8aad506bd714ebe00c47fd61b673ad2352e51a0fd8175777bb6a1c93e7 SHA512 fc4acbfeef48866c5c8884681375069c7308a86aaefe5b36e631240a96dcdc7c56b3e8d0c221f66dbbe29302b549c5c9b9c5e01bbf4103165b085ae33c369f55
 EBUILD gcovr-6.0.ebuild 975 BLAKE2B 1d7c2fedfdbfa0757f009cf588e68068e9400693d19327af86af41097d490b8e06659782673f8cc2bf6c96d10bd3b497dfbfccc5327a5a40152d142ed8bd3568 SHA512 1cb95bdad3671f38aa06aa3a1a40fdd3542fb01f149df1c9da7bd52a1163f963e6ba05f3b84d91fe50d172f571629e8947819d954e9913ed74aab23001a83630
+EBUILD gcovr-7.2-r1.ebuild 7884 BLAKE2B f62e7ddc59cf5cd3a51c802705b04ee6f07eca5887123a7b6f02a9c205198e609e9e00f7f5f8cfa5c3f2d9d22bddcdf774c8b205e376e006d2d89b79f8e4bc05 SHA512 89c21679b5e5b4b5edc6c41064ed05d944e6941f860a4e0528a739378e808238e68cf1314f5add46e7ed67fe25334396d1ec8fad9d7ba9362c7549343973caad
 EBUILD gcovr-7.2.ebuild 7848 BLAKE2B 46b6dbea5b05553d9dcc38510583eff704f19ef9a04620fe2c9577ebaa40e23c7fc2c95959163c5fb0413048766dba5b192cc7a5ca057a2d81284ce05b306a3f SHA512 4c806ef11538031293653c481ad431b9cdfeace4347a8d57cfde4b2fb09282ad51b8482c3344a8f8a1a536689ba7bd223f204454ce4500bab3bafcb26bd57f6f
 MISC metadata.xml 326 BLAKE2B 0ff392fe3a804fc6d8ea83de983357676a8155dee2fbb5204baf0ead2800210ea30a0171398c71dc60b1d9423a6fd65c0a9032d4511caa459c9b4d4f70ee4132 SHA512 5f5a49bfbbd3d3b77314f7de0c5981a3e700b42733d1c4f6868a7c25d12bb6227ebd254925cbbb6a5d73bf8a0b9f99115d396009d55797e39b53dc43a1a79107
diff --git a/dev-util/gcovr/gcovr-7.2-r1.ebuild b/dev-util/gcovr/gcovr-7.2-r1.ebuild
new file mode 100644
index 000000000000..1d820d592f3c
--- /dev/null
+++ b/dev-util/gcovr/gcovr-7.2-r1.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit toolchain-funcs distutils-r1
+
+DESCRIPTION="A Python script for summarizing gcov data"
+HOMEPAGE="https://github.com/gcovr/gcovr"
+SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/yaxmldiff[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib"
+
+	# these tests assume gcc-8, and fail with newer gcc versions
+	local -a test_build_deselect=(
+		"add_coverages-coveralls"
+		"add_coverages-html"
+		"add_coverages-html"
+		"bad++char-coveralls"
+		"bad++char-html"
+		"calls-html"
+		"cmake_oos-coveralls"
+		"cmake_oos-html"
+		"cmake_oos_ninja-coveralls"
+		"cmake_oos_ninja-html"
+		"coexisting_object_directories-from_build_dir-cobertura"
+		"coexisting_object_directories-from_build_dir-html"
+		"coexisting_object_directories-from_build_dir-without_object_dir-cobertura"
+		"coexisting_object_directories-from_build_dir-without_object_dir-html"
+		"coexisting_object_directories-from_build_dir-without_object_dir-sonarqube"
+		"coexisting_object_directories-from_build_dir-without_object_dir-txt"
+		"coexisting_object_directories-from_build_dir-without_search_dir-cobertura"
+		"coexisting_object_directories-from_build_dir-without_search_dir-html"
+		"coexisting_object_directories-from_build_dir-without_search_dir-sonarqube"
+		"coexisting_object_directories-from_build_dir-without_search_dir-txt"
+		"coexisting_object_directories-from_root_dir-cobertura"
+		"coexisting_object_directories-from_root_dir-html"
+		"coexisting_object_directories-from_root_dir-without_object_dir-cobertura"
+		"coexisting_object_directories-from_root_dir-without_object_dir-html"
+		"coexisting_object_directories-from_root_dir-without_object_dir-sonarqube"
+		"coexisting_object_directories-from_root_dir-without_object_dir-txt"
+		"coexisting_object_directories-from_root_dir-without_search_dir-cobertura"
+		"coexisting_object_directories-from_root_dir-without_search_dir-html"
+		"coexisting_object_directories-from_root_dir-without_search_dir-sonarqube"
+		"coexisting_object_directories-from_root_dir-without_search_dir-txt"
+		"config-output-html"
+		"config-toml-html"
+		"config-toml-txt"
+		"decisions-html"
+		"decisions-json"
+		"decisions-neg-delta-html"
+		"different-function-lines-separate-coveralls"
+		"different-function-lines-separate-html"
+		"different-function-lines-use-0-coveralls"
+		"different-function-lines-use-0-html"
+		"different-function-lines-use-max-coveralls"
+		"different-function-lines-use-max-html"
+		"different-function-lines-use-min-coveralls"
+		"different-function-lines-use-min-html"
+		"dot-coveralls"
+		"dot-html"
+		"excl-branch-coveralls"
+		"excl-branch-html"
+		"excl-line-branch-coveralls"
+		"excl-line-branch-html"
+		"excl-line-coveralls"
+		"excl-line-custom-coveralls"
+		"excl-line-custom-html"
+		"excl-line-html"
+		"exclude-directories-relative-coveralls"
+		"exclude-directories-relative-html"
+		"exclude-lines-by-pattern-coveralls"
+		"exclude-lines-by-pattern-html"
+		"exclude-relative-coveralls"
+		"exclude-relative-from-unfiltered-tracefile-html"
+		"exclude-relative-html"
+		"exclude-throw-branches-cobertura"
+		"exclude-throw-branches-coveralls"
+		"exclude-throw-branches-html"
+		"exclude-throw-branches-jacoco"
+		"exclude-throw-branches-json"
+		"exclude-throw-branches-lcov"
+		"exclude-throw-branches-sonarqube"
+		"exclude-throw-branches-txt"
+		"filter-absolute-coveralls"
+		"filter-absolute-from-unfiltered-tracefile-html"
+		"filter-absolute-html"
+		"filter-relative-coveralls"
+		"filter-relative-from-unfiltered-tracefile-html"
+		"filter-relative-html"
+		"filter-relative-lib-coveralls"
+		"filter-relative-lib-from-unfiltered-tracefile-html"
+		"filter-relative-lib-html"
+		"html-css-html"
+		"html-default-html"
+		"html-encoding-cp1252-html"
+		"html-encoding-iso-8859-15-html"
+		"html-high-100-html"
+		"html-high-75-html"
+		"html-line-branch-html"
+		"html-medium-100-high-100-html"
+		"html-medium-50-html"
+		"html-nested-filter-html"
+		"html-nested-nonsort-html"
+		"html-nested-sort-casefold-html"
+		"html-nested-sort-percentage-html"
+		"html-nested-sort-uncovered-html"
+		"html-source-encoding-cp1252-html"
+		"html-source-encoding-utf8-html"
+		"html-tab-size-2-html"
+		"html-template-dir-html"
+		"html-themes-github-html"
+		"html-themes-html"
+		"html-title-html"
+		"linked-coveralls"
+		"linked-html"
+		"nested-coveralls"
+		"nested-html"
+		"nested2-coveralls"
+		"nested2-coveralls"
+		"nested2-html"
+		"nested2-html"
+		"nested2-use-existing-coveralls"
+		"nested2-use-existing-html"
+		"nested3-coveralls"
+		"no-markers-html"
+		"nobranch-coveralls"
+		"nobranch-html"
+		"noncode-coveralls"
+		"noncode-html"
+		"oos-coveralls"
+		"oos-html"
+		"oos2-coveralls"
+		"oos2-html"
+		"rounding-html"
+		"shadow-coveralls"
+		"shadow-html"
+		"shared_lib-coveralls"
+		"shared_lib-html"
+		"simple1-coveralls"
+		"simple1-dir-coveralls"
+		"simple1-dir-html"
+		"simple1-html"
+		"simple1-stdout-coveralls"
+		"simple1-stdout-html"
+		"sort-percentage-html"
+		"sort-uncovered-html"
+		"source_from_pipe-cobertura"
+		"source_from_pipe-coveralls"
+		"source_from_pipe-html"
+		"source_from_pipe-lcov"
+		"subfolder-includes-html"
+		"threaded-coveralls"
+		"threaded-html"
+		"update-data-coveralls"
+		"update-data-html"
+		"use-existing-coveralls"
+		"use-existing-html"
+		"wspace-coveralls"
+		"wspace-html"
+	)
+
+	local cc cc_ver
+	cc="$(tc-get-compiler-type)"
+	case "${cc}" in
+		gcc)
+			cc_ver="$(gcc-major-version)"
+
+			# a bunch of tests are broken on gcc-14
+			# https://bugs.gentoo.org/930680
+			if [[ $(gcc-major-version) -ge 14 ]]; then
+				test_build_deselect+=(
+					"calls-json"
+					"decisions-neg-delta-json"
+					"different-function-lines-separate-lcov"
+					"different-function-lines-use-0-lcov"
+					"different-function-lines-use-max-lcov"
+					"different-function-lines-use-min-lcov"
+					"dot-lcov"
+					"excl-branch-lcov"
+					"excl-line-json"
+					"excl-line-lcov"
+					"excl-line-branch-lcov"
+					"excl-line-custom-lcov"
+					"exclude-directories-relative-lcov"
+					"exclude-lines-by-pattern-lcov"
+					"exclude-relative-lcov"
+					"exclude-relative-from-unfiltered-tracefile-lcov"
+					"filter-absolute-lcov"
+					"filter-absolute-from-unfiltered-tracefile-lcov"
+					"filter-relative-lcov"
+					"filter-relative-from-unfiltered-tracefile-lcov"
+					"filter-relative-lib-lcov"
+					"filter-relative-lib-from-unfiltered-tracefile-lcov"
+					"linked-lcov"
+					"nested-lcov"
+					"nested2-lcov"
+					"nested3-lcov"
+					"no-markers-json"
+					"no-markers-lcov"
+					"noncode-json"
+					"noncode-lcov"
+					"oos-lcov"
+					"oos2-lcov"
+					"shadow-json"
+					"simple1-txt"
+					"simple1-json"
+					"simple1-dir-json"
+					"simple1-stdout-json"
+					"simple1-stdout-lcov"
+					"threaded-lcov"
+					"update-data-lcov"
+					"wspace-lcov"
+				)
+			fi
+		;;
+		clang) cc_ver="$(clang-major-version)";;
+		# placeholder since tests need CC_REFERENCE to be string-number
+		*) cc_ver=1;;
+	esac
+
+	readarray -t EPYTEST_DESELECT < <(printf 'gcovr/tests/test_gcovr.py::test_build[%s]\n' "${test_build_deselect[@]}")
+
+	EPYTEST_DESELECT+=(
+		# tests that don't work in the ebuild environment
+		gcovr/tests/test_args.py::test_html_template_dir
+		gcovr/tests/test_args.py::test_multiple_output_formats_to_stdout
+		gcovr/tests/test_args.py::test_multiple_output_formats_to_stdout_1
+	)
+	local -x CC_REFERENCE="${cc}-${cc_ver}"
+
+	epytest gcovr
+}
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index 5d839516fe75..eb110361e8b3 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -2,13 +2,13 @@ AUX gitlab-runner.confd 688 BLAKE2B 1e99cdca8949a1a085e126c9aa2f23cf15d081087d02
 AUX gitlab-runner.initd 1174 BLAKE2B 53b897abb3bc358839843faf56b52d99412c2a08e2e69e1b8258bab907a0da10dedeafd95e6c4e505fd7e8e4d2344dc07b1e693a130fe0d6a3730bf619ee2e75 SHA512 eae2668c5a98a9e111573a2ea193266252e46e073fafd2c101d3a93e65cb9705f78ceab173ca4d3e1c806443345e7f66b7b97c8b644188cf9f86dc4c087d401f
 AUX gitlab-runner.service 419 BLAKE2B f1a9217eb97d03036eac67569ec6ce6ed91dc2182b20357cf8d17ee0eee01b8d094854b1c76942e0515c2a5923f4d3a1ed044c60b89d8a29c354955f9f666160 SHA512 10cbe1cc0a0b7bb9decde5780bc20caf73892759532df5fc42a7c3b55e141b26957a2986656ac1eb79ce15fd95ee01a184893c22d0dd1ce9117932d0e55ae1b4
 AUX gitlab-runner.tmpfile 54 BLAKE2B 4b2849b9c72998409efce207a336dce42d6e9104e72e0071266e03509841bbb5f39ad8e560beb696eee780bfe82efdec5b877120b5606c524d5cd002095e52c4 SHA512 2b5cccd83c8113a8c58011ced9ff5720a5aeaedb8f819c2a71c8fff3b1683ad87b54fa3da67b7e5f91ab35659d2adf5cf792d93ff293eee39924fbb5b9db2d4b
-DIST gitlab-runner-16.10.0-deps.tar.xz 87356404 BLAKE2B 87616f6544efcfddf854ccf8892ab955f44d11fa6f7ec3a5d0c2d32f165adf985011997e701b325e7eedfb4532547dbb94e08df3118d591550d511c09a9cc957 SHA512 6f800f4f965767898a21c9e4c7b0fc5f07ae089910f98ae96189b2501434f3de8a51ac6326e4df2234f3524bce4b15e4b05b183473988e717d2067d022e6c67f
-DIST gitlab-runner-16.10.0.tar.bz2 1373754 BLAKE2B ca0d39a4c04cc37afc48d9346266d075da6f4c3f62891d871a6d21e357de62067ea34e1dbffa34a410e2fb0656742eb46bcd3e555a56a20d6429b2c590e96fda SHA512 445cc39bd4d4b5ecf092fb4850b4224c0312b5b6a5aafdfb44ead5c590cf6ff38d759f765b1a97bd3beae73b5dd733daba53a33d3cb5d1f1346af28d39509b7c
 DIST gitlab-runner-16.11.1-deps.tar.xz 86847148 BLAKE2B 68520b6ae8a0250ffe134e1bd19360e142c51ec012df026212f80f8c4f23e8bce633451606502cf0af6762489564ff71c4fab5aafc04513695f161d929fa3ec2 SHA512 695f23266ebd82ed6bcf22da6eb41fd69404d929dbc55cc0e2d1f8e01f476d5343d88b9f07198447af2030b48db085ae382e7f627eb685e1c19f99ddaf55b483
 DIST gitlab-runner-16.11.1.tar.bz2 1377748 BLAKE2B c2dd939c30f1eccedaaa8d941abceea258a445d4b6c4518231cdc7e1ebc34d61912c5f1fd9e338d482a6ced547e8174dde6938b746334b215c50ee83ba1b8781 SHA512 80ac885a6d04f97c85222e87b4a3aabfa949caa060eae538d873c6b5172cb3de8234f36a9db3daaa5df132de1ac18d6f5c6a5a267cd4448dd87e98bdd393cf25
 DIST gitlab-runner-17.0.0-deps.tar.xz 86841028 BLAKE2B c7952e6028869264ed6d728043074ef5318230db18ea06a5ab740262693f22bd3111c5ad99ca2da2ca57079e3389b5a87a9994635f98fe6670f87df97e158956 SHA512 1c705bacc8eb896b23dee06ed4258c22cb0ba96073725761f2e138d4687efab4a1866e76203c1f7694c8d71995e18ad96d7da333fe88c24aa3454ac5caf4dc63
 DIST gitlab-runner-17.0.0.tar.bz2 1370211 BLAKE2B 756972b3d28d0a90ab517ecd014ccba42255dfaeb09b5e755f7395c064705273193d9a4efcbf2f1dfa8d54a9c1ed2192dcd5d3258c70aa514056df725f37322f SHA512 2cc67aa8ca43583bc60ca4d752423760b612f1a741203b0a7f0cd2fc77c292bd3a4c31f252c353a28d112d753ca920c1e8f9a401e79ac90c4eeeaf1d588ee09c
-EBUILD gitlab-runner-16.10.0.ebuild 1679 BLAKE2B 79973607477559ab1bf0f1e621f0d2ecc4f903e4e1ac257e58976d7674c2e0d1ba315a29414ae1b8e0d3c2ce0bdcc8cf44c783f0ff003366db754bee23d5ad0c SHA512 af71349167f6d59f130eb66ad3db71ba8447e622e1a6fbb863e33adeb74a6364b3e6a53c2f1889d397ff75bf6adbf77d4bb7e4ca88784abd9bbe9240bb0ce8de
+DIST gitlab-runner-17.1.0-deps.tar.xz 86656984 BLAKE2B 7766a3764d8ba17e3943f16a63e2af9705a23080bed23f30c813f07c4ce71057665682d6221790ff767848fefe258ffb796866d1a4e2a693faea1edd55945a30 SHA512 d2b8df673f8ab6a0380bbf3604d71fd963894f5bf55ba91c8755f827654b8b1fd394401c2654a78684dab022ac6f356befbfd862282a1a503422553ce8bd76fc
+DIST gitlab-runner-17.1.0.tar.bz2 1372603 BLAKE2B 1600fbc4ec5eb2b7190424f9f2877e1938bad33b683fefd750e541f72e6d9ee4bf05c1c65de030c9022211333bbfce768bbd96ab750c46153c491d301ec63c6f SHA512 1904bac24b5f9b7bdbd18c7a7c32e875bbfb1017c34441e83a9970624a48c8bbeb3a59f926303ae3a2a28586107f29a5849bee0f17acb8dfdb6e2f7ae904c3b9
 EBUILD gitlab-runner-16.11.1.ebuild 1679 BLAKE2B d9fbff218a9af7402f7d83a4f0275acb2d8fc5c3fce8828aaa776ed7fda8fec66fefa5fa613a6e4dccb660f32e1fa25797c8ad69ce3b5308dcff2bd705de9696 SHA512 d4c2e722e50db0c1002cf5e63ff7a02e93cfb57a1789f8f5ed7a9cd11f414ef7e844b7ada9c3bdcac029b330d6dc9165135dfe3bb624b8b477c60bdea98f050b
 EBUILD gitlab-runner-17.0.0.ebuild 1679 BLAKE2B 9cd429724c397140ee34f06890920489b52efe36bbfbe1eb3b19047ba7497f203a5e29ba4b1bb18d2b48884ec1d1f73c7448aee101d826015aff61b2e8b6db28 SHA512 7255219f6c96eac59ceb45c3546ac2c5f4e538ff1180046c732574f5319dd535037d82a6eb46f7209a294e8a1e90bcd053d4563b1ba7cc4ae6e48c4ac8533bf1
+EBUILD gitlab-runner-17.1.0.ebuild 1679 BLAKE2B 74da717c9d1578e3a4626c88072e490d48223f97b7e1305d758d1f45dd32615caed6f68b5651297ffffe2452aab2fc047e4810a6c0cb8226f36030d224133c33 SHA512 45a7a33c9e15839ea06153f87313110c77550e02caba751b81ec23f2b776eec3f50a4c0fdf76579f54f512ed649551473e72917c823a92b93565e4b959d0515b
 MISC metadata.xml 338 BLAKE2B dfdcaaee18d3e5492674d3b4055002201342fa4d5b713f88240753002de2bde6244469fe42fe514cb82544d15deacd235cd031dcf71d661a24b26f422c67c392 SHA512 b12a8270df4f07c6b4359150a3b7341d3913a93598153824ec758384758e69667a89de20066735ccc24aea7af07b5c1bdd444fca3193be5402bce5154f90ec79
diff --git a/dev-util/gitlab-runner/gitlab-runner-16.10.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-17.1.0.ebuild
index cf259193f257..e7ae3dd55714 100644
--- a/dev-util/gitlab-runner/gitlab-runner-16.10.0.ebuild
+++ b/dev-util/gitlab-runner/gitlab-runner-17.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 inherit go-module systemd tmpfiles
 
 # make sure this gets updated for every bump
-GIT_COMMIT=81ab07f6
+GIT_COMMIT=fe451d5a
 
 DESCRIPTION="The official GitLab Runner, written in Go"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index fb1377efe577..7c9d50e61a6c 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,6 +1,8 @@
 AUX gource-0.53-boost-1.85.patch 1033 BLAKE2B 4dfcd1fcdf9e7a5d092136742c6fbafbe7014fda377a5a4a1c10ca2d59829aff59a4d7dd08f896a3614cb285d6df89527ec2b22fad59aad99ea4b87928c81c02 SHA512 cebeab8de0799765f92368976bf6c3ba01bb5000d73b95a69f526020dd17ab03683d845509bcdb76c95a85472a0ab8cb8445fea04a7acbc52352330ef69da521
 DIST gource-0.53.tar.gz 900932 BLAKE2B 7f2822b11b5eaeb5345ade1326702109dff120d3ef8c523a2425a84b54d357a29cfe23a9c4a253b287d570e74943cb67bb80753c6c698f9f60739735cb41769b SHA512 e4190eb581d9998808d1bb4f18ba5a3ae22bacf643b9a150c7d1607e97fca2eab720592aefdcc6a47f92adb4a8df17db48bb941a67ee3d23a10f300754f473be
 DIST gource-0.54.tar.gz 900831 BLAKE2B be0fafa35457532b3cdc5d007ae5935189b60efc415ecd0979b25e4437d39570db90c4ac1883cc6baf7e0d25eeb9c98c2f8b6ec855ef63a874d223af09caa5d9 SHA512 a9fd2ff7c51931a543d4ab6dc85dd4b2c187ecca1be630006bb60ac2507180ccf40561e37f50493e052c839d9f5f896ae8f113fb65844c2fa9bde33fcd6b53e8
+DIST gource-0.55.tar.gz 900907 BLAKE2B c2836045e3c556d94ea433d52b6386de08290ad1f6287ab7dbfa6b632cbcd2f557d0365542de108925eeec237086883491ac90ee3439740969c16fda9894b197 SHA512 6df687441fc04e9bdfcf3620ed6b8a8fc1ac5774d21f51afdb0d518339ea1518914db77c90fb457ada899653c491a3b45c340665c3efa28bddeac65eeb334488
 EBUILD gource-0.53.ebuild 1272 BLAKE2B 8c1bd0bcb16ce9765d6d3a022808cc710fd178060932ba0bbcb065752ac2c8e274309ff6f5a73ef6683cd78ab9b5b794bb24d05fff9e8009b7d3b5f1f5ecc6a0 SHA512 df36fe84722ad7716efa5c1c8392004da4890a16b378c572d51601b62e2987dc644110bbb2615a578fb5b1df77c929ac26e1967c5bf2dc826048f728f026aaed
 EBUILD gource-0.54.ebuild 1266 BLAKE2B 6d55a9356ebf6deaca999328d399f60cc3abacaeb4bee9f48266a68ce89966f94cb79d233a0a3f24626c19bed65550d3dca30d83003b70701c001a76e6083329 SHA512 adb5410ca1cb09204bcb75c7ddf048e63df1c92930c67a49e7cf0c3c69fa013958a66358114096b742e883ca8efbe90df35bdf2839105f8a3c58e3ed6b9f6152
+EBUILD gource-0.55.ebuild 1173 BLAKE2B dec5f414ac1801d54e110c04737bb4980097bbbadfd485b5b42a68ff8b4fd4ed4f3d7d1a19a757d1d78619c78175d2024dfed24d7a9b287f338a9ee7d687d4bb SHA512 0d34dcc058889bf23dac097fc60051d32c00bdb8c501b8afb20282231466526c56c55d921d0f644195ffa5ada1fd1b02df18785ea6c56a0c583ec0b39ebaf5ce
 MISC metadata.xml 300 BLAKE2B 23f7c7b46ea61159b545277ae554947169d30f4065c6c405ef99ae5e78481e0af297ef6cc4dcc1b196d7cef9f9d9a7709c240aa642f89243fe14a703a859b8ed SHA512 298f789fe6e827ce647c45ea23d5cde8df085a31f378997d37d081dae9b768c6fe79fa68dad0a4c4110d5b95f59a834d35e8757f8cef5b9806003acd38ae244f
diff --git a/dev-util/gource/gource-0.55.ebuild b/dev-util/gource/gource-0.55.ebuild
new file mode 100644
index 000000000000..2f6e8a06c68a
--- /dev/null
+++ b/dev-util/gource/gource-0.55.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A software version control visualization tool"
+HOMEPAGE="https://gource.io/"
+SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	dev-libs/boost:=
+	>=media-libs/glew-1.5:0=
+	>=media-libs/libpng-1.2:0=
+	media-libs/libsdl2[video,opengl,X]
+	media-libs/sdl2-image[jpeg,png]
+	dev-libs/libpcre2:=
+	dev-libs/tinyxml
+	media-libs/libglvnd[X]
+	media-libs/freetype:2
+	virtual/glu:0
+"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/freefont
+"
+DEPEND="${COMMON_DEPEND}
+	>=media-libs/glm-0.9.3
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -e "/data\/gource.1/s/^/#/" -i Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	# fix bug #386525
+	# this enables gource to be compiled against dev-libs/tinyxml[stl]
+	if has_version dev-libs/tinyxml[stl]; then
+		append-cppflags -DTIXML_USE_STL;
+	fi
+
+	econf \
+		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
+		--with-tinyxml
+}
+
+src_install() {
+	default
+	doman data/gource.1
+}
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index d2bd67b92f8b..9579ca8ea457 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -1,14 +1,10 @@
-AUX 0001-SWDEV-316128-HIP-surface-API-support.patch 1156 BLAKE2B 52ff9a2389533ac213055ff8c1d4359cbd490f64699233a6c97dbb54ea8216d94039b016b9dcdde7a304662b9ca5c444ac889a6491e847b0a701e0b0cc0e4b59 SHA512 0c210ac60929a951ce1210b1f76e2e6966cc411834a350e6d01d1eb20cb862056cec881a00978cdbe5bfc61e53128c1cd09c6138cca9469213a6bbf425b8686d
-AUX 0001-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch 2734 BLAKE2B 5580ae24e854a42837979a1f6e688eb7edcfeee554577f41611941aa69d5a0bf3f1eb1916c4c7b2ba0389fc16efc31b229a9b21dbec3bfcf0cccad20241191a7 SHA512 156f650559fdeb625c15a8b94320f0b422b04b883f84a5e74ef03293420292be25c118df67bba1ae11fca6a1ac7429b0254aa32b963f7e09a7d8d923589009fd
-AUX 0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch 7304 BLAKE2B 3fca9d44f706250438f1c3f5d44142e1fa3040336eb9ab8b9e7fc54b9473e11957962a9a93cdb3b6980228fffe1a3fd5dab3f8c972340a83723858c12790c1f8 SHA512 7e54d22b0a0924c79d0b31764586891401d1a39f37380d3809e23a60075baacc55468930c30fa5a8ce64083b274701dbc190f67244822191873ae4f831a7fc33
-AUX 0002-SWDEV-355608-Remove-clang-include-path-2996.patch 1866 BLAKE2B 89e377104b0bc383f69c10f894ff28cb8282eeaf042fcb27b03a64b78959c147ef6cd4291aef47a25b616ea2b801363d7a382df4d924ba94fcea7e9ffa1b26f6 SHA512 7f73d7a66adc959ef4dd0dc3540b6db472a3650926f315f4c79761a45e619432107898dc58cb15958be4b36823029ccf91e599760a23fd886429789de586db3b
-AUX 0003-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch 8063 BLAKE2B c0b7b83682c13bb21e6a152b8c4c2b003024fd2dfc4f5f59e8b91b3d933bbfa888549c1a4471a29a225400f3d900d47023c3394111d41a3ecf52a48647db1694 SHA512 972a249daf692ce847884821a1205608d9ee2941793c474cb36f435eff2ad52dc7cb4f1a3a48a4037df3d62a6e47db84c86014933c94b4bb9bf7b7b12f31cce1
 AUX hip-4.2.0-cancel-hcc-header-removal.patch 820 BLAKE2B 544f93864fafe38a0ac2456f6301f8076ea24061bd4fe9a5501a366cca6d46edbb50eaac6c71acb3534579cdd9fa5518a687ac7e6d265926db53f0820fdec0f2 SHA512 3e37b761148cc31f78d6beb6bdff4b472fe4171a496b8f76ecbe82900f1483df690f846e0473ae700127482bcc3787af16bcd6217506e1e9dd1ad019408725a5
 AUX hip-4.2.0-config-cmake-in.patch 588 BLAKE2B 98081d4caa593756c966b8eff9e3a306ba4d9799abaaccb9bdab40db3e32dd769b07b3c428a22787231e8819e62cd50a33f549f2d1de32f9528036f1abf400cb SHA512 803aae515ee8e2694e5ba1cf6b5d66c98a9e0abf422479c7f599e8bfa38b027062a40e3e9806fa0057fa89a00d019c93d22f1c1ad78f68f1ac3f9bea5ebd93be
 AUX hip-5.0.1-DisableTest.patch 1689 BLAKE2B dd25393370a594abd3cb6fe8abab6481c2c544edb3f84c7b6481501fd5c2cd33970245cb38d148c5218915a67a8c1d24fde14a5a5c47ed809c613ec78b6d25c7 SHA512 6932af7662b067766b6566f858dba9606818757070b642778d559b83052097ee2ecedb1ae0184ab000c7b068b5413201bb5521e0aa3bf090df369139f292306e
 AUX hip-5.0.1-hip_vector_types.patch 312 BLAKE2B fb5a61a73e741e2456c031adc9c2e96fdccb5b88a3d99e6b4d31a9b53897f6ccbb41c9535296b55512055f0581a394289bae31036d3b7c07a8081e88708b9a19 SHA512 2ab41b46baf0f8adcb82f55b7ebfcfa3097159b7317d2609b490c0406ba47728c37531c03b0a4e474d760776cf7b614e32ccab45c769ce2fb8e54fcdffa61f5a
 AUX hip-5.0.2-correct-ldflag.patch 1117 BLAKE2B 8d11bc278660fb7e14585822a462de96ebca78bf5cec026c8097fa2b9eef87f3d4fd21641d0cfe77f217067bc161b6ece94eb55de71611f106243c8bd41b157c SHA512 1d4b46f941f5b3115705a416822b2a7c034ca6611a7706bc126902e5130239dcf84624f35624f9c7b952314c1d76fcba3f17e40ceb2574b4b37bddada073f808
 AUX hip-5.0.2-set-build-id.patch 741 BLAKE2B 9d4668ab770fd1ebc93a19a3ddc2916e8feb69a95e54ceb5955c4a162733b8899d43f906c86b0b994add22ab46969ff18aad03035e6285a6492bc9c1405bce38 SHA512 714b2f8e791f0e30a7af567e430e2bba38473725e0d96e42de0c97a2ba939fd83b2f233eebf03cb8a6a82d10c46cfa5ea869af97f35c02da38924250a19e660a
+AUX hip-5.1.3-0001-SWDEV-316128-HIP-surface-API-support.patch 1156 BLAKE2B 52ff9a2389533ac213055ff8c1d4359cbd490f64699233a6c97dbb54ea8216d94039b016b9dcdde7a304662b9ca5c444ac889a6491e847b0a701e0b0cc0e4b59 SHA512 0c210ac60929a951ce1210b1f76e2e6966cc411834a350e6d01d1eb20cb862056cec881a00978cdbe5bfc61e53128c1cd09c6138cca9469213a6bbf425b8686d
 AUX hip-5.1.3-clang-include-path.patch 564 BLAKE2B 8cdfbd9eba9c5e642a8e85aa269b0e369ef11a90c30771e0b1ef21d1ff1bfbb6d9f27cc03693b22b39347d939a11994ffbe4dd2f9edc5583811fff273c304307 SHA512 e6d8dda10155a6d269435f37bf8d4fa25b503861450d474cc01c21ea582857caa9ed26ca04e513b12708ae60348cd32296aaf39c805ee3f925e7d6590cae658c
 AUX hip-5.1.3-correct-sample-install-location.patch 537 BLAKE2B 924010e903cf7a27591930f5533bc41591ea7821b1f5f73bbbe5d5659a78a712699bb3be94ec5e473a0a5e0d11140850f7bb8e00f7775688adaa79deb7f2597f SHA512 91d89d403eef7ba460e648f5415f654601147920a81f650c40928733d5dbb8a99ebc00530052bf22bec67d9d325bde867c08e7d24e1e05b734b9e31a909030f7
 AUX hip-5.1.3-fix-hip_prof_gen.patch 1480 BLAKE2B caa3fa9840a8add5a25daaeb6f26eed9da3fe55686f6343e31b836a0b2e12999cd45d9220469cde036c7914f672b6cc46695fce1bfe4a8d6d35c836cdc14e413 SHA512 a588238cb12dc973acc6513bead68439b10b49214d5dceb81a0498510f79269b79897a02dd9e2ee1ef396a762d49310fd0a406d7f8b6c0e85faeba0f69b1de23
@@ -16,6 +12,10 @@ AUX hip-5.1.3-fno-stack-protector.patch 788 BLAKE2B 8f9d01ceeec2098df4d49e116c14
 AUX hip-5.1.3-llvm-15-noinline-keyword.patch 829 BLAKE2B 39b859e90acacd2eccdd60b690e1d882b63cfa66ff1b12effe447b18de72ffd61dd32983552f9ae39b384c3bbfbbcfd59ff2bb47943c1340bf6c1df5cb7d4075 SHA512 1933e883f84451e8512669572ea03dd25c916c6baeafac27b07e3d4a5e89165952a64afaceade4546e7e2d4473aba9811ac21131f283f9680d35e777ad9659a7
 AUX hip-5.1.3-remove-cmake-doxygen-commands.patch 896 BLAKE2B 35640516bf416760db69b736d72c1e78efdbad8a930d621fdaffd13c5c250f5d80a6975c1e4c368389ce8059aee964c36645f420d0844141d09463637ba0bccb SHA512 b1288e1f4b7553c5bf0fe38a46fbdf269ca5c01fd8e0e225b9454d4916092601d565c57eaf9f716e06fee816e41cb3a948884060551b5a9d71da9b1a050765f9
 AUX hip-5.1.3-rocm-path.patch 564 BLAKE2B ad554063a11d58ce5acfa8c8980bac2668d199b059bc2555d4cea40fbc53b6334daaea448d99cc391cee246d8318a450efdef669db2ee164a4db3a55d7d8e193 SHA512 eaa03f4d2394f61dcedde376de6c398625d284a7ac0c94ff2484929efdf298f455c796b96f16bf3989de6593a9a026a7681620b5ca13ce403aba4a32e5a38226
+AUX hip-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch 7304 BLAKE2B 3fca9d44f706250438f1c3f5d44142e1fa3040336eb9ab8b9e7fc54b9473e11957962a9a93cdb3b6980228fffe1a3fd5dab3f8c972340a83723858c12790c1f8 SHA512 7e54d22b0a0924c79d0b31764586891401d1a39f37380d3809e23a60075baacc55468930c30fa5a8ce64083b274701dbc190f67244822191873ae4f831a7fc33
+AUX hip-5.3.3-0002-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch 2734 BLAKE2B 5580ae24e854a42837979a1f6e688eb7edcfeee554577f41611941aa69d5a0bf3f1eb1916c4c7b2ba0389fc16efc31b229a9b21dbec3bfcf0cccad20241191a7 SHA512 156f650559fdeb625c15a8b94320f0b422b04b883f84a5e74ef03293420292be25c118df67bba1ae11fca6a1ac7429b0254aa32b963f7e09a7d8d923589009fd
+AUX hip-5.3.3-0003-SWDEV-355608-Remove-clang-include-path-2996.patch 1866 BLAKE2B 89e377104b0bc383f69c10f894ff28cb8282eeaf042fcb27b03a64b78959c147ef6cd4291aef47a25b616ea2b801363d7a382df4d924ba94fcea7e9ffa1b26f6 SHA512 7f73d7a66adc959ef4dd0dc3540b6db472a3650926f315f4c79761a45e619432107898dc58cb15958be4b36823029ccf91e599760a23fd886429789de586db3b
+AUX hip-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch 8063 BLAKE2B c0b7b83682c13bb21e6a152b8c4c2b003024fd2dfc4f5f59e8b91b3d933bbfa888549c1a4471a29a225400f3d900d47023c3394111d41a3ecf52a48647db1694 SHA512 972a249daf692ce847884821a1205608d9ee2941793c474cb36f435eff2ad52dc7cb4f1a3a48a4037df3d62a6e47db84c86014933c94b4bb9bf7b7b12f31cce1
 AUX hip-5.3.3-correct-ldflag.patch 1196 BLAKE2B 93c0e7e92c898cfa5d39d008f8c18d82b9032d3f865725b59fb4c0fef263c9a7c4108ecca9f406c21411d72781b88fcacbd7b1e50cc6dd5483cbe89a37b9a2fc SHA512 7a81444c6f2b1a70a451b13440235ba14e058f9023abfd56502ad2ba12a00e31970873b92313a7888c3794083d0c011ce8a314b43e835e9fe872ad97de4e758f
 AUX hip-5.3.3-disable-Werror.patch 621 BLAKE2B 9bcdec821484ac20343e1352e3c3d5a9297f8e7ab81ed135c5b27f11dd0667c68939fe04157ae8b7dacc5cdcbb6631e0a1b66d6cc2cd796f6322b6ded75055c7 SHA512 799c40b5a2524e166aa674c432c7bfb93c03fe00832680a99cd701b2498cd33c52e5582f9754161173f17048b6ae346a7a5b6d59eddce8696670b1f229858fef
 AUX hip-5.3.3-remove-cmake-doxygen-commands.patch 976 BLAKE2B edff02ed7b2371739f1659a93ecad9485045091ec48c6aa018d8fde3a9f4a9a48bdcf0cca660e03b4f3ff0e6c4f019068019407f429913f8c3231cdb252b0464 SHA512 f6835f74fb34cd4a9ea0db693eff6e57c742f6912b29046f7b01b87037c014cdeb38f17dd0a6b90dd823656e2957b2d0bc981eb0c71221994ae455cefc03805b
@@ -27,11 +27,20 @@ AUX hip-5.5.1-disable-Werror.patch 748 BLAKE2B 965af2240c72e22706c5b1ecb414954ba
 AUX hip-5.7.0-install.patch 576 BLAKE2B b3c5437a81bcc901327ba4ee9419ad77ea94aab3f6df49c1ce581fd5dad9321d7ffe4d81e1991476978690811d748ee8600dbdf9d70151cfdfb348130e18efdc SHA512 28301e939b3dc49c47d5db16d11b580dbedd47796a2765afab2b535fcd005d4a909f54865f044f0bacb0470ca2e29e529d1511c8bf4d037987bc046704e8e9eb
 AUX hip-5.7.1-disable-stack-protector.patch 771 BLAKE2B 46ea4b48ae32c7e120418fec467fedc7c496fec2c0589c04e4b62a0afe9b7e6b6e9aae8a4502d5772eefc07c5f71d39b37e4a47d1796d7688b1804814a0274da SHA512 30b82c3b8e7403e8098d1d564c94a85cd29fbf0d6fb4d4af26874bbc5ed03477933fb61064d57c2e2c724182b4816598752b38b1bb9f9384685be72a774d81af
 AUX hip-5.7.1-exec-stack.patch 1136 BLAKE2B b45560c1cd3410ba9340d5dea7fc2ab7167126a3dbcee6fdaa5ccdab6140db8a6ce9c9f588451f77a1cd27154551a4cb00743d7b2ac3dcb6c36e87f2bc182fe1 SHA512 66a6a9518975a9702f365ae6e9b09835ff93cde49209714b4cbb19c375052859ac26f3d4d2b61052280eee93e237f930a4b7b2d837245a7d477e30893ca6a0b4
-AUX hip-5.7.1-extend-isa-compatibility-check.patch 9043 BLAKE2B 8effc992b0d3478939fed4b003b4cbc1ef09ca1f59792f46d4c5c9253ac1a4d9a32357294b15c50e9c0dc867ebf284fe1823f3c7d829097c69d6633ff2027adc SHA512 ccab928a25089e6f9260dcdda665258fb71b6aefaae444ea25274475b3d668785b5bf4396ca4fbefb1471c06115b139b13f0af4d9b1f76e66821d585e7c8b781
+AUX hip-5.7.1-extend-isa-compatibility-check.patch 9039 BLAKE2B d1c80da9ca584aa43461f4301e8caa49aa995f1050ba71b9a81bf4e184cd361e28ac79ee25b081802611251b0b6ac30afbcd60759724f88361768ffc3f2cfe39 SHA512 b4db426300d93ddf97d419a4388359abd7841213c9be7dee20b0b7bd7a9a7c8f8fc391629984759bc4b365dd7b73e205fbd14d04be8caaff8037df8c572e3b84
 AUX hip-5.7.1-fix-mmap-oom-check.patch 1317 BLAKE2B d1e9db74bb815cd9194b47688bb125630a8baf8c3df14e454b2f8c59303c136c6c69b7ca89fddabb2533bfa034c984d88ec276851daf2241d9abeda7f5a50f87 SHA512 b6a5d7b861fe4138c72f91b765df822cce00fda94d3b8b85c0a40c3697455b018256f37317adf714280aa387ebe5da14a092ab69e375e8a804f01243837f7b60
 AUX hip-5.7.1-fix-unaligned-access.patch 3011 BLAKE2B d8a6a130edcf51c40e88250508ff3db13f134fb3833d1eadfac32dfdee09c7635091b1f32ed640bcba0c5ca2b745c401183ee8adaa392977ecece12a03450f9e SHA512 f9b85117927d18921d939daa73d2d97477bb49eb6ff7e496f9b110b8e70e00734b698517ae4235a03c560bdfc3618367d7eb2970c9d90dc2bcf07e2ab803d994
 AUX hip-5.7.1-no_asan_doc.patch 817 BLAKE2B 4bc80470f9cb476289086ae561560bb54fcdd9d1e66ef420dc60f129f29b0de02025be0ed2a7bfd2143b9bc0b456a354abc574dcbff509872a35e2e0c06f7760 SHA512 10a97524acce0c45c8edeccd11b64445f6edeb380e8262e1fc63163c4758efd731af36701dae1c9988264e8ce10971c9b3959ea881e81646994c779a96d10bb9
+AUX hip-6.0.2-install.patch 993 BLAKE2B e54542801197ad33e3feee0896401acec60190e95ec09ede70b357f5af550255dc4f08e75279d21e3932d7be6b7e0c0b5cd86f8ca235f463135d42699855f4d9 SHA512 a3d772d60d3842a91796f32d8bad3289eee8f878bcedb6c064df43f514ed102729f8f7ed62fc1d8b3f73dd969e5368a86b847b0858d296da916ac424ef593059
+AUX hip-6.1.0-extend-isa-compatibility-check-v2.patch 1323 BLAKE2B 1af3ebf4c9c328a89a6b7440acd744955078b1a35c90d7476905417398e05848435776ba954184e37a943d2ff31d10aa3116ce00eed754574bf843a16cd0da1c SHA512 19c93c98ea3bc6fbff309ff02424355e482ea584266adf4322bd46d55a2f6f0196fd02eae843c08080d01a6afc1cf94e1bed3905881a67df9f3c3b0d8b17c464
+AUX hip-6.1.0-extend-isa-compatibility-check.patch 9037 BLAKE2B d9dceb54665816468971e8ee1ae9e749df48f60be0cd9a131259179f4b5cc8e465a27971906f2d990e73ad00f278e9736cba9941686ecb604ca8820e82e2ac94 SHA512 18bd5365774694619d8601dc6ed40517cc77f4dcdd124ef59f486416c4f6c08586adece94bd175ef33109744de84a11e78a34b4e07425a2616cbf68ef1c1bf49
+AUX hip-6.1.0-install.patch 937 BLAKE2B a694b8d4fd433ed788e97df09ed26a58305944b63f1f88948b0ff47f9f60f96236bda072917d279d263d02059aaab0e3d2282feb0cee02a7da86e9f016a091f0 SHA512 62a38326021bb1b81a43cf26336528dd1cb30ac90d41c5a3ab9a2d8996090cb8677fc163d156785347f0cb893c84b7166b698b801e1d52449fdb3ee01e75483b
+AUX hip-6.1.1-fix-musl.patch 566 BLAKE2B ca84d7a1c38b6ae3e7dedbda8cafa0ad5bf31165c3a7b5af8a1a9714d871eeedb64bd6e6c71960e65ee3f7bed2bdf302d07e7c33e225102123d8516018391430 SHA512 e224e84b6eb4b43fd79e5172ad4882d1862d7a50fcb7ed60afc58148a399a96fafaf14477ed31d503f3ecb4c93ba2b58bdcad3c6dce7afab61ee7a8e60d3f65e
 AUX hip-test-5.7.0-rocm_agent_enumerator-location.patch 651 BLAKE2B 237ae5e71c9a6c565680c4fb07ece160f6bc635d25c77a20f3da54b92fcead95c0f6871f53a58a1e9b26b1d5fef3372ebc547638ba2fba43621c2867d276e75a SHA512 79d3cb277c41a84e6db70b28ad465067403f27d1f54adcbcd3e3501fc08c29f2aafc60fa2e6e78794eed95987352aa7ae844fbd55abc1abe0be8ff1879ed7d8f
+AUX hip-test-5.7.1-remove-incompatible-flag.patch 1474 BLAKE2B eeb5442fbb4db172a88949b8d824e036bf6be68b92096d827239a841ede8247e663cb54ede44914272e36be552c2a5f2e99c089807477a8961a255ce2c789b6f SHA512 7ebb72f29adea25200bcd400e7b8dc8fb3b7d017699717d7f495a4cf07a25b3aba749938392268b9b9a461057932cfd340763a43b55623cb6aa64c30e0ee48e0
+AUX hip-test-6.0.2-hipcc-system-install.patch 1912 BLAKE2B a20f5bdaf84d7e22ee7903e36d31f9e61328474456a1b91ab936478dd7e79f50510a4f5cb7cfefd31f6c200f9c40afc9ff2641667f10bb8c88871c9aa964faea SHA512 c237658d8d3f3c2ab7cc583dd62c32d1ccda610b2515b47250ce112639d4838c9b3d14e77a9edc7b854d14368fa16c9bd048ec014f528620cb8d11d7601e1350
+AUX hip-test-6.1.0-disable-hipKerArgOptimization.patch 943 BLAKE2B 1cfc94f9969d28f64c3b2598916669101f4d5704abec8fedb896f3d26403b273a6acdce5a189380da08174f8a5b679f4c7f3a97e4856c9b683dc68fdd72edb47 SHA512 3cb098d8d672801f394e059540846d541eef38f52da5044e29cac0863b473150a8771c12585ddad1e2e2599c667367529649914779df467f1c5e1dd8acfc13b5
+AUX hip-test-6.1.1-fix-musl.patch 5506 BLAKE2B 9f6c97491c76d5194b20e8705a645de170d1234dd1422b1857442c5d1a90d33c726b473d35ce673465e3893cb36f4f2cb1babef5f2140b453234131bb5883193 SHA512 173cdb65c24091548a8ec3c994fc393052ccd582e27a9ffb259bedf6fabf543a0e18aa6a5f5d9fd1541834acee470a1d6d2dc7def88d6b1cbe0c916bbc361a21
 AUX hipvars-5.1.3.pm 629 BLAKE2B 6149f230aa0756603ac0b455d802db9c698be8e4a22367e98915db974ea16176f85f9b5a22e2572183641734cedbbe2ba2c826aa0223ea3e12c5550983db0480 SHA512 26ba459b13df1ad6dc50411ac6589dd3d17eff727fee0e938275912e36459c7a43b35233a7f78bbed282a992e969d8b8f95007964c810a5954b0abeccc67082d
 AUX hipvars-5.3.3.pm 581 BLAKE2B edf0c1df5f7f5c57189c76fbcedec8155072a9f8e2c580d637dcfb557a844e7cc276b754d0fd8f5a9f59d2c5bbcfda6c9ac9951ad16d8a12bb48e74f062987ab SHA512 9fd72b000f59ec25a74ef5965f4affc5e866025424211b4d81fbea979ffba9f08319dde0063c8c835507a1b9db990f8f25eea3a8e2e6d88faceaf34d5dd722cb
 AUX hipvars.pm 598 BLAKE2B 1645b12179195b95757d207248c85b7c8d9eda0347caee5cb48bdc66e85fda517f607bcb69cdfc63657a0db04ad8e96494a0a80268df7c17d6bb0e689325c2e8 SHA512 6c4e71455341673a329b4b0163fefd7f2f4b7d62da3496643d0de096755899c99b3b5a80fffbdf29896c234cb4f617b368217f4eecfd005849b294ff434b79c6
@@ -39,14 +48,15 @@ AUX rocclr-5.3.3-fix-include.patch 6053 BLAKE2B e215cefd0f2895beda0e3c029a24e48f
 AUX rocclr-5.3.3-gcc13.patch 776 BLAKE2B f942628db7c91aff27ba6f0cb96ec857b28f6967806aba88473e11a9ab0b6b6169f12f4a1990131709c74da6635e793fafaf2d0bef9759c8f4f816e9777c966c SHA512 72bafbd708a222f03e8f5a89aaaf3050eff9d15202f759298a50995aeb545238107a5c8e00ff5b4d2ba510dad3f71a4061261b20d7dd958632ebae63c2ccb2ca
 DIST hip-5.1.3-update-header.patch.gz 3406 BLAKE2B 805539c3396a9cdcc4b807afd96eacd2de0e494a9ec927a1526cb8ce26b1c6e0a4d06415cd0210cba1398b5ff70f995fa67ad22b659578c075eb24c2a2cc9228 SHA512 eef4d70f9470a61d1d8cb140728cc4f2e792a4e64e0900a7410a74f3a6421410e7546e4e62bbbf35ae231b566bf162fb85de1f1ad1d8cfb2f282d2ed9a34b53a
 DIST hip-5.7.1.tar.gz 553774 BLAKE2B f88c235f688d3a662ec6cb4ad7fe3f82c0015015997871609cc30ab5b2f7fcb9709a08683d77194e45a6dbbe1d24c6355b128d2ecf655f1dea3468711c64e0a3 SHA512 68fa8753725b53c999d102d254c6b1dba53af4e00d6a48db93d10213cc02eec30b4a39c66e773d4f625dd9636cf8b0c5faa05b69fac27cf5a6b19dd3ddd2b905
-DIST hip-6.0.0.tar.gz 243451 BLAKE2B c404d23f7ee46a6c5601077d598edf4d6b2ca48da5e6cabf45c926ee1224eedc3d9eb6715948bc44cf3da2431a2feb879b1b8cd35bac69319c9dc066ab2e12f7 SHA512 2beb100812f9f515d6bc29fd4930913c2ff64c4f824727c9fc38d2e249841c840bd35357f652ab2b5022d166331de8f7409e72c49a5f69042f54f16a6a290339
+DIST hip-6.1.1.tar.gz 247192 BLAKE2B c40bb483fb61b3037693f456e546046598df7e0dd81a1f1c8d222ab0d9c0752092ce85c8533bd355f883dda5ce1f32f7ff2b2a58cebac50d53e0e7f4d85ca3ae SHA512 3e6162938294a74af51bc2161ada38dc4ba19614e182238f320f2052a9025be6ea413e40f00cb80f4e86696793d6c4431e2417ea798a2330886a3f3e66aedf0d
+DIST hip-test-6.1.1.tar.gz 1080605 BLAKE2B 7eddf648be31365479baa0cd4fd1c060a682a6b44d923cac1c4840c0768782db2fef4e5d97318ef0423be1e5c85b1a0cc6b9d324db789dad28be17f64ab38cae SHA512 0dd679c5b94a59e192bea5789f4448b53ac23c8a03b24a347758b1d70ff692483fd4aaea0b19345eb6ffb82a4492ed21958398b53ae6244a244a660dfa33412f
 DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca
 DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827eeea59f4312b788e868265dcb42197181fd5ef411416da2e11662c7f665f578aa750ab88c3a5405bcc58ee449 SHA512 3f85532cffc09c2ca8e7cd1770263d1c1a38633ed2bc5cfe62072e12a6f8f669db400519950718be31f6b77693d372e2ef905f06c7f02e126aa9ff7d2da97924
 DIST rocclr-5.4.3.tar.gz 640557 BLAKE2B 9ab91bab7ffb06c9c0d1c2ae79533fccc597071dda289ac375e32eb2965c638a7029951d2a49d46eeead9d7d242fe3a0cedb3e444d877af1bbf0e2d801c91e11 SHA512 c1d1a2ca08c2d762a221c04d394469aa7aff46086151333b145e0db9a7c7eb3dbbf8b9693e50d816aa9a13c16b4ebacf5ff3d5d8ff3393a8a764728ef5172d3a
 DIST rocclr-5.5.1.tar.gz 634330 BLAKE2B e6383a6b6b09f274a944d66effd345e38a191ec73ee5c5240f8ec8bb62a4df97b80835ce57f8f78c3834602b9da425b49289b5c7cd7e4c7071147ff409c6a6c9 SHA512 4c12011d22a4f14d9e93250b2a38716eb973139afa1adbbbd51c0e0ed13c0b7c1f45a37c71ef937c5fdabf09e928d7913ca3332fc61b7a2c10d21421306a228f
 DIST rocm-5.7.0.tar.gz 845881 BLAKE2B 08255edc1407e5ef85895336b11496319695318fce265565728ad75175b5e1dfab98f696fee2d27e60c48e862f721fad4c53118cc70b807353fff5f97ed72ac2 SHA512 72420e16c7cfe9687e030331838666dabaa43d686bdad1d109431e44db99070a2cf6dd64b59e3275019abedd6612f6008c798a79275e7225b6b122fb9f644660
 DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965
-DIST rocm-clr-6.0.0.tar.gz 1983453 BLAKE2B 2cf6ec7c3b0ec5dedeea94ff54af30662b781fc2eee22e3315094af61dc9d331eba33c1d9d463295848c5724e515a3137f9b189c1261273afad1a5f9d32226c2 SHA512 12e77a121150d8c25121b98bd7c6233c2568f9f4130bdbe6bc3ab225f14b8bea6a6bdc4ed497c0f999d3d3daabdca0de8caaa1b69911c11974b5d6f951734433
+DIST rocm-clr-6.1.1.tar.gz 2031034 BLAKE2B b0485bb015d31986f4988d1db0c029c826856e50b5bb1b58fac2097c14b3966668f1b8d41ec198889e27ac860497a8b3c081ec31d52390d5c9ff5db092bf7cce SHA512 86925e8b9a9e77b06a57daefbc7279887b4ef7c6a79c3717bc2f2d3bf29926281c60063fd17e21c65d7def520d9f579bf88f69051d053a38750ba968f69ca3fc
 DIST rocm-hip-5.1.3.tar.gz 967696 BLAKE2B 15cb52b5934b84acf515fe9c83b7c8982e00a23e20af933bdd2c4bc5b56fd42b08c8a08e840c85d2e0a8386d5a0e9c110504f68499989de1aaad00e9a5efcf43 SHA512 6b6fd6c12d73788df1711b12326b97fc7a184f319e0db114947b7967b75f2ee131f81e42e43a4981456b507221a6013133731120409f90214e13304299ccbc24
 DIST rocm-hip-5.3.3.tar.gz 1151858 BLAKE2B 5f460b2078c850b3eb4414fcec4a6f951a3b282aa9828f77ba5d5adfdc0ee8d2e62c856e112a154c340daaf7dad49f4871412edd7b38f7fae2e6b17840ee144b SHA512 e747cc10e78cd09009cac762f0e060be13f3447af7ec2a4a2889cbdc09cd76ecb1b5b58c89f09a3b45a8296c2c71e1c55baf113e58a5a12434af3de7168b8d87
 DIST rocm-hip-5.4.3.tar.gz 1195173 BLAKE2B 7452ee7a874bc4703b0d3aaaf9fa2a51e223d5650c65c34982a9981dbe14e8ec70c93d7e70c5ad36a8d02c3d2214fa6a393e20502a01418fb3320d8cfe363feb SHA512 1f4100e114576dcbad83aae453e21ab85cf25bd8a6ada380bb11cfc30e5f92ba903055b7257a099321a84b65adb444dd52b8258e82567f4bc882e65d89369b43
@@ -60,10 +70,10 @@ DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123
 DIST rocm-opencl-runtime-5.4.3.tar.gz 1005268 BLAKE2B f9398e4c2b0f045f1b5d8df9f31b7f2bef6a9201885aa6ee5fc5d71632cfde26a078d9a5ea38c3da12d3c187faf04c7bdcf1a8ecb9927cdba56b1efdfcdc44ee SHA512 f65d4622ce8721a6b91ab5b5b306d142ba507d3e631ac3ab0b76c5bc6d8d18455e02debd954c82e7eb609f232b509f1ec1a013dc2fad467c2c2ad31fdf15755d
 DIST rocm-opencl-runtime-5.5.1.tar.gz 991802 BLAKE2B 07d955b4a76b11296259287f5878cadc2438350a3abcdb5bd693c02790ff4c330b1d0a2a87f8de5334b3e3459c26b3fdf695886502ec5d2c373d807c242c8f93 SHA512 06786e818002dc43f64e4b0aaae0a0a2bcdad7acdb4662e1215d43277b107d65fb9a7f7441c31e3378c380cac860b1cd2eaefb5753246beffa4d9c10efced85e
 DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b
-EBUILD hip-5.1.3-r4.ebuild 6638 BLAKE2B 4ccc536736e737f0066ab4f200a5ea76a9f16edef0db0eefa36573bc4c9d3ea26ca04e6ad3cd4fd5d4dcbd7437177957b6cdd23307249525340bfcc7ae3ed9c6 SHA512 235042a89298d383a4a33ac437f510036d922f049ff0e02990167165e448dd88b615d6be7dd84c67d644f5fbcab5f9a71a9b7393fffa1b406095bae91a5087ed
-EBUILD hip-5.3.3-r3.ebuild 5346 BLAKE2B 4f5c0570e8a4ff65ac0b11bc555e2f81f7c6e56cc3ff86de894536b3b0597c049216a9d4184e25471999c4cf73b8f774daf1bb46d613c830bcc0d8c445f85b74 SHA512 9a54281155f14f467286d132ec405b90703b94760b8f4e268aed77b4a47d8a195febef3200068d0e5905cf7078fb92e2252b6ab7a3b86e40d330449315c0cf4d
-EBUILD hip-5.4.3.ebuild 5239 BLAKE2B 74d5423c5f7c01f15c5583b2c53420b1780fa7fdb11581fef2f0570be11a2047a43881a13b41b333905faaafab7dee15e1fb4af96703829cdab7d547e2cb5796 SHA512 7b2f5abfbc2ded1751b3d32349eb81715468125e9a9cc64522b725ed9a92f0dbf6e575fd1b84ab5234532badbf3a6b0c4d3a5b375384665ab413b22c54a5ee3e
-EBUILD hip-5.5.1.ebuild 5244 BLAKE2B aa1f937c5f2651ad3e79898ffc427696253c619583cd1450f1a3e7b9a7448e0d750f5df72a87458dfe6107f2f8846bc2b9b064d54b0b849fc3812a4f268c4af1 SHA512 94cad30f1f0e3e376a5902c83a151d3fe2a7b72b45747672e96b9d13dedadc7184c8f714789ff3e436133ffb8a7d58e8194471c843c694d3d39c348fd7d5a3ab
-EBUILD hip-5.7.1-r2.ebuild 5350 BLAKE2B d8dcd223e711f9ba0b61822761d2805a0e54ef50a048bdd16170cfc64f00bb6bd3f0d018984201f0dc5c383badb2574174419f8c42c5cee006cca93047a77054 SHA512 f88b8f32d37bc13e78e4fe452012af44dd7aa09b6a67a3c1243632127510381ebb2293947a708043e47defcd53607a744102260e0f4602579024ef50ed6189b9
-EBUILD hip-6.0.0.ebuild 4818 BLAKE2B d98c4b514dbdeacbc633fe6b8347f228238b8e56c2854790991cd2ab8fb685417fd32795c4246bd4fdf8bb2497be3133373fdf505b1583955fc4a1acf07f658d SHA512 2260791ffbab2f527e9a3f390de477e98f4f1eccc8e8e709d2b4d57ee055b07d1ea53f34a849851d0f1909bb3649f7b14769f6da08a7de323f52e6f6967cbdbd
-MISC metadata.xml 729 BLAKE2B 92e36c42f6d8335e5a8e3a86b591ff9e6306e0d187644620fab7f8f7ddd00156ee91ff49184ffbe379e509f2096c51c421575a69de7abea3c0b372fdcec52ccb SHA512 84fc8234a5fdf54bf43228c2144d809a461862fb45fea24bf366ee5937df3882c3332429938792981e37dbb4cda6e5d7e05ac5deaded34d8bcce1eb53df8d0fd
+EBUILD hip-5.1.3-r4.ebuild 6650 BLAKE2B 83eb1cbf369f7b5112de88334b340ff89486c093da946218eae42cd7bef7a3982e6da08ebdb8d12e79f60b2920f8680f555dc16fc75d99a41b7a9d1f42b2aada SHA512 e60014a38997e93f13d73fc52e77408b61414eef90263f3ff19025d42efe324b8e5a2fb50b6aa830ded6e764273ccea007341918de48e3bf4e728b525e42bbbc
+EBUILD hip-5.3.3-r3.ebuild 5396 BLAKE2B 1303346f578f16525415144781dbde4838da758888346136fb4f88f53e6b1abcc43bfbde7f9b16bbf00eb26b7409564948949d82981bee30b177c1265acfdd8b SHA512 39c9dbfee84aea0c60e5ae000ea6ce72a8112b0ad95e41ccca2d74180f52f7aca2eb017344e66c4e17fba3d0cd412c7024ccaeaad2947e1849edffa57293c6b5
+EBUILD hip-5.4.3.ebuild 5263 BLAKE2B 4fd371749bfe8d1359941be7f71962e9157efab0410a457691609cddd400ae1046b687dcacf7238090864f9082c52a1ad76df59e50c7fb4a767cafdb3c6bd1c9 SHA512 1bd49dcbd11405933b75db6369e9c803a007bdc3393bc2bdf8a858e883e9d1d9ec98add9c6e64341b53af7ef943e9de0ecce8d94cfdf7df49d08f2260a3d2cb7
+EBUILD hip-5.5.1.ebuild 5269 BLAKE2B 29d0f7303267e6baec24ea65b24b1b4e1d62255312496f962e7ef81a4da3fd8fe67fac9f87d61bd11de14c0bd8497749183c7a702fed187b54e6b34a5a590b77 SHA512 49a5cbae272cafe9f5b696ddca3099932a50671d2d59d589252834cc7ecb01eccb8efac0a3b39f646e38017e009ffcbfaac7b2f4d59443a68845d4be97f6b361
+EBUILD hip-5.7.1-r2.ebuild 5452 BLAKE2B ff7f44547964dabff96ed68e60d0928512d208b37a446053bc93052aea809914fe4c49430958b7c26900015886b7be0b7c9e6bea4aed91377d83b19f5ba63754 SHA512 a0d0786e8f5e75b4450b90a53131c2580810afcb51d8df618d253c2968b8da3ab1641df9142d8f13db93ed773dcb7e2b746eaab9f42a4f49f820819d5cdb64fb
+EBUILD hip-6.1.1.ebuild 6598 BLAKE2B 01a40b98c8739f976e8b2f81d3fe5dd5ee970cb38ea97317ec18722db9483ced21c8116eb92e206250d8f4209187a78619b2f4f854edb5fb139c884e501e8dbe SHA512 ad283051ed13122d4e2402102cd12abfbcbca996d532398577b74eadc1f17875a26806a9254e4733d9b3c290193eed92ac712c911805cc89dfe6fe4b6c14cb59
+MISC metadata.xml 1076 BLAKE2B 816a3628360882d89e2bc64f7b5be6442ad4fb0866b6a8291c4701a03e626d9482b93980b34e5ab21c37bda025359978b471d09e2d4817ceeb209d83afaecbfe SHA512 009079d56a9fb1c3212dc4e67dd88bc16bbc6350bb832912543b2a1e6747c77d13021e7a94da9a4c9371722828214b308246e7ad58406276126cdf6e44281506
diff --git a/dev-util/hip/files/0001-SWDEV-316128-HIP-surface-API-support.patch b/dev-util/hip/files/hip-5.1.3-0001-SWDEV-316128-HIP-surface-API-support.patch
index 14af91f9055b..14af91f9055b 100644
--- a/dev-util/hip/files/0001-SWDEV-316128-HIP-surface-API-support.patch
+++ b/dev-util/hip/files/hip-5.1.3-0001-SWDEV-316128-HIP-surface-API-support.patch
diff --git a/dev-util/hip/files/0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch b/dev-util/hip/files/hip-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch
index 9dbfe8a55395..9dbfe8a55395 100644
--- a/dev-util/hip/files/0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch
+++ b/dev-util/hip/files/hip-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch
diff --git a/dev-util/hip/files/0001-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch b/dev-util/hip/files/hip-5.3.3-0002-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch
index b9a1329e5931..b9a1329e5931 100644
--- a/dev-util/hip/files/0001-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch
+++ b/dev-util/hip/files/hip-5.3.3-0002-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch
diff --git a/dev-util/hip/files/0002-SWDEV-355608-Remove-clang-include-path-2996.patch b/dev-util/hip/files/hip-5.3.3-0003-SWDEV-355608-Remove-clang-include-path-2996.patch
index 6d64ad8c9fd8..6d64ad8c9fd8 100644
--- a/dev-util/hip/files/0002-SWDEV-355608-Remove-clang-include-path-2996.patch
+++ b/dev-util/hip/files/hip-5.3.3-0003-SWDEV-355608-Remove-clang-include-path-2996.patch
diff --git a/dev-util/hip/files/0003-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch b/dev-util/hip/files/hip-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch
index f92cce4cf8d8..f92cce4cf8d8 100644
--- a/dev-util/hip/files/0003-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch
+++ b/dev-util/hip/files/hip-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch
diff --git a/dev-util/hip/files/hip-5.7.1-extend-isa-compatibility-check.patch b/dev-util/hip/files/hip-5.7.1-extend-isa-compatibility-check.patch
index 7853de693cde..25bdfba07fd2 100644
--- a/dev-util/hip/files/hip-5.7.1-extend-isa-compatibility-check.patch
+++ b/dev-util/hip/files/hip-5.7.1-extend-isa-compatibility-check.patch
@@ -42,7 +42,7 @@ https://salsa.debian.org/rocm-team/rocm-hipamd/-/blob/master/debian/patches/0026
 +}
 +
 +static bool isGfx1010EquivalentProcessor(const std::string& processor) {
-+  return matches(GfxPattern{"gfx101", "02"}, processor);
++  return matches(GfxPattern{"gfx101", "0"}, processor);
 +}
 +
 +static bool isGfx1010SupersetProcessor(const std::string& processor) {
@@ -181,7 +181,7 @@ https://salsa.debian.org/rocm-team/rocm-hipamd/-/blob/master/debian/patches/0026
    }
 --- a/rocclr/device/device.cpp
 +++ b/rocclr/device/device.cpp
-@@ -232,10 +232,49 @@ std::string Isa::isaName() const {
+@@ -234,10 +234,49 @@ std::string Isa::isaName() const {
    return std::string(hsaIsaNamePrefix) + targetId();
  }
  
@@ -211,7 +211,7 @@ https://salsa.debian.org/rocm-team/rocm-hipamd/-/blob/master/debian/patches/0026
 +      }
 +    } else if (codeObjectIsa.versionMajor() == 10) {
 +      if (codeObjectIsa.versionMinor() == 1) {
-+        const std::array<uint32_t, 2> gfx1010_equivalent = { 0, 2 };
++        const std::array<uint32_t, 1> gfx1010_equivalent = { 0 };
 +        const std::array<uint32_t, 4> gfx1010_superset = { 0, 1, 2, 3 };
 +        if (Contains(gfx1010_equivalent, codeObjectIsa.versionStepping()) &&
 +            Contains(gfx1010_superset, agentIsa.versionStepping())) {
diff --git a/dev-util/hip/files/hip-6.0.2-install.patch b/dev-util/hip/files/hip-6.0.2-install.patch
new file mode 100644
index 000000000000..e2fc3a8852cb
--- /dev/null
+++ b/dev-util/hip/files/hip-6.0.2-install.patch
@@ -0,0 +1,23 @@
+diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt
+index 7ad30019d..e79ea0714 100755
+--- a/hipamd/CMakeLists.txt
++++ b/hipamd/CMakeLists.txt
+@@ -398,18 +398,7 @@ if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
+       set(hipcc_bin ${hipcc_bin}.exe)
+       set(hipconfig_bin ${hipconfig_bin}.exe)
+     endif()
+-    if(EXISTS ${hipcc_bin} AND EXISTS ${hipconfig_bin})
+-      install(PROGRAMS ${hipcc_bin} DESTINATION bin)
+-      install(PROGRAMS ${hipconfig_bin} DESTINATION bin)
+-    endif()
+   endif()
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
+ endif()
+ 
+ #############################
diff --git a/dev-util/hip/files/hip-6.1.0-extend-isa-compatibility-check-v2.patch b/dev-util/hip/files/hip-6.1.0-extend-isa-compatibility-check-v2.patch
new file mode 100644
index 000000000000..d6e95c994c8f
--- /dev/null
+++ b/dev-util/hip/files/hip-6.1.0-extend-isa-compatibility-check-v2.patch
@@ -0,0 +1,35 @@
+From e188c092a987c45caf2ea4651686ea631ca47c3d Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Tue, 25 Jun 2024 15:22:33 +0200
+Subject: [PATCH] prepare usage of old patch
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+---
+ hipamd/src/hip_code_object.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hipamd/src/hip_code_object.cpp b/hipamd/src/hip_code_object.cpp
+index 6b3a6d0..fef89df 100644
+--- a/hipamd/src/hip_code_object.cpp
++++ b/hipamd/src/hip_code_object.cpp
+@@ -410,7 +410,7 @@ static bool isCodeObjectCompatibleWithDevice(std::string co_triple_target_id,
+   if (co_triple_target_id == agent_triple_target_id) return true;
+ 
+   // Parse code object triple target id
+-  if (!consume(co_triple_target_id, std::string(kAmdgcnTargetTriple) + '-')) {
++  if (!consume(co_triple_target_id, std::string(AMDGCN_TARGET_TRIPLE) + '-')) {
+     return false;
+   }
+ 
+@@ -423,7 +423,7 @@ static bool isCodeObjectCompatibleWithDevice(std::string co_triple_target_id,
+   if (!co_triple_target_id.empty()) return false;
+ 
+   // Parse agent isa triple target id
+-  if (!consume(agent_triple_target_id, std::string(kAmdgcnTargetTriple) + '-')) {
++  if (!consume(agent_triple_target_id, std::string(AMDGCN_TARGET_TRIPLE) + '-')) {
+     return false;
+   }
+ 
+-- 
+2.45.2
+
diff --git a/dev-util/hip/files/hip-6.1.0-extend-isa-compatibility-check.patch b/dev-util/hip/files/hip-6.1.0-extend-isa-compatibility-check.patch
new file mode 100644
index 000000000000..40ccf6fdc089
--- /dev/null
+++ b/dev-util/hip/files/hip-6.1.0-extend-isa-compatibility-check.patch
@@ -0,0 +1,236 @@
+Combined with matching changes within rocr-runtime ebuild, this patch allows
+to load compatible kernels whenever possible.
+For example if AMDGPU_TARGETS is set to gfx1030 and some application
+was started on gfx1036, it loads gfx1030 kernel.
+
+Author: Cordell Bloor <cgmb@slerp.xyz>
+https://salsa.debian.org/rocm-team/rocm-hipamd/-/blob/master/debian/patches/0025-improve-rocclr-isa-compatibility-check.patch
+https://salsa.debian.org/rocm-team/rocm-hipamd/-/blob/master/debian/patches/0026-extend-hip-isa-compatibility-check.patch
+--- a/hipamd/src/hip_code_object.cpp
++++ b/hipamd/src/hip_code_object.cpp
+@@ -390,47 +390,123 @@ static bool getTripleTargetID(std::string bundled_co_entry_id, const void* code_
+   return true;
+ }
+ 
+-static bool isCodeObjectCompatibleWithDevice(std::string co_triple_target_id,
+-                                             std::string agent_triple_target_id) {
++struct GfxPattern {
++  std::string root;
++  std::string suffixes;
++};
++
++static bool matches(const GfxPattern& p, const std::string& s) {
++  if (p.root.size() + 1 != s.size()) {
++    return false;
++  }
++  if (0 != std::memcmp(p.root.data(), s.data(), p.root.size())) {
++    return false;
++  }
++  return p.suffixes.find(s[p.root.size()]) != std::string::npos;
++}
++
++static bool isGfx900EquivalentProcessor(const std::string& processor) {
++  return matches(GfxPattern{"gfx90", "029c"}, processor);
++}
++
++static bool isGfx900SupersetProcessor(const std::string& processor) {
++  return matches(GfxPattern{"gfx90", "0269c"}, processor);
++}
++
++static bool isGfx1030EquivalentProcessor(const std::string& processor) {
++  return matches(GfxPattern{"gfx103", "0123456"}, processor);
++}
++
++static bool isGfx1010EquivalentProcessor(const std::string& processor) {
++  return matches(GfxPattern{"gfx101", "0"}, processor);
++}
++
++static bool isGfx1010SupersetProcessor(const std::string& processor) {
++  return matches(GfxPattern{"gfx101", "0123"}, processor);
++}
++
++enum CompatibilityScore {
++  CS_EXACT_MATCH           = 1 << 4,
++  CS_PROCESSOR_MATCH       = 1 << 3,
++  CS_PROCESSOR_COMPATIBLE  = 1 << 2,
++  CS_XNACK_SPECIALIZED     = 1 << 1,
++  CS_SRAM_ECC_SPECIALIZED  = 1 << 0,
++  CS_INCOMPATIBLE          = 0,
++};
++
++static int getProcessorCompatibilityScore(const std::string& co_processor,
++                                          const std::string& agent_processor) {
++  if (co_processor == agent_processor)
++    return CS_PROCESSOR_MATCH;
++
++  if (isGfx900SupersetProcessor(agent_processor))
++    return isGfx900EquivalentProcessor(co_processor) ? CS_PROCESSOR_COMPATIBLE : CS_INCOMPATIBLE;
++
++  if (isGfx1010SupersetProcessor(agent_processor))
++    return isGfx1010EquivalentProcessor(co_processor) ? CS_PROCESSOR_COMPATIBLE : CS_INCOMPATIBLE;
++
++  if (isGfx1030EquivalentProcessor(agent_processor))
++    return isGfx1030EquivalentProcessor(co_processor) ? CS_PROCESSOR_COMPATIBLE : CS_INCOMPATIBLE;
++
++  return CS_INCOMPATIBLE;
++}
++
++static int getCompatiblityScore(std::string co_triple_target_id,
++                                std::string agent_triple_target_id) {
+   // Primitive Check
+-  if (co_triple_target_id == agent_triple_target_id) return true;
++  if (co_triple_target_id == agent_triple_target_id) return CS_EXACT_MATCH;
+ 
+   // Parse code object triple target id
+   if (!consume(co_triple_target_id, std::string(kAmdgcnTargetTriple) + '-')) {
+-    return false;
++    return CS_INCOMPATIBLE;
+   }
+ 
+   std::string co_processor;
+   char co_sram_ecc, co_xnack;
+   if (!getTargetIDValue(co_triple_target_id, co_processor, co_sram_ecc, co_xnack)) {
+-    return false;
++    return CS_INCOMPATIBLE;
+   }
+ 
+-  if (!co_triple_target_id.empty()) return false;
++  if (!co_triple_target_id.empty()) return CS_INCOMPATIBLE;
+ 
+   // Parse agent isa triple target id
+   if (!consume(agent_triple_target_id, std::string(kAmdgcnTargetTriple) + '-')) {
+-    return false;
++    return CS_INCOMPATIBLE;
+   }
+ 
+   std::string agent_isa_processor;
+   char isa_sram_ecc, isa_xnack;
+   if (!getTargetIDValue(agent_triple_target_id, agent_isa_processor, isa_sram_ecc, isa_xnack)) {
+-    return false;
++    return CS_INCOMPATIBLE;
+   }
+ 
+-  if (!agent_triple_target_id.empty()) return false;
++  if (!agent_triple_target_id.empty()) return CS_INCOMPATIBLE;
+ 
+   // Check for compatibility
+-  if (agent_isa_processor != co_processor) return false;
+-  if (co_sram_ecc != ' ') {
+-    if (co_sram_ecc != isa_sram_ecc) return false;
++  int processor_score = getProcessorCompatibilityScore(co_processor, agent_isa_processor);
++  if (processor_score == CS_INCOMPATIBLE) {
++    return CS_INCOMPATIBLE;
+   }
+-  if (co_xnack != ' ') {
+-    if (co_xnack != isa_xnack) return false;
++
++  int xnack_bonus;
++  if (co_xnack == ' ') {
++    xnack_bonus = 0;
++  } else if (co_xnack == isa_xnack) {
++    xnack_bonus = CS_XNACK_SPECIALIZED;
++  } else {
++    return CS_INCOMPATIBLE;
+   }
+ 
+-  return true;
++  int sram_ecc_bonus;
++  if (co_sram_ecc == ' ') {
++    sram_ecc_bonus = 0;
++  } else if (co_sram_ecc == isa_sram_ecc) {
++    sram_ecc_bonus = CS_SRAM_ECC_SPECIALIZED;
++  } else {
++    return CS_INCOMPATIBLE;
++  }
++
++  return processor_score + xnack_bonus + sram_ecc_bonus;
+ }
+ 
+ // This will be moved to COMGR eventually
+@@ -483,6 +559,7 @@ hipError_t CodeObject::extractCodeObjectFromFatBinary(
+   for (size_t i = 0; i < agent_triple_target_ids.size(); i++) {
+     code_objs.push_back(std::make_pair(nullptr, 0));
+   }
++  std::vector<int> compatibility_score(agent_triple_target_ids.size());
+ 
+   const auto obheader = reinterpret_cast<const __ClangOffloadBundleHeader*>(data);
+   const auto* desc = &obheader->desc[0];
+@@ -495,17 +572,19 @@ hipError_t CodeObject::extractCodeObjectFromFatBinary(
+         reinterpret_cast<const void*>(reinterpret_cast<uintptr_t>(obheader) + desc->offset);
+     const size_t image_size = desc->size;
+ 
+-    if (num_code_objs == 0) break;
+     std::string bundleEntryId{desc->bundleEntryId, desc->bundleEntryIdSize};
+ 
+     std::string co_triple_target_id;
+     if (!getTripleTargetID(bundleEntryId, image, co_triple_target_id)) continue;
+ 
+     for (size_t dev = 0; dev < agent_triple_target_ids.size(); ++dev) {
+-      if (code_objs[dev].first) continue;
+-      if (isCodeObjectCompatibleWithDevice(co_triple_target_id, agent_triple_target_ids[dev])) {
++      if (compatibility_score[dev] >= CS_PROCESSOR_MATCH) continue;
++      int score = getCompatiblityScore(co_triple_target_id, agent_triple_target_ids[dev]);
++      if (score > compatibility_score[dev]) {
++        compatibility_score[dev] = score;
++        if (!code_objs[dev].first)
++          --num_code_objs;
+         code_objs[dev] = std::make_pair(image, image_size);
+-        --num_code_objs;
+       }
+     }
+   }
+--- a/rocclr/device/device.cpp
++++ b/rocclr/device/device.cpp
+@@ -232,10 +232,49 @@ std::string Isa::isaName() const {
+   return std::string(hsaIsaNamePrefix) + targetId();
+ }
+ 
++template <class T, std::size_t N>
++static bool Contains(const std::array<T, N>& arr, const T& value) {
++  return std::find(std::begin(arr), std::end(arr), value) != std::end(arr);
++}
++
++static bool IsVersionCompatible(const Isa &codeObjectIsa,
++                                const Isa &agentIsa) {
++  if (codeObjectIsa.versionMajor() == agentIsa.versionMajor() &&
++      codeObjectIsa.versionMinor() == agentIsa.versionMinor()) {
++
++    if (codeObjectIsa.versionStepping() == agentIsa.versionStepping()) {
++      return true; // exact match
++    }
++
++    // The code object and the agent may sometimes be compatible if
++    // they differ only by stepping version.
++    if (codeObjectIsa.versionMajor() == 9 &&
++        codeObjectIsa.versionMinor() == 0) {
++      const std::array<uint32_t, 4> gfx900_equivalent = { 0, 2, 9, 12 };
++      const std::array<uint32_t, 5> gfx900_superset = { 0, 2, 6, 9, 12 };
++      if (Contains(gfx900_equivalent, codeObjectIsa.versionStepping()) &&
++          Contains(gfx900_superset, agentIsa.versionStepping())) {
++        return true; // gfx900 compatible object and agent
++      }
++    } else if (codeObjectIsa.versionMajor() == 10) {
++      if (codeObjectIsa.versionMinor() == 1) {
++        const std::array<uint32_t, 1> gfx1010_equivalent = { 0 };
++        const std::array<uint32_t, 4> gfx1010_superset = { 0, 1, 2, 3 };
++        if (Contains(gfx1010_equivalent, codeObjectIsa.versionStepping()) &&
++            Contains(gfx1010_superset, agentIsa.versionStepping())) {
++          return true; // gfx1010 compatible object and agent
++        }
++      } else if (codeObjectIsa.versionMinor() == 3) {
++        return true; // gfx1030 compatible object and agent
++      }
++    }
++  }
++
++  return false;
++}
++
+ bool Isa::isCompatible(const Isa &codeObjectIsa, const Isa &agentIsa) {
+-  if (codeObjectIsa.versionMajor() != agentIsa.versionMajor() ||
+-      codeObjectIsa.versionMinor() != agentIsa.versionMinor() ||
+-      codeObjectIsa.versionStepping() != agentIsa.versionStepping())
++  if (!IsVersionCompatible(codeObjectIsa, agentIsa))
+     return false;
+ 
+   assert(codeObjectIsa.isSrameccSupported() == agentIsa.isSrameccSupported() &&
diff --git a/dev-util/hip/files/hip-6.1.0-install.patch b/dev-util/hip/files/hip-6.1.0-install.patch
new file mode 100644
index 000000000000..416663f6ea48
--- /dev/null
+++ b/dev-util/hip/files/hip-6.1.0-install.patch
@@ -0,0 +1,20 @@
+These files already installed by hipcc, which is a runtime dep
+--- a/hipamd/CMakeLists.txt
++++ b/hipamd/CMakeLists.txt
+@@ -401,16 +401,7 @@ if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
+       set(hipcc_bin ${hipcc_bin}.exe)
+       set(hipconfig_bin ${hipconfig_bin}.exe)
+     endif()
+-    if(EXISTS ${hipcc_bin} AND EXISTS ${hipconfig_bin})
+-      install(PROGRAMS ${hipcc_bin} DESTINATION bin)
+-      install(PROGRAMS ${hipconfig_bin} DESTINATION bin)
+-    endif()
+   endif()
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin)
+   if(WIN32)
+     install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
+     install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
\ No newline at end of file
diff --git a/dev-util/hip/files/hip-6.1.1-fix-musl.patch b/dev-util/hip/files/hip-6.1.1-fix-musl.patch
new file mode 100644
index 000000000000..424cd0dde119
--- /dev/null
+++ b/dev-util/hip/files/hip-6.1.1-fix-musl.patch
@@ -0,0 +1,24 @@
+Fix "basename" and "__cpu_mask" definitions for musl
+
+Upstream PR: https://github.com/ROCm/clr/pull/83
+--- a/rocclr/os/os.hpp
++++ b/rocclr/os/os.hpp
+@@ -29,6 +29,7 @@
+ 
+ #if defined(__linux__)
+ #include <sched.h>
++#include <libgen.h>
+ #endif
+ 
+ #ifdef _WIN32
+@@ -377,6 +378,10 @@ ALWAYSINLINE address Os::currentStackPtr() {
+ 
+ #if defined(__linux__)
+ 
++#ifndef __GLIBC__
++typedef unsigned long int __cpu_mask;
++#endif
++
+ inline void Os::ThreadAffinityMask::init() { CPU_ZERO(&mask_); }
+ 
+ inline void Os::ThreadAffinityMask::set(uint cpu) { CPU_SET(cpu, &mask_); }
diff --git a/dev-util/hip/files/hip-test-5.7.1-remove-incompatible-flag.patch b/dev-util/hip/files/hip-test-5.7.1-remove-incompatible-flag.patch
new file mode 100644
index 000000000000..02aa12f1fe42
--- /dev/null
+++ b/dev-util/hip/files/hip-test-5.7.1-remove-incompatible-flag.patch
@@ -0,0 +1,28 @@
+https://github.com/ROCm/hip-tests/pull/443
+
+From cb0140843a162f69c454e91cd994524423b39b8c Mon Sep 17 00:00:00 2001
+From: Yiyang Wu <xgreenlandforwyy@gmail.com>
+Date: Sun, 10 Dec 2023 21:57:14 +0800
+Subject: [PATCH] -fallow-half-arguments-and-returns is not recognized by clang
+
+Reference: https://reviews.llvm.org/D145345
+Issue: https://github.com/ROCm/HIP/issues/3178
+Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
+---
+ catch/unit/deviceLib/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/catch/unit/deviceLib/CMakeLists.txt b/catch/unit/deviceLib/CMakeLists.txt
+index 0645def..3662cbd 100644
+--- catch/unit/deviceLib/CMakeLists.txt
++++ catch/unit/deviceLib/CMakeLists.txt
+@@ -171,7 +171,6 @@ if(${ARCH_CHECK} GREATER_EQUAL 0)
+     set_source_files_properties(unsafeAtomicAdd_NonCoherent_withunsafeflag.cc PROPERTIES COMPILE_OPTIONS "-munsafe-fp-atomics")
+     set_source_files_properties(unsafeAtomicAdd_Coherent_withnounsafeflag.cc PROPERTIES COMPILE_OPTIONS "-mno-unsafe-fp-atomics")
+     set_source_files_properties(unsafeAtomicAdd_NonCoherent_withnounsafeflag.cc PROPERTIES COMPILE_OPTIONS "-mno-unsafe-fp-atomics")
+-    set_source_files_properties(hipMathFunctions.cc PROPERTIES COMPILE_FLAGS "-Xclang -fallow-half-arguments-and-returns")
+     file(GLOB AtomicAdd_files *AtomicAdd_*_*.cc)
+     set_property(SOURCE ${AtomicAdd_files} PROPERTY COMPILE_FLAGS --save-temps)
+     file(GLOB unsafeAtomicAdd_files *unsafeAtomicAdd_*_*.cc)
+--
+2.42.0
diff --git a/dev-util/hip/files/hip-test-6.0.2-hipcc-system-install.patch b/dev-util/hip/files/hip-test-6.0.2-hipcc-system-install.patch
new file mode 100644
index 000000000000..bf143939d13e
--- /dev/null
+++ b/dev-util/hip/files/hip-test-6.0.2-hipcc-system-install.patch
@@ -0,0 +1,43 @@
+In Gentoo rocm_agent_enumerator is installed by rocminfo and is in PATH.
+
+Index: catch/CMakeLists.txt
+===================================================================
+--- catch.orig/CMakeLists.txt
++++ catch/CMakeLists.txt
+@@ -55,9 +55,9 @@ endif()
+ message(STATUS "HIP_PATH: ${HIP_PATH}")
+ message(STATUS "ROCM_PATH: ${ROCM_PATH}")
+ 
+-set(CMAKE_CXX_COMPILER "${HIP_PATH}/bin/hipcc${EXT}")
+-set(CMAKE_C_COMPILER "${HIP_PATH}/bin/hipcc${EXT}")
+-set(HIPCONFIG_EXECUTABLE "${HIP_PATH}/bin/hipconfig${EXT}")
++set(CMAKE_CXX_COMPILER "hipcc${EXT}")
++set(CMAKE_C_COMPILER "hipcc${EXT}")
++set(HIPCONFIG_EXECUTABLE "hipconfig${EXT}")
+ execute_process(COMMAND ${HIPCONFIG_EXECUTABLE} --version
+                 OUTPUT_VARIABLE HIP_VERSION
+                 OUTPUT_STRIP_TRAILING_WHITESPACE)
+@@ -183,9 +183,8 @@ message(STATUS "CMAKE HIP ARCHITECTURES:
+ # OFFLOAD_ARCH_STR
+ # rocm_agent_enumerator
+ if(NOT DEFINED OFFLOAD_ARCH_STR
+-   AND EXISTS "${ROCM_PATH}/bin/rocm_agent_enumerator"
+    AND HIP_PLATFORM STREQUAL "amd" AND UNIX)
+-    execute_process(COMMAND "${ROCM_PATH}/bin/rocm_agent_enumerator"
++    execute_process(COMMAND "rocm_agent_enumerator"
+          OUTPUT_VARIABLE HIP_GPU_ARCH
+          RESULT_VARIABLE ROCM_AGENT_ENUM_RESULT
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+Index: catch/hipTestMain/hip_test_context.cc
+===================================================================
+--- catch.orig/hipTestMain/hip_test_context.cc
++++ catch/hipTestMain/hip_test_context.cc
+@@ -37,7 +37,7 @@ std::string TestContext::substringFound(
+ 
+ std::string TestContext::getCurrentArch() {
+ #if HT_LINUX
+-  const char* cmd = "/opt/rocm/bin/rocm_agent_enumerator | sort -u | xargs | sed -e 's/ /;/g'";
++  const char* cmd = "rocm_agent_enumerator | sort -u | xargs | sed -e 's/ /;/g'";
+   std::array<char, 1024> buffer;
+   std::string result;
+   std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd, "r"), pclose);
diff --git a/dev-util/hip/files/hip-test-6.1.0-disable-hipKerArgOptimization.patch b/dev-util/hip/files/hip-test-6.1.0-disable-hipKerArgOptimization.patch
new file mode 100644
index 000000000000..cb65ebae62be
--- /dev/null
+++ b/dev-util/hip/files/hip-test-6.1.0-disable-hipKerArgOptimization.patch
@@ -0,0 +1,24 @@
+Those tests requires >=clang-18 to support -amdgpu-kernarg-preload-count
+index afdf8c4..28b0198 100644
+--- a/unit/module/CMakeLists.txt
++++ b/unit/module/CMakeLists.txt
+@@ -41,9 +41,6 @@ add_custom_target(copyKernel.s
+                   -I${CMAKE_CURRENT_SOURCE_DIR}/../../include --rocm-path=${ROCM_PATH})
+ 
+ if(UNIX)
+-set(TEST_SRC
+-    ${TEST_SRC}
+-    hipKerArgOptimization.cc)
+ 
+ add_custom_target(copiousArgKernel.code
+                   COMMAND ${CMAKE_CXX_COMPILER} --genco ${OFFLOAD_ARCH_STR}
+@@ -106,8 +103,4 @@ hip_add_exe_to_target(NAME ModuleTest
+   TEST_TARGET_NAME build_tests COMMON_SHARED_SRC ${COMMON_SHARED_SRC})
+ 
+ add_dependencies(build_tests copyKernel.code copyKernel.s)
+-if(UNIX)
+-add_dependencies(build_tests copiousArgKernel.code copiousArgKernel0.code copiousArgKernel1.code copiousArgKernel2.code
+-copiousArgKernel3.code copiousArgKernel16.code copiousArgKernel17.code)
+ endif()
+-endif()
+\ No newline at end of file
diff --git a/dev-util/hip/files/hip-test-6.1.1-fix-musl.patch b/dev-util/hip/files/hip-test-6.1.1-fix-musl.patch
new file mode 100644
index 000000000000..c3f3e45efe4d
--- /dev/null
+++ b/dev-util/hip/files/hip-test-6.1.1-fix-musl.patch
@@ -0,0 +1,159 @@
+Fix musl errors:
+* reinterpret_cast from 'std::nullptr_t' to 'void **' is not allowed
+* error.h is GNU extension
+
+Upstream PR: https://github.com/ROCm/hip-tests/pull/463
+--- a/unit/rtc/headers/printf_common.h
++++ b/unit/rtc/headers/printf_common.h
+@@ -30,7 +30,6 @@ THE SOFTWARE.
+ #if defined(_WIN32)
+ #include <io.h>
+ #else
+-#include <error.h>
+ #include <unistd.h>
+ #endif
+ 
+@@ -110,7 +109,7 @@ struct CaptureStream {
+     saved_fd = dup(orig_fd);
+ 
+     if ((temp_fd = mkstemp(tempname)) == -1) {
+-      error(0, errno, "Error");
++      fprintf(stderr, "Error: %s\n", strerror(errno));
+       assert(false);
+     }
+   }
+@@ -118,11 +117,11 @@ struct CaptureStream {
+   void Begin() {
+     fflush(nullptr);
+     if (dup2(temp_fd, orig_fd) == -1) {
+-      error(0, errno, "Error");
++      fprintf(stderr, "Error: %s\n", strerror(errno));
+       assert(false);
+     }
+     if (close(temp_fd) != 0) {
+-      error(0, errno, "Error");
++      fprintf(stderr, "Error: %s\n", strerror(errno));
+       assert(false);
+     }
+   }
+@@ -130,11 +129,11 @@ struct CaptureStream {
+   void End() {
+     fflush(nullptr);
+     if (dup2(saved_fd, orig_fd) == -1) {
+-      error(0, errno, "Error");
++      fprintf(stderr, "Error: %s\n", strerror(errno));
+       assert(false);
+     }
+     if (close(saved_fd) != 0) {
+-      error(0, errno, "Error");
++      fprintf(stderr, "Error: %s\n", strerror(errno));
+       assert(false);
+     }
+   }
+@@ -148,7 +147,7 @@ struct CaptureStream {
+ 
+   ~CaptureStream() {
+     if (remove(tempname) != 0) {
+-      error(0, errno, "Error");
++      fprintf(stderr, "Error: %s\n", strerror(errno));
+       assert(false);
+     }
+   }
+--- a/unit/memory/hipMemRangeGetAttributes_old.cc
++++ b/unit/memory/hipMemRangeGetAttributes_old.cc
+@@ -268,7 +268,7 @@ TEST_CASE("Unit_hipMemRangeGetAttributes_NegativeTst") {
+     // Passing NULL as first parameter
+     SECTION("Passing NULL as first parameter") {
+       if (!CheckError(hipMemRangeGetAttributes(
+-                                      reinterpret_cast<void**>(NULL),
++                                      static_cast<void**>(NULL),
+                                       reinterpret_cast<size_t*>(dataSizes),
+                                       AttrArr, 4, Hmm, MEM_SIZE),
+                                       __LINE__)) {
+--- a/unit/occupancy/hipOccupancyMaxActiveBlocksPerMultiprocessor_old.cc
++++ b/unit/occupancy/hipOccupancyMaxActiveBlocksPerMultiprocessor_old.cc
+@@ -40,7 +40,7 @@ TEST_CASE("Unit_hipOccupancyMaxActiveBlocksPerMultiprocessor_Negative") {
+   ret = hipOccupancyMaxActiveBlocksPerMultiprocessor(NULL, f1, blockSize, 0);
+   REQUIRE(ret != hipSuccess);
+ 
+-  ret = hipOccupancyMaxActiveBlocksPerMultiprocessor(&numBlock, NULL, blockSize, 0);
++  ret = hipOccupancyMaxActiveBlocksPerMultiprocessor(&numBlock, static_cast<void*>(NULL), blockSize, 0);
+   REQUIRE(ret != hipSuccess);
+ 
+   ret = hipOccupancyMaxActiveBlocksPerMultiprocessor(&numBlock, f1, 0, 0);
+--- a/unit/occupancy/hipOccupancyMaxPotentialBlockSize_old.cc
++++ b/unit/occupancy/hipOccupancyMaxPotentialBlockSize_old.cc
+@@ -37,7 +37,7 @@ TEST_CASE("Unit_hipOccupancyMaxPotentialBlockSize_Negative") {
+ 
+ #ifndef __HIP_PLATFORM_NVIDIA__
+   // nvcc doesnt support kernelfunc(NULL) for api
+-  ret = hipOccupancyMaxPotentialBlockSize(&gridSize, &blockSize, NULL, 0, 0);
++  ret = hipOccupancyMaxPotentialBlockSize(&gridSize, &blockSize, static_cast<void*>(NULL), 0, 0);
+   REQUIRE(ret != hipSuccess);
+ #endif
+ }
+--- a/unit/occupancy/hipOccupancyMaxActiveBlocksPerMultiprocessor.cc
++++ b/unit/occupancy/hipOccupancyMaxActiveBlocksPerMultiprocessor.cc
+@@ -48,7 +48,7 @@ TEST_CASE("Unit_hipOccupancyMaxActiveBlocksPerMultiprocessor_Negative_Parameters
+       blockSize);
+ 
+   SECTION("Kernel function is NULL") {
+-    HIP_CHECK_ERROR(hipOccupancyMaxActiveBlocksPerMultiprocessor(&numBlocks, NULL, blockSize, 0),
++    HIP_CHECK_ERROR(hipOccupancyMaxActiveBlocksPerMultiprocessor(&numBlocks, static_cast<void*>(NULL), blockSize, 0),
+                     hipErrorInvalidDeviceFunction);
+   }
+ }
+--- a/unit/kernel/printf_common.h
++++ b/unit/kernel/printf_common.h
+@@ -24,7 +24,6 @@ THE SOFTWARE.
+ #define _STRESSTEST_PRINTF_COMMON_H_
+ 
+ #include <errno.h>
+-#include <error.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -47,17 +46,17 @@ struct CaptureStream {
+     saved_fd = dup(orig_fd);
+ 
+     if ((temp_fd = mkstemp(tempname)) == -1) {
+-      error(0, errno, "Error");
++      fprintf(stderr, "Error: %s\n", strerror(errno));
+       assert(false);
+     }
+ 
+     fflush(nullptr);
+     if (dup2(temp_fd, orig_fd) == -1) {
+-      error(0, errno, "Error");
++      fprintf(stderr, "Error: %s\n", strerror(errno));
+       assert(false);
+     }
+     if (close(temp_fd) != 0) {
+-      error(0, errno, "Error");
++      fprintf(stderr, "Error: %s\n", strerror(errno));
+       assert(false);
+     }
+   }
+@@ -67,11 +66,11 @@ struct CaptureStream {
+       return;
+     fflush(nullptr);
+     if (dup2(saved_fd, orig_fd) == -1) {
+-      error(0, errno, "Error");
++      fprintf(stderr, "Error: %s\n", strerror(errno));
+       assert(false);
+     }
+     if (close(saved_fd) != 0) {
+-      error(0, errno, "Error");
++      fprintf(stderr, "Error: %s\n", strerror(errno));
+       assert(false);
+     }
+     saved_fd = -1;
+@@ -90,7 +89,7 @@ struct CaptureStream {
+   ~CaptureStream() {
+     restoreStream();
+     if (remove(tempname) != 0) {
+-      error(0, errno, "Error");
++      fprintf(stderr, "Error: %s\n", strerror(errno));
+       assert(false);
+     }
+   }
diff --git a/dev-util/hip/hip-5.1.3-r4.ebuild b/dev-util/hip/hip-5.1.3-r4.ebuild
index a8654a3e0568..764d4f49f49b 100644
--- a/dev-util/hip/hip-5.1.3-r4.ebuild
+++ b/dev-util/hip/hip-5.1.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -51,7 +51,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.1.3-fix-hip_prof_gen.patch"
 	"${FILESDIR}/${PN}-5.1.3-correct-sample-install-location.patch"
 	"${FILESDIR}/${PN}-5.1.3-remove-cmake-doxygen-commands.patch"
-	"${FILESDIR}/0001-SWDEV-316128-HIP-surface-API-support.patch"
+	"${FILESDIR}/${PN}-5.1.3-0001-SWDEV-316128-HIP-surface-API-support.patch"
 	"${FILESDIR}/${PN}-5.1.3-llvm-15-noinline-keyword.patch"
 )
 
diff --git a/dev-util/hip/hip-5.3.3-r3.ebuild b/dev-util/hip/hip-5.3.3-r3.ebuild
index c03da0d6effc..fe717ad3b84c 100644
--- a/dev-util/hip/hip-5.3.3-r3.ebuild
+++ b/dev-util/hip/hip-5.3.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.0.2-set-build-id.patch"
 	"${FILESDIR}/${PN}-5.3.3-remove-cmake-doxygen-commands.patch"
 	"${FILESDIR}/${PN}-5.3.3-disable-Werror.patch"
-	"${FILESDIR}/0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch"
+	"${FILESDIR}/${PN}-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch"
 )
 
 S="${WORKDIR}/hipamd-rocm-${PV}"
@@ -78,9 +78,11 @@ src_prepare() {
 	eapply "${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
 	eapply "${FILESDIR}/${PN}-5.1.3-fno-stack-protector.patch"
 	eapply "${FILESDIR}/${PN}-5.3.3-correct-ldflag.patch"
-	eapply "${FILESDIR}/0001-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch"
-	eapply "${FILESDIR}/0002-SWDEV-355608-Remove-clang-include-path-2996.patch"
-	eapply "${FILESDIR}/0003-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch"
+
+	eapply "${FILESDIR}/${PN}-5.3.3-0002-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch"
+	eapply "${FILESDIR}/${PN}-5.3.3-0003-SWDEV-355608-Remove-clang-include-path-2996.patch"
+	eapply "${FILESDIR}/${PN}-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch"
+
 	eapply "${FILESDIR}/${PN}-5.4.3-fix-HIP_CLANG_PATH-detection.patch"
 	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
 	# which makes "stdlib.h" not found when using "#include_next" in header files;
diff --git a/dev-util/hip/hip-5.4.3.ebuild b/dev-util/hip/hip-5.4.3.ebuild
index 7798aab3e444..3eb09247c48f 100644
--- a/dev-util/hip/hip-5.4.3.ebuild
+++ b/dev-util/hip/hip-5.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.0.2-set-build-id.patch"
 	"${FILESDIR}/${PN}-5.3.3-remove-cmake-doxygen-commands.patch"
 	"${FILESDIR}/${PN}-5.3.3-disable-Werror.patch"
-	"${FILESDIR}/0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch"
+	"${FILESDIR}/${PN}-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch"
 )
 
 S="${WORKDIR}/hipamd-rocm-${PV}"
@@ -80,7 +80,7 @@ src_prepare() {
 	eapply "${FILESDIR}/${PN}-5.4.3-correct-ldflag.patch"
 	eapply "${FILESDIR}/${PN}-5.4.3-clang-version.patch"
 	eapply "${FILESDIR}/${PN}-5.4.3-clang-include.patch"
-	eapply "${FILESDIR}/0003-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch"
+	eapply "${FILESDIR}/${PN}-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch"
 	eapply "${FILESDIR}/${PN}-5.4.3-fix-HIP_CLANG_PATH-detection.patch"
 
 	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
diff --git a/dev-util/hip/hip-5.5.1.ebuild b/dev-util/hip/hip-5.5.1.ebuild
index 276e8628ad9c..3bb5b6bb99c9 100644
--- a/dev-util/hip/hip-5.5.1.ebuild
+++ b/dev-util/hip/hip-5.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.0.2-set-build-id.patch"
 	"${FILESDIR}/${PN}-5.3.3-remove-cmake-doxygen-commands.patch"
 	"${FILESDIR}/${PN}-5.5.1-disable-Werror.patch"
-	#"${FILESDIR}/0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch"
+	# "${FILESDIR}/${PN}-5.3.3-0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch"
 )
 
 S="${WORKDIR}/hipamd-rocm-${PV}"
@@ -80,7 +80,7 @@ src_prepare() {
 	#eapply "${FILESDIR}/${PN}-5.4.3-correct-ldflag.patch"
 	#eapply "${FILESDIR}/${PN}-5.4.3-clang-version.patch"
 	#eapply "${FILESDIR}/${PN}-5.4.3-clang-include.patch"
-	#eapply "${FILESDIR}/0003-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch"
+	#eapply "${FILESDIR}/${PN}-5.3.3-0004-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch"
 	eapply "${FILESDIR}/${PN}-5.4.3-fix-HIP_CLANG_PATH-detection.patch"
 
 	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
diff --git a/dev-util/hip/hip-5.7.1-r2.ebuild b/dev-util/hip/hip-5.7.1-r2.ebuild
index c6c7376c0297..e5d5fee9a796 100644
--- a/dev-util/hip/hip-5.7.1-r2.ebuild
+++ b/dev-util/hip/hip-5.7.1-r2.ebuild
@@ -7,17 +7,17 @@ DOCS_BUILDER="doxygen"
 DOCS_DEPEND="media-gfx/graphviz"
 ROCM_SKIP_GLOBALS=1
 
-inherit cmake docs llvm rocm flag-o-matic
+inherit cmake docs flag-o-matic llvm rocm
 
 LLVM_MAX_SLOT=17
 
 TEST_PV=5.7.0 # No hip-test-5.7.1 release
 
 DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd"
-SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz
-	https://github.com/ROCm-Developer-Tools/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz
-	test? ( https://github.com/ROCm-Developer-Tools/hip-tests/archive/refs/tags/rocm-${TEST_PV}.tar.gz )"
+HOMEPAGE="https://github.com/ROCm/hipamd"
+SRC_URI="https://github.com/ROCm/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz
+	https://github.com/ROCm/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz
+	test? ( https://github.com/ROCm/hip-tests/archive/refs/tags/rocm-${TEST_PV}.tar.gz )"
 
 KEYWORDS="~amd64"
 LICENSE="MIT"
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
 IUSE="debug test"
 
 DEPEND="
-	dev-util/hipcc
 	>=dev-util/rocminfo-5
 	sys-devel/clang:${LLVM_MAX_SLOT}
 	dev-libs/rocm-comgr:${SLOT}
@@ -35,7 +34,9 @@ DEPEND="
 	x11-base/xorg-proto
 	virtual/opengl
 "
+BDEPEND="test? ( =dev-util/hipcc-5* )"
 RDEPEND="${DEPEND}
+	=dev-util/hipcc-5*
 	dev-perl/URI-Encode
 	sys-devel/clang-runtime:=
 	>=dev-libs/roct-thunk-interface-5"
@@ -51,12 +52,12 @@ PATCHES=(
 )
 
 S="${WORKDIR}/clr-rocm-${PV}/"
+TEST_S="${WORKDIR}/hip-tests-rocm-${TEST_PV}/catch"
 
 hip_test_wrapper() {
-	local S="${WORKDIR}/hip-tests-rocm-${TEST_PV}/catch"
-	local CMAKE_USE_DIR="${S}"
-	local BUILD_DIR="${S}_build"
-	cd "${S}" || die
+	local CMAKE_USE_DIR="${TEST_S}"
+	local BUILD_DIR="${TEST_S}_build"
+	cd "${TEST_S}" || die
 	$@
 }
 
@@ -66,8 +67,8 @@ src_prepare() {
 		-e "s:#Set HIP_CLANG_PATH:set(HIP_CLANG_PATH \"$(get_llvm_prefix -d ${LLVM_MAX_SLOT})/bin\"):" \
 	    -i "${WORKDIR}"/HIP-rocm-${PV}/cmake/FindHIP.cmake || die
 
-	# https://github.com/ROCm-Developer-Tools/HIP/commit/405d029422ba8bb6be5a233d5eebedd2ad2e8bd3
-	# https://github.com/ROCm-Developer-Tools/clr/commit/ab6d34ae773f4d151e04170c0f4e46c1135ddf3e
+	# https://github.com/ROCm/HIP/commit/405d029422ba8bb6be5a233d5eebedd2ad2e8bd3
+	# https://github.com/ROCm/clr/commit/ab6d34ae773f4d151e04170c0f4e46c1135ddf3e
 	# Migrated to hip-test, but somehow the change is not applied to the tarball.
 	rm -rf "${WORKDIR}"/HIP-rocm-${PV}/tests || die
 	sed -e '/tests.*cmake/d' -i hipamd/CMakeLists.txt || die
@@ -75,8 +76,11 @@ src_prepare() {
 	cmake_src_prepare
 
 	if use test; then
-		PATCHES=${FILESDIR}/hip-test-5.7.0-rocm_agent_enumerator-location.patch \
-			   hip_test_wrapper cmake_src_prepare
+		local PATCHES=(
+			"${FILESDIR}"/hip-test-5.7.0-rocm_agent_enumerator-location.patch \
+			"${FILESDIR}"/hip-test-5.7.1-remove-incompatible-flag.patch
+		)
+		hip_test_wrapper cmake_src_prepare
 	fi
 }
 
@@ -115,6 +119,7 @@ src_configure() {
 		local mycmakeargs=(
 			-DROCM_PATH="${BUILD_DIR}"/hipamd
 			-DHIP_PLATFORM=amd
+			-DCMAKE_MODULE_PATH="${TEST_S}/external/Catch2/cmake/Catch2"
 		)
 		hip_test_wrapper cmake_src_configure
 	fi
@@ -167,7 +172,7 @@ EOF
 
 	rm "${ED}/usr/include/hip/hcc_detail" || die
 
-	# files already installed by hipcc, which is a build dep
+	# files already installed by hipcc, which is a runtime dep
 	rm "${ED}/usr/bin/hipconfig.pl" || die
 	rm "${ED}/usr/bin/hipcc.pl" || die
 	rm "${ED}/usr/bin/hipcc" || die
diff --git a/dev-util/hip/hip-6.0.0.ebuild b/dev-util/hip/hip-6.0.0.ebuild
deleted file mode 100644
index ff53e07dc49a..000000000000
--- a/dev-util/hip/hip-6.0.0.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="media-gfx/graphviz"
-ROCM_SKIP_GLOBALS=1
-
-inherit cmake docs flag-o-matic llvm rocm
-
-LLVM_MAX_SLOT=17
-
-TEST_PV=5.7.0 # No hip-test-5.7.1 release
-
-DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd"
-SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz
-	https://github.com/ROCm-Developer-Tools/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz
-	test? ( https://github.com/ROCm-Developer-Tools/hip-tests/archive/refs/tags/rocm-${TEST_PV}.tar.gz )"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RESTRICT="!test? ( test )"
-IUSE="debug test"
-
-DEPEND="
-	dev-util/hipcc
-	>=dev-util/rocminfo-5
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	dev-libs/rocm-comgr:${SLOT}
-	>=dev-libs/rocr-runtime-5.6
-	x11-base/xorg-proto
-	virtual/opengl
-"
-RDEPEND="${DEPEND}
-	dev-perl/URI-Encode
-	sys-devel/clang-runtime:=
-	>=dev-libs/roct-thunk-interface-5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.7.0-install.patch"
-	"${FILESDIR}/${PN}-5.7.1-fix-unaligned-access.patch"
-	"${FILESDIR}/${PN}-5.7.1-exec-stack.patch"
-	"${FILESDIR}/${PN}-5.7.1-disable-stack-protector.patch"
-	"${FILESDIR}/${PN}-5.7.1-no_asan_doc.patch"
-	"${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
-)
-
-S="${WORKDIR}/clr-rocm-${PV}/"
-
-hip_test_wrapper() {
-	local S="${WORKDIR}/hip-tests-rocm-${TEST_PV}/catch"
-	local CMAKE_USE_DIR="${S}"
-	local BUILD_DIR="${S}_build"
-	cd "${S}" || die
-	$@
-}
-
-src_prepare() {
-	# hipamd is itself built by cmake, and should never provide a
-	# FindHIP.cmake module.
-	rm -r "${WORKDIR}"/HIP-rocm-${PV}/cmake/FindHIP* || die
-
-	# https://github.com/ROCm-Developer-Tools/HIP/commit/405d029422ba8bb6be5a233d5eebedd2ad2e8bd3
-	# https://github.com/ROCm-Developer-Tools/clr/commit/ab6d34ae773f4d151e04170c0f4e46c1135ddf3e
-	# Migrated to hip-test, but somehow the change is not applied to the tarball.
-	rm -rf "${WORKDIR}"/HIP-rocm-${PV}/tests || die
-	sed -e '/tests.*cmake/d' -i hipamd/CMakeLists.txt || die
-
-	cmake_src_prepare
-
-	if use test; then
-		PATCHES=${FILESDIR}/hip-test-5.7.0-rocm_agent_enumerator-location.patch \
-			   hip_test_wrapper cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/858383
-	# https://github.com/ROCm/clr/issues/64
-	#
-	# Do not trust it for LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	use debug && CMAKE_BUILD_TYPE="Debug"
-
-	# Fix ld.lld linker error: https://github.com/ROCm/HIP/issues/3382
-	# See also: https://github.com/gentoo/gentoo/pull/29097
-	append-ldflags $(tc-flags-CCLD -Wl,--undefined-version)
-
-	local mycmakeargs=(
-		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-		-DCMAKE_BUILD_TYPE=${buildtype}
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_HIPIFY_CLANG=OFF
-		-DHIP_PLATFORM=amd
-		-DHIP_COMMON_DIR="${WORKDIR}/HIP-rocm-${PV}"
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DUSE_PROF_API=0
-		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
-		-DCLR_BUILD_HIP=ON
-		-DHIPCC_BIN_DIR="${EPREFIX}/usr/bin"
-		-DOpenGL_GL_PREFERENCE="GLVND"
-	)
-
-	cmake_src_configure
-
-	if use test; then
-		local mycmakeargs=(
-			-DROCM_PATH="${BUILD_DIR}"/hipamd
-			-DHIP_PLATFORM=amd
-		)
-		hip_test_wrapper cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use test; then
-		HIP_PATH="${BUILD_DIR}"/hipamd \
-			hip_test_wrapper cmake_src_compile build_tests
-	fi
-}
-
-src_test() {
-	check_amdgpu
-	export LD_LIBRARY_PATH="${BUILD_DIR}/hipamd/lib"
-
-	# TODO: research how to test Vulkan-related features.
-	local CMAKE_SKIP_TESTS=(
-		Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Positive_Read_Write
-		Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Negative_Parameters
-		Unit_hipImportExternalMemory_Vulkan_Negative_Parameters
-		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Positive_Binary_Semaphore
-		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Positive_Multiple_Semaphores
-		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Negative_Parameters
-		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Positive_Binary_Semaphore
-		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Positive_Multiple_Semaphores
-		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Negative_Parameters
-		Unit_hipImportExternalSemaphore_Vulkan_Negative_Parameters
-		Unit_hipDestroyExternalSemaphore_Vulkan_Negative_Parameters
-	)
-
-	MAKEOPTS="-j1" hip_test_wrapper cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# files already installed by hipcc, which is a build dep
-	rm "${ED}/usr/bin/hipconfig.pl" || die
-	rm "${ED}/usr/bin/hipcc.pl" || die
-	rm "${ED}/usr/bin/hipcc" || die
-	rm "${ED}/usr/bin/hipcc.bin" || die
-	rm "${ED}/usr/bin/hipconfig" || die
-	rm "${ED}/usr/bin/hipconfig.bin" || die
-	rm "${ED}/usr/bin/hipvars.pm" || die
-}
diff --git a/dev-util/hip/hip-6.1.1.ebuild b/dev-util/hip/hip-6.1.1.ebuild
new file mode 100644
index 000000000000..eab3697cf4ef
--- /dev/null
+++ b/dev-util/hip/hip-6.1.1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="media-gfx/graphviz"
+ROCM_SKIP_GLOBALS=1
+
+LLVM_COMPAT=( 18 )
+
+inherit cmake docs flag-o-matic llvm-r1 rocm
+
+TEST_PV=${PV}
+
+DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
+HOMEPAGE="https://github.com/ROCm/clr"
+SRC_URI="
+	https://github.com/ROCm/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz
+	https://github.com/ROCm/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz
+	test? (
+		https://github.com/ROCm/hip-tests/archive/refs/tags/rocm-${TEST_PV}.tar.gz -> hip-test-${TEST_PV}.tar.gz
+	)
+"
+S="${WORKDIR}/clr-rocm-${PV}/"
+TEST_S="${WORKDIR}/hip-tests-rocm-${TEST_PV}/catch"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="debug +hip opencl test video_cards_amdgpu video_cards_nvidia"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	|| ( hip opencl )
+	^^ ( video_cards_amdgpu video_cards_nvidia )
+"
+
+DEPEND="
+	video_cards_amdgpu? (
+		>=dev-util/rocminfo-5
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}
+		')
+		dev-libs/rocm-comgr:${SLOT}
+		dev-libs/rocr-runtime:${SLOT}
+	)
+	video_cards_nvidia? (
+		dev-libs/hipother:${SLOT}
+	)
+	x11-base/xorg-proto
+	virtual/opengl
+"
+BDEPEND="
+	video_cards_amdgpu? (
+		dev-util/hipcc:${SLOT}[${LLVM_USEDEP}]
+	)
+"
+RDEPEND="${DEPEND}
+	sys-devel/clang-runtime:=
+	video_cards_amdgpu? (
+		dev-util/hipcc:${SLOT}[${LLVM_USEDEP}]
+		>=dev-libs/rocm-device-libs-${PV}
+		>=dev-libs/roct-thunk-interface-5
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-no_asan_doc.patch"
+	"${FILESDIR}/${PN}-6.1.0-install.patch"
+	"${FILESDIR}/${PN}-6.1.1-fix-musl.patch"
+)
+
+hip_test_wrapper() {
+	local CMAKE_USE_DIR="${TEST_S}"
+	local BUILD_DIR="${TEST_S}_build"
+	cd "${TEST_S}" || die
+	"${@}"
+}
+
+src_prepare() {
+	# NOTE We do this head stand to safe the patch size.
+	# NOTE Adjust when we drop 5.7.1
+	sed \
+		-e 's:kAmdgcnTargetTriple:AMDGCN_TARGET_TRIPLE:g' \
+		-i hipamd/src/hip_code_object.cpp || die
+	eapply "${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
+	sed \
+		-e 's:AMDGCN_TARGET_TRIPLE:kAmdgcnTargetTriple:g' \
+		-i hipamd/src/hip_code_object.cpp || die
+
+	# hipamd is itself built by cmake, and should never provide a
+	# FindHIP.cmake module. But the reality is some package relies on it.
+	# Set HIP and HIP Clang paths directly, don't search using heuristics
+	sed -e "s:# Search for HIP installation:set(HIP_ROOT_DIR \"${EPREFIX}/usr\"):" \
+		-e "s:#Set HIP_CLANG_PATH:set(HIP_CLANG_PATH \"$(get_llvm_prefix -d)/bin\"):" \
+		-i "${WORKDIR}/HIP-rocm-${PV}/cmake/FindHIP.cmake" || die
+
+	cmake_src_prepare
+
+	# With Clang>17 -amdgpu-early-inline-all=true causes OOMs in dependencies
+	# https://github.com/llvm/llvm-project/issues/86332
+	if [ "$LLVM_SLOT" -le "17" ]; then
+		sed -e "s/-mllvm=-amdgpu-early-inline-all=true //" -i hipamd/hip-config-amd.cmake || die
+		sed -e "s/-mllvm=-amdgpu-early-inline-all=true;//" -i "${WORKDIR}/HIP-rocm-${PV}/hip-lang-config.cmake.in"
+	fi
+
+	if use test; then
+		local PATCHES=(
+			"${FILESDIR}"/hip-test-6.0.2-hipcc-system-install.patch
+			"${FILESDIR}"/hip-test-5.7.1-remove-incompatible-flag.patch
+			"${FILESDIR}"/hip-test-6.1.0-disable-hipKerArgOptimization.patch
+			"${FILESDIR}"/hip-test-6.1.1-fix-musl.patch
+		)
+		hip_test_wrapper cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/858383
+	# https://github.com/ROCm/clr/issues/64
+	#
+	# Do not trust it for LTO either
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	use debug && CMAKE_BUILD_TYPE="Debug"
+
+	# Fix ld.lld linker error: https://github.com/ROCm/HIP/issues/3382
+	# See also: https://github.com/gentoo/gentoo/pull/29097
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	local mycmakeargs=(
+		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix)"
+		-DCMAKE_SKIP_RPATH=ON
+		-D__HIP_ENABLE_PCH="no"
+
+		-DCLR_BUILD_HIP="$(usex hip)"
+		-DCLR_BUILD_OCL="$(usex opencl)"
+
+		-DHIP_COMMON_DIR="${WORKDIR}/HIP-rocm-${PV}"
+		-DHIPCC_BIN_DIR="${EPREFIX}/usr/bin"
+		-DROCM_PATH="${EPREFIX}/usr"
+		-DUSE_PROF_API="no"
+		-DFILE_REORG_BACKWARD_COMPATIBILITY="no"
+
+		-DOpenGL_GL_PREFERENCE="GLVND"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git="yes"
+	)
+
+	if use video_cards_amdgpu; then
+		mycmakeargs+=(
+			-DHIP_PLATFORM="amd"
+		)
+	elif use video_cards_nvidia; then
+		mycmakeargs+=(
+			-DHIPNV_DIR="${EPREFIX}/usr"
+			-DHIP_PLATFORM="nvidia"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local mycmakeargs=(
+			-DCMAKE_MODULE_PATH="${TEST_S}/external/Catch2/cmake/Catch2"
+		)
+		if use video_cards_amdgpu; then
+			mycmakeargs+=(
+				-DROCM_PATH="${BUILD_DIR}/hipamd"
+				-DHIP_PLATFORM="amd"
+			)
+		elif use video_cards_nvidia; then
+			mycmakeargs+=(
+				-DROCM_PATH="${BUILD_DIR}/hipother"
+				-DHIP_PLATFORM="nvidia"
+			)
+		fi
+		HIP_PATH="${EPREFIX}/usr" hip_test_wrapper cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use test; then
+		HIP_PATH="${BUILD_DIR}"/hipamd \
+			hip_test_wrapper cmake_src_compile build_tests
+	fi
+}
+
+src_test() {
+	check_amdgpu
+	export LD_LIBRARY_PATH="${BUILD_DIR}/hipamd/lib"
+
+	# TODO: research how to test Vulkan-related features.
+	local CMAKE_SKIP_TESTS=(
+		Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Positive_Read_Write
+		Unit_hipExternalMemoryGetMappedBuffer_Vulkan_Negative_Parameters
+		Unit_hipImportExternalMemory_Vulkan_Negative_Parameters
+		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Positive_Binary_Semaphore
+		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Positive_Multiple_Semaphores
+		Unit_hipWaitExternalSemaphoresAsync_Vulkan_Negative_Parameters
+		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Positive_Binary_Semaphore
+		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Positive_Multiple_Semaphores
+		Unit_hipSignalExternalSemaphoresAsync_Vulkan_Negative_Parameters
+		Unit_hipImportExternalSemaphore_Vulkan_Negative_Parameters
+		Unit_hipDestroyExternalSemaphore_Vulkan_Negative_Parameters
+	)
+
+	MAKEOPTS="-j1" hip_test_wrapper cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# add version file that is required by some libraries
+	mkdir "${ED}"/usr/include/rocm-core || die
+	cat <<-EOF > "${ED}"/usr/include/rocm-core/rocm_version.h || die
+		#pragma once
+		#define ROCM_VERSION_MAJOR $(ver_cut 1)
+		#define ROCM_VERSION_MINOR $(ver_cut 2)
+		#define ROCM_VERSION_PATCH $(ver_cut 3)
+		#define ROCM_BUILD_INFO "$(ver_cut 1-3).0-9999-unknown"
+	EOF
+
+	dosym -r /usr/include/rocm-core/rocm_version.h /usr/include/rocm_version.h
+
+	if use video_cards_nvidia; then
+		newenvd - 99hipconfig <<-EOF
+			HIP_PLATFORM="nvidia"
+			HIP_RUNTIME="cuda"
+			CUDA_PATH="${EPREFIX}/opt/cuda"
+		EOF
+	fi
+}
diff --git a/dev-util/hip/metadata.xml b/dev-util/hip/metadata.xml
index 21b0e03f6a41..8746df97725c 100644
--- a/dev-util/hip/metadata.xml
+++ b/dev-util/hip/metadata.xml
@@ -17,7 +17,17 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCm-Developer-Tools/HIP</remote-id>
+    <remote-id type="github">ROCm/HIP</remote-id>
   </upstream>
+  <use>
+    <flag name="hip">Build HIP runtime</flag>
+    <flag name="opencl">Build OpenCL runtime</flag>
+    <flag name="video_cards_amdgpu">Build for AMD platform</flag>
+    <flag name="video_cards_nvidia">Build for Nvidia platform</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-util/hipcc/Manifest b/dev-util/hipcc/Manifest
index 3c95471bd0e7..aadfbc006417 100644
--- a/dev-util/hipcc/Manifest
+++ b/dev-util/hipcc/Manifest
@@ -1,7 +1,7 @@
 AUX hipcc-5.7.1-fno-stack-protector.patch 499 BLAKE2B d848b79ad2fd542bc6e6595ebc7dbd240b23aa2903aae31a0583b7beba032d8f4999142b932e9a443415bdb7ae4fe06f9e7da607c402109e3b887fef741d460f SHA512 a115cc8c9779cd318e7806d78a8aa99f03596258f8d3b105231dd6b1f9d3168687c305d1ec1c95902f841bb18570f943d3a655a03504f19a6f6ca7419d9272fd
 AUX hipcc-5.7.1-hipcc-hip-version.patch 2245 BLAKE2B 85e41db593706478e92966ee2ee33e1e8c8309251446f14192083a81e35f43be5dfa23337abc8371147b59c9399be79f9461cadf7ba0e025f1355d6c9836d68e SHA512 2cbfdeb9361b38a32ef52dec0c899c7cadc7220a5213fd6e9670c8a9ea6690e80e956d236e0de893bc4fe19117466659bdfdb2e16e720011b7480bc2e8bee458
 DIST hipcc-5.7.1.tar.gz 36589 BLAKE2B a8ae6bd9f0f985d78119223b67b5b35b8d1ee38edb7e43c1e77752d203fe2c8b669b3bcff0cec661054d8cb24f799e7784a49eb0664bdd1dc2bf024ce026c175 SHA512 2d232c8dd4a47de6e0cff9d37b4e63a26cb1809ef2ff3a119c15e992cae96ffc2f4d8c1ddffd8732dea3a3d589a93e177f424a6174f982908aa50904e265432a
-DIST hipcc-6.0.0.tar.gz 36648 BLAKE2B d4b67a962e61da5e96423191dad13e90c6aaec890a2b0dccb83ec4b3a9551ed9e2050bdc747fe7c79627d51b62408918157114f954aa579097163af2fc0b06e8 SHA512 e5307c880c96906d216b44b7bb269756e713cf45f5c72fc5dfc31f1e69d8e5e2cc8022bca289dc2b0a1bd72f86ddbdbb29dfda45010d4e4a4fb77096c9c93621
+DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
 EBUILD hipcc-5.7.1-r3.ebuild 1168 BLAKE2B 480af07e6feb93e684ff7de07efada9231d43296bfc498267c8d758a25d2690779b7d3bd9f872290f86a8621fa1e519d37d0712200ac0a2cb57c915942b2b3e0 SHA512 c3c3abb00fee6fcc593df78dad13b5ec8a144ed92439942512c67d9fb369dec7f8fa055075a0121a3b08823e236560d256741b1243fb14a3e643cda929f90650
-EBUILD hipcc-6.0.0.ebuild 1254 BLAKE2B 717f472afefd65ffc96a22b9f0701edd35c18df2d2cdc782ff5786c7c04d97f16c1c566b43d787f2555fd99fb3167541c85b531af5200bf2b810fdb185403582 SHA512 d9d043e58856cd1b4e64505d165fa40b15f95e8b4dde1c4966cc2d55257fbb42fb160bf09004b91dde747286839d8668149f1270a3880230646afd2a5133a4de
-MISC metadata.xml 845 BLAKE2B 108a9ee40f02d5e190f4d1ee11eea32aaec844c63811265d52046bdb266f6cddfb1774419feace41aaa2bacfd01581847f655aa5fc49536968c54e7f023d49ae SHA512 2b7bbe1205b4a07b81e6c0f4cc2c224a573a03004ce808b4d1ef51ea1b0bec770545b7c46530a1b18222cd67854f790ae44695dd39ef2201d7f3e3ea3ada904f
+EBUILD hipcc-6.1.1.ebuild 2024 BLAKE2B 9cad5c85c2795a692878aa46b3b578e518e4ed8f2443d55d62408c16e0b3561417d34939dd52f26980f8fabf04b7d70ec53263fe47710bcff3b51eb8163609b5 SHA512 b09ef0e288403be4beaecd59d41a3c44e17c3543b3ff3f9fe59e4a7de44d54fca98d82fb5c12c834fa2246e301ac4d137e7bb54558a5a4b79a8578c82f4cd12b
+MISC metadata.xml 942 BLAKE2B 56fe9d0c0615796d69d11ced9aa54834f9e3cb649786cc117bb2628086be15e1bc2dfb8e96fc93a043603ab34abec04a8bb1592b101444ea077ba0d73e55c374 SHA512 84bac9774f2d0dfec093c0269fe76662dc12a44fa3d4861152c6a076165d44af399cdcb134bea93d094b9b9d0094bec6ba72f6f81ad29b7467ce5262348ba263
diff --git a/dev-util/hipcc/hipcc-6.0.0.ebuild b/dev-util/hipcc/hipcc-6.0.0.ebuild
deleted file mode 100644
index 088297598782..000000000000
--- a/dev-util/hipcc/hipcc-6.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=17
-
-DESCRIPTION="Radeon Open Compute hipcc"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipcc"
-
-KEYWORDS="~amd64"
-SRC_URI="https://github.com/ROCm-Developer-Tools/hipcc/archive/refs/tags/rocm-${PV}.tar.gz -> hipcc-${PV}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/HIPCC-rocm-${PV}
-
-DEPEND="<sys-devel/llvm-18:=
-	<sys-devel/clang-18:=
-	"
-RDEPEND="${DEPEND}
-	!<dev-util/hip-5.7"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.7.1-fno-stack-protector.patch"
-	"${FILESDIR}/${PN}-5.7.1-hipcc-hip-version.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "s:\$ROCM_PATH/llvm/bin:$(get_llvm_prefix ${LLVM_MAX_SLOT})/bin:" \
-		-i bin/hipvars.pm || die
-
-	sed -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \
-		-e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \
-		-e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \
-		-e 's:${ROCM_PATH}/usr/bin/rocm_agent_enumerator:/usr/bin/rocm_agent_enumerator:' \
-		-i bin/hipcc.pl || die
-}
-
-src_install() {
-	cmake_src_install
-	# rm unwanted copy
-	rm -rf "${ED}/usr/hip" || die
-}
diff --git a/dev-util/hipcc/hipcc-6.1.1.ebuild b/dev-util/hipcc/hipcc-6.1.1.ebuild
new file mode 100644
index 000000000000..87a19b598953
--- /dev/null
+++ b/dev-util/hipcc/hipcc-6.1.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+inherit cmake perl-functions llvm-r1
+
+DESCRIPTION="Radeon Open Compute hipcc"
+HOMEPAGE="https://github.com/ROCm/hipcc"
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/hipcc" )
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/llvm-project"
+	inherit git-r3
+	S="${WORKDIR}/${P}/${components[0]}"
+else
+	SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}/${components[0]}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	$(llvm_gen_dep '
+		sys-libs/compiler-rt:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+		sys-devel/clang:${LLVM_SLOT}=
+	')
+"
+RDEPEND="${DEPEND}
+	!<dev-util/hip-5.7"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-hipcc-hip-version.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_fetch
+		git-r3_checkout '' . '' "${components[@]}"
+	else
+		archive="${MY_P}.tar.gz"
+		ebegin "Unpacking from ${archive}"
+		tar -x -z -o \
+			-f "${DISTDIR}/${archive}" \
+			"${components[@]/#/${MY_P}/}" || die
+		eend ${?}
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s:\$ROCM_PATH/llvm/bin:$(get_llvm_prefix)/bin:" \
+		-e "s:/opt/rocm:/usr:" \
+		-i bin/hipvars.pm || die
+
+	sed -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \
+		-e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \
+		-e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \
+		-i bin/hipcc.pl || die
+
+	# With Clang>17 -amdgpu-early-inline-all=true causes OOMs in dependencies
+	# https://github.com/llvm/llvm-project/issues/86332
+	if [ "$LLVM_SLOT" != "17" ]; then
+		sed -e "s/-mllvm -amdgpu-early-inline-all=true //g" -i bin/hipcc.pl || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	# rm unwanted copy
+	rm -rf "${ED}/usr/hip" || die
+	# Handle hipvars.pm
+	rm "${ED}/usr/bin/hipvars.pm" || die
+	perl_domodule "${S}"/bin/hipvars.pm
+}
diff --git a/dev-util/hipcc/metadata.xml b/dev-util/hipcc/metadata.xml
index d280423bad96..b6d25312b735 100644
--- a/dev-util/hipcc/metadata.xml
+++ b/dev-util/hipcc/metadata.xml
@@ -21,7 +21,11 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCm-Developer-Tools/hipcc</remote-id>
+    <remote-id type="github">ROCm/hipcc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-util/hipify-clang/Manifest b/dev-util/hipify-clang/Manifest
index f9489960373f..2a9ac02ed62c 100644
--- a/dev-util/hipify-clang/Manifest
+++ b/dev-util/hipify-clang/Manifest
@@ -1,4 +1,6 @@
 AUX hipify-clang-5.7.1-fix-clang-libs.patch 1298 BLAKE2B 3f6d24300e50d4144c60635045ae0d6c84a1e153607e6779180065c4158afe33a8e8df642eda9c84d1eb189b9ec00eba0614060fc7b3f9136b92b163b932bae5 SHA512 8af2408124e5caca08ea7f72a95dfed816bae4dd07effdc04562f24f209ba5ce57b5e5875f0e03a5560c09d6d3718921bfbb56dc2b55db926aa618486d00032c
 DIST HIPIFY-5.7.1.tar.gz 673452 BLAKE2B e0293c1b7f9ea028efc8d712ddedae4ec933c5bcfba524e13816bd999e67bcf06097f9fe0e4d1f4fa6a38df133be694e92adeefd92f77301d8537b6880b1a1fe SHA512 0cc75fdbcb6278d319cfe8ee3c8547dc75ea494a007d2159c64312c3411627905e0d6c7d7f0032cbc4c727a90723325aa2705db2fd473dbeb41e60f276d1c9a7
+DIST HIPIFY-6.1.1.tar.gz 813425 BLAKE2B accc661431f11796d0c8bcf638537a6035020b2a36ebe66c1b8c10bb63b762418d5fd1f256f3a3e51d2ace224a6492abfe72838bef859b1da68c2126cc3521be SHA512 29c45e312c8e2f0d06916b57f24eba27ba7beae3bd860850b57cfe27c87df22aabe9fdcf3d12671b81e68b61c3974aaf0064e96ae68392d181148aaeef14f1c7
 EBUILD hipify-clang-5.7.1.ebuild 1037 BLAKE2B c13330ff2f0ce915b37841abde52c70cf8907a674969ba5ed929702dbe180e1166b7c62b7dc0bd6f8df2af6e4689337d22cf1e247f27f7d0c72d0cf5c59c23a4 SHA512 24caa7e7007d9ae952e976b5b5d86912cc7780dec7e04a001707d24840d98369799f6766ca85eb242ad04b8e5c8faf7a72fae1d315f42ce1608d81d896ca2fc1
-MISC metadata.xml 469 BLAKE2B b62d4ab1829968943d48809f2059527b44d464e8b0e089214ec3fb8fcde1d5f380045a68978be63e3e149243f5d57e1cd4958943d0cff97a882711d688870800 SHA512 c8a00d04d7f41f47b636c367f6d7c41d2bd750650af98182c250bcd9d687af64d408b9031bcd1df480746c04ffa9f0ff07bc02250cf98a6f33bf21d1b714ea2d
+EBUILD hipify-clang-6.1.1.ebuild 1057 BLAKE2B e4357b90e71c1b177c1cde5373ae9c84ec9f9e3ff8ca47b5d48c482d7f59e4b17a9337d31f6cc6c1cd86007f9360d5e9ffde11835ad66a809ca19bb44694fdfc SHA512 2530656d0a68d34cef1a9d5b810b57b79daa807c368ebd1dcc53b1f9c893b58e869323729df2217f9717213b3434799aac71aacec00728c51f1d50c33ee33454
+MISC metadata.xml 453 BLAKE2B b7719f4627bf53a6b4bb0c5255860382008294b3e5abf41512f62a0b55f0de6e5f5859472cb4352ecbab2139c27b68015922baec4c75a45cc4d078257a1bf846 SHA512 33d3fe6ab49e832e97c122f0eca8292b9129396d9ffec137516259fc5d12924062bbd8fe600da6f1685f954bcb61b466f5631db661023ceb507151c7741c33ce
diff --git a/dev-util/hipify-clang/hipify-clang-6.1.1.ebuild b/dev-util/hipify-clang/hipify-clang-6.1.1.ebuild
new file mode 100644
index 000000000000..ca0eeb20cc2a
--- /dev/null
+++ b/dev-util/hipify-clang/hipify-clang-6.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+
+inherit cmake llvm-r1
+
+DESCRIPTION="A set of tools to translate CUDA source code into portable HIP C++"
+HOMEPAGE="https://github.com/ROCm/HIPIFY"
+SRC_URI="https://github.com/ROCm/HIPIFY/archive/rocm-${PV}.tar.gz -> HIPIFY-${PV}.tar.gz"
+S="${WORKDIR}/HIPIFY-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+BDEPEND=">=dev-build/cmake-3.22"
+DEPEND="
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-fix-clang-libs.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i 's:/../libexec/hipify::' \
+		bin/hipconvertinplace.sh bin/hipconvertinplace-perl.sh \
+		bin/hipexamine-perl.sh bin/hipexamine.sh || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix)/$(get_libdir)/cmake/llvm"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# rm unwanted copy
+	rm -rf "${ED}/usr/hip" || die
+}
diff --git a/dev-util/hipify-clang/metadata.xml b/dev-util/hipify-clang/metadata.xml
index 82e35f93e198..4d4ce95c15e4 100644
--- a/dev-util/hipify-clang/metadata.xml
+++ b/dev-util/hipify-clang/metadata.xml
@@ -10,6 +10,6 @@
     <name>Sv. Lockal</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">ROCm-Developer-Tools/HIPIFY</remote-id>
+    <remote-id type="github">ROCm/HIPIFY</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-util/makeheaders/Manifest b/dev-util/makeheaders/Manifest
index 05530142f4c7..37c536954beb 100644
--- a/dev-util/makeheaders/Manifest
+++ b/dev-util/makeheaders/Manifest
@@ -3,5 +3,5 @@ DIST makeheaders-0_p20220411.html 40335 BLAKE2B 6eec5080226d7759e8bdf97b2238fb33
 DIST makeheaders-262696252dc50250c896c90cc240dcd946614b9c7727902aa7606640507e9231.html 40335 BLAKE2B 6eec5080226d7759e8bdf97b2238fb33e85700d29b0b539fcb797fa219d9d00461aafdabf2642e2cf1a622cf633cf889d71381bb3342113736ddfdafca3582de SHA512 6cccd5388e8af6f814d735c643abb231dab21a16799fba080858b15885a77b99bf37a5c7bac72958bbfcacea2ed54635ccc6323f5c7d47e2a1a73fffa8952504
 DIST makeheaders-cae894dc3611ee6e0fba4100c0e377fcd3bbc6d8ddb91c997939ce439c50cee2.c 101039 BLAKE2B bff701e0230351b268591c24b3ae255916c0ffcb740375f9029d706b41a4c2a091330d74eee9ff687ff2237b53ebd94913a2e43213315fb01ec862c158b01b63 SHA512 0673648b1d3bb0e665edf05dd8c3075e4e4fa52acd1a051caa1018680d4969d5189c4750d7c36d59ddaa79646432cb75fcfec8181eabca804c56d81b4d8f6600
 EBUILD makeheaders-0_p20220411.ebuild 1176 BLAKE2B 7bece779ad96d2b54cda9b9842a0ac383bf50700fc7d9db13dbb77c274cd2672e0b2c93d20eeea62d92304cad07f951ef0f1a025c097aacbcd7268ac981aea7f SHA512 4190f9110293c2523b25bea0d1422eabedac52fb1e1817d47170477577c9b80dd1ca83b0c91b30e460b3f0799b82830930fda7a2e155956b7282ae6ff0b72a5c
-EBUILD makeheaders-0_p20240202.ebuild 1244 BLAKE2B 3f08fd540c095d1f12654a9d0129b0aaa0b771a42334b6efae6501d56987a89fbc394a7a047937ee4006d3e73d778135edf2d7202037c5ff5d0b8deac6c14d5e SHA512 d61eee642db028330e80772c348b2c83185b1f56c7e0c6046ce23f5647bb458d02746ede6c441b9a626214be92be0f13508376b37a8839d3453c7b16dc3616d0
+EBUILD makeheaders-0_p20240202.ebuild 1242 BLAKE2B d7d6b1471a5c820f8c367a5b311e5bd60792e30c2fb169a1a1953a02bd3f3db9a42046428ca6cb9f660ea8d532bf619bd37e9a53aba9834a198006ccf2c48913 SHA512 5d3fca1a6e83d21dc5de0c6636112fdfa1516c9e32c679736a8f1af905b351c9bc2ce1fb25125e35cb5ee4bf0e03b7c8176638c605b02b34b8263cb9c6614fb1
 MISC metadata.xml 959 BLAKE2B d584237736f0fa8879ee7637a44c3705c29b66a7d07fef3b6ce4c96c4ee7d9acc0ac3dcdc10e6575a4777fc48dd0365786e3fa805298889132c553dcb65f6586 SHA512 18407e55d8e1697e6eb80662bb7ecd27633f0357e85155894bd221ff972972479b514f99b3c6c10b0d1baa8ee7c50d4e02d15e882049652c4ffdb13963ce93bd
diff --git a/dev-util/makeheaders/makeheaders-0_p20240202.ebuild b/dev-util/makeheaders/makeheaders-0_p20240202.ebuild
index 5af574ab1fca..e5a85cd9f98a 100644
--- a/dev-util/makeheaders/makeheaders-0_p20240202.ebuild
+++ b/dev-util/makeheaders/makeheaders-0_p20240202.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 HTML_DOCS=( "makeheaders.html" )
 
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 16a4b606490c..46237e130823 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,4 +1,5 @@
 DIST pkgdev-0.2.10.tar.gz 85476 BLAKE2B 2002daa38d445f90cbc2f17ad0e42045b32b5dcefdd85a3485b6e253d9703ad7e59119873718259874de32e7c50e4f5acbacc6c3b40770d55f4d38dbbd7805c4 SHA512 aa9f6465ba44ff67f2b160bc9249583c355e7cc807ce4c797cc8b6d2a4858414a82e702e47ff5b87dc0f6ba70b9c83d515c59a732406437e5325aa3ae7ff95aa
+EBUILD pkgdev-0.2.10-r1.ebuild 1806 BLAKE2B afe832fa24855c0e3daafb76f9789263d9190353b42e60f7244076beaa160fd2375e27b5ff7c3f9583c485e6514bd65422b500bb5c5b1b4deb6fa3d96ff34542 SHA512 c1a1b2e9e85947b2d0f578fbaeca44f0ff6c0a17c2f6c2436c23dd553c6efe1e0b98c2e928e9ecef72a99a652893aa8836b16696258a4b8a2c27bbbe4fb6cccf
 EBUILD pkgdev-0.2.10.ebuild 1727 BLAKE2B e0d47b1da47f758d779e3056df523379d44bf558b8ef1e6722ce7549d90f8a28fa2bf3eae6fffa8c5a17b9fa971e8129f74561206cc1ee2c84bfe9ec7372e1de SHA512 497c7a6417c510ca3e4db16aa8fcf927ba6f59364dcac8153774e8f5e2e4f984422174278572f9eabba5a26664523bbbc3ea26927300039703b74a6a90f8bc12
-EBUILD pkgdev-9999.ebuild 1729 BLAKE2B a777826f4477b18a5ec90667ef0847707cfea6d5d43b1dafce6672040616e326fda38e7a5153a61484f8f673fefce99c0f761fbbe8628a0a86969c886f2b56e2 SHA512 3480ac0ffbf8bd20b93f440500d4fcd08d2484bc4e30c7d562c50537bff80d1151e4f2937be5b971821f4a8199e530260291c80fc032f4ee35112b939f955246
+EBUILD pkgdev-9999.ebuild 1800 BLAKE2B 079de03e55c642251d2d3e206beece76d5e23282ee97b7ba75ac32811cbc2eb358b74689fde314c3b0aa7c40ada561ffc03a75b828026f4c15157ab80f731e26 SHA512 ee99685aaa7f0a0214edd6b3a9d6b01f750f3515e71c1d983f35eb931bf4263a235a23f56abd84c0c24f9999b1db616f9d01db0b73fa3492fe0d632392c4c1ef
 MISC metadata.xml 449 BLAKE2B f440d395e5453394e7bcc857ccd07b6735bce1b68b3e4ce9d33068c28c5794f6ba65d7394ed6f585dcd3e58ccd3f49ecee4d001ff4e40893db721b5ac869f7ae SHA512 a07c315d071af0ad53ee79f9db3cfd1a8acbdbabfad960cf64025eea1a3759f1ef7d5dcf71bf07b17cbfb6f912513edf118c28d3c24de06223a7a3420cc4438d
diff --git a/dev-util/pkgdev/pkgdev-0.2.10-r1.ebuild b/dev-util/pkgdev/pkgdev-0.2.10-r1.ebuild
new file mode 100644
index 000000000000..1fc8f43e2948
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.2.10-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_BRANCH="main"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgdev.git
+		https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="doc"
+
+if [[ ${PV} == *9999 ]] ; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.10.5[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.23[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.25[${PYTHON_USEDEP}]
+	"
+fi
+
+RDEPEND+="
+	dev-vcs/git
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.10.5[${PYTHON_USEDEP}]
+	test? (
+		x11-misc/xdg-utils
+	)
+"
+
+distutils_enable_sphinx doc \
+	">=dev-python/snakeoil-0.10.5" \
+	dev-python/tomli
+distutils_enable_tests pytest
+
+python_compile_all() {
+	use doc && emake PYTHON="${EPYTHON}" man
+
+	sphinx_compile_all # HTML pages only
+}
+
+python_install_all() {
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if use doc || [[ ${PV} != *9999 ]]; then
+		doman build/sphinx/man/*
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "sending email support" x11-misc/xdg-utils
+	optfeature "tatt subcommand" "app-portage/nattka dev-python/jinja"
+}
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 207bcf10ce9c..a1858addd1ea 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -40,6 +40,9 @@ fi
 
 RDEPEND+="
 	dev-vcs/git
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
 "
 BDEPEND="
 	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 79c616128c78..606dc6d083ea 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,6 +1,7 @@
 AUX rbtools-5.0-importlib-resources.patch 425 BLAKE2B 6ea4e39cd033b468f8e3ecdef564e161299f539580890a5ba4930e5ceee7a339ecaf4c77f88d0b700019cfd1319369061262bef7301d2e84201d4af26e12a77c SHA512 44ebe3eced9f5fbee2ecfe891959d37e83699dd74677a4aef614de39ffc2aab69dbb79f0cf0df1921fd73cd70e61c89b9b1f326dbef72bb5f93aab71f118262d
+AUX rbtools-5.0-scmtool-crash.patch 18177 BLAKE2B 67d07d40ecaaf75ac2c2908f78127f8821f37cb499c9e46d464335f989d94e776dcc0d1a64fed8e48218e566d3b342ce0863c00921322a1ac1cece4ac8c70b13 SHA512 a9bbaed7b467707124d2f505d93fae76d5d3f1a4ac548736b762357585a17a7c6e31bffa0d631e6158b088cd544056af50dab175f68674ca6f962e984c4cf45f
 DIST rbtools-4.1.tar.gz 619541 BLAKE2B 9b1aeca4f139a0189affb873363dba8f6d13eb954d4872939c543f6d91c00b09b2452cc379d4d99450c05d3d44a1996e910ff512ba9849292a7b705ce01be654 SHA512 58aa58ce6c55d4d3be9f221c493c8a3c15537776ff4e28be1ea44c0441f1dd9877ac9145066fdceb90d392c75cf29ec80e7efd154b0a2f1893422b65a0189ea0
 DIST rbtools-5.0.tar.gz 649338 BLAKE2B c6a08004e7c8ba17936865e53b78e086ec74e8f5fee7ecc124750f3bf24b9b52ab8a26d1caa7010cdd2822463fcb27b8e5c5f757068924e22d3e59268166f7bf SHA512 7fbc5198fc89ee911a3cc487ead094d46213cfc4f85ab01cf22bd2a628559acdaaed138b430b08aa94ea25dec1179bf7c28349ac8226d632a6112ec83e2b57b7
 EBUILD rbtools-4.1.ebuild 1421 BLAKE2B e3ad76841f38a456551bf7180645059c2dbd54be236eac0b4407b29936724d74e1bdac8197ab812e731eb5c09c49e92b0c7f83b5b96ed696f605fb4d1eb54a0c SHA512 c21b192ef90417f5e5726ae2158de614079a16a10275fd589b738788ed5f005cd0eeb33801435ada41b4932373ca04e10d62dfb8aa318ced52f39290c697c94a
-EBUILD rbtools-5.0.ebuild 1537 BLAKE2B 594e197b4fc87c616d6f045d5d3028e65336f2bcb3105f6bd7c3bbade13d75e126ee685a512125dd6a412f337a1a29b917047e13193b343280940ecebafb3e0e SHA512 3cb89e3fbb36f4a63b0873d3ad5bdf02b19cf06853dc412c330dc0f8ce82061021b4ce67b97d6aa1665eafc87976cc3e11508a162e036e1693850c701afe64a5
+EBUILD rbtools-5.0-r1.ebuild 1580 BLAKE2B 93d644d3f6b0ae7ab73b74e9841cd60d60b5bd817a7501cfcb3381b53f3e4d3bc8389dc9fc27642ed2a18aeec0f8f7c8898d4f61b775dd291c21f59c562affc4 SHA512 89b375e100c567602654fa5a7361cabd4438fb59bbf781fe4f78d0124bfe63c2cd9abf6f07415437e1a50435e6ecfff0b4296fcf3907f0f5a3aede7c8400ea6c
 MISC metadata.xml 310 BLAKE2B d4825072b11fd2f9cad88fd9f3e0670d42f997f2f49034539ea9cab13751e08d7f4153fc7534d4931baa55cab6a4bb1ae65f1790fce12d784dfab1eb747a344b SHA512 4b2b81003437f8f97af748509521ce7f946df9e0fcc4ffbabf4de5289b046eeee25d0e1acaf3604fa09995965728b7e4cd10233074ddc4e9bed54a68f26e6613
diff --git a/dev-util/rbtools/files/rbtools-5.0-scmtool-crash.patch b/dev-util/rbtools/files/rbtools-5.0-scmtool-crash.patch
new file mode 100644
index 000000000000..28783545edef
--- /dev/null
+++ b/dev-util/rbtools/files/rbtools-5.0-scmtool-crash.patch
@@ -0,0 +1,483 @@
+From 36efa0724e3b4d941aa0554b1d82934319d25ce3 Mon Sep 17 00:00:00 2001
+From: David Trowbridge <trowbrds@gmail.com>
+Date: Tue, 11 Jun 2024 17:22:15 -0600
+Subject: [PATCH] Use SCMTool IDs to look up repositories when possible.
+
+Many versions of Review Board currently have a bug where sending an
+unknown value in the tool= parameter to the repository list API would
+cause a crash. We'll be shipping a fix for that, but unfortunately there
+are a variety of released versions where the Git and Clearcase clients
+can trigger this crash on servers that do not have Power Pack installed.
+
+This change fixes the RBTools side to not include the Power Pack SCMTool
+names, which will avoid the problem for existing servers. For new
+servers, we'll be shipping a server-side fix that fixes the crash, adds
+the SCMTool IDs to the capabilities, and allows us to pass SCMTool IDs
+rather than names to the repository list API. If we see the IDs in the
+capability blob, we can assume that we can pass the IDs, including
+potentially unknown IDs.
+
+This also fixes a problem where we were sometimes accessing the
+repository list API twice with exactly the same parameters.
+
+Testing Done:
+- Ran unit tests.
+- Verified that the repository list API was accessed using SCMTool names
+  that did not include potentially missing ones when running against an
+  older server.
+- Verified that the repository list API was accessed with SCMTool IDs
+  when running against a server with the new API fixes.
+
+Reviewed at https://reviews.reviewboard.org/r/13973/
+---
+ rbtools/clients/base/scmclient.py | 59 +++++++++++++++++++++++++------
+ rbtools/clients/bazaar.py         |  1 +
+ rbtools/clients/clearcase.py      | 10 +++++-
+ rbtools/clients/cvs.py            |  1 +
+ rbtools/clients/git.py            | 10 +++++-
+ rbtools/clients/mercurial.py      |  1 +
+ rbtools/clients/perforce.py       |  1 +
+ rbtools/clients/plastic.py        |  1 +
+ rbtools/clients/svn.py            |  1 +
+ rbtools/clients/tfs.py            |  1 +
+ rbtools/commands/base/commands.py |  3 +-
+ rbtools/commands/setup_repo.py    | 25 +++++++++----
+ rbtools/utils/repository.py       | 58 ++++++++++++++++++++++--------
+ 13 files changed, 139 insertions(+), 33 deletions(-)
+
+diff --git a/rbtools/clients/base/scmclient.py b/rbtools/clients/base/scmclient.py
+index c053b91b..9f56c084 100644
+--- a/rbtools/clients/base/scmclient.py
++++ b/rbtools/clients/base/scmclient.py
+@@ -9,24 +9,24 @@
+ import argparse
+ import logging
+ import re
+-from typing import (Any, Dict, List, Mapping, Optional, Tuple, Union, cast,
+-                    TYPE_CHECKING)
++from typing import (Any, cast, ClassVar, Dict, List, Mapping, Optional,
++                    TYPE_CHECKING, Tuple, Union)
+ 
+ from typing_extensions import NotRequired, TypedDict, final
+ 
+-from rbtools.api.capabilities import Capabilities
+-from rbtools.api.resource import (ItemResource,
+-                                  ListResource,
+-                                  ReviewRequestResource)
+ from rbtools.clients.base.patch import PatchAuthor, PatchResult
+-from rbtools.clients.base.repository import RepositoryInfo
+ from rbtools.clients.errors import SCMClientDependencyError, SCMError
+ from rbtools.deprecation import RemovedInRBTools50Warning
+-from rbtools.diffs.tools.base import BaseDiffTool
+ from rbtools.diffs.tools.registry import diff_tools_registry
+ from rbtools.utils.process import execute
+ 
+ if TYPE_CHECKING:
++    from rbtools.api.capabilities import Capabilities
++    from rbtools.api.resource import (ItemResource,
++                                      ListResource,
++                                      ReviewRequestResource)
++    from rbtools.clients.base.repository import RepositoryInfo
++    from rbtools.diffs.tools.base import BaseDiffTool
+     from rbtools.config import RBToolsConfig
+ 
+ 
+@@ -281,14 +281,27 @@ class BaseSCMClient(object):
+     #:     str
+     name: str = ''
+ 
+-    #: A comma-separated list of SCMClient names on the server
++    #: A comma-separated list of SCMClient names on the server.
+     #:
+     #: Version Added:
+     #:    3.0
+     #:
+     #: Type:
+     #:     str
+-    server_tool_names: Optional[str] = None
++    server_tool_names: ClassVar[Optional[str]] = None
++
++    #: A comma-separated list of SCMClient IDs on the server.
++    #:
++    #: This supersedes :py:attr:`server_tool_names` when running on a version
++    #: of Review Board that supports passing tool IDs to the repositories
++    #: list API.
++    #:
++    #: Version Added:
++    #:    5.0.1
++    #:
++    #: Type:
++    #:     str
++    server_tool_ids: ClassVar[Optional[List[str]]] = None
+ 
+     #: Whether this tool requires a command line diff tool.
+     #:
+@@ -692,6 +705,32 @@ def get_diff_tool(self) -> Optional[BaseDiffTool]:
+ 
+         return diff_tool
+ 
++    def get_server_tool_names(
++        self,
++        capabilities: Optional[Capabilities],
++    ) -> Optional[str]:
++        """Return the list of supported tool names on the server.
++
++        Version Added:
++            5.0.1
++
++        Args:
++            capabilities (rbtools.api.capabilities.Capabilities):
++                The server capabilities, if present.
++
++        Returns:
++            str:
++            A comma-separated list of server-side tool names to match with.
++        """
++        if (capabilities is not None and
++            capabilities.get_capability('scmtools', 'supported_tools') and
++            self.server_tool_ids is not None):
++            # Versions of Review Board that have this capability allow us to
++            # pass SCMTool IDs rather than names.
++            return ','.join(self.server_tool_ids)
++        else:
++            return self.server_tool_names
++
+     def find_matching_server_repository(
+         self,
+         repositories: ListResource,
+diff --git a/rbtools/clients/bazaar.py b/rbtools/clients/bazaar.py
+index 0e39315d..4174c010 100644
+--- a/rbtools/clients/bazaar.py
++++ b/rbtools/clients/bazaar.py
+@@ -37,6 +37,7 @@ class BazaarClient(BaseSCMClient):
+     scmclient_id = 'bazaar'
+     name = 'Bazaar'
+     server_tool_names = 'Bazaar'
++    server_tool_ids = ['bazaar']
+     supports_diff_exclude_patterns = True
+     supports_parent_diffs = True
+     can_branch = True
+diff --git a/rbtools/clients/clearcase.py b/rbtools/clients/clearcase.py
+index f9c8762e..e2c04633 100644
+--- a/rbtools/clients/clearcase.py
++++ b/rbtools/clients/clearcase.py
+@@ -392,7 +392,15 @@ class ClearCaseClient(BaseSCMClient):
+ 
+     scmclient_id = 'clearcase'
+     name = 'VersionVault / ClearCase'
+-    server_tool_names = 'ClearCase,VersionVault / ClearCase'
++
++    # Review Board versions that use the old names-based repositories/?tool=
++    # API parameter also have a bug where a missing name could cause a
++    # server-side crash. This was making it so servers that did not have Power
++    # Pack were failing when we tried to make a query that included the
++    # VersionVault name. We therefore only include it when we know the server
++    # can use server_tool_ids instead.
++    server_tool_names = 'ClearCase'
++    server_tool_ids = ['clearcase', 'versionvault']
+ 
+     requires_diff_tool = True
+ 
+diff --git a/rbtools/clients/cvs.py b/rbtools/clients/cvs.py
+index 98354e8b..dd2c72ef 100644
+--- a/rbtools/clients/cvs.py
++++ b/rbtools/clients/cvs.py
+@@ -28,6 +28,7 @@ class CVSClient(BaseSCMClient):
+     scmclient_id = 'cvs'
+     name = 'CVS'
+     server_tool_names = 'CVS'
++    server_tool_ids = ['cvs']
+     supports_diff_exclude_patterns = True
+     supports_patch_revert = True
+ 
+diff --git a/rbtools/clients/git.py b/rbtools/clients/git.py
+index f4b96cb6..431fd7c6 100644
+--- a/rbtools/clients/git.py
++++ b/rbtools/clients/git.py
+@@ -76,7 +76,15 @@ class GitClient(BaseSCMClient):
+ 
+     scmclient_id = 'git'
+     name = 'Git'
+-    server_tool_names = 'Git,Perforce,Subversion,Team Foundation Server (git)'
++
++    # Review Board versions that use the old names-based repositories/?tool=
++    # API parameter also have a bug where a missing name could cause a
++    # server-side crash. This was making it so servers that did not have Power
++    # Pack were failing when we tried to make a query that included the TFS-Git
++    # name. We therefore only include it when we know the server can use
++    # server_tool_ids instead.
++    server_tool_names = 'Git,Perforce,Subversion'
++    server_tool_ids = ['git', 'perforce', 'subversion', 'tfs_git']
+ 
+     supports_commit_history = True
+     supports_diff_exclude_patterns = True
+diff --git a/rbtools/clients/mercurial.py b/rbtools/clients/mercurial.py
+index 2ee473c9..6f1c5ea0 100644
+--- a/rbtools/clients/mercurial.py
++++ b/rbtools/clients/mercurial.py
+@@ -64,6 +64,7 @@ class MercurialClient(BaseSCMClient):
+     scmclient_id = 'mercurial'
+     name = 'Mercurial'
+     server_tool_names = 'Mercurial,Subversion'
++    server_tool_ids = ['mercurial', 'subversion']
+ 
+     supports_commit_history = True
+     supports_diff_exclude_patterns = True
+diff --git a/rbtools/clients/perforce.py b/rbtools/clients/perforce.py
+index f5892073..4f5d7fb1 100644
+--- a/rbtools/clients/perforce.py
++++ b/rbtools/clients/perforce.py
+@@ -445,6 +445,7 @@ class PerforceClient(BaseSCMClient):
+     scmclient_id = 'perforce'
+     name = 'Perforce'
+     server_tool_names = 'Perforce'
++    server_tool_ids = ['perforce']
+ 
+     requires_diff_tool = True
+ 
+diff --git a/rbtools/clients/plastic.py b/rbtools/clients/plastic.py
+index c45c7abd..3bec215a 100644
+--- a/rbtools/clients/plastic.py
++++ b/rbtools/clients/plastic.py
+@@ -28,6 +28,7 @@ class PlasticClient(BaseSCMClient):
+     scmclient_id = 'plastic'
+     name = 'Plastic'
+     server_tool_names = 'Plastic SCM'
++    server_tool_ids = ['plastic']
+     supports_changesets = True
+     supports_patch_revert = True
+ 
+diff --git a/rbtools/clients/svn.py b/rbtools/clients/svn.py
+index 34cdffcb..6d0352cc 100644
+--- a/rbtools/clients/svn.py
++++ b/rbtools/clients/svn.py
+@@ -52,6 +52,7 @@ class SVNClient(BaseSCMClient):
+     scmclient_id = 'svn'
+     name = 'Subversion'
+     server_tool_names = 'Subversion'
++    server_tool_ids = ['subversion']
+ 
+     requires_diff_tool = True
+ 
+diff --git a/rbtools/clients/tfs.py b/rbtools/clients/tfs.py
+index 2b70fae3..7b02d3de 100644
+--- a/rbtools/clients/tfs.py
++++ b/rbtools/clients/tfs.py
+@@ -1321,6 +1321,7 @@ class TFSClient(BaseSCMClient):
+     scmclient_id = 'tfs'
+     name = 'Team Foundation Server'
+     server_tool_names = 'Team Foundation Server'
++    server_tool_ids = ['tfs']
+ 
+     requires_diff_tool = True
+ 
+diff --git a/rbtools/commands/base/commands.py b/rbtools/commands/base/commands.py
+index 3313a689..d4e20f61 100644
+--- a/rbtools/commands/base/commands.py
++++ b/rbtools/commands/base/commands.py
+@@ -939,7 +939,8 @@ def initialize(self) -> None:
+                 api_root=self.api_root,
+                 tool=tool,
+                 repository_name=options.repository_name,
+-                repository_paths=repository_info.path)
++                repository_paths=repository_info.path,
++                capabilities=self.capabilities)
+             self.repository = repository
+ 
+             if repository:
+diff --git a/rbtools/commands/setup_repo.py b/rbtools/commands/setup_repo.py
+index 615bc9e3..9905d1b5 100644
+--- a/rbtools/commands/setup_repo.py
++++ b/rbtools/commands/setup_repo.py
+@@ -1,14 +1,20 @@
+ """Implementation of rbt setup-repo."""
+ 
++from __future__ import annotations
++
+ import difflib
+ import os
+ import textwrap
++from typing import Optional, TYPE_CHECKING, Union
+ 
+ from rbtools.commands.base import BaseCommand, CommandError
+ from rbtools.config.loader import CONFIG_FILENAME
+ from rbtools.utils.console import confirm, confirm_select
+ from rbtools.utils.repository import get_repository_resource
+ 
++if TYPE_CHECKING:
++    from rbtools.api.resource import ItemResource, RootResource
++
+ 
+ class SetupRepo(BaseCommand):
+     """Configure a repository to point to a Review Board server.
+@@ -38,22 +44,27 @@ class SetupRepo(BaseCommand):
+         BaseCommand.tfs_options,
+     ]
+ 
+-    def prompt_rb_repository(self, local_tool_name, server_tool_names,
+-                             repository_paths, api_root):
++    def prompt_rb_repository(
++        self,
++        local_tool_name: str,
++        server_tool_names: Optional[str],
++        repository_paths: Optional[Union[str, list[str]]],
++        api_root: RootResource,
++    ) -> Optional[ItemResource]:
+         """Interactively prompt to select a matching repository.
+ 
+         The user is prompted to choose a matching repository found on the
+         Review Board server.
+ 
+         Args:
+-            local_tool_name (unicode):
++            local_tool_name (str):
+                 The local name of the detected tool.
+ 
+-            server_tool_names (unicode):
++            server_tool_names (str):
+                 A comma-separated list of potentially matching SCMTool names in
+                 the Review Board server.
+ 
+-            repository_paths (list or unicode, optional):
++            repository_paths (list or str, optional):
+                 A list of potential paths to match for the repository.
+ 
+             api_root (rbtools.api.resource.RootResource):
+@@ -192,9 +203,11 @@ def main(self, *args):
+         while True:
+             self.stdout.new_line()
+             self.stdout.write('Current server: %s' % server)
++
++            tool_names = tool.get_server_tool_names(self.capabilities)
+             selected_repo = self.prompt_rb_repository(
+                 local_tool_name=tool.name,
+-                server_tool_names=tool.server_tool_names,
++                server_tool_names=tool_names,
+                 repository_paths=repository_info.path,
+                 api_root=api_root)
+ 
+diff --git a/rbtools/utils/repository.py b/rbtools/utils/repository.py
+index d30d2cc0..d3ec280d 100644
+--- a/rbtools/utils/repository.py
++++ b/rbtools/utils/repository.py
+@@ -1,17 +1,34 @@
+ """Utility functions for working with repositories."""
+ 
++from __future__ import annotations
++
++from typing import Optional, TYPE_CHECKING, Union
++
+ from rbtools.api.errors import APIError
+ 
++if TYPE_CHECKING:
++    from rbtools.api.capabilities import Capabilities
++    from rbtools.api.resource import ItemResource, RootResource
++    from rbtools.clients.base.repository import RepositoryInfo
++    from rbtools.clients.base.scmclient import BaseSCMClient
++
+ 
+-def get_repository_resource(api_root,
+-                            tool=None,
+-                            repository_name=None,
+-                            repository_paths=None):
++def get_repository_resource(
++    api_root: RootResource,
++    tool: Optional[BaseSCMClient] = None,
++    repository_name: Optional[str] = None,
++    repository_paths: Optional[Union[str, list[str]]] = None,
++    capabilities: Optional[Capabilities] = None,
++) -> tuple[Optional[ItemResource], Optional[ItemResource]]:
+     """Return the API resource for the matching repository on the server.
+ 
+     Version Added:
+         3.0
+ 
++    Version Changed:
++        5.0.1:
++        Added the ``capabilities`` argument.
++
+     Args:
+         api_root (rbtools.api.resource.RootResource):
+             The root resource for the API.
+@@ -19,12 +36,15 @@ def get_repository_resource(api_root,
+         tool (rbtools.clients.base.BaseSCMClient, optional):
+             The SCM client corresponding to the local working directory.
+ 
+-        repository_name (unicode, optional):
++        repository_name (str, optional):
+             An explicit repository name provided by the local configuration.
+ 
+-        repository_paths (list or unicode, optional):
++        repository_paths (list or str, optional):
+             A list of potential paths to match for the repository.
+ 
++        capabilities (rbtools.api.capabilities.Capabilities, optional):
++            The capabilities fetched from the server.
++
+     Returns:
+         tuple of rbtools.api.resource.ItemResource:
+         A 2-tuple of :py:class:`~rbtools.api.resource.ItemResource`. The first
+@@ -47,8 +67,11 @@ def _get_info(repository):
+         'only_links': 'info,diff_file_attachments',
+     }
+ 
+-    if tool and tool.server_tool_names:
+-        query['tool'] = tool.server_tool_names
++    if tool:
++        server_tool_names = tool.get_server_tool_names(capabilities)
++
++        if server_tool_names:
++            query['tool'] = server_tool_names
+ 
+     if repository_name:
+         query['name'] = repository_name
+@@ -70,9 +93,12 @@ def _get_info(repository):
+     # configured path than the client. In that case, we want to try again
+     # without filtering by path, and ask each tool to match based on other
+     # conditions.
+-    query.pop('path', None)
++    if 'path' in query:
++        query.pop('path', None)
+ 
+-    all_repositories = api_root.get_repositories(**query)
++        all_repositories = api_root.get_repositories(**query)
++    else:
++        all_repositories = repositories
+ 
+     if all_repositories.total_results > 0 and tool:
+         repository, info = tool.find_matching_server_repository(
+@@ -93,7 +119,11 @@ def _get_info(repository):
+     return None, None
+ 
+ 
+-def get_repository_id(repository_info, api_root, repository_name=None):
++def get_repository_id(
++    repository_info: RepositoryInfo,
++    api_root: RootResource,
++    repository_name: Optional[str] = None,
++) -> Optional[int]:
+     """Return the ID of a repository from the server.
+ 
+     This will look up all accessible repositories on the server and try to
+@@ -106,18 +136,18 @@ def get_repository_id(repository_info, api_root, repository_name=None):
+         api_root (rbtools.api.resource.RootResource):
+             The root resource for the API.
+ 
+-        repository_name (unicode, optional):
++        repository_name (str, optional):
+             An explicit repository name provided by local configuration.
+ 
+     Returns:
+         int:
+         The ID of the repository, or ``None`` if not found.
+     """
+-    repository, info = get_repository_resource(
++    repository = get_repository_resource(
+         api_root,
+         tool=None,
+         repository_name=repository_name,
+-        repository_paths=repository_info.path)
++        repository_paths=repository_info.path)[0]
+ 
+     if repository:
+         return repository.id
diff --git a/dev-util/rbtools/rbtools-5.0.ebuild b/dev-util/rbtools/rbtools-5.0-r1.ebuild
index 6a99f1af7e31..e3d01d77608e 100644
--- a/dev-util/rbtools/rbtools-5.0.ebuild
+++ b/dev-util/rbtools/rbtools-5.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/rbtools-release-${PV}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 
 RDEPEND="
 	>=dev-python/certifi-2023.5.7[${PYTHON_USEDEP}]
@@ -40,7 +40,7 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${P}-importlib-resources.patch" )
+PATCHES=( "${FILESDIR}/${P}-importlib-resources.patch" "${FILESDIR}/${P}-scmtool-crash.patch" )
 
 DOCS=( AUTHORS NEWS README.md )
 
diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
index 3fa0a1500d13..0fc8e5a1f444 100644
--- a/dev-util/rocm-smi/Manifest
+++ b/dev-util/rocm-smi/Manifest
@@ -4,11 +4,15 @@ AUX rocm-smi-5.4.2-detect-builtin-amdgpu.patch 1071 BLAKE2B 1957d49b0c3c1f9db24a
 AUX rocm-smi-5.7.1-no-strip.patch 1405 BLAKE2B 703eafdfe552afe3d2d4d67af2e847b42669b09b8b553b7a77e46f39f3a960174380187f5927b3a4c686dded54b4d9fa6be6c5c862ea2a023bf84224de3be5b6 SHA512 60806893c6ae7fe4c66ae927528f0db13c75f74c464885a251ac5e021bf61aaa5f529cca3de72c9c49dd993375039e0052bbccb4c3065a17849852c9283e20c5
 AUX rocm-smi-5.7.1-remove-example.patch 560 BLAKE2B 6f541822947e6f458e5c553c307e137de63db884d7933dd5dad752990c7f4c15d02c47d66dd399d053368d79ab0b6d8237adb1d7c3fae28a9b03d0c34006d027 SHA512 e3be170af0d6f8b4e238e9f9940ac91748fd9b45a0f43fb1c7286d676c2a878a05aeb260e6248bc66ba93adcea5d4c7bc22ce6db6a248cee20d678fdfa7d07ec
 AUX rocm-smi-5.7.1-set-soversion.patch 5234 BLAKE2B b2e40d803d0511e98c87125dae05a415b2ddf38b28f774edfe6fca1bf552e630f872631b3cfe82c1302a1c2d7be83bf7a6b4e67c0f8eb271612999eaec3cba68 SHA512 af51867d0baeca303932b0d38f716a657bf14f57e595056694eadb2c120c741e03615837eee9b86932f1fa04815c2803b6115e5e2cb81ea51b07d558155eb398
+AUX rocm-smi-6.0.2-set-soversion.patch 7897 BLAKE2B 3b18e771001c651b1ab4cb041b7e3da4e799073ef94a1ae9db42ba072430a3f79f5ccb1896190217807105a185235209b4411b33159f4a457fff1d82ebec8aa7 SHA512 9e67af5545b890a3a830a34334c551ec6934146268670549d43fe7a4b249ff8729225b31a603efee0beee3cff910ca14a000dc6b3384d456b8481fbae3864614
+AUX rocm-smi-6.1.1-fix-const-qualifier.patch 517 BLAKE2B d5a35233910380d6a5bb7931bc7861efb22254ce33f4f015ae27d44bef7afa13b5e66afbe5c33dce228a95bb3d82783d3e95570f0a0ec77f6043c69bfe828bf1 SHA512 03c06d0fc663b9e5c57f970596444cf851047c40c5a2511fa5d1c1d196f20ddcfec013bdf6d7789cb62ec60d858abeac69a35b57784de4dfc92bfb8e4131d5e0
 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
 DIST rocm-smi-5.7.1.tar.gz 801646 BLAKE2B b4799bbdaeb7203c16117cd30511d589a2b96e15801bb9f1382fe7a4d87d43e1d4b458d6923b6ebd602fdccba74bd65bcb98766dbd83c48fc3e02219be8c1022 SHA512 ad364278f137228a39108c93d482635137ea2724a5a39debb5b32329493ebf5c706dcf3863e2e24b6f0b6286f3877942277f5ae447446f155518972b957f7d9d
+DIST rocm-smi-6.1.1.tar.gz 872628 BLAKE2B 35830fd0eb36688b3803bed2059f29ba4d8613112ae4cfff2e0a3b1d7afef9f0d77ec16771e2205ba351df0aa678c3b0d2436940b76d10d020f1a30d14d760e9 SHA512 3e31ff0d94e7f0ea650c985973b27107e3f7293b92857fbf2fe196b61632c530e95c3228ad7550d44f8ee9f5f1abfd17e5c2b19164759728fb6d4b0995455fa7
 EBUILD rocm-smi-5.1.3-r1.ebuild 1850 BLAKE2B 9f7cbf7d5ec55ac112980609f8a924b5678aa4fa5cf75cdda3d80ad90c15ecb5f1d129a21c0248985d7f4e792abbcd3f0d822e8e10e76314ebaa5fc240632ae9 SHA512 30181897335c17d81a9d9dce8c4417c62fe66a20d557251158bf2a8ffe6fc075e51878a4bd42708ef47a89022fd03a97b4dccca1f5ee450d098cf66af1095158
 EBUILD rocm-smi-5.4.2.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e
 EBUILD rocm-smi-5.7.1-r2.ebuild 1604 BLAKE2B 213d8d92f900537d4b84b419deca531a8b29bbb9d4ce3a6e64368b789aa341af02d8d5a2417acdc5267e370f16cd9b08a98f24156ce5ae93cae3bb648721b77d SHA512 3ad7dc560bad8eae69e3d78cff802f5a00a3984524bf94a7fab8491a1c043691deb61fe02f41b060caf834dd7210442471a72771b96162e7ff643e7ef918ec55
+EBUILD rocm-smi-6.1.1.ebuild 1479 BLAKE2B 56815b93b97e4e20f0405ce35467b10d8d8c5813044d995f94da8dcff468af8deb17f6cca2ce43cefdf4bdb63baceb4be64c284d5d4862ea03ad076bc6a974c4 SHA512 3627f49d454a34295ed75031f4480e5cb7758a57a641495b8c1abb19139e307db4a3b72c4e7302550817e02899f28c3fee481cd0a3e058fde473375e12810e77
 EBUILD rocm-smi-9999.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e
-MISC metadata.xml 661 BLAKE2B ed6ec563956132012b44907f348091135c7a463fc47a51ac0726e7749da9a4c33811df87442e576fb510799a50c14949cd20c8ca10a5850ee941a8794b70ef7d SHA512 c047963068b4ccefb73539ecd91b4c3310f0863a674acb15e9843dda7f0c917616dc8cbfe5f859e42d9ee25323bf1b66b1ce7fbe9a2e8292963ac38aa0bd72f3
+MISC metadata.xml 769 BLAKE2B 4b19247215c20587c6c7b6958dbd2ed57a242e8718d642c602b4067c4ad3e7cc7778a62e2f20b2b940b3281cc6e0a793153e8ff7bfd54aaa7a16e74b8e54ac6c SHA512 76648eff089ed88259457dfea04a4db19393b0d1285b3556a583b7750782a3b2406e2c407c2c7cdff47cabf1c7377fdf8a053b74226f73c32426155361dc0c83
diff --git a/dev-util/rocm-smi/files/rocm-smi-6.0.2-set-soversion.patch b/dev-util/rocm-smi/files/rocm-smi-6.0.2-set-soversion.patch
new file mode 100644
index 000000000000..6d28c7bb8e3e
--- /dev/null
+++ b/dev-util/rocm-smi/files/rocm-smi-6.0.2-set-soversion.patch
@@ -0,0 +1,165 @@
+Switch from extracting version with git to version from ebuild filename.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,20 +33,17 @@ set(SHARE_INSTALL_PREFIX
+     "share/${ROCM_SMI}"
+     CACHE STRING "Tests and Example install directory")
+ 
+-# provide git to utilities
+-find_program (GIT NAMES git)
+-
+-## Setup the package version based on git tags.
+-set(PKG_VERSION_GIT_TAG_PREFIX "rsmi_pkg_ver")
+-get_package_version_number("7.0.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT)
+-message("Package version: ${PKG_VERSION_STR}")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_BUILD "0")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_HASH "${PKG_VERSION_HASH}")
+-
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_STRING "${${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR}.${${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR}.${${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH}+${${ROCM_SMI_LIBS_TARGET}_VERSION_HASH}")
++set(VERSION_MAJOR "@VERSION_MAJOR@")
++set(VERSION_MINOR "@VERSION_MINOR@")
++set(VERSION_PATCH "@VERSION_PATCH@")
++set(PKG_VERSION_STR "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
++set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}")
++set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
++set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
++set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
++set(rocm_smi_VERSION_MAJOR "${VERSION_MAJOR}")
++set(rocm_smi_VERSION_MINOR "${VERSION_MINOR}")
++set(rocm_smi_VERSION_PATCH "${VERSION_PATCH}")
+ 
+ # The following default version values should be updated as appropriate for
+ # ABI breaks (update MAJOR and MINOR), and ABI/API additions (update MINOR).
+--- a/oam/CMakeLists.txt
++++ b/oam/CMakeLists.txt
+@@ -29,17 +29,6 @@ set(OAM_NAME "oam")
+ set(OAM_COMPONENT "lib${OAM_NAME}")
+ set(OAM_TARGET "${OAM_NAME}")
+ 
+-################# Determine the library version #########################
+-set(SO_VERSION_GIT_TAG_PREFIX "oam_so_ver")
+-
+-# VERSION_* variables should be set by get_version_from_tag
+-message("Package version: ${PKG_VERSION_STR}")
+-
+-# Debian package specific variables
+-# Set a default value for the package version
+-get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
+-
+-# VERSION_* variables should be set by get_version_from_tag
+ if ( ${ROCM_PATCH_VERSION} )
+     set ( VERSION_PATCH ${ROCM_PATCH_VERSION})
+     set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+--- a/python_smi_tools/rsmiBindings.py
++++ b/python_smi_tools/rsmiBindings.py
+@@ -26,17 +26,7 @@ def initRsmiBindings(silent=False):
+     if (rocm_smi_lib_path != None):
+         path_librocm = rocm_smi_lib_path
+     else:
+-        path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../lib/librocm_smi64.so.7'
+-
+-    if not os.path.isfile(path_librocm):
+-        print_silent('Unable to find %s . Trying /opt/rocm*' % path_librocm)
+-        for root, dirs, files in os.walk('/opt', followlinks=True):
+-            if 'librocm_smi64.so.7' in files:
+-                path_librocm = os.path.join(os.path.realpath(root), 'librocm_smi64.so.7')
+-        if os.path.isfile(path_librocm):
+-            print_silent('Using lib from %s' % path_librocm)
+-        else:
+-            print('Unable to find librocm_smi64.so.7')
++        path_librocm = 'librocm_smi64.so'
+ 
+     # ----------> TODO: Support static libs as well as SO
+     try:
+@@ -44,7 +34,7 @@ def initRsmiBindings(silent=False):
+         return CDLL(path_librocm)
+     except OSError:
+         print('Unable to load the rocm_smi library.\n'\
+-              'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so.7\n'\
++              'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so\n'\
+               '{0}Please refer to https://github.com/'\
+               'RadeonOpenCompute/rocm_smi_lib for the installation guide.{1}'\
+               .format('\33[33m', '\033[0m'))
+--- a/python_smi_tools/rsmiBindings.py.in
++++ b/python_smi_tools/rsmiBindings.py.in
+@@ -26,17 +26,7 @@ def initRsmiBindings(silent=False):
+     if (rocm_smi_lib_path != None):
+         path_librocm = rocm_smi_lib_path
+     else:
+-        path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../@CMAKE_INSTALL_LIBDIR@/librocm_smi64.so.@VERSION_MAJOR@'
+-
+-    if not os.path.isfile(path_librocm):
+-        print_silent('Unable to find %s . Trying /opt/rocm*' % path_librocm)
+-        for root, dirs, files in os.walk('/opt', followlinks=True):
+-            if 'librocm_smi64.so.@VERSION_MAJOR@' in files:
+-                path_librocm = os.path.join(os.path.realpath(root), 'librocm_smi64.so.@VERSION_MAJOR@')
+-        if os.path.isfile(path_librocm):
+-            print_silent('Using lib from %s' % path_librocm)
+-        else:
+-            print('Unable to find librocm_smi64.so.@VERSION_MAJOR@')
++        path_librocm = 'librocm_smi64.so'
+ 
+     # ----------> TODO: Support static libs as well as SO
+     try:
+@@ -44,7 +34,7 @@ def initRsmiBindings(silent=False):
+         return CDLL(path_librocm)
+     except OSError:
+         print('Unable to load the rocm_smi library.\n'\
+-              'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so.@VERSION_MAJOR@\n'\
++              'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so\n'\
+               '{0}Please refer to https://github.com/'\
+               'RadeonOpenCompute/rocm_smi_lib for the installation guide.{1}'\
+               .format('\33[33m', '\033[0m'))
+--- a/python_smi_tools/rsmiBindingsInit.py.in
++++ b/python_smi_tools/rsmiBindingsInit.py.in
+@@ -26,17 +26,7 @@ def initRsmiBindings(silent=False):
+     if (rocm_smi_lib_path != None):
+         path_librocm = rocm_smi_lib_path
+     else:
+-        path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../@CMAKE_INSTALL_LIBDIR@/librocm_smi64.so.@VERSION_MAJOR@'
+-
+-    if not os.path.isfile(path_librocm):
+-        print_silent('Unable to find %s . Trying /opt/rocm*' % path_librocm)
+-        for root, dirs, files in os.walk('/opt', followlinks=True):
+-            if 'librocm_smi64.so.@VERSION_MAJOR@' in files:
+-                path_librocm = os.path.join(os.path.realpath(root), 'librocm_smi64.so.@VERSION_MAJOR@')
+-        if os.path.isfile(path_librocm):
+-            print_silent('Using lib from %s' % path_librocm)
+-        else:
+-            print('Unable to find librocm_smi64.so.@VERSION_MAJOR@')
++        path_librocm = 'librocm_smi64.so'
+ 
+     # ----------> TODO: Support static libs as well as SO
+     try:
+@@ -44,7 +34,7 @@ def initRsmiBindings(silent=False):
+         return CDLL(path_librocm)
+     except OSError:
+         print('Unable to load the rocm_smi library.\n'\
+-              'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so.@VERSION_MAJOR@\n'\
++              'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so\n'\
+               '{0}Please refer to https://github.com/'\
+               'RadeonOpenCompute/rocm_smi_lib for the installation guide.{1}'\
+               .format('\33[33m', '\033[0m'))
+--- a/rocm_smi/CMakeLists.txt
++++ b/rocm_smi/CMakeLists.txt
+@@ -31,17 +31,6 @@ set(ROCM_SMI_TARGET "${ROCM_SMI}64")
+ ## Include common cmake modules
+ include(utils)
+ 
+-################# Determine the library version #########################
+-set(SO_VERSION_GIT_TAG_PREFIX "rsmi_so_ver")
+-
+-# VERSION_* variables should be set by get_version_from_tag
+-message("Package version: ${PKG_VERSION_STR}")
+-
+-# Debian package specific variables
+-# Set a default value for the package version
+-get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
+-
+-# VERSION_* variables should be set by get_version_from_tag
+ if ( ${ROCM_PATCH_VERSION} )
+     set ( VERSION_PATCH ${ROCM_PATCH_VERSION})
+     set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
diff --git a/dev-util/rocm-smi/files/rocm-smi-6.1.1-fix-const-qualifier.patch b/dev-util/rocm-smi/files/rocm-smi-6.1.1-fix-const-qualifier.patch
new file mode 100644
index 000000000000..6c4197091575
--- /dev/null
+++ b/dev-util/rocm-smi/files/rocm-smi-6.1.1-fix-const-qualifier.patch
@@ -0,0 +1,13 @@
+Fix error "cannot assign to variable 'rhs' with const-qualified type"
+PR: https://github.com/ROCm/rocm_smi_lib/pull/156
+--- a/include/rocm_smi/rocm_smi_utils.h
++++ b/include/rocm_smi/rocm_smi_utils.h
+@@ -216,7 +216,7 @@ class ScopeGuard {
+   __forceinline ~ScopeGuard() {
+     if (!dismiss_) release_();
+   }
+-  __forceinline ScopeGuard& operator=(const ScopeGuard& rhs) {
++  __forceinline ScopeGuard& operator=(ScopeGuard& rhs) {
+     dismiss_ = rhs.dismiss_;
+     release_ = rhs.release_;
+     rhs.dismiss_ = true;
diff --git a/dev-util/rocm-smi/metadata.xml b/dev-util/rocm-smi/metadata.xml
index 6ae700d1f577..c909acfea388 100644
--- a/dev-util/rocm-smi/metadata.xml
+++ b/dev-util/rocm-smi/metadata.xml
@@ -9,11 +9,15 @@
         <email>gentoo@holzke.net</email>
         <name>Wilfried Holzke</name>
     </maintainer>
+    <maintainer type="person">
+      <email>lockalsash@gmail.com</email>
+      <name>Sv. Lockal</name>
+    </maintainer>
     <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/ROC-smi</remote-id>
+        <remote-id type="github">ROCm/ROC-smi</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-util/rocm-smi/rocm-smi-6.1.1.ebuild b/dev-util/rocm-smi/rocm-smi-6.1.1.ebuild
new file mode 100644
index 000000000000..056dd80b453a
--- /dev/null
+++ b/dev-util/rocm-smi/rocm-smi-6.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake python-r1
+
+DESCRIPTION="ROCm System Management Interface Library"
+HOMEPAGE="https://github.com/ROCm/rocm_smi_lib"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ROCm/rocm_smi_lib"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/ROCm/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)"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.1-no-strip.patch
+	"${FILESDIR}"/${PN}-5.7.1-remove-example.patch
+	"${FILESDIR}"/${PN}-6.0.2-set-soversion.patch
+	"${FILESDIR}"/${PN}-6.1.1-fix-const-qualifier.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s/@VERSION_MAJOR@/$(ver_cut 1)/" \
+		-e "s/@VERSION_MINOR@/$(ver_cut 2)/" \
+		-e "s/@VERSION_PATCH@/$(ver_cut 3)/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-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
+
+	mv "${ED}"/usr/share/doc/rocm_smi "${ED}"/usr/share/doc/${PF} || die
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 9a592ca40116..0ea7c677da77 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,15 +1,10 @@
 AUX rocminfo-5.1.3-detect-builtin-amdgpu.patch 1720 BLAKE2B 990b0bfd101fbe41e7dfda85f88d18763371f7c9cdc46ac10a5c695c45d8e29c08f1444b44524ba0917489b89d4906498c81e9e8d805f5ab9b98e2160a394799 SHA512 c193cc7f72df6cc8d5118f1f55ae184f8d80083aee255efb64762b4f0cc00f2c8973515617630dd8267dc1053cac4d1773683870563c29000eb4fd32a7f54e78
 AUX rocminfo-5.5.1-detect-builtin-amdgpu.patch 3763 BLAKE2B 8d37239cb8e9964bef2e22ea2e1ccfab53cd10247e4a04b4f7ec03c18fa3b1ad2b734169f277fad2cb8d951bee82d71f42ca97c3bd514edd44a65e78a0b82856 SHA512 5b9b4682ac1babe92ce5d86d9a2f2b62a556dbe804da53de2f34af36806b7ba8b53ba1d1eb0b2c446fb834bb91f46d06401f2f79e10f61f7b7b6cc1cf8846d25
-DIST rocminfo-5.1.3.tar.gz 16772 BLAKE2B 1b35661f9e6cd8cd5180ef3e4fd3dd8e7d6b282947d25c81b0b8bd347a5bee11cf87d950bbd8adcbd7a8a3053c41622b8e99fc0b56f4a14bdf4acf20992becc7 SHA512 998d499b0ae9a22bde30b2c26e31587a78b5ed63a19649d5b203eb47a044f17d1d4d3e951ec094d5be1ca3ba37efa4b19f5b53047727158170fa90c13a8c7563
-DIST rocminfo-5.3.3.tar.gz 16829 BLAKE2B 341908048b9726a22ab5e81317916166d4ba114c5060fd8b7b455e0f4df3857b16a735cfccce2d013cd6632680e29b2e0c9ef91461d46b7e94dc71b0751aa42e SHA512 336a408eb49eb8d40b506f58d62de3fd406d00b0de169bc3f6176c76f1f50366347d212de8783b5c48ae1b6660d307b276ba6b3bac8d8286f5e93cfe739c4dae
-DIST rocminfo-5.4.3.tar.gz 16832 BLAKE2B 2344b6bd3ffecdfa657559e4d4d8c09de862ebcda287fd67db9864d19aab0a928b071bc43ddd4a24a31037c61500b1bb9697d11b3031c860c5bac77392c664ef SHA512 80221c91f56cd04ba8dcbddd53bb47cb57bb97b74102890a7a43203e9a2fd572762025feb65676774f774a9a5f0d0a1293fc4508fc82d21b6b4042ad92210096
-DIST rocminfo-5.5.1.tar.gz 17020 BLAKE2B 42fdbd32b7092306dc4442910ae922b616c859439511e2acfb17dee32557d77a9731aeb1d7ce25d32ae76f9cafd1e56476ac522545efe516d238d9285fa7b4a3 SHA512 5710979ee885bf35d40b7d07b157226ea4bb84bd14a2c57bdf8c93ca483685a8ce39d01f15b828d015968102457e9a94335a5273524d98eca76d0f8ceed2e8c1
+AUX rocminfo-6.0.0-detect-builtin-amdgpu.patch 1004 BLAKE2B b75f82db423455391951e6477e7b5a2e63f39f5e8b8eeb88e1ebd7047267defdfd806de7b3b6289106dd70472f63f121426b8528e62cb2ee79d743d66d60529b SHA512 22507911ca38b5147db58c020caf5859e6782211d363059c3e15334348950a921ee00110fa7e16ba9315625eced32b1191ce2f51eb0c97e5c59a9f6c83a541f5
+AUX rocminfo-6.0.0-python-3-12-support.patch 1333 BLAKE2B df3d2a7f338327ac3fbe08820fef1b2f40bdc14aca7091313eb354f2f2bc41373fb67b765554df6939ef5f32fb7fe3cd6c295b4e381917117074ce3f9066b44a SHA512 9bbec362a3c8435a58be53500048ebb0458bff46b3793b9b21019e8994528afd703431bf6ce189a045afdef3941b14d143b2bfb38e50a26f3be16a448c3f6fef
+AUX rocminfo-6.0.0_python-3.12.patch 3102 BLAKE2B b11743bceb52b280835eccfe23815541f702c205d62c8e08b1a2a72e5d68882f16689b517f8733738657cef7fab7c933886168d3c9260567400827409856cb06 SHA512 59cca81b13fb3a01a7fbb5e9abf838571cd2ce09ea14e5bb1a72447b6450681dfc58d79cc524e9ffca03c9f4f23fd0cc524bf272fffeb5bc3cd0d70d5358e207
 DIST rocminfo-5.7.1.tar.gz 17302 BLAKE2B 395c695ed0b79c771c4240310c457aec893ffd889ddd551866753d2a0c8d4e98399672d74a7114a89faf8b1960dd54fbb0425ea00f7d15e5c740e33ce4046d0b SHA512 38726bc52bd045b6281cccd702706fd6ea5b57cdc421ad23106d5447a002f4b530e8d4e4430d2bb8eb30803af3bacdaf34646a965cea26f42d726bf7f6aafbab
-DIST rocminfo-6.0.0.tar.gz 17614 BLAKE2B f296d43103062c492c3a13a8f79a70ebe719126136abe38b020035f0e31819b9b25928aa538416ec9cc733a4e352e83fe8550d15c10f8071b7f889b361814fa6 SHA512 66de2e84b78f69a0c7d302e5432b08874374a45f7d577b158f23abbb40455c574868a7093e64c3a7d19e21dd13b48865a36bd626ef34b99ce52f3363bbb261a7
-EBUILD rocminfo-5.1.3.ebuild 1008 BLAKE2B 283c059c8c574638ae19d88972d41f7f51b99270c2ba9c8edf5e38e9a546e6e872044ef6685eb51965ccbfcbaad97ea5404e11cc66ed16dd604cde853301dc95 SHA512 f729a8e2c7418e42b96d64294cc6b8b6a1a62f319e4f2e2a67bc9219b698ac47d88b6e95d525c5fba83f9431088011c0ad4b54b859eb08e01d2c2ef5d792c390
-EBUILD rocminfo-5.3.3.ebuild 1008 BLAKE2B 283c059c8c574638ae19d88972d41f7f51b99270c2ba9c8edf5e38e9a546e6e872044ef6685eb51965ccbfcbaad97ea5404e11cc66ed16dd604cde853301dc95 SHA512 f729a8e2c7418e42b96d64294cc6b8b6a1a62f319e4f2e2a67bc9219b698ac47d88b6e95d525c5fba83f9431088011c0ad4b54b859eb08e01d2c2ef5d792c390
-EBUILD rocminfo-5.4.3.ebuild 1008 BLAKE2B b6762c3b90d65e74c0d770efe37fcf7632c89426b99d174069da219de96a022fae0b5432b9492c93c7921bd2119b7d843d6ad8130ebe596041d209dfea357a2e SHA512 e8aeb732f6331b153cc322a4d554fcaee681c37b1a9386bca280bd8716cf505e14a018274ffae75dc7d74b6d7e92d3774ab35ec3902b84ff19689f7731843a8a
-EBUILD rocminfo-5.5.1.ebuild 1014 BLAKE2B 3302e95273bc3c577b14bd977a507e72e3b9ed397517263abfb1b2c23782f54d6ff726387bf798aaf35609c838eeafe18a04f70bb26b20a73cff4bb70138181b SHA512 d2dc4b9810ed7a63d1c04d2751fcfde0192cf85320a71c8187f579dcf90df02369989f6a1cf96b09725c9d79af3d59d39a20760fa5528f8e5b19bf73e277b647
-EBUILD rocminfo-5.7.1.ebuild 1014 BLAKE2B 3302e95273bc3c577b14bd977a507e72e3b9ed397517263abfb1b2c23782f54d6ff726387bf798aaf35609c838eeafe18a04f70bb26b20a73cff4bb70138181b SHA512 d2dc4b9810ed7a63d1c04d2751fcfde0192cf85320a71c8187f579dcf90df02369989f6a1cf96b09725c9d79af3d59d39a20760fa5528f8e5b19bf73e277b647
-EBUILD rocminfo-6.0.0.ebuild 1014 BLAKE2B 3302e95273bc3c577b14bd977a507e72e3b9ed397517263abfb1b2c23782f54d6ff726387bf798aaf35609c838eeafe18a04f70bb26b20a73cff4bb70138181b SHA512 d2dc4b9810ed7a63d1c04d2751fcfde0192cf85320a71c8187f579dcf90df02369989f6a1cf96b09725c9d79af3d59d39a20760fa5528f8e5b19bf73e277b647
-MISC metadata.xml 370 BLAKE2B 25693db5400c16b160c544c9afbf0a093c18cc94164e38fcde05e50cf6cbeef1f4875f59cf83830f8e700a60508b913430208b96518cc9a14c14f036d8152748 SHA512 763bc8e1c7f89ae046514b721ece281146d0b80768f49699ba8f347ff5f8c6a8facb8e6554c0ac0abfb195797acfb51f30f322fe90f6d342320a1d9cb44e1740
+DIST rocminfo-6.1.1.tar.gz 17740 BLAKE2B 6331054e1c8a59f2d4246c3fcb999afc28a8cabea9d5faf2b95d767f7153ab0930a633ee630cabc4472413a8a54fd9ef798516baa77e94aabda7687a36bf312f SHA512 d2982874ad09bfbe15418a88c2d3360f9bce262674d50f5858a08e52dd266e255f95116c85e069d7e8d28cb323164fb6999c5834163105f33e0c773aede4efdf
+EBUILD rocminfo-5.7.1-r1.ebuild 1339 BLAKE2B 5d7ba72f7c1309efc6e5cdd9d05a0c2fccd0abb972ed8caca46004bfb16818d81bbef1fee87ec2a8af1600f8d54ae9c3b775f2168ed3105401ea6d43ef0760ea SHA512 9dc874889be072acbafb3e45b18d336ce4084104efa3df800f3066fca41c7c9cd60e12df55a79efa98fb6259a6fe8eab656615eda90fb4607a3790768b42c755
+EBUILD rocminfo-6.1.1.ebuild 1255 BLAKE2B c1e6948dd71632d93aa11a6ec8c5884bc124daa9db5cc1fe655dc801fa7503479b22c5b39ddc67fb8410b59a696fbf251d8525ae68d66cadbb6cac7d789291b1 SHA512 3096db54c2cdd00029d11e183ef02e80762da6902a4750089dc93c6a8ec8816c4da2d9c01a51d623eb416d7f653246aea3d5a5ac1e82ed1c57729596bfad14fd
+MISC metadata.xml 357 BLAKE2B 09a7d224662327ffc7936d1d98691ce626dec3a23ffb7ba1b87da12a58659bff330a7a7718798928898b46754bb96869ec63c766ba25719b3abf88b06dd286d3 SHA512 ddf900d23e4bc3f69f0f1b53c9cff6e6f309a7add531512860e288b0c3593ca76f0590f73a0e934bdb5a4d2cfadb47e64bcfce0a354c31d27af1ff6214c32da8
diff --git a/dev-util/rocminfo/files/rocminfo-6.0.0-detect-builtin-amdgpu.patch b/dev-util/rocminfo/files/rocminfo-6.0.0-detect-builtin-amdgpu.patch
new file mode 100644
index 000000000000..8956a790fbe1
--- /dev/null
+++ b/dev-util/rocminfo/files/rocminfo-6.0.0-detect-builtin-amdgpu.patch
@@ -0,0 +1,33 @@
+https://github.com/ROCm/rocminfo/pull/65
+From: YiyangWu <xgreenlandforwyy@gmail.com>
+Date: Wed, 18 Aug 2021 21:05:20 +0800
+Subject: [PATCH] Check /sys/module/amdgpu for ROCk instead of lsmod
+
+Closes: #42
+
+Signed-off-by: YiyangWu <xgreenlandforwyy@gmail.com>
+---
+ rocminfo.cc | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/rocminfo.cc b/rocminfo.cc
+index 8ed9111..78b3afd 100755
+--- a/rocminfo.cc
++++ b/rocminfo.cc
+@@ -1063,9 +1063,14 @@ int CheckInitialState(void) {
+       return -1;
+     }
+   } else {
+-    printf("%sROCk module is NOT loaded, possibly no GPU devices%s\n",
++    int module_dir;
++    module_dir = open("/sys/module/amdgpu", O_DIRECTORY);
++    if (module_dir < 0) {
++      printf("%sROCk module is NOT loaded, possibly no GPU devices%s\n",
+                                                           COL_RED, COL_RESET);
+-    return -1;
++      return -1;
++	}
++	close(module_dir);
+   }
+ 
+   // Check if user belongs to the group for /dev/kfd (e.g. "video" or
diff --git a/dev-util/rocminfo/files/rocminfo-6.0.0-python-3-12-support.patch b/dev-util/rocminfo/files/rocminfo-6.0.0-python-3-12-support.patch
new file mode 100644
index 000000000000..2b14e42e4705
--- /dev/null
+++ b/dev-util/rocminfo/files/rocminfo-6.0.0-python-3-12-support.patch
@@ -0,0 +1,34 @@
+Fix "SyntaxWarning: invalid escape sequence" SyntaxWarning in python 3.12+
+Bug: https://github.com/ROCm/rocminfo/issues/69
+--- a/rocm_agent_enumerator
++++ b/rocm_agent_enumerator
+@@ -92,7 +92,7 @@ def getGCNISA(line, match_from_beginning = False):
+    return result.group(0)
+  return None
+ 
+-@staticVars(search_name=re.compile("gfx[0-9a-fA-F]+(:[-+:\w]+)?"))
++@staticVars(search_name=re.compile(r"gfx[0-9a-fA-F]+(:[-+:\w]+)?"))
+ def getGCNArchName(line):
+  result = getGCNArchName.search_name.search(line)
+ 
+@@ -149,9 +149,9 @@ def readFromROCMINFO(search_arch_name = False):
+ 
+   # search AMDGCN gfx ISA
+   if search_arch_name is True:
+-    line_search_term = re.compile("\A\s+Name:\s+(amdgcn-amd-amdhsa--gfx\d+)")
++    line_search_term = re.compile(r"\A\s+Name:\s+(amdgcn-amd-amdhsa--gfx\d+)")
+   else:
+-    line_search_term = re.compile("\A\s+Name:\s+(gfx\d+)")
++    line_search_term = re.compile(r"\A\s+Name:\s+(gfx\d+)")
+   for line in rocminfo_output:
+     if line_search_term.match(line) is not None:
+       if search_arch_name is True:
+@@ -172,7 +172,7 @@ def readFromLSPCI():
+   except:
+     lspci_output = []
+ 
+-  target_search_term = re.compile("1002:\w+")
++  target_search_term = re.compile(r"1002:\w+")
+   for line in lspci_output:
+     search_result = target_search_term.search(line)
+     if search_result is not None:
diff --git a/dev-util/rocminfo/files/rocminfo-6.0.0_python-3.12.patch b/dev-util/rocminfo/files/rocminfo-6.0.0_python-3.12.patch
new file mode 100644
index 000000000000..9c4530b98b05
--- /dev/null
+++ b/dev-util/rocminfo/files/rocminfo-6.0.0_python-3.12.patch
@@ -0,0 +1,75 @@
+https://github.com/ROCm/rocminfo/pull/66
+From: Yiyang Wu <xgreenlandforwyy@gmail.com>
+Date: Mon, 1 Jan 2024 22:34:23 +0800
+Subject: [PATCH] Fix python3.12 SyntaxWarning: invalid escape sequence
+
+Use raw strings for regular expression
+
+Reference: https://docs.python.org/dev/whatsnew/3.12.html#other-language-changes
+---
+ rocm_agent_enumerator | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+Index: rocminfo-rocm-6.0.0/rocm_agent_enumerator
+===================================================================
+--- rocminfo-rocm-6.0.0.orig/rocm_agent_enumerator
++++ rocminfo-rocm-6.0.0/rocm_agent_enumerator
+@@ -81,7 +81,7 @@ def staticVars(**kwargs):
+     return func
+   return deco
+ 
+-@staticVars(search_term=re.compile("gfx[0-9a-fA-F]+"))
++@staticVars(search_term=re.compile(r"gfx[0-9a-fA-F]+"))
+ def getGCNISA(line, match_from_beginning = False):
+  if match_from_beginning is True:
+    result = getGCNISA.search_term.match(line)
+@@ -92,7 +92,7 @@ def getGCNISA(line, match_from_beginning
+    return result.group(0)
+  return None
+ 
+-@staticVars(search_name=re.compile("gfx[0-9a-fA-F]+(:[-+:\w]+)?"))
++@staticVars(search_name=re.compile(r"gfx[0-9a-fA-F]+(:[-+:\w]+)?"))
+ def getGCNArchName(line):
+  result = getGCNArchName.search_name.search(line)
+ 
+@@ -135,8 +135,8 @@ def readFromROCMINFO(search_arch_name =
+         break
+       # run rocminfo
+       rocminfo_output = subprocess.Popen(rocminfo_executable, stdout=subprocess.PIPE).communicate()[0].decode("utf-8").split('\n')
+-      term1 = re.compile("Cannot allocate memory")
+-      term2 = re.compile("HSA_STATUS_ERROR_OUT_OF_RESOURCES")
++      term1 = re.compile(r"Cannot allocate memory")
++      term2 = re.compile(r"HSA_STATUS_ERROR_OUT_OF_RESOURCES")
+       done = 1
+       for line in rocminfo_output:
+         if term1.search(line) is not None or term2.search(line) is not None:
+@@ -149,9 +149,9 @@ def readFromROCMINFO(search_arch_name =
+ 
+   # search AMDGCN gfx ISA
+   if search_arch_name is True:
+-    line_search_term = re.compile("\A\s+Name:\s+(amdgcn-amd-amdhsa--gfx\d+)")
++    line_search_term = re.compile(r"\A\s+Name:\s+(amdgcn-amd-amdhsa--gfx\d+)")
+   else:
+-    line_search_term = re.compile("\A\s+Name:\s+(gfx\d+)")
++    line_search_term = re.compile(r"\A\s+Name:\s+(gfx\d+)")
+   for line in rocminfo_output:
+     if line_search_term.match(line) is not None:
+       if search_arch_name is True:
+@@ -172,7 +172,7 @@ def readFromLSPCI():
+   except:
+     lspci_output = []
+ 
+-  target_search_term = re.compile("1002:\w+")
++  target_search_term = re.compile(r"1002:\w+")
+   for line in lspci_output:
+     search_result = target_search_term.search(line)
+     if search_result is not None:
+@@ -196,7 +196,7 @@ def readFromKFD():
+       if os.path.isdir(node_path):
+         prop_path = node_path + '/properties'
+         if os.path.isfile(prop_path) and os.access(prop_path, os.R_OK):
+-          target_search_term = re.compile("gfx_target_version.+")
++          target_search_term = re.compile(r"gfx_target_version.+")
+           with open(prop_path) as f:
+             try:
+               line = f.readline()
diff --git a/dev-util/rocminfo/metadata.xml b/dev-util/rocminfo/metadata.xml
index 3213bd34da97..24dcfaf2507f 100644
--- a/dev-util/rocminfo/metadata.xml
+++ b/dev-util/rocminfo/metadata.xml
@@ -6,6 +6,6 @@
         <name>Craig Andrews</name>
     </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/rocminfo</remote-id>
+        <remote-id type="github">ROCm/rocminfo</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-util/rocminfo/rocminfo-5.1.3.ebuild b/dev-util/rocminfo/rocminfo-5.1.3.ebuild
deleted file mode 100644
index 6c175c0a3bd4..000000000000
--- a/dev-util/rocminfo/rocminfo-5.1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-rocm-${PV}"
-fi
-
-DESCRIPTION="ROCm Application for Reporting System Info"
-HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
-LICENSE="UoI-NCSA"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}"
-
-PATCHES=("${FILESDIR}/${PN}-5.1.3-detect-builtin-amdgpu.patch")
-
-src_prepare() {
-	sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die
-	sed -e "/num_change_since_prev_pkg(/cset(NUM_COMMITS 0)" -i cmake_modules/utils.cmake || die # Fix QA issue on "git not found"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=( -DROCRTST_BLD_TYPE=Release )
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-5.3.3.ebuild b/dev-util/rocminfo/rocminfo-5.3.3.ebuild
deleted file mode 100644
index 6c175c0a3bd4..000000000000
--- a/dev-util/rocminfo/rocminfo-5.3.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-rocm-${PV}"
-fi
-
-DESCRIPTION="ROCm Application for Reporting System Info"
-HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
-LICENSE="UoI-NCSA"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}"
-
-PATCHES=("${FILESDIR}/${PN}-5.1.3-detect-builtin-amdgpu.patch")
-
-src_prepare() {
-	sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die
-	sed -e "/num_change_since_prev_pkg(/cset(NUM_COMMITS 0)" -i cmake_modules/utils.cmake || die # Fix QA issue on "git not found"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=( -DROCRTST_BLD_TYPE=Release )
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-5.5.1.ebuild b/dev-util/rocminfo/rocminfo-5.5.1.ebuild
deleted file mode 100644
index 296b859a1fd3..000000000000
--- a/dev-util/rocminfo/rocminfo-5.5.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-rocm-${PV}"
-fi
-
-DESCRIPTION="ROCm Application for Reporting System Info"
-HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
-LICENSE="UoI-NCSA"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}"
-
-#PATCHES=(
-#	"${FILESDIR}/${PN}-5.5.1-detect-builtin-amdgpu.patch"
-#)
-
-src_prepare() {
-	sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die
-	sed -e "/num_change_since_prev_pkg(/cset(NUM_COMMITS 0)" -i cmake_modules/utils.cmake || die # Fix QA issue on "git not found"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=( -DROCRTST_BLD_TYPE=Release )
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-5.4.3.ebuild b/dev-util/rocminfo/rocminfo-5.7.1-r1.ebuild
index 15e50f8d07fa..4b5df7bd0033 100644
--- a/dev-util/rocminfo/rocminfo-5.4.3.ebuild
+++ b/dev-util/rocminfo/rocminfo-5.7.1-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+PYTHON_COMPAT=( python3_{11..12} )
+inherit cmake python-r1
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
@@ -19,14 +20,20 @@ HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
 LICENSE="UoI-NCSA"
 SLOT="0/$(ver_cut 1-2)"
 
-RDEPEND=">=dev-libs/rocr-runtime-${PV}"
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-PATCHES=("${FILESDIR}/${PN}-5.1.3-detect-builtin-amdgpu.patch")
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0.0-detect-builtin-amdgpu.patch"
+	"${FILESDIR}/${PN}-6.0.0_python-3.12.patch"
+)
 
 src_prepare() {
 	sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die
-	sed -e "/num_change_since_prev_pkg(/cset(NUM_COMMITS 0)" -i cmake_modules/utils.cmake || die # Fix QA issue on "git not found"
+	sed -e "/num_change_since_prev_pkg(/cset(NUM_COMMITS 0)" \
+		-i cmake_modules/utils.cmake || die # Fix QA issue on "git not found"
 	cmake_src_prepare
 }
 
@@ -34,3 +41,9 @@ src_configure() {
 	local mycmakeargs=( -DROCRTST_BLD_TYPE=Release )
 	cmake_src_configure
 }
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/rocm_agent_enumerator" || die
+	python_foreach_impl python_doexe rocm_agent_enumerator "${BUILD_DIR}"/rocm_agent_enumerator
+}
diff --git a/dev-util/rocminfo/rocminfo-5.7.1.ebuild b/dev-util/rocminfo/rocminfo-5.7.1.ebuild
deleted file mode 100644
index 296b859a1fd3..000000000000
--- a/dev-util/rocminfo/rocminfo-5.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-rocm-${PV}"
-fi
-
-DESCRIPTION="ROCm Application for Reporting System Info"
-HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
-LICENSE="UoI-NCSA"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}"
-
-#PATCHES=(
-#	"${FILESDIR}/${PN}-5.5.1-detect-builtin-amdgpu.patch"
-#)
-
-src_prepare() {
-	sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die
-	sed -e "/num_change_since_prev_pkg(/cset(NUM_COMMITS 0)" -i cmake_modules/utils.cmake || die # Fix QA issue on "git not found"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=( -DROCRTST_BLD_TYPE=Release )
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-6.0.0.ebuild b/dev-util/rocminfo/rocminfo-6.0.0.ebuild
deleted file mode 100644
index 296b859a1fd3..000000000000
--- a/dev-util/rocminfo/rocminfo-6.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-rocm-${PV}"
-fi
-
-DESCRIPTION="ROCm Application for Reporting System Info"
-HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
-LICENSE="UoI-NCSA"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}"
-
-#PATCHES=(
-#	"${FILESDIR}/${PN}-5.5.1-detect-builtin-amdgpu.patch"
-#)
-
-src_prepare() {
-	sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die
-	sed -e "/num_change_since_prev_pkg(/cset(NUM_COMMITS 0)" -i cmake_modules/utils.cmake || die # Fix QA issue on "git not found"
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=( -DROCRTST_BLD_TYPE=Release )
-	cmake_src_configure
-}
diff --git a/dev-util/rocminfo/rocminfo-6.1.1.ebuild b/dev-util/rocminfo/rocminfo-6.1.1.ebuild
new file mode 100644
index 000000000000..5f6dfcd53860
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-6.1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+inherit cmake python-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ROCm/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-rocm-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/ROCm/rocminfo"
+LICENSE="UoI-NCSA"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0.0-detect-builtin-amdgpu.patch"
+)
+
+src_prepare() {
+	sed -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i CMakeLists.txt || die
+	sed -e "/num_change_since_prev_pkg(/cset(NUM_COMMITS 0)" \
+		-i cmake_modules/utils.cmake || die # Fix QA issue on "git not found"
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=( -DROCRTST_BLD_TYPE=Release )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/rocm_agent_enumerator" || die
+	python_foreach_impl python_doexe rocm_agent_enumerator "${BUILD_DIR}"/rocm_agent_enumerator
+}
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 09b1bca32d8a..3f7eff645618 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -13,7 +13,9 @@ DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7f
 DIST rocm-tracer-5.3.3.tar.gz 353041 BLAKE2B b7614707ae3af2f5a46d058dacadfb0ef3b980963ac49face66a80c8396e66cf13e0430ab41737ba15e163f5da03697376b13238ea1decfe7ee4a7f31c7664a5 SHA512 95a202f76f6b68a35942750233bd09d372a9be843150d7ec02824da13c6b9a7c8da7a752ac69f66776e7ccfb6176473745dc46a7baadfe77c99c0596fbc2ffeb
 DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce
 DIST roctracer-5.7.1.tar.gz 354686 BLAKE2B 2e72d8df5cf53a913102a715dab55f7c6d33b2d4a9cad7647a61824deba0363cf3dbf96d8de3469a78d6b5c8e517c163c303bf6aa12eeaf8e43f82ac8381ef97 SHA512 62cf62fc505955426596bd6d539c92f4d730d90d820d817343525f1b7be693290727c8c447ca98b1a0e46d1d188b62b3f4fafcf6bffbf2479fc5d937fb354e13
+DIST roctracer-6.1.1.tar.gz 396688 BLAKE2B e332c3a6056d1678e3da511878fd2710a4eaa02526cd1e7353dd1dbcba776cb77e6e431d90daf5f238ec7793fc8e9f51afd7f09992f70b26c7e3aab28bb319a9 SHA512 d59c367953b1d5df0daae96746095e2e19f706f43b5ebed3d45c15d23697e9c99c1623bbb8dfa001648fdeda172a3c1d820d884b6da3946addec8f4b9a86e5dc
 EBUILD roctracer-5.1.3-r1.ebuild 2414 BLAKE2B 177f01dc1079d29a764541b00b1df66763691cf42a6115c6c7f76a525605c928852d485271f5812efeb5b9aaa752c83213db6d874386e2a8e6796d32a01ea443 SHA512 2860674405c36b699c633737549a03382acd113be07371dbde78c25ec965208618218f85e940aba6280676918f34c7e6d3a8181c71f9b1f57ff976406e46f75a
 EBUILD roctracer-5.3.3-r1.ebuild 1659 BLAKE2B d8b729531db35650b674f30e2c9aeb2c494d82705bd46c784365dbe7d6396dfdba9339af5e378a4eec35a40f93fded8b2df4c0d583b976bc689d51d087d6900f SHA512 7efbf7deaf110325d6df22f1180609f7ffa54bf3b34ca50a9c2fa2b4c4b0359ff2c4aa881e4c36d8a11db3946bf6cc8746f9c384811635beed945b35565cc1ae
 EBUILD roctracer-5.7.1-r1.ebuild 2230 BLAKE2B a2a1f033a011244d6039107c7f121b39965abfe12c362eedcb0d1e13c63e09dc7a8214b9115fd59ea5c4c5faced21f4e8ead45277ad9f5d49b1f3145f0abfca2 SHA512 ef63e786f59130b2b4bbe071d598b44d04aa66a932f17739908f41dfc4029debcbcc139cd4693a970ed7e7b2a2d70d497806c651fe634dec775991fdbe06e0c3
-MISC metadata.xml 620 BLAKE2B 305256592e98101accc2200175ee94af58ac66f529fc01978972b9daeb33c1588751e242fc72a69860e5aada7a94f641c71d60d4b2ae48daca8f606f1336e8d9 SHA512 10b5b9a17a3696915eefc0602ff21b160ddd9c45390ae2bb35472c213f1b3d67b5f650c962218b6300d51284ca5086a439c8f5fea52272f81ef014025c48f4f7
+EBUILD roctracer-6.1.1.ebuild 2325 BLAKE2B 4038182909251dfc4d15b499e881fd555909f03886420c67ab2e52cdb9bec35c19bda6531e0af1aa60a76ed8c54b78261465675141cc8fcf49c363f3858a3024 SHA512 c90319f75e904475cc0bea9f06a26809eccf39551737b3443b1f08e3a41c924f0c958e1ff379ad10459e80cf7525940ad218f8cc61ca187275017384d79f7003
+MISC metadata.xml 717 BLAKE2B 9705d469093d1851c10e8f727b43300a1fbe1746057114ddeaa38520a094a8906c1a8bd13869e3f84ffff652b68823f63522685a97ab3d3f0fdcb52283fc27bd SHA512 d6ff1910d66ed3990e965826f0df28c74b9b6287f4dc4d619425c2803a1092bcd1c7d8dc9776e5ae3366a31f3a56d498b0ffaf8f7c336af623df02421de26430
diff --git a/dev-util/roctracer/metadata.xml b/dev-util/roctracer/metadata.xml
index 872a2a3bdb22..a7f7157360b0 100644
--- a/dev-util/roctracer/metadata.xml
+++ b/dev-util/roctracer/metadata.xml
@@ -13,7 +13,11 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCm-Developer-Tools/roctracer</remote-id>
+    <remote-id type="github">ROCm/roctracer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-util/roctracer/roctracer-6.1.1.ebuild b/dev-util/roctracer/roctracer-6.1.1.ebuild
new file mode 100644
index 000000000000..61a5b02149f2
--- /dev/null
+++ b/dev-util/roctracer/roctracer-6.1.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+LLVM_COMPAT=( 18 )
+ROCM_VERSION=${PV}
+
+inherit cmake prefix python-any-r1 rocm llvm-r1
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm/roctracer"
+SRC_URI="https://github.com/ROCm/roctracer/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/roctracer-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip:${SLOT}
+	dev-libs/rocr-runtime
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep '
+	dev-python/CppHeaderParser[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}"/roctracer-5.7.1-with-tests.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" \
+		"dev-python/ply[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	llvm-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	hprefixify script/*.py
+	eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.3.3-rocm-path.patch)
+
+	# Install libs directly into /usr/lib64
+	sed -e 's:${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}:${CMAKE_INSTALL_LIBDIR}:g' \
+		-i src/CMakeLists.txt plugin/file/CMakeLists.txt || die
+
+	# Remove all install commands for tests
+	sed -E '/^ *install\(.+/d' -i test/CMakeLists.txt || die
+
+	# Fix search path for HIP cmake
+	sed -e "s,\${ROCM_PATH}/lib/cmake,/usr/$(get_libdir)/cmake,g" -i test/CMakeLists.txt || die
+
+	# bug #892732
+	sed -i -e 's/-Werror//' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/cmake/hip"
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DWITH_TESTS=$(usex test)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DHIP_ROOT_DIR="${EPREFIX}/usr"
+		-DHIP_CLANG_INSTALL_DIR="$(get_llvm_prefix)/bin"
+		-DGPU_TARGETS="$(get_amdgpu_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}" || die
+	# if LD_LIBRARY_PATH not set, dlopen cannot find correct lib
+	LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}" bash run.sh || die
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove unneeded copy
+	rm -r "${ED}/usr/share/doc/${PF}-asan" || die
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 49a26429f4fc..e376d7a81323 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index adbc5242053a..3c2d190c4c15 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -1137,7 +1137,7 @@ java-pkg_jarfrom() {
 }
 
 # @FUNCTION: java-pkg_getjars
-# @USAGE: [--build-only] [--with-dependencies] <package1>[,<package2>...]
+# @USAGE: [--build-only] [--runtime-only] [--with-dependencies] <package1>[,<package2>...]
 # @DESCRIPTION:
 # Get the classpath provided by any number of packages
 # Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
@@ -1157,6 +1157,7 @@ java-pkg_jarfrom() {
 # Parameters:
 #	--build-only - makes the jar(s) not added into package.env DEPEND line.
 #	  (assumed automatically when called inside src_test)
+#	--runtime-only - marks the jar(s) not added into package.env RDEPEND line.
 #	--with-dependencies - get jars also from requested package's dependencies
 #	  transitively.
 # $1 - list of packages to get jars from
@@ -1165,6 +1166,7 @@ java-pkg_jarfrom() {
 java-pkg_getjars() {
 	debug-print-function ${FUNCNAME} $*
 
+	local dep_constraint
 	local build_only=""
 	local deep=""
 
@@ -1173,6 +1175,9 @@ java-pkg_getjars() {
 	while [[ "${1}" == --* ]]; do
 		if [[ "${1}" = "--build-only" ]]; then
 			build_only="build"
+			dep_constraint="build"
+		elif [[ "${1}" = "--runtime-only" ]]; then
+			dep_constraint="runtime"
 		elif [[ "${1}" = "--with-dependencies" ]]; then
 			deep="--with-dependencies"
 		else
@@ -1191,7 +1196,7 @@ java-pkg_getjars() {
 	debug-print "${pkgs}:${jars}"
 
 	for pkg in ${pkgs//,/ }; do
-		java-pkg_ensure-dep "${build_only}" "${pkg}"
+		java-pkg_ensure-dep "${dep_constraint}" "${pkg}"
 	done
 
 	for pkg in ${pkgs//,/ }; do
@@ -1808,7 +1813,6 @@ java-pkg_ant-tasks-depend() {
 	fi
 }
 
-
 # @FUNCTION: ejunit_
 # @INTERNAL
 # @DESCRIPTION:
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 03f650428a45..44ab00160a49 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 475b95977b13..705d4e9db7aa 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -21,18 +21,20 @@ DIST stone-soup-0.31.0.tar.gz 22432560 BLAKE2B f3e696915458674e3f7ce2a47d19c740c
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.32.0_pre20240409.tar.gz 23206591 BLAKE2B 7d5f44adc4aaa1c7f881e4fddf2bd83240c126987168c8ef2e15681f83790b6f5ff5ca840ea46091c24a2dbaf80fe456c6919a09665519d71c6430d6ac9f09ad SHA512 81992f69fb7d70c968bc82f91131a55753d4323c15a12a1fd095cb4b75b77dc9645c4b5d9eb1106227d81d31d705bdc5ecc0e2ad3a63ba6562ee3730545a6c2a
+DIST stone-soup-0.32.0_pre20240626.tar.gz 23577520 BLAKE2B 43a7d9db8037cb1f37ff821da95106d77fa46b0bf34a6b0ef02b66023e1e77a76cc906d2f34d66d6bdea4e9b3859728e2e93909f2c9e1898caab52955d218de2 SHA512 f7a3c58a9f266f354e01175fcc9e2978f4afc5d4e1fc7b5f84979e36213057f2e3bb15f600d40988135e06dc01b65540a4342b16c82edf1c3cfb41421ea92285
 DIST stone-soup-0.32.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.32.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
 DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204
 DIST stone_soup-0.28.0.zip 98876317 BLAKE2B 10f554ea004778b6a2537caa2f994c8e7b12e190ddaaf55f9fb5d2499b91ee6d15d63a9d50167528c1625058bc262c5cba8ba08235fc377e83329ba5f80158be SHA512 7316175ccf6efea376a8a9157f9c4d1786f59c544af39e5ff28a9fcd889e23ef58c2a3680df46807c84b2ce0feb347e661c929195e8affb3d3f98c24832b17e0
-EBUILD stone-soup-0.25.1-r103.ebuild 5863 BLAKE2B 15901d21e4d9cade5739bc1f076ca8bc603d0d75c0f644453bf6ffa5bb113b0fa4c3f63678e4c6ae609de06ac143d234cd9362435bc88c52c722a41e33dc6002 SHA512 45d31e2b6cf729026209034ef8004ea94aa220ffbb349f4bfa62d1d0c4e28cea6cb34061b0d4e8f793cd0371448598f040bd7c425e08be4bc0aaefd82537ba8b
-EBUILD stone-soup-0.26.1-r2.ebuild 6076 BLAKE2B 753ad93cc0958f4fdc9eaa56037bacae80145fc3ace6653aa8127cc42f53fa745722c07a0a2cd0e0ebf6a955e799e2e57950f3b9057ff2be75195cce446e6747 SHA512 3e13e4f5e6b2dc4a86f7716cd830a96977f08bd928f76b2e1289c47f919ba08ebd658d6f8986b6f8cb2e392b94637a9edc4b79e7bb6be10f0e3a4f270288712f
-EBUILD stone-soup-0.27.1-r1.ebuild 5863 BLAKE2B 5a081d057ae0c8fb26b7a621d3a4b8c5710f9882157907e7cd637f83b487cca21bc238caf44470ba4035638f9fcc6443b60193bd790313711cd11c7e77e728d3 SHA512 7aac452c00f748a5e8d7308a4e042bb7a6b93a4ce1fa7d38a59e58c8c2e0c950d9d7b07e1a1bf02d408a2173c861ebc1891dca05956665161649a69d6222487b
-EBUILD stone-soup-0.28.0-r1.ebuild 6466 BLAKE2B 248ea8d0477c262d0d973747ebe9b02544a948f6115f59f363c5e747b7f59e79987e1d07faaa633a51b8ef3d6cbc133042c2df55600a97f60d32f3ab345eb980 SHA512 9a9816cc5c94f302d171b54ed66f29add3ca1ebe78b096738aa1205e324864ad3b3486a67a8efbb88a7c66f926d25e8503b42f1d3cd4ca6ee647268ee2a2902f
-EBUILD stone-soup-0.29.1.ebuild 6418 BLAKE2B d5b8416ee3b23576a1f4994de269dc282fb4d7dc9704a254ecd52807437ccd5e164a3b721c03455ab39c28ef973e6b44121187883325974312b9ed05aa5e536e SHA512 813887e30b67d0c54ff35bf5e5b6b71101348a3dcbb5655ef74281df9cf2b64212253341e874267054fd336506a19248788e02d651d2c50d519d6d16cde719f1
-EBUILD stone-soup-0.30.1.ebuild 6421 BLAKE2B 58d40ec007755283e2715e31e823306f01ff34527a653341be234b75e040ceb1ff0bbecc43768715ad6a921f171a2b741cea7ccdd129420fdb21f720d4a12c69 SHA512 829a1862b9d7af10741b87f95f32a37e96d582265fd1dcba52965f0800fba4e04708673dcd3ee9fb338560be58c12d31c41d825c145f4b163e52c30d84eb9498
-EBUILD stone-soup-0.31.0.ebuild 6419 BLAKE2B 7917d84feef7c95776fa31af6fee0c3edfad2bb148c297a2a8bbbf626094c41bc469eee5bfdc9faaafc73941f60b398d9f0f4504c030672ef1b3f9a8acea4365 SHA512 fd36100fd7a1026d1324673735c42b3dc08de952f11ce18919e0aadee666cf031e874959b536f302a68e7060c2dd3b4cd4848de9ea748618224ddff4b6fdbe7a
-EBUILD stone-soup-0.32.0_pre20240409.ebuild 6459 BLAKE2B 9feb542cf08853057f181e1025621856e1f6c1eaa13dcf9fa29df657df7f4769ce40f500473a262e9c3b95d03b857f69eba06dc1802ee95c74ff9150d48e5abd SHA512 2e4ef05a0dce8b41db50a186f833cc7d31e33a8caf4d8edf4662ac550a106e5d7d0d9921f172bdada22a17d39106dcc8d3cf6b3f68ea3b14ef44096200372021
+EBUILD stone-soup-0.25.1-r103.ebuild 5864 BLAKE2B 90a4a7e74b95cfe643db20df0f5aab279d63e3f32a2367ed0b42cb69ffcd3c1a5fe8b1f6e49cc957b04b7ad9c3fa3d50c477bedf244b9aecf96cc7e968333b20 SHA512 26be8a34c824aadf6d3977dec8674b91c3743b5b97cbf7dde5c4dac256da86b23c198d089ffa2fcb891ad49cb26a58bc8332970049b97e11c50a1320741ab63d
+EBUILD stone-soup-0.26.1-r2.ebuild 6077 BLAKE2B 196a9ae162949b3c497c4e5e0f92d77c9583d50870506877c254ad85b429c1c324bb23ad354ff4c7884dabb3aeac8401200268f964665cdece3e0138105a178f SHA512 26566b9d6a6d99aaf63a5996467df4e054e6fd465c4952281f25935fb8011c4df6b51978dc41eb4ca55faad7098df4f9c383e8b02c3e77245766551fb1ac9235
+EBUILD stone-soup-0.27.1-r1.ebuild 5864 BLAKE2B b82c261f452ffa00bd2b8a080904b705aa9a3d7bc825533ecdd17e7ff62d9ff8788f0b1b140cd0b3229eda111acc26fe091c65d9091a42f008694e974f77a8aa SHA512 e44ab6eaac578fc536c1d29276b4cc22df8a16152c0672eff997433504a9048df8cd1568270eb8b794ed940bfc73c96d536b2ba4e687e486d255dc9db92f3727
+EBUILD stone-soup-0.28.0-r1.ebuild 6467 BLAKE2B cc8374aedcb5bcda53932d12533e2e2572eaa3b01585fe0ec83330984862a6d2af21b680c96dc57b706f483f8e38b74f444c721d04cbb8e69c7e980e8435a113 SHA512 994a3655f4824f66b85793ad35f285918e344123c054ba3c52f29e4820a41e1ec4b502915f8b7838facafdf93c6afd4c687b7f0e549b88ad2555eae7ae2fe95c
+EBUILD stone-soup-0.29.1.ebuild 6419 BLAKE2B 108cd8a40ead709a8c87fbc6ada1a8d5f4079483d54907a206b78333c1dd51a8e62b10a36f346cf3730e0f19c6dfaf755b90511ca18c9c6610fc0a2ce9aa62c3 SHA512 7eb9c238fb908966b599836d189e6ef5e19c3fbc63a5759ead5696ff3d788b64d090722b1bc841e9c983e6695d7ea63c47cb86a07c5f20ef3ef7fe7708fc38b4
+EBUILD stone-soup-0.30.1.ebuild 6422 BLAKE2B 6e2ef0c1404b05c73834dfbdb0cd579b37609c3ab0563442dbd00afe0b58a1698abdddde4eca8d3840af42eb5756c7abef39b8d5886021013a7caf7b9d0e75f2 SHA512 cb95b93e760007374d2617ab42baaaacc1712cea2d4a7b3a083357711b792b355239fcb5c0149d462247fc2df0499298a7dd9f40d3b520658295a92e59ad3bb2
+EBUILD stone-soup-0.31.0.ebuild 6422 BLAKE2B a524e779c680eefcfea799957d90fab631a62a028fd7c2336b3726491e0a38892799e35c0133f84c9927507ce071771dce50efe5b2d0250e5990e53c755aab8e SHA512 f8ad0683334ff8432a28b586d8f65de3ae37ffe42159d4282ca3fe97ba3be3d2cae9ac1180cf2df7d23e13bea6c310d454a15391166343831266aa5122f1e079
+EBUILD stone-soup-0.32.0_pre20240409.ebuild 6462 BLAKE2B 56032e2cb9ef35a8f4b49a7f8b5f9c3f2372c259aa5f00aaa261b5d3ba05f49c082fba751a8d318f44fc7a33c79821c6869360da32d388ea1005f70190c3b0e2 SHA512 7fac3deaa6121eec5ba3767afca3247f39caf34b02510f3f1290f44a1167dbe542abd6898fd066816ead100a70bcbf9c38f51aeaeb173356f5834a49483027a8
+EBUILD stone-soup-0.32.0_pre20240626.ebuild 6464 BLAKE2B 01c1c247755657d080b92d8bbc7a368dbfd1e5d24170afec82697ba2817128543231021e9c6bc2831ece3a9d81ea5b3100c3bf3b96e39964b3f42cf44c0a1cdb SHA512 f4101c2d2f86d1217289e2d080a93256def3ec68d3b8618e817152c49bd0f5c4e1cd13fd446f9aa05fd131eff09f54e788c666f919b2ab627ba830d303de62ba
 MISC metadata.xml 1735 BLAKE2B 7c4c4777bbda596e10acf0eafac0b5682a8d3a6e81562b12ca38ad6d09c66a672933a127b9d5c853122ffcd4feb436667149f5e64732053e002b6e1044e7b1ee SHA512 a252f1ffe9b57659d9c7ee25aca3263d6dd79e95399fde3d888aa6d3fceb8f821ccf2a47fc0fa72eb5e1bab4bac4c861d436732818366d81b8cf7df6f0e659aa
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
index 0b712dda89b3..dd87d033bd97 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r103.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
index 6e8f74d68955..69dd7d5bd22e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r2.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
diff --git a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
index 0c67e25b1d5e..808ceedc5014 100644
--- a/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.27.1-r1.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
diff --git a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
index a2a5d00a8ad8..7596a6a35871 100644
--- a/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.28.0-r1.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
diff --git a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
index b3aa85ee3dae..82d404c5678d 100644
--- a/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.29.1.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
diff --git a/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
index 92908ca4accc..38c0919a3cab 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.1.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
diff --git a/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
index aabb2224fe3e..4dadb2f8148e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.31.0.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
index b86851ad074c..79c93c7aa401 100644
--- a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240409.ebuild
@@ -16,7 +16,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10,11,12} )
+PYTHON_COMPAT=( python3_{10,11,12,13} )
 VIRTUALX_REQUIRED="manual"
 inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
new file mode 100644
index 000000000000..3341d6b83dad
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.32.0_pre20240626.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
+PYTHON_COMPAT=( python3_{10,11,12,13} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
+
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
+HOMEPAGE="https://crawl.develz.org"
+
+# Leave empty string if not a _pre release
+COMMITSHA="3d6ac616a9d452a692b94beb1a9d6b8e66346631"
+if [ -z "${COMMITSHA}" ]; then
+	# This is a tagged release
+	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${PV}/crawl-ref"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
+fi
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.32"
+SRC_URI="
+	${SRC_URI}
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
+"
+
+S=${WORKDIR}/${MY_P}/source
+# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
+# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
+# Public Domain|CC0: most of tiles
+# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
+LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
+SLOT="${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="advpng debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	sys-libs/zlib
+	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
+	ncurses? ( sys-libs/ncurses:0 )
+	tiles? (
+		media-fonts/dejavu
+		media-libs/freetype:2
+		media-libs/libpng:0
+		sound? (
+			   media-libs/libsdl2[X,opengl,sound,video]
+			   media-libs/sdl2-mixer
+		)
+		!sound? ( media-libs/libsdl2[X,opengl,video] )
+		media-libs/sdl2-image[png]
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${RDEPEND}
+	test? ( <dev-cpp/catch-3.0.0:0 )
+	tiles? (
+		sys-libs/ncurses:0
+	)
+	"
+BDEPEND="
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	app-alternatives/lex
+	tiles? (
+		advpng? (
+			app-arch/advancecomp
+		)
+		!advpng? (
+			media-gfx/pngcrush
+		)
+	)
+	virtual/pkgconfig
+	app-alternatives/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make-v3.patch
+	"${FILESDIR}"/rltiles-make.patch
+	"${FILESDIR}"/avoid-musl-execinfo.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+
+	if use !ncurses && use !tiles ; then
+		ewarn "Neither ncurses nor tiles frontend"
+		ewarn "selected, choosing ncurses only."
+		ewarn "Note that you can also enable both."
+	fi
+
+	if use sound && use !tiles ; then
+		ewarn "Sound support is only available with tiles."
+	fi
+}
+
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+
+	if use advpng; then
+		eapply "${FILESDIR}/make-advpng.patch"
+	fi
+
+	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
+		|| die "Couldn't append slot to executable name"
+
+	# File required for a _pre build
+	if ! [ -f "${S}/util/release_ver" ]; then
+		echo "${SLOT}" >"${S}/util/release_ver" || die "Couldn't write release_ver"
+	fi
+
+	# Replace bundled catch2 package with system implementation
+	# https://bugs.gentoo.org/829950
+	if use test; then
+		cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"
+	fi
+}
+
+src_compile() {
+
+	# Insurance that we're not using bundled lib sources
+	rm -rf contrib || die "Couldn't delete contrib directory"
+
+	myemakeargs=(
+		$(usex debug "FULLDEBUG=y DEBUG=y" "")
+		BUILD_LUA=
+		AR="$(tc-getAR)"
+		CFOPTIMIZE=''
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
+		CONTRIBS=
+		DATADIR="/usr/share/${PN}-${SLOT}"
+		FORCE_CC="$(tc-getCC)"
+		FORCE_CXX="$(tc-getCXX)"
+		LDFLAGS="${LDFLAGS}"
+		MAKEOPTS="${MAKEOPTS}"
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+		RANLIB="$(tc-getRANLIB)"
+		SAVEDIR="~/.crawl-${SLOT}"
+		SOUND=$(usex sound "y" "")
+		STRIP=touch
+		USE_LUAJIT=
+		V=1
+		prefix="/usr"
+	)
+
+	if use ncurses || (use !ncurses && use !tiles) ; then
+		emake "${myemakeargs[@]}"
+		# move it in case we build both variants
+		use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;}
+	fi
+
+	if use tiles ; then
+		emake "${myemakeargs[@]}" clean
+		emake "${myemakeargs[@]}" "TILES=y"
+	fi
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" \
+		  $(usex tiles "TILES=y" "") \
+		  catch2-tests
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" \
+		  $(usex tiles "TILES=y" "") \
+		  DESTDIR="${D}" \
+		  prefix_fp="" \
+		  bin_prefix="${D}/usr/bin" \
+		  install
+
+	[[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}"
+
+	# don't relocate docs, needed at runtime
+	rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license
+
+	mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \
+	   || die "Couldn't append slot to man page name"
+	doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6"
+
+	# icons and menu for graphical build
+	if use tiles ; then
+		doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png
+		doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg
+		make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	elog "crawl is a slotted install that supports having"
+	elog "multiple versions installed.  The binary has the"
+	elog "slot appended, e.g. 'crawl-"${SLOT}"'."
+
+	if use tiles && use ncurses ; then
+		elog
+		elog "Since you have enabled both tiles and ncurses frontends"
+		elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the"
+		elog "tiles binary is called 'crawl-"${SLOT}"'."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 0080ffba1855..d6c3f4dfe148 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 70e4e26f78cc..93ab595fabf9 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -2,138 +2,71 @@ AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44f
 AUX gentoo-default-prefs.js 362 BLAKE2B d3f08c4ac1ae1941e2a805175dd0621756a7aa44f2dc0daf90762a0307c56eb1777e0acd572c6e131e5494c6586c4af2154e0980d25c0f4d4ab3cf4df1747892 SHA512 924313eb0e23b3609b27e3984cc39545122fdecf69d6382d11f18e92962d7a2018a1846404329f21b5880b7baed9491c7506fec998081413fc7c2c4c6c4e6bd1
 AUX icon/thunderbird-bin-r2.desktop 909 BLAKE2B b7e555dee5baf53cae48cecac514d222d24a67f6a7bbc406a6c1699a86ccbb4ccd87b477a453cd2d39d239f00337d9d20fa621bd19ee40df911c51880e924aa6 SHA512 ac80c279082f88e3e2763b07f28d2bcc67f9ea9c730a1c984f102bc092f171921a1748473bb164d97a47a6f8bb5d7cac76dc544ee322add7654056a0a14af718
 AUX thunderbird-bin-r1.sh 2674 BLAKE2B 724c45ead31ba09110a30c2e36efef96314654873717c8da9236c12fae33b873bb034ea050ee4bc46e34e3325817f8bfc839be3098828d14fd66a80d82cfe0ba SHA512 aec35b1f7df0d4d94af03e248a68c13867b05eea73bb61bf1bb5a6a50fffa123808ab8635c2c2b627748568c9addb9298cfb22a25919715dea935f0a999fca8d
-DIST thunderbird-115.11.1-af.xpi 550973 BLAKE2B 0c9b99b5661b12651b386fe23e81fd7c7d7b7d0b3191ab5cb6941cf84a2fa118ef1428f57896fa656ad25167b09e95bab90124fb101c9889517e888dd1bf1393 SHA512 7a2e986f218bf8f1323bf45041d54eeacf9e2ccbf1778e37136591fb2341265c695450954c9f800e0d0c5825a7816649f64b332a33ceddd59f4eb43dab248752
-DIST thunderbird-115.11.1-ar.xpi 673668 BLAKE2B 3f5991f765a815616d2b29299f5ad4f74f0de585383589a618b559a6263ff4c4f26352ddc0fd5f3aef0715a5474f5a6c863aa408ac7b857ba21f88485ceaffa9 SHA512 1506ea4f2a86c2b4ba930ba382341c54f26f21328af5445bfab5cb570af53b0d06d496d56f05464bd397f895bf766b3347822b72818e8bed425e7e9cdffa137e
-DIST thunderbird-115.11.1-ast.xpi 569921 BLAKE2B b385640bacd2921185fc81a4a02173e5ad37cfd8515c2bc974927784550605ee9712f0917b4a88aea944459ca3bf29a6b49ca157b8d5ad6d138fb956d552c8d1 SHA512 7d1535455b4a2ce41f0aa6c377dc57d4a351c0a28bf00eb656ae0b552bc051bfe256953c9aef6da92bb665487b55bbc5f0071d876c4396c3bd6ea53adbdbd1c4
-DIST thunderbird-115.11.1-be.xpi 734713 BLAKE2B 983e91182504cacb0b9819586e88b9840212fc3fc22ffb240ffd63c3ea0bedfb9cdddef919a40cdf9903e7f0950cfaef477abfe9e18e4a869187e4503e2b492b SHA512 024c1254c0a857332f71a3191943419598c6ff517fe3664e0ff08a444b5d6bdf25590fb631550b6adf8a58bd26811c8872dbcdb34146f8956cfdd7ba6dfb344d
-DIST thunderbird-115.11.1-bg.xpi 783910 BLAKE2B ee1c379b7b7bda7aadc5666c312ad45339fa9478633f732d31f3a4d340d15999b7c08e1d1c0f309327b7d5f036039f35e0cb3c06ffc96049599af6781b1e29d4 SHA512 b5a383ae34d9a9cc076ebd315bba671b5cf0e02596797d9632519dd99c276660cb7177f0e22ed4ed8f88d12b086a129046e44892d4ee386520f1d95d51ffa205
-DIST thunderbird-115.11.1-br.xpi 648069 BLAKE2B 418b2589cd57eceadfd8d167cb057ca873c25baf6b3dd28de747dd3ab3ef777ba6c73816c259a768e21c767cb771c0c877d6f282cb70fa99a81bfb4ce4f2519d SHA512 d1dafbf9080c1f1db22d387ce4773c663bdd1d270dbe7a5d8748ecf411ed3e4d64f849dd162f41db792b308523a8389539f5ee55a0f0e9dcb3d97764224d6636
-DIST thunderbird-115.11.1-ca.xpi 687691 BLAKE2B f3010ebf53681339661f622bb3b78b3a5cbc68d5214c9c9b8fe70a0f6cd783f7655b3d6aaa2b291abcba425c2a18214416079f1f368b13f0aae977ad6547faa9 SHA512 b7a3648875442490b11af639b212ad968bbf64741233b98eab252b687209ff9052bb06086ebd3fedf8c767efa809e08f0d6234c4095c5ccfc3effb3576bb1522
-DIST thunderbird-115.11.1-cak.xpi 669821 BLAKE2B 87179f2e7bece84c8fc9f76d0f2672f267ae51e8a7629768778dbac99d1e4f981a01f2a6c0caab78e250faf7b32f2f2d795e0baa31391bf713eaa5926e686b04 SHA512 2a7c0110416a0552a964f501d048beb796fa2d298863a00f6c11a45d034fcae8c4e29e64f6128a3e45e58e5b4aaa35cf27062d94841ae05403c11cfee34b362b
-DIST thunderbird-115.11.1-cs.xpi 769913 BLAKE2B 015eaf273a2db436cce453bd1977616a7913ecf2afb42ee3c2cf04ecc422e131613d31ae197918d79258c311f694d946e725faec52a89245ad87bd8a9b9bfc07 SHA512 d185c045cde749a058b4741d9771dc86e51b3fb30b6a49aaf07678b5220a2cb29921aa46c1f3a55d1fe3634021c7e0b415bd7661a6c14de8c7b89d8ed6bdd4bd
-DIST thunderbird-115.11.1-cy.xpi 734615 BLAKE2B 5921067450995283d5c1beebe3c89306a47926bf2e9512dd831e9f2e0c7c59d3619957f0d6a94bb6cd5f8c77984ea9fa3a9062d3835342ff93a1de5cbc4175f4 SHA512 1fe01e2a4c7e3990e8881bcae448c86fcf54afcee75997996f1b91ed3cbb80ed3b4904ff13ee2b1478a2dbded5c6e1304fb4e479a7c85a3b5f3d8141325a5c71
-DIST thunderbird-115.11.1-da.xpi 722531 BLAKE2B 149f5cf471455630e38b8d529e31b2cbc277c642618e310631a46629f55c0755321a4d7efb9764666a62eaeadb9375276c5acc81d5a7da5edd67c05ad74ae4ac SHA512 f563fc77f785ffa1e7685b3546d923d2d0e5fcc3bdc7b87a2143cd1984df9b3e14faf6b28fa14139839e45a85264434089e08888946069f5a8c09bcaffe33de5
-DIST thunderbird-115.11.1-de.xpi 750860 BLAKE2B 851539ed92552c47a826fa9f4d95751ddab9e79055c759042d3479b0069c1d8660fe7136e5c15eb6ff2e52993b5da2e1d107d975b0109f645c970344cc6af681 SHA512 9f3e57a7a39be59240b82a3973543676d6ef87c708cca7316c7979e26cd265d87e14f3729344e7e0e3b6d3afd5fe9ede929099c9ec70d1b587e87b9788023add
-DIST thunderbird-115.11.1-dsb.xpi 770434 BLAKE2B 249c253a3c00700bdba6c8462df529da1a6faccc59c56e721ad57b3f92a984bff9e2ba7f730ece0902d1fd1bfa21f91e7394e0ed35fe2b5564af7050d3dd5567 SHA512 9493f93b30c8f7caf1c07a005ad1538d2da99c444070500cffea2b18dde5220a81c019eb487ca0c0a39f3e410f1ba3cf78a4f7644dc1f37aeec64b79e36c46d2
-DIST thunderbird-115.11.1-el.xpi 873407 BLAKE2B a1d7a36c635aa2aed731955384a0f3e84f1686273e84653fa203a3fd1aa37f9146abc45459364ef3a87c61ef05960e097ea944dc61080dcb9ee23751e0c5e818 SHA512 d915d02a752f62e433472627c3421ff1841618341e8ff27b7996b955dd638db36bb70e7d3dea28fe100d38a2518e2b42ef4bc71197981fd424cbbe8528dba5d2
-DIST thunderbird-115.11.1-en-CA.xpi 688599 BLAKE2B c507ab345d7662d2188ae75351fbb9d50aeaaf6b80d9806287ec6faa587d95116dd963e0bad7a5345126e00bc9376fd2c70c090b3831785b0d4d122b3f6ca926 SHA512 fd7142e39a14e2663f8e08f22592df9f0b3c06564aee513a6d6760779bdd1f17f8e609bf719b229a58a52b4836b08e485fba0ba0f834bb2129a3742e1b38c499
-DIST thunderbird-115.11.1-en-GB.xpi 690435 BLAKE2B 1dcbb536450c0196c33bbe40e3418aca75a22109dc39bd52b9208086c8210f40fdf327cb8831d588398eefbbcb310320f4dc2563f680e4d411ebd236e14a8b37 SHA512 d5ced4647b381cbc4019537f0b1124780b2d46cbdc14a1380b90d9d4babf8ede771c9a6d3aa51b4e6204490e8cee5cc76dcb9881645d8968a8f016617b92a240
-DIST thunderbird-115.11.1-es-AR.xpi 745002 BLAKE2B f1fae57ec39ed0639eaf686fa0a0e1e2f5275e8a6a21f27bd09d9aa9ad203a8725926ba3d19a52b30a2c1e292cfdc98500eac986e8f62fb54e4c414a021b74eb SHA512 3f28770d0eb767ffe914b0e3f8aef4157c24657174144c478565c759f694a9132e0ef1a865562a96fcfbd83e7a23d2f25ea748e19f4f559961b0cdf226df3896
-DIST thunderbird-115.11.1-es-ES.xpi 707995 BLAKE2B 6900cfa5acabfd048e580cc25e871e9463f7d1ffddf271353a8f8527283253e0953ad5bc23fb7c3dd11640a2f0736a76c1d88d8d7a7bc6879f0f38069fab2f23 SHA512 7609b7f90fb89ca06df2e48065895aa4b73f38aa21e4799392fb830dfaa00ec6391ca2c2e9542aa84f66e48ae3bbaadc23614c699bfdf229caa9c1d1dcbbeed9
-DIST thunderbird-115.11.1-es-MX.xpi 721552 BLAKE2B d7c9561767a1a8f333acec4977027f353d5df2ff6e9962ba35d7c4d478804495398bcbb6b90b7d2300b7e96f5fa89fe8366335140917a1eec3bc764da53e2a0c SHA512 85ff729324fb85bc889e164d67590006fad624af565576ed61f9da245335967daf5d6706855a50a17e2f2a2c963fce9d141bf5484a28ede8f354eabe2d88719d
-DIST thunderbird-115.11.1-et.xpi 681749 BLAKE2B 5d963a4cd285e5a1603ad6c3a7dbed03cfd94468222e88ce89cef5596d42f651986c48bf8f17208d71cb602f8672fef42bdbd4dc4ad8cb0fec40638109ae8cc8 SHA512 1142a2421b1ddec007e3b3a2929c58e60dccebb2a3ef203b825db8dcddab9657bb6bd2dbee56261d54fdf93d8866cb8a0b2b028131204297b077a5f68b95715e
-DIST thunderbird-115.11.1-eu.xpi 713611 BLAKE2B 6448cc936653f03a3005e3fed63c98923e63010541955970fd8674cb1907f5873bef25f7a417b517da37d230cea42c3604c78df85f63c9933a036c338220ea8e SHA512 47fd9e99e06b4b37d5ef74236c9a8d41fbe1e23938110c5b04f9cdc1d00040c7f2c5b9ddae4daabeeb22627595d2643c52b300e7490ff44014271471db9ca0db
-DIST thunderbird-115.11.1-fi.xpi 720334 BLAKE2B c473bcb554ea64d64e6d85eae0901f29a70a8c556e302633bfb8ce77dcfa90712ad2f7283a5bc15ea109659a00cdb3626a5cf481bce691b91ff81a1ec65a718e SHA512 722c1fd50544f6da54b0a2487ee16187271445a15b8841c32886a103d561a55db59234b4ef5359d97f5a8c08c8a6121335112c9b062787787e1f415aca9fd888
-DIST thunderbird-115.11.1-fr.xpi 757740 BLAKE2B ab26e4287fbe256713d9933334cd607d4362a9960a70f8164bde64f80a0789609ceecd06b65b902373fa65888765b2b626187d0e8053fba13db3bdb7bf6fce30 SHA512 502dadd6b7906a883dd8c2136a8a15696c90ce9c33d0c74e198e673e3f4623d0fb0a6c117d01448eb1edbafc534de343be1b9a055f20d1bbc306592122d66a55
-DIST thunderbird-115.11.1-fy-NL.xpi 739635 BLAKE2B 5f992839f6516917806f378e8f4a36032b00a29f100dbbe5fcba30d94c5e3ce1a99fc5f59eb8ec677eefdf5edb104022358eab1aae33cdbd13e902247c12b13f SHA512 4eefe1e5be9a01f22326a0d6a2cd98e1aa578994732d2b09dfa4e8f7cc453b1c85b517f0393445604e6f851b94ab4195ca05c89357d7fafc0f84555c9e02df59
-DIST thunderbird-115.11.1-ga-IE.xpi 611160 BLAKE2B d40cc83adbe35df6319666be567b6a4ec7a9b997099dbecc2bc39462a97c27bbddd15213ba4cf88a5ef29bff385c6b1418f6ef5f9b1a02edaed32f94caa0b973 SHA512 d4f832ada9a61870612fbfd5d79c74ac80162df0a1ebad8872c2e6ab5b85569ebd035856ecad5b6b87b28948139f97c56577732609da5216b9f11a68ee7cc7cc
-DIST thunderbird-115.11.1-gd.xpi 714246 BLAKE2B f939b2528a38c09b17e8942d1b45fc0c61805ce6437975f008463185718330d56fdf02b3bf4c3a2f38e5b55c599b4d92625f7d294ccb1c0c1285a74fbdf1d48a SHA512 a7599530e4759713eac67a06ba8256f265f6f5dcd3492d6865bd8e39821e187c5ae6576f3a5b47847ea94bd5e1aed56229292a9cd45a4d4448a3081d42f19e23
-DIST thunderbird-115.11.1-gl.xpi 726197 BLAKE2B a3bee29f6608cd52a427cdcbbc5541b9d69bfb75b66cd3240fd4a8340579a859effd19c066c681bcb7ed3088e31714295596aba6a1d131b8989dc64ee4603308 SHA512 2d0ceb132498b30a777dccabfb312daa37be851d80fbe39efe2f0a9f2aee88ba60683408bfe0e19640d781cb12ee36297fba9e34888c6d2448eed510f96b7375
-DIST thunderbird-115.11.1-he.xpi 692094 BLAKE2B 3e27b87f2055806e8cbe4dc1da8ffa085b0983db6c8990e486f6d1dcfd30414e9e04db578a1b27cf84654879a9fe283eaed17532d71f697a6dfc46d259965178 SHA512 4ec5d864007004a4e8a2d19ce6305c8b5b15bd91f546f4a75889a958fd9fe208fdbdfa148dad4554cf18c168bd93fe3118e6a2bbc4080381371917b24c2e9e6b
-DIST thunderbird-115.11.1-hr.xpi 689194 BLAKE2B 6328d9fd8fad0913aebb2816c11b7ed36b0daa9fba05d2a251e846730181aa8f8448b52ae2e97a4b40634833936a0114cd5336ce88d3ff49921039eeedaed8bc SHA512 385b489efaeb24375227c6e293513ac492ac05857127616ba0877f1b954613453115f4cc2a766ee1c7ae764425cd20a1e423e30cd62fa1fa5c0399db74c6d89a
-DIST thunderbird-115.11.1-hsb.xpi 766501 BLAKE2B 977fc639ce9c0cd82f70887a08edfe165afebec7b5783ed00abe9f7c0c393caa7654dd8f4f497a4044a640d5c82ae8a524414f711ced9ef1db8a573ab9a4b32d SHA512 ac79b2eb924d0b69771a6f4c8b051b8d6258b5fcd051392e57b08c804b1c0e15ed17bba4ad4421dfd64a08939812599bf4bd0072f1de037555eae87be8d30fcd
-DIST thunderbird-115.11.1-hu.xpi 769133 BLAKE2B eb64fd0cd7c371284aa5086f7f16d04761acc50d1a5a6ae741d7f17916db98ddd76127aa9fec340f7f993736e0e28591512ad0493f9a2fbf69b0cdb4f4dabdca SHA512 431f186bb0f17332b916691bc7576dbefc58f8e78a2bda9c4cd9a476fcbc2ae9a5f602d36ea17afd21b65c39f6585152d2867e317dcac16cdd66c1a8f03e9f5b
-DIST thunderbird-115.11.1-id.xpi 653754 BLAKE2B ed53983a8b5b0d74b0d59803f471fe61398ab87da7d845a0545e7dd88f7872c2905639fe976cc2a40ab35bb58fc7b9047b5b0cf051b70c1dc241c87478eeafdb SHA512 8c63433079420eb4c2331e37608223ebbf21c4228fbc2a9e0375c2c482acaf2bd7b160974bbe4aa4ad52721dfc9dbf57136ce4fa5ef6fd05106b990497752331
-DIST thunderbird-115.11.1-is.xpi 727096 BLAKE2B ee03706aa6f7613e9f97d2478e4e95f777ce54432e8e248c639cb7ae0b7c968a30d6fd50bb05840bf7bbc5bd803baf21cd7b45ce747f0e88816f6a0547452bce SHA512 607039a2490b450548d8f51ea2622773c5e570245be7b6a80f36b1d89e4b72723cbfce38b299e4d422eae81d5fccdf8d3de03c7ba64acf3c3c99d28dbf93bee8
-DIST thunderbird-115.11.1-it.xpi 676205 BLAKE2B 0b2b7f627405c1c3c3238e6f8ca784b264c582824ab3757d402401091274e6aa065f3d873c2a073713d31cbf4e9159d6f1ef5acb4b08ad7865f3677dc0777eaf SHA512 4fae05347125d6ce69737922caea80fc9584f99736e53e6c2610f1fabf4548e13f2bd22822d13b0e4cac25389a12c98c6cb5432c34b0163e3eb37f0644c69228
-DIST thunderbird-115.11.1-ja.xpi 804930 BLAKE2B a98f1ea541824e24c4b8ee71c15ff9c7ae0f6919381728aa5089ad83bd77dd34474c0458583ef49dde954f778f8897a125023ffd210dbf1113df48b869eb90e2 SHA512 dadd5be43b6d9a7b02edfcb385abc60af6dfa1f6bc72f50a626d0a1bb7928dccfcdf4765f7b084eb26a77b0b7ae78af7a47112ea28057e3e7cf1778490ba2703
-DIST thunderbird-115.11.1-ka.xpi 786093 BLAKE2B 356eb6c61856678d13cf73674fd410acfd475f9f21476c5976433903e1f8e432f5d32c7a9e35736d1a5cf616fb577a939ecefb83e5ea2d83e508e9742c0c8eaa SHA512 c15cf29f7964664d5bb9bde5280387d5e4ddb8bdbcf0a2e598989464da2734e26eff135277d6e8c50eebd04d5d2f1f49f39fea9bcfa35a95b23c668139812437
-DIST thunderbird-115.11.1-kab.xpi 714604 BLAKE2B e848b8d07954d0f54076adeac2951b10a83cc8440827caa9e7b1206aefaeee7445cca626d777e171abecc0f609a0f6bceaf4bc7a0b4d34f97ef4cdb890a63fbc SHA512 889f9304374e4a35e83dd082fba49bbbce1070b06bfae323e9080e66bbdd69ef14edb0c3f3eb170f4f8d01b4529f41509189801e7a813df371adf10d8e70928f
-DIST thunderbird-115.11.1-kk.xpi 842879 BLAKE2B f14848832f11eb4133336bc5f92081ccc7b75ecbc8413a95afa1c1c213c940e424e87a3f8a3d8c27b3c23b1d293aa50af16be6d14bb428dcbe95171b5bc1f337 SHA512 4edf817cb105281722be4d18e93fb82bbec611f1a4844e893e20e6750018dbe830c1e44efae38674b1e984f27cfa2306b7b8c61b8353db4ea046c9a685f20c75
-DIST thunderbird-115.11.1-ko.xpi 746224 BLAKE2B 5b88a585d675676be7c485f9bf8ee1840c016f44bec7821267d8857838bc9510d482c0533fc4fcb6d2403825df6191c5f36895294d3cdb12871e245130b03cb1 SHA512 f3f851aa9d95fa45220e7563e0152e4e9223b2b9164e5ee531c3c289c6c1bba6f0449311bd233ca8245df72d245a53c8a9300219d72d7676f25125073d5860e7
-DIST thunderbird-115.11.1-lt.xpi 690572 BLAKE2B 199c287ac9d27c9c52a51d5916d9b169140e28d32d46ccf21a2372b7e5f5744ca58c8cb172d892189cc7739e849dbd8eacb2d80619777f667e98d0cba586262f SHA512 d7856b4f8ccd3f965b06d7c745fb1fd396df6950ddeeca710b402a013bb75df1796bceb7bd31ca962aea9fdf7c33ff42c06c83de2bedbd250d82f4cefd0d42f7
-DIST thunderbird-115.11.1-lv.xpi 627157 BLAKE2B 846fa80fad8a93400a84403f0b1b5a29ab315c1c61eb671bf5e504f164f1c1b15593b617f3174fb44b18dfdd77b9feeccb205213e1825712eed7c4cba031ab0d SHA512 38d62f6a7914cf5345ffce4424af483d090ad159c94f3e6adb6aa0aa0c2ec072cf10eab922f7def4ebc40916a0967e5d8a4840f3f0d9231a30c67870c8db149e
-DIST thunderbird-115.11.1-ms.xpi 575469 BLAKE2B 7ca7fd21905b5f18e1239a20838cd7adfc6b269ffd208031e03325abca7f77178b9035f972f4ba7c72b7731088e5c1d2072119f50fda557f94da9a57b524e938 SHA512 3f6e9ce9ba7190169bdab77256eaf8982a5590ddd26f89b24ecb906148191e320307e939146881bda925bc731603fb41fac9c81f09e36772a23000519d085665
-DIST thunderbird-115.11.1-nb-NO.xpi 693901 BLAKE2B 47e3a564c49936dfd5b4c5a3ab247806ba324feb467e513d5b630a28782aea63f94f6531da1682a2216c806684d9a98933e125c6dd735b6c06c00b0d9a39b712 SHA512 2727428e955e65f24379981f73cc55f7c831e09b9ab7ba2d47c3cc99ca6f73e50e2a9dc320c7ef7ab4fd08116dff3f398bdcbe83afc9de4e4f13d3c170cad660
-DIST thunderbird-115.11.1-nl.xpi 730835 BLAKE2B 3a5c2db91e81ecb90f2cccc9795785644105c532da648b88a4b21ad2e15c114d696bb2326f9c790028c139bf07a1bf53972aaede103156484dd7c9fdeb91581a SHA512 d20a9c5fbdc38090bb126184e466ffb9f79239bd1dfd221ff6fb496033b7655ea65fef8d1cf058bb8c7b601ee1c169d7f69568eb7e12344bc972791cc12a9457
-DIST thunderbird-115.11.1-nn-NO.xpi 696718 BLAKE2B 31bf6d42e515ea91bc556ea9f7b0e59780594c9184c01379dd59166ccca9d85fc54361f562c23e628a8dfbef271babfb31c0edbb99f47714b25ac850b189f8c1 SHA512 be3600761a73731a60d47fc37a0963c60e20749321f93f7736f68114bd4e227805f2dade32f82d0f58f5f52155cd6e9d8f4819681def5f4afdca24c8949d0d11
-DIST thunderbird-115.11.1-pa-IN.xpi 683514 BLAKE2B 89c3265a613f2e99563eba36f4de7caf8ef9fc1978a88d6b3d0df2392f33d26aeedd7e7f0b6d4b5e30b79f77e9093bc2e8648bb1087a0b4da6ec5f08a1016c2c SHA512 f0de02df80c9fc043e0f874e61bc3c462ebb5e49b5be3727f47ccd113272b88e2a8b7a02b1334c9cbade4bb7c4932a545f2654b8c7ef87362fa3516cc0ea5f79
-DIST thunderbird-115.11.1-pl.xpi 749662 BLAKE2B a3f5da05a3bf6f1eebaba2b51561710224a5ae03e6baeaf894e139c041c6016eb08a6d76346a4814c3de4d2d37af6f43786fa86f95063a48a0dd422bdf1f7e28 SHA512 3737dd411432421a6a303a96738306db6c156596058c2fbac258fadb9184a3403281c0114d2d037a95f23e3910687198a215191ab5afd9f9c98e41913060bfc4
-DIST thunderbird-115.11.1-pt-BR.xpi 738424 BLAKE2B e708a8cacf1454619b3d1668cf79f61264d937a177a6ad73e1f5fea66d05ad7ee3c05c50d75ec9603e6aa719095fa23e989159e249c2e80aca4245cb879b59c1 SHA512 0cf7ee1bc79886fbec9c11d0afba12534d80f8f8d8124c42a84c90a47de1a88973f2f0e0aec0562bdcaf6bef3c0b79b9a23bb5f99abdce7bc9c99205549e4927
-DIST thunderbird-115.11.1-pt-PT.xpi 728870 BLAKE2B 2c3cd7a44595205a7f62e2f03c99554a602ca09fc29f8decf34c64bbe9b294b21201f8a587a5e41ef909c5d856e161d48478a45e84fb8f2ff8eb60dd0bb3203b SHA512 fb7e434fdd76b94c0fffc282edba84ceba9259ca025120f221bbd03c654f17a67e5d9bf9218893dfbc9a243a76fa3e0fd68c7d75dda6d5ddaab6246ff358579f
-DIST thunderbird-115.11.1-rm.xpi 732588 BLAKE2B 0a92f079eb74c4bb5dc00b6465ff3ea072d03438ab29b8848fce5ab0a13f4a51c77438dd23dde02bf553580be963c08a3f6b9265c979762c680d6fa6de38c613 SHA512 2fa7af9db3dfea5b2d31eed543357b3b047bd65904823db624465b8df8a14100259bb25d292f6f3dd37ab640e4a98418912e93fc5d8badaa4f736d9868c3ba25
-DIST thunderbird-115.11.1-ro.xpi 661831 BLAKE2B 8c6fc3a96f6f8c6c1b88c4a622c184b05288b3482eae0f0bd809e7f8a7dffe7b7effee832be5efd2d7466088e3ebb26a1f17a1232a719d0c29cdbd8142a4e16d SHA512 dfa11705311f2371355d2e745c47a42c1d5fb4c60fc1d575ab25650c78d905e780c748a71e8d677b7ddd24370410d95367b7e61a2e0f300bdebd13a4cb89cea9
-DIST thunderbird-115.11.1-ru.xpi 857137 BLAKE2B 3c4f7f6a72728c6eb4b5db68555fcb5a29110933c36bfec05b0f9d432c6c41abacb0ef5a06ac53873d2e047229473744f598e88d00091c2d32b7645879c632d8 SHA512 505e7a560ad24f8077c7ec243a50080528dc40e75fa7e4d2e69cca8b04c299a44e309d158c760c67369c190a674c97d5e7240c81739d7928047834c4473899ba
-DIST thunderbird-115.11.1-sk.xpi 769056 BLAKE2B 3e5981424050929ad700ac208295a8b61352b36042f071e7ed931b5b2ff6303e30b98e5a7bc693dc918f68139ca86c34a70616d2c2dcc302e1652e8acfe90da8 SHA512 8b8cf0b39dd7ea032a69c05e606ffd089e854fd35522436c475050a0a356fb4d45b3be3dea06c22622ecd86b27190113e0f642d10397c855fd842bb08980cd06
-DIST thunderbird-115.11.1-sl.xpi 729108 BLAKE2B 5c4a8ad40a83e6c2561a0ef24155c1c960ec7b0481e81faad7df294ed76afc1d9790fb2ce721f47e9cb6ae3040a30e97f16f00ca55d2f4216ea0cfafd17958c3 SHA512 9a15492c2df3450f532311c076600500ba5bfc11f995272c2b24d9d25b254e37ffa8d7e5bd90100b3c145f15b81431adb695c12483fab548fa0791215288c8cb
-DIST thunderbird-115.11.1-sq.xpi 753635 BLAKE2B 845282bff9407773186f02a99f32c06bf4924c9b528f0c5cdaa38846bf0504c98bdac47cc14c2551ad6c81e717f609c833de12f13a1f6e6b31cba3044838f1cd SHA512 78849e83e065bd5502f91f6e870d36565a59cd533fba82b7105a4f086e3bcd52a57ede5ca68c560c32ff57ca0ff93caf589e63e820727e6ca543f888b29e9a14
-DIST thunderbird-115.11.1-sr.xpi 757455 BLAKE2B c4c5f233e42d4f2ba791feb4af9d1ce83de416cfa7ca6c2dbba41ea082167f15c8d0ffca08c6c1d0989b42aa5fee3a0e7ab3809e62c973f50071ec1d574fca52 SHA512 b4be864253f02542934900cad888bf92fe8922c8e87daae8bf099279ee4d06f741ba31a74d44350632c97d72a4d51ed2debd157c74adc75c58978d21f8010f18
-DIST thunderbird-115.11.1-sv-SE.xpi 733955 BLAKE2B db56c9def3286a2abebdac723eb9512214089d89c46b4dc541da1a4c7e8e4414497df3cdab3c0e9775d2bf58782ead7422ede223ba19dc161d5b09f816a1f290 SHA512 304f3946a596b197525263a58995b8256edc097cacee2fb7fa94fc48b7372dace6590eff4f1dbb1d3389d5dfd6aef9692768b4a3802ebe4d4cce5fe463a60a9f
-DIST thunderbird-115.11.1-th.xpi 804657 BLAKE2B 7738763a07a10571776e0a71dd6efeb9c67496f4087c03e4da4bb321d7747fe8da08d6f3345cac04ab2d71c3ffb5276a265032bf374627dfd497eeb44d91a602 SHA512 de5d48ddd4792cd9a6c31024ceb678475d5516c712c81493560835feb058862de959d3e2800c3a33813a7a314056a4bb403e593ded88efc5a40ad218515a619e
-DIST thunderbird-115.11.1-tr.xpi 743474 BLAKE2B d2acf16e52f1a6c72c54add96144e6a54879e622fc04a589df3007d2a6f4ed78dae5c295313de66943d0d613172d8c8d198f28bb6cc38da59c5d2b5b1a69c163 SHA512 443fe8f6815a40bf2bccc2628857228d2a9af84ddc10e39e1c6e2ad527292a4d56f04e8bf8c35ff223184a1525cd05871a38e33a6d49c6e7ea8065a4aff2c734
-DIST thunderbird-115.11.1-uk.xpi 846639 BLAKE2B 99a070f5c7b56dfb6f62db7b3ccf11b5582c501e3ca3ec599fe5a0c53d9e52081456b6c87627c968635c7ede2f94cc0c7efa6651e9eb2b94a528087d343269fb SHA512 3882220c6811e178fc8ebe36a9706419ef2b40fed4b7b970b3876df96aad3bcc5448227924b836efccdd87f2bf7469dffb63aa8350bccccd35ae4c12436a7244
-DIST thunderbird-115.11.1-uz.xpi 588507 BLAKE2B 3975bfea68b229b49831d600354322a4da6bbe0583df10e55aef75f4f71d9e14e83cee8fc23326b1f87f7d35763dbe8fb9e9e525a1393688c3a28bd4c1846ed4 SHA512 e6d6227818b668301cfa5bfd3ee4a0c3e727365d1bf3c05e54353158a83585f815e4c8a5f16145fdb893c342e3562f0226dbff9a94535a57045065bea721f9dc
-DIST thunderbird-115.11.1-vi.xpi 772900 BLAKE2B 238958f46845afe5f3751f368f31db13df8297f660d6d6f242dad37fce2995e6a5017e38d61ef4fce581d9eb9a7a88ed43ea10288f66d0b168cac24bb727a11d SHA512 2afdd6d318c48aca73d5bf1f88477bba638c4ed5f1b8cac7919c409a5a5a715819bbf4f752b398ae249d13eccff51beedb4657667112bab6bb32894f58e4446f
-DIST thunderbird-115.11.1-zh-CN.xpi 771965 BLAKE2B 5818e1a504bf0ba3f438b9a2b0b0ae6647cb9b479bec9fc2165356d4bee86ecf17ef29a06c2e26cb2d0eab9f6b26e8812ba261af03d2e8fc48e39ee5a41d349e SHA512 d83fdbb374359ee1450fe305b85e360781853c114a18597d4e72fc928e0584273a80ab96d4a8bbc3dc8cb11312013bb01dd1d3cf0ee7b974639090cc28e65155
-DIST thunderbird-115.11.1-zh-TW.xpi 776441 BLAKE2B 078595591f5f18fbf4fb843b24a22793e3088a03d0ba483c914bdfbf59dc142f02a30dd260a1915c83080b2177a81a1b94d64edc6e1b65457c1592d7a2fdb908 SHA512 14bd6e4c4746f838c7f0813d304c7d861a31623ed7ea6c9dbc0f6126adc674e9b9b73631472138465a23b0f3f463284f9b378cc5367212318bda8dadb913627a
-DIST thunderbird-115.12.1-af.xpi 550974 BLAKE2B 3f973170020cd5fa492e3b1cea3088a801e799f48dffa2081589cbcaa51eaa953dafb62ce008f894b465f6c0bee45532241b823dcc4ebe643c032fcc7ad58ae2 SHA512 6f2084f4b61d39eef49a499da144308accd2dddf1c191adda616a5289c7afc8e4cf8700b45e0b9957bdbb8b882a998234d2971d51eb970957d4a2d99ce3cc877
-DIST thunderbird-115.12.1-ar.xpi 673669 BLAKE2B c4bdce98303c81590bcb30c99bbbd5026e41aa67e3c14e5a2e0e91f2452fb8774a7c7242c6c4f82c68312a67e1caa4fb2d7d892ff6fda9c35073f270ac394ce7 SHA512 549b8b491785f20e0459754087c89bdbb9fe21cd124bd025b6854040da98724884c78556382be6cd9de5652569a19c8a540c67123d3c7e9c31ae8ff445db3c94
-DIST thunderbird-115.12.1-ast.xpi 569921 BLAKE2B 58b9e9e037dcd13ff2768eac57c06a0769a47eefd37d5705a4b61cc28a338422fac10eec787501d173839a68099071cea11f0c2adec2e277d756b089e7860042 SHA512 47e605d6846cbcbdd07f6388453fad1ef5fcd99013e288a6ff5a70920b2946567dd6317416f2dfcbc19b2def5980005e245b14c6f273f4ff2dda6ef31cb96253
-DIST thunderbird-115.12.1-be.xpi 734712 BLAKE2B f0608c46d6255e12683ac4648702fb4898912669ed1bf4854b9924dd3ef6c33a8898bdf04922594a16ef539a1dc9768de6eee4355ea60e03cf941ea0f4c5a044 SHA512 cc5066fa64dbf58d4af7d273e6a3159b38aac39c6b1af7021c3772ea654b55283a4475e9d1186b8d907750d2c66538251f5b45cf7951bbbe9ec3519fc9d03b49
-DIST thunderbird-115.12.1-bg.xpi 783909 BLAKE2B f73e174d5df6a74d398cbf9bfff45c363cb028813a13688bb6653e5ef87e9013f0e651af1b9e50f8e38348ca8113af2f2a32d27360b3f93029e35a5b922c2ef7 SHA512 edacf38b501eafadc9b73ce03854601abaec9f7bc5dd34c382a34548e32978e6e148116913aa2f2f4b69447ef2703520649b690ce35ed193cfcb7db1b0070dcd
-DIST thunderbird-115.12.1-br.xpi 648068 BLAKE2B d51f46dda78af672bb7e3f4c9113b46ee8ce3170139a95a6c5c600356a58db6906520b8f52a84058c2bdb6bb06af3aebf41b7bf75230c6bf2fe24f0139279982 SHA512 9f35e5382ec6a95e48151fc6b11be353dcb82ea5477ae4b32becca4e83e7784423ad9f96922aa3881461c9adf8dbb8e569cbc051ab62cc32304da4342c4f7623
-DIST thunderbird-115.12.1-ca.xpi 687689 BLAKE2B 7121218ff3555af30595ea78e7ba8650b06049baee81074ea656556ab5f3f02bf789378e312acf25d8cfb6ad0205c23a5798f4e3c9486d06fe66af31348c09dc SHA512 81d08a7253dc7d7e9af257f8b28ecf5bdb52b1606c5e7b673646ee6b72d6bb9b7b5ec6fc53e4ad74fa7a55110a3a42ea61db0b17a04472937af733fc4e508f31
-DIST thunderbird-115.12.1-cak.xpi 669821 BLAKE2B c9c0a1ac9ca828a301bf01e518818121996c7dbbee26e0c931cf253538375fcaed142ee01b6ac0245d6c0de4de08c3a9c15bde5cb637bc9ce6acf14176e4645f SHA512 67e31d1a1d0997804563739a1e825f3de8d37207f550ceff05a1360d84c4d22832d025861825cb67ca41d3d8adbb64c7fe9a8222f0c5d0f1b5e88d903250f57f
-DIST thunderbird-115.12.1-cs.xpi 769913 BLAKE2B b76f373c766ea89e27fc841d5a912823de4b122d2dafda54c6ccdfb1ddaf0d84df6f16325d5a75cf1723d9d86102a75408ed2453ee08134e3d0501d913b70e18 SHA512 8d322bec969ebebb1a5932ff57a1f48a3fe0c243719dd56b1645cd91a5dda463d052b40a198c5681dc6696b79322e805dffca9e77939352d5165d60733a834be
-DIST thunderbird-115.12.1-cy.xpi 734616 BLAKE2B 01006ab1f8bb225062663fc6bd99fddbb1ca4d02260267fb983bcdcf7014fa66c881c17197d5b8e2305783044f3924377e185583a6ea9c3a60b48e3132f61437 SHA512 998ec9f54615939a2a661bfb30de01c34f99d247a20c8bf24b9ccf78dc5555e43a6a6f1e543a0ca4bb2fba9c9a6e2069f92d27b915ad08f4fecbe08284961c5b
-DIST thunderbird-115.12.1-da.xpi 722530 BLAKE2B b91f58f4eb1a48953b9cb168c216547d5653c8d20b3275421766ff88d2e18ae864a080162a1b3c1fa7f126113bace68e290cb8bb6e008a19381b8dfb3488ad03 SHA512 a6a443e41da1a54ba5f089d051a282671fd72e7e0e3d3ecc710f21a0aec8f681991fc8ff0f1275fbb06003d55591bfc60732f8fccad7aba341bf23618c5dd9dc
-DIST thunderbird-115.12.1-de.xpi 750859 BLAKE2B 0517697578147f78d03dd2925c3d71c8b4d074bac477cb248c7677bc6583df57fffddb4da9f7a1e311383960b05c65f5763dc4ad2587f8814bdeba0e1792d0d5 SHA512 6a64c4fcd7f07d725f75aeea5499dff34875a870a91250de611bf19896624b56579f9f0f29aaa1612480c621613d3705cc2f8504a298782a45904a09d6105531
-DIST thunderbird-115.12.1-dsb.xpi 770432 BLAKE2B 03522bac35b87ffe25cd7d69cd662bdf1d4674ff3f2c60f76854d4b02505f8131108ba9c76e73c4fb2b870d64b8f5ae7fcdc96e5ec976195716d9eee52bd3509 SHA512 2b44e64196ca98f25d01283c91d89f07cf25ad4fec5ed32a3c8c1d1bba45e2d04fe23b63cc5ee1f8dbf691e6e25a6fbfe8a92b29cfc8d91d9a37479a673a54f7
-DIST thunderbird-115.12.1-el.xpi 873405 BLAKE2B 312ea9cd388986f26b7a1783b8f2e71605f3dcf002fa00d8a020148c55ed8f51feadd53dc1e45b68da8f4d8a3d8a73e59c90f593f7b56138ab18627d56fcda0a SHA512 afd3505dfe52f62ce1d63699f37ddf637cdbce2261ee3f6411246bb3b88e6a679d527ea1b47d7d44ac4ac50d1ad7e5b3459a0981c409834f5fd4b596c5c0840f
-DIST thunderbird-115.12.1-en-CA.xpi 688600 BLAKE2B e8cc063ecfc455a23ffedb91580ebf68531a5e0e1f2b18dbd42e1f1de2634898b55d9a8b17227931e9467461ef1290c1f8f806a9e179449a7e216626224759fd SHA512 c2255509ca03ec3b664720f0e6db4f68f4aa4edf8df1e8b5ece9308dcc93ec82877ab9acc0c861178c8e37de99dbe29fe1b3a55bf40fa42683e79a5fbeff66a6
-DIST thunderbird-115.12.1-en-GB.xpi 690435 BLAKE2B a34168bbebbb877d76344ff1655dd7110989258228e8e670224bfbbf90726b5b2e8b3d1bf3faa7d1e2d9f34deef660d075568eab2e045daee8534f14c9c8c74f SHA512 cf6fcc6da7eb8a2181880d5a352a0d02df5f67936e295052d5c4dd791e78e095adeabc7bb4203dd2afec3fe1fa1057b9e210ae69483495f721ab7c0b5926802b
-DIST thunderbird-115.12.1-es-AR.xpi 745001 BLAKE2B 9b563927d118a5a5f71a534c33df07b81d84d273cbef760576855977c7b53da06fc785a07a6392b429425fbf5cf410d7f576060a7c6ce972f64671022a423ca6 SHA512 7f252604d90f555ad6eb57af605b9a0b4eacf24042bb58a539b2360241e116cc799326843db16d6e9bab7eb98cec42e90e293efcfd4949a60d83b4f8774f0a58
-DIST thunderbird-115.12.1-es-ES.xpi 707996 BLAKE2B 0edc1b29f069950c6e0c8c0036b53fae21ec8e721abcce313602ca1bddc25374f07d7903bbe7ee5dbfdd06473b4e0a6c3902794f7c1b6dfbae6841a9e3559c70 SHA512 98d182124132601f006169d963ab3b176234042cd23487d5424e78c5bb8c2e1c2733cb53bbd491cd0914835f8917f1c65c7e43b8573cce5830412aef891044f9
-DIST thunderbird-115.12.1-es-MX.xpi 721552 BLAKE2B ee70b0a39c75ae7fa76d18fbe3a6bede475893fafec313c22b589c6c0b655855ef38a2c62d57a0ff845ea52b330b9d05ba9e7565ed782d6e1cce22b2e5cca82e SHA512 e47e74acf760eecc675ce5529ee3a2f6af545a0f090cb454038f4221c79d57fa976600f728398af1b828bf6afe3b09dc749ee40f9b0c887e6cb8e5572af364f7
-DIST thunderbird-115.12.1-et.xpi 681748 BLAKE2B e31b693c3ed663d47760ecc92708feec67d18ee2e8d18cec9d9375a91786f483478330aa8abae350e32b40c7f23461a6f9a0529ffa922754fe0fe580365a0bde SHA512 d0962e59698dd5df9f58bc703a0dbc9879905bb24c1dfe7b8ad2ebcb0a5894200ba7cf69fd4d65ea083109e8dcc53ce1c7972dbd06e3d55b757705494dbdba45
-DIST thunderbird-115.12.1-eu.xpi 713611 BLAKE2B aa92c752186ff825d9c732079f3d1272e413051953cf6d98058c856870d91a415c16b8857ad5d79865c5ac410d5cca3da3925e4214a8b9f61f2478b38679c126 SHA512 d47d9fd61e49ce0e2de1c3ab0f82bd346b4b5655b08ae1b1253241f36bdb71b9c21bde408de3d3620a7e8b4cd9c3094e2a3628b9552471ba065e8f35f5b8b0f0
-DIST thunderbird-115.12.1-fi.xpi 720333 BLAKE2B 708537776ca439e5814c973761fc90917c15e8167c3f84c3ca28d74089be0b8c9ee8342240aaab3b278ce7ce728a1d6cead65f23c21a05380b8c6920b25b0599 SHA512 45af869267cffecafa63bb38c68e19c03fb5d9130639facbdfef050e7592695d84c772f6c81119bc1fdc9c18fea19a6484a4d11b554a6e85234be50112ec8817
-DIST thunderbird-115.12.1-fr.xpi 757740 BLAKE2B cabd6993bc744621e65003e7ef84d03fd71cef9d63490a31118d0931a106a67fc1ab044782a72cc810c8032ebbf1bf162078fa3cc42a2b75efd669b03ae8c86e SHA512 a56ef86a0bc0ac1f973fb393a20fe0447cede474d561b1c8fb59f93c5611fd305c909f376177279640036cab0ec49e53d0f26444ecadc96b96c9d8dc458bcd01
-DIST thunderbird-115.12.1-fy-NL.xpi 739634 BLAKE2B f3c1883e7f00839bed0ad3b885a2e7d97d9d32bb45f3ec15285c751360dbafa90144ccd38f28777f530babf0314234d0c62fa2eacced62819d805d8e506283b9 SHA512 e127985ca3d93bc9bf140b5e7c1233288f288fb1a0b46c0df7246f9e1027e4474468dfe88dce3986d21a0ccc1f14db2d6f9bfd8b88e9a3ad5d9ce1bfae4fad2d
-DIST thunderbird-115.12.1-ga-IE.xpi 611161 BLAKE2B be2e54b26d935bed0ffdb3075c1ae0e4a64dc79171e28b4174a15f7fc1c532aff363be1012ffc75dbb38b6f2adc477d0460481732b6b5f3240f0fa49c2a659ef SHA512 218ff4e8089895d2192d407c95f42153bf2246b1df993fa7084cee04fcd2428912cbdde62d8bf45c23f672a2378d78219b39d97a75c4615f9c7587a51c38e7ee
-DIST thunderbird-115.12.1-gd.xpi 714246 BLAKE2B 66a3d5c5555577561cef1744682ad865eba24470d42317000ac22e93a25daf2860cbb24c3d245705146000fb2ac40c7f18a069d74b8116771153659dc6b9da74 SHA512 f639bb2ae8d7c1a001b63ef04fac26869cf1d2e3d35f85bbf7392b76d66a8d5eaf96c26cd35126a7153f1e1d4fbe5442a209843039787babfd63a484d20be9e4
-DIST thunderbird-115.12.1-gl.xpi 726195 BLAKE2B 9ee434be0ede6f672fdb8f093868af2926085859f09177160fe508ce7f655d48c477d53b574838a1a9aaad78c9272cf2ca95648cd11ba44cf03b7c14936e32e6 SHA512 af01a0afd5ada78493f55272e8990a59e9cefb565cc388f213b8ddb2104ec79048b4be9285249a2ad5a74c809cfda7a35269ae2f4a43bed63591b912cd63b427
-DIST thunderbird-115.12.1-he.xpi 692093 BLAKE2B abc771cf7255aa6bbb116ba090f7c569cb51f6bb1dfcea4f62dbdb77ad1e18d95004369e921cd2e43d06597c4822f0b59a03e96e3aae8a8505f7dc4c66fc5f46 SHA512 b3d396ee8bc9013a53717de1c6e0a5ad704da415ecfc2790a4a3e4a452abb2ebd9b8845f7c3707b0a194791f9f7e5a71be6dc67d64b8086dedff88676b33bc60
-DIST thunderbird-115.12.1-hr.xpi 689195 BLAKE2B 8ff2126c054c40ef85b70db5497be9814a495d7c1d0a647f8cc77498b67baac63558592449ab8ce3e4daa7427e0fe6507b972f614d1fab4321be9970c99b8592 SHA512 62573d37a62bf929d82fff07cb49a4cea62e1f5bbc09a1708c86b74a2aa4b04dcd8d43717c2fb585cc1529ff632b41e1b644139308b46a87e41d5cdd11970b1f
-DIST thunderbird-115.12.1-hsb.xpi 766501 BLAKE2B 22738e67d08c3e34f067d829523d7a2322ba9bc1441f49615bfdc9fe1938b169f077c001e5c2369fc910ae289388c3457d3ec335db48b5991f9adddba2cfd705 SHA512 fe4522b0193537736d3ea1c88815a97cc8ddc0d05bcf5d1b6076a33e1a0cc6c646dcfb09a7b7abd991a9424cc67e151d844753a619548b68c179cbf280618fea
-DIST thunderbird-115.12.1-hu.xpi 769133 BLAKE2B 7facbedd24363693041d1ada4c41bb4ec75cf5e12f7450a33ece1659a1cd282e64483ffc31b6281db414a55ea3b94202471e7bc3e570c376b2e7c101476ae368 SHA512 deffc15b07061b1a161ff3cc201a62e5bed36fa5000d3f47a726bda3a90f3e3e4ec3c4b722bfbcb2610717cc89f7f12a157f4b0b0901d0ff2006f3b2d7eb60bc
-DIST thunderbird-115.12.1-id.xpi 653752 BLAKE2B 51d3687cff4bdb6c82390b85852e13cfc2270ecc6ca2d23ae59849b2ea96b710e37874d51c5f0e54484fbb358664804a4c9d11b76363f4850c2e4027f4add928 SHA512 da59bca0261f7d9ff6f77e81abe2da15c0ee9fd82e6b6d0da5b8c75acced23cba42a967fae62cf43c07f13e0d049c1fa42484f346990aeaab1cd181a6cd3a9cd
-DIST thunderbird-115.12.1-is.xpi 727097 BLAKE2B c9e3524aa036a1f543fbb7c53845ad1c7bf0df33a67931cb1eae802c59db0f9299bdc60156bb74cc04da371500163a67a69e03d8a1663bd4bf0830dfb9384f37 SHA512 c609d487a0ade339b0a0299d88f45abab40618891336c236d627af384b4508f79cd0a61e2b22d1bdd000c319a076d420cff5e9bf9f1a008e43f68cd11c44f855
-DIST thunderbird-115.12.1-it.xpi 676204 BLAKE2B f72f26de8f3190da2ff771e9534952b8526b86e914b4f2a99f9651236914cec0f32b81e15db57b978dcf5ebab5313e380c95a4199d76d15722a00adf54890c49 SHA512 03bc410caeea17fa75d7cf4ddb83e81f52dd918298dca6f727c16c682d352351bbe9056402365d2ecf64fdf511febf57ebc700c27374c8e06c948492b058e825
-DIST thunderbird-115.12.1-ja.xpi 804931 BLAKE2B 3e1955ccb8a5eed15458b4373e932bd82ec2f4688579996c96f2ea701780b8c272ebde7652eb0947fee4afb727c0ea7dd2ae0921b702f044f0baf05b3dc626ff SHA512 1c604763509686acd19fe1d0f492049b0355cebef2179361f49e8324b81766500f504935b96cc3f1a88ad87e7e39fef255a77340c94230f4879d8ec46be8b931
-DIST thunderbird-115.12.1-ka.xpi 786093 BLAKE2B bb8094a7311e8f7cfcfd8237e6acbeec56f689201a4bde15fa11d4f233daf1fe97b624539de0abf8326fef5a2cac78d9f3532fe54bf7477ec8ac9c838c4e00da SHA512 793ed043bea3c7fe26c7b857f490b66be7b25984c8cf13c2457271151f964dd67882c60f9fbdcd0031c75798cfae599eccd51f20c31cf55cc9ced044db7ded38
-DIST thunderbird-115.12.1-kab.xpi 714604 BLAKE2B ee65868b223bc95b4174b523e5f39a83d22361d71f53f2750cb51257820165e1421714a421913d6e034618c907bc0149c3944fecaee5962e66d30c15cccab1e4 SHA512 91597a44fc4ac5260bb43d9d70c4e0c3bebc1c5d8a633444016206eb6a2b4f4c5fa6fbce5aee2106e785fa4c3387d053c3413741c26b7b2262ee05e1c7c3fda6
-DIST thunderbird-115.12.1-kk.xpi 842880 BLAKE2B 7927f8be84884c0c2d18c62cb41e9e944105458010c51c7d983f66bbc68ebc1e5f16f3fc4d3dd43451edd395bd7a90ab5e8ef79ed2248d84a873795608777292 SHA512 f838fde95baa1176b798c1822a359e976ce518337104dbb6b39be6ae40f8d067f68960dfd5d4408c23fd0886618ae7b82c50a3849c17ea78132a4dda1412f53d
-DIST thunderbird-115.12.1-ko.xpi 746225 BLAKE2B 0e705bfa44b5fef277cb592ead66016d1c2345d3be22acd1216e9490c67b3b8f5b591d691c17200461ef82d1fe510519de45aea7e6973b5119921cce1c4f2e21 SHA512 099d7b24666aeffd66dc5fc8723cf4d5b353c55eecbce7862eb75e0a84b1986dd2d6d4ae1a4ee19276d3177aa2b5c23526607505d42ea213db1bdb3a603600e2
-DIST thunderbird-115.12.1-lt.xpi 690573 BLAKE2B f3bf6f0ea7a66ceeb9496baa2f1712733bf1ab67e9f7b7a01d62a8374e1a4828452e656bbf12b876951301e1a988d5202734d9495bb6cb1fe29c0431c96defaf SHA512 d62690b67ea1497a0279f8ef434f4d4b994217deaca701134a38d2f7440a0a398aa5e4eacdffacb0c33c77beaf357c820d172b071ed4af06806b4013f1499d39
-DIST thunderbird-115.12.1-lv.xpi 627156 BLAKE2B 30efb2d413397b86ebd85700a38a2ee0cc527e00909c9d3ef174c226f55ea0c96ceec4f62c11d273413d3df7337e351726bb047196304580672a8a1ba94217ee SHA512 ce7ba9ea43ca3535e4ebafcf0a8fce56bdb03a44c264b09a2b37541b8cdf5153403638df38d6be53effdf7ff1cd0ed5c44a88d2de2defd3ad9ddcc50086d8eb6
-DIST thunderbird-115.12.1-ms.xpi 575469 BLAKE2B 2780564733f270b58a1ace2911f2681cbe052ee2ae546bc3d5194047d5cdaa66a13e90052c92c851d58cf60a914ab07b5e30e613bdcbbdb26d4eada0b149c868 SHA512 32ccfb52cc2d7e19da3164d24888b0f8c78794e62f0a4bae364bb6ef859806a1dc5fe7df70d6e604b76791a7e85005f5e1894f5884ac74359bd18810b6f185b5
-DIST thunderbird-115.12.1-nb-NO.xpi 693900 BLAKE2B 90acc3e629ad51dbc7de16d4544a327ff7cb69837e0a5bf76fef3face1fcd017d3aaebc042e40b86daca359b00a4744ea32d41b39cde9bd5e67e174d0e104043 SHA512 b9e80d4fc1789b0541cc5ac1a64cd57ffb27c7368151c10df9cc18596ee69de0996611ab6750be551264599848a61d8f96ceed620fe2d1119918a617d62671be
-DIST thunderbird-115.12.1-nl.xpi 730833 BLAKE2B da356e76a9855f4f09a16c92ce9e789558c91594f4b6f4e6a9739a345396554a43d3977e1c63da29ea762957d6a0d509de7cfa1c31f58784a31b6dd67b2e60c5 SHA512 b08fc93ff1456c5a65d4735d70fd3df501c4e85820402285c27536cfb7332e3ac64f37f6eff4f229c221f8a68b644ba5d2b79269063a051ee86c5fe0fb23a168
-DIST thunderbird-115.12.1-nn-NO.xpi 696719 BLAKE2B 64b347a4ba080f0205f6a011e24ca6e7885385dcb45ca3455dff13e288e32ce7a9aed2fd5eeed661e5a568503d9120f62d13f758a5e785f988c9135ecfb25d0b SHA512 9ef9929a88cb361aab34629d499266a8ed383fca964704e53f4a6e371145652fa5f19c5797f5e3179c6776f635aa536d54389e2f9c1de3368311166e969380c2
-DIST thunderbird-115.12.1-pa-IN.xpi 683514 BLAKE2B 9ba499c93c9b1579da936654e9a7be90684aa350a2fb268d5f5fd9b18383dfe0e629a3b271c9a5b99d34eb1d3a4e0b19ba8e0de748870f2fef3152039433a4b4 SHA512 d316e8a364cba0335be79553ac947d8ee8c338384c6dd836527dbb8f97822e834d0fc9b403a992c6573d3fc2204b6288409b43dd7b6dd3076d505815b5ea7f63
-DIST thunderbird-115.12.1-pl.xpi 749664 BLAKE2B 6f596c78b3813b554cb67abc747d7fc5a53a15eb8081e251e85eb299f8feec416e220a27ec82d38a53a1220399d0f45c128e05ac6cd8316c78c9f241f3db9633 SHA512 a8bb04b02511a16af58c3ed31441ce330459ad90d8ced0a21611601df84fc27b8afc8fe12aa6798f0341353b18119861ee6e68d038c0b93a87d430f7b04f4565
-DIST thunderbird-115.12.1-pt-BR.xpi 738421 BLAKE2B c04ffd683d7cac6db9fc967a8d945adc9dad85792455d065aa3ae0605bb58e18dca19a66a4ff2de3224214bd91eed5f94a38ea9074a6bcc3eb805543ade92803 SHA512 e9bf1f72bb174a6d9ccdccba664f1393a835eee2305e6f57703ca2545b87c1074b04dfdecb7ee88ca7a9afe81b6950dbb325b3262a059482222b6ef17daad7e6
-DIST thunderbird-115.12.1-pt-PT.xpi 728869 BLAKE2B 3dbc5a7cac7be62217d2ca9d63c8312e3d351b3799475d72fabe2671bef9ce431efeb4e21138a84eea0f31068a2841bc6b0be9ce21d44032c306517151f9c33b SHA512 ac6370656730cf71988bb8577a97ee9987661891b06817691b651f5e250b4f71fe54ff84afc1c89e8bef517df8827c6367f9576d4d57fc710208499304fb69cb
-DIST thunderbird-115.12.1-rm.xpi 732589 BLAKE2B fa947e6a869b50cbe114dc00e0dcab866584fcca401ed16f3121949b3a5ab7866a18218e9555ccdaaa30be94f5896e1cbae5a1647c5846ac5a537865dea225f8 SHA512 5640bc32fa9016c5a6a784ba3f9c3843f48bc0e0374bafc9e0bf760cb27122bbe1a363bff43fa29df11dadb45bfe1302318617e41946aa9732b6620eca2d4429
-DIST thunderbird-115.12.1-ro.xpi 661831 BLAKE2B 9b7536bba0d9ca3bf8aa3d6f8672ae04d6158af7a7812a8057cd9df7b9fbadf276828e25d2004e4c2a8a45d480c31823bab50f5f65b7519e12f2d9b3d9029682 SHA512 9e1f0cb28901702fbab8e4f4020feeec3514f4435f7349a7db223c60a7c8c2fc1a048ef4b1fde290178da6c66a0ca46862a67222ad0012052743fec0dd2e0cbc
-DIST thunderbird-115.12.1-ru.xpi 857135 BLAKE2B ed9acef4f3286df4f991722f89e3c8dcd55f9f28ce566ca1948c4119727dc540ffac7cdb7e6a18fa82d2f757bee710d7fc56f4021c7fa9f309480b36c5811ae7 SHA512 551f219de6e2f431836bfce4c0bbfd4d72a9aa197b3cbcefdc13ef9a7df8184ec0942f4d6ff9e45e961b908ec495391be004f2dbbed2b271037160ad3801d753
-DIST thunderbird-115.12.1-sk.xpi 769056 BLAKE2B fded2a6b57b72a28309d6fc135bb6caffd9a708d0085cc694455f47e2288b9ec1e3eeb262e9a6702abfe54cddcea3a2f9c243488386e7446a2fc2aad3262d78d SHA512 c56cc72032525c928e96ca2a28f64656f4a1293d8613d8a2138abda4980aab9eb995553aa76ce2a281a4b4ae42e0939fb83afbbf51d2c84330baaf1584a65d8c
-DIST thunderbird-115.12.1-sl.xpi 729110 BLAKE2B 119365a7393efcedec3a0e8e34e7267403e8bff41f1cdf27b9468a81de4242de3a464c08ff47183f57f36551f8e77f8788011fce0b2d490574ab7bcd0c99ecc0 SHA512 fe5e83fcd34a984c9843235e1c8d0eea8ab83ed40247a81fee8cb2ff77dcb190a0ea7e8a522599472c30e6e5a554449f45f900454f54245ff896b541ad0e98ae
-DIST thunderbird-115.12.1-sq.xpi 753635 BLAKE2B ba3b4b34beb01ecaafe88d7194fba718bf49063087a7141467b7e1dcbcab5d5fafb4a966a31309bbd3936dc2aeccb84bdafa751411afd76b2e463e47ab6c2b37 SHA512 1a668ef60e757b2cf44aa8354d79141e14d721bc6e45adc8a1095b64b595ab4cd75f11352896de682acb34b6276288a0d8203aefdb302641fed1114dac7567fc
-DIST thunderbird-115.12.1-sr.xpi 757455 BLAKE2B f6caa5e44ac06935fd64a51a29b89b2c9f7d898c9db02a1487120c327cdfe2c0c66a5259ee84ac7e5431b259b13443660f77da238e7eec43868f5b0cfdf9a95c SHA512 c12af3b11c0726ca7fabfb0aa1fd8bf81af27e200a6da9a2d165b0476322767309b1ccc4b0f6f8fb1d0a5a2ffc6163d99d837e2265f4bf3a20305da315c7e84c
-DIST thunderbird-115.12.1-sv-SE.xpi 733955 BLAKE2B dca12a48732ed9af210b6938f6e49ece7befe714ab62ddd9d584d7f2e5678e70c9945462be35028dd75b8b85414935035ca10a4c850f93f8f32a45e37a1f5005 SHA512 ec0151c44bb938c246a6ef6db20dd766c49498658cf3cdc3f32bddab8b644166ec2cc31642b71ca6955d1272bd7fbd4de9b781614ca7861c8b3cf058b9ef27b7
-DIST thunderbird-115.12.1-th.xpi 804660 BLAKE2B 8ce689ffb8535810e922173daf305d8fc46c9315148a18cea1ed919031123bf2ba1d7ea9e222a5c9956cc88ee7c64088a74aa1fbeeeb957c398cb90efb334b13 SHA512 a7a549aaba5e368dce0810f0c212529f5c477669b4ad0526112bc1622c147316ea4e4fbd96e86395247534ec56f885ea15605b6c533e170a165bc2ddccf0a363
-DIST thunderbird-115.12.1-tr.xpi 743474 BLAKE2B 82a8f60d332d19ab84dbe118498ac749a24348ae093aedc69a545d0b06d9fe02eac5b9cd1901d4c27656c10ddb06a5ab93d40eb293bb1724022011606cb80839 SHA512 a458aefa8638c7a894558d848dc101defa11b682f18de882850c8ef1fdf44c9be75cf16d3f2afcbcfd48b4719183ec300833bb60b6430f7a0c9d59c627527649
-DIST thunderbird-115.12.1-uk.xpi 846639 BLAKE2B 7355cf3324250be1360c52660d23152e3033f8706b9080e4874b38a0eb095993ca46f01575f303f6a8ccc903b508c78f20ad732d29bcc8d95df747ef92905b7e SHA512 6ea9d1b7ce831feba53cf305f6f6a4471d7d4de95148843e22d1ea087179ab1601fd5f87fd7542b1a9a5dd1ade7d0bb6aa3c43428b607979823ff416f3d48a6f
-DIST thunderbird-115.12.1-uz.xpi 588508 BLAKE2B 4e9dc2b9d60caf57edd056e34e42d6d360125dbf7bcc15a446ee4d28e77c1fad551d95995959ba5c9dd09e65f3629b70cba3203fbade2cdd6b59ef749767621b SHA512 1a4f9c4f2c2830ef9fa00b0fd2153dd866800c6fe30088df70da29757a755fccd76c80ce981c2a3293b954f6ee5a932cc764746f2dcd8dc43e3d28ebbfe91774
-DIST thunderbird-115.12.1-vi.xpi 772899 BLAKE2B 177d6bd9d8458b55ea93fc2e72dee81e21b3bd8b902b173f28997b7b3b17231f811ee27d0ba5acaf409f67d9788b6d614f812080b0496a0d1a9f5318e4cb1c84 SHA512 b9ebcb3e736a92de097575e6651a98fd2dda2a00d797f225f9b9f031921e8a91d8f807a4aac034c295bd94e7a8071451f57609725c8dae3cecabc622a4a67759
-DIST thunderbird-115.12.1-zh-CN.xpi 771966 BLAKE2B d53a9f428691bfaf2e7c35977b8f87867f79e6fbeedbc4610e75ee3a1d2dbeb11184d13ebc2d39163ad02336ed509b9cfa09b7d3f920251ec00dacaabcc3469e SHA512 67f2c96a0347790acd48df1afc3adeacfb7bd5624069af70ef72ee4d31a5fc1d0120b6d0cbf1bfddea6e4dc9c5b663d940c996ba49f3a9341527b8485cae8910
-DIST thunderbird-115.12.1-zh-TW.xpi 776444 BLAKE2B 51dd24e9b4549887def3fddbf32a55cf2bcb3374bc9df83533d9585cb90f7c72b2f5b0673a9460aedfc89ef75e13155dce7248c6bd3c8353394ac14349e0d956 SHA512 a0adf8fc4329a39a6d1c05c4dcf9e0eccff4be29d2f3ef1814a78bb8c7579ed42cfd1f121355d3e5b99ff4123685a7a65d7281a2e65b502986bbc1efc611baef
-DIST thunderbird-bin_i686-115.11.1.tar.bz2 82957038 BLAKE2B 7c0f0d4ae6e349ffd2c86264845cc8e1ad68b260cbe717c061c41211d5647f23178cad4be17ce200283ebdd276224fdaf79d183a42274b415aef9f59e1d7c5e7 SHA512 aa63849db9fdb69059556fab0e24ee19986e28cece8a9617d27b3af593894cdab06b525d2e70d1e776612d50da1eca358b54fcfe5a4081f646ef3485d407546c
-DIST thunderbird-bin_i686-115.12.1.tar.bz2 82991105 BLAKE2B f977cc67e59fee69cbe95975f522e0924ec32e62e466d69e93495d76c0dec63aad90fafd51f1a247a41731f6f52bca72a766dad915e9e80196a76f103fdbf54c SHA512 8633729764488ba5e6ddf6f3becc17d1510e17a11991326509c5ffe24f0e9f791b6e523adda44aa9b6e80a590cee4df71870d4ab545fc074a32627726bdf74da
-DIST thunderbird-bin_x86_64-115.11.1.tar.bz2 80688385 BLAKE2B 448c6afb17fc58351e4805c533548a33283195993ae9edbc2ce932265d96b05d3b584c7a0e7391a8a1804f136432991117f23e61609b80b749cb51563af567ac SHA512 2f192a45b14d7be2958bc2d2c6faf1bba0c094713ceaadc30a43184dbf2aa27ce6a507d7e4242255d1e6365fa4b8042d62bfb185415dbe767a611fe8e54a7ba4
-DIST thunderbird-bin_x86_64-115.12.1.tar.bz2 80593518 BLAKE2B 2f4f237476f34bc8e1a367d17e1af5fbef435939537ff01a5af79993cb42b404a0f85e0fd276866a62141cfe8d583c5a70856a9adfcc530ab69ed54c801b6c04 SHA512 d0a9fd7415931413cdf4c4f58c33d26194d6a88e617049585851fcb190b350caa7095ec315b4ad1e6e2607c0fccce96dfdeabab4c0acf863b5d8c79c7090cb9f
-EBUILD thunderbird-bin-115.11.1.ebuild 9025 BLAKE2B b920c9d10cd4ab8c4e9167f777fef46e6cd254c8a7c41955bf68bfa609b3f81170147b2e46910a29db50b9cc655200421524f2918b63ab7c43f370362432830a SHA512 93b42f57a301b7bc9433a7c93d042e7f8728f6bdf004cd5e3d9ba64f18059adce79cf534ee3686246534ab3509ff5cd4a2f5fc20cd9945071431f0ac675a520f
-EBUILD thunderbird-bin-115.12.1.ebuild 9025 BLAKE2B b920c9d10cd4ab8c4e9167f777fef46e6cd254c8a7c41955bf68bfa609b3f81170147b2e46910a29db50b9cc655200421524f2918b63ab7c43f370362432830a SHA512 93b42f57a301b7bc9433a7c93d042e7f8728f6bdf004cd5e3d9ba64f18059adce79cf534ee3686246534ab3509ff5cd4a2f5fc20cd9945071431f0ac675a520f
+DIST thunderbird-115.12.2-af.xpi 550972 BLAKE2B b5254a4c369a7c639a4d50b600ba6f27b23cf6b87e13c352035adcc233e9fe653f3caa76c427fa80aa3d5a78262d383c7b8f6cb61ede4dca0edda3e6a9f001e6 SHA512 9aa4fc2089fa6fa7e7caea4205057fd23636748e97c151b0946a94275f7d425ce333cad20f6c27fa95ac9f2e752496b7483afbcacce0429dad3ed782ad18d6c1
+DIST thunderbird-115.12.2-ar.xpi 673669 BLAKE2B dfb2992367a9a284e223f2d65b5b433adb9e5ca8fe6839fab2fad5481771235fdd0a454cfa9a6773bce48f677a556d3ccd50e8f4f7279d7a33827150a03155d0 SHA512 b10a5f8c0b8281a3ebefa57b9c0b8a39eb7bf5cf74bdf7751a4e2c223a19f06b901b4a7b3045b224450c9347884d3b74d68a0bbbf828ce5ac6b16acf6a10a3f1
+DIST thunderbird-115.12.2-ast.xpi 569921 BLAKE2B f7c7239f076b6d95422a7bc7467a63686feef7f816b78dbb801c41bd7870c48923059638b7bee717abb64659250bd625f8763f30985c75aa79bc719493ccc23b SHA512 2043835a58e5b2831907c35fd6f119c7b13bc3a21b15d28aaa57cfca8b14a7631a5f8fedb1d8f69081070b37729f6f58b70b1dc15191b45ef58e5b8e2434bce9
+DIST thunderbird-115.12.2-be.xpi 734712 BLAKE2B 4f91d24bcfabb4e040fd5caf8f4e09b3b9881aba35d1fd590f10d7b5f29bba92c3844b03b831b00dbc16599d37160a02a3d5a8cd08d28c1c332113702cca4a07 SHA512 85f6d9302eb9d209edf7b2b1f0a0526e353f05f186807839f2511588e162f4cd2b7cb7726ab5067cb1c935ed6c278ca7d8b0f98a5c9ae8be7ef361500dbe0e1f
+DIST thunderbird-115.12.2-bg.xpi 783911 BLAKE2B 940eace96cef9ba74d4ea478217b83a458db7ef978b41874ec1cf3933a1b6b58c82e141790f897457864659aaa79460d934c56a59ccecc6e2abf0f77e7bd9340 SHA512 4f96c192164689c867b1c5c1baded825ddf1d562b6dbdb45d148243691df46b3c94a466cb6f843405abc996e08ccfa46401fce996e70bbe8cb3e761f2ca51366
+DIST thunderbird-115.12.2-br.xpi 648069 BLAKE2B 7e56887b6b035d37a21bb00b473ce6253b43ae45827800933df26157037dd975511187fa743dd9691b9cd81f429e920e385e5b20dda03cfaa678fafebdb5109a SHA512 be1665d3974cdcbb7e9f0651e75e1ffe99126fe1c6514815e14e3bc2f46d8dabf27def941ea135a34c32bf6afc554177a354f2592ae0ab3754f5425f7786a280
+DIST thunderbird-115.12.2-ca.xpi 687691 BLAKE2B 649bf938b4ee9f8654cb497d27b7997760786720910a48b87105930c7dbdfc37bfb326dc6e7c36f444c5ad22047af896de61e3901aa51fbe64dc62eda1b31287 SHA512 ad22cdea7283c7748489739c4e6e73a41e603dc01f31c1e20a8c912ef24361ea2cf94e7d9fecd03662150d368bccb0ee03eaf22d8c79fefa31fe9c413ec2e1f0
+DIST thunderbird-115.12.2-cak.xpi 669821 BLAKE2B c31754e3e7258e857da977dfaf28b7031a07dd2368e12d83512eb4242452922ddc953361855ff809bcebb46a26178fe739461e9e9561643ad71d4dd979413401 SHA512 9d5fe0fce332693fea684428ce7810cd6ae7b37bb5699fa5630644043d086017b2085245f8d86c0ff86eb7f7cbe4baacf6a9b3e9b7c0e3ab42402840b5d46397
+DIST thunderbird-115.12.2-cs.xpi 769914 BLAKE2B be832c61e5015956eb92e746a424950946bfe70d4efc25db3a8ccfdac528980534b9e75ec3f5e17afa1f6349d8b606b2ff2e5a0fc11ac19e100b7ca82dd994cc SHA512 6d8598bf6a2ba094a028e2dc811b851609f2701a134643cf2ba50435d30a88ac344ce877c2ed8a61497a6b7ff9b2befcc4ed8eb47773f4e1fd2facffd2af9958
+DIST thunderbird-115.12.2-cy.xpi 734617 BLAKE2B 1c6b3161e19d248a8b6c5833948bb5a7144620563c15ec1feaafcb0fdc418dcded8c0ea2f0c404e770408812e1982faf3bdb1fc590657797f5a8c333ece7959e SHA512 e5b426723d10e349e76bb00c4b6e361107fe0d6304f5e2dfc472212143ebbca8f75f3f66a99425709e7a505f2e740e8e2f129b53fd74ef2d2f5ab1855c96d2e3
+DIST thunderbird-115.12.2-da.xpi 722531 BLAKE2B 0a53ceb4242e335675acd7c037f4317a5b01a87f379b815fad208d7bf36bc90cfbded141585dc6676fa76a3fea9d31cca6b38979dd61c87fa47b562f50462859 SHA512 165a6787695f4253e9c4b43d7a7d8c9653cc60597c4f4cc2c5baaec7768a786effbd6efe5d584fb37c2bab89649b8437fa92990cd446f16dcd8ee9d09505c8a3
+DIST thunderbird-115.12.2-de.xpi 750860 BLAKE2B 17dc9e335c516cdc56ee8602803a0dc583a8554e4f71ce75e1c1d21a869ec05680d283fedeaf04e527c8f4bb50c72d6b27ba917a45c0d4e72f34661bda710fd7 SHA512 b7985d9b466313a475d190af333a478aa710e68c33bdbb77bf2cd95b514012b3126cc91734a197df2125071b8479849f888f1d0d1d37411fcbd69caf4126ebd8
+DIST thunderbird-115.12.2-dsb.xpi 770434 BLAKE2B 972e0b10641cebeffc091367f524fb0f767bee8a7de65acad62cf0f36cbf064b9969a1f60835f0683a5ac641bc13655104cd9625e8334148a4e3382ddd1c4a68 SHA512 cdffab52b4b0e87906945b5b3e8b290e979bd3fe0bf8490a7d7e57ec01fce024c682d96ee0a47ba9f5e71700e3e2ad7e07dda27d1c65aa0f00fb0c0bc437203e
+DIST thunderbird-115.12.2-el.xpi 873408 BLAKE2B c80f96980e8466d4d276d6acb8b00a917ca24c63b3dbb8dfe1f5be4a76a8f7fab77a27f1f02153a220c26f9c2719fb6686e7c75f9547e57efb40875d666c409b SHA512 e709410072578fb4c2ab196f8150e942efac867cc4e272c8701cd5ebd07d26f70794d20ef37e3a4a1e0891dada07e1a5483a2361ea631a8a862598c691656a73
+DIST thunderbird-115.12.2-en-CA.xpi 688599 BLAKE2B 8022c244bd2922ae2a84cc3e0639bea9967a405a156178a9089602334a246e21d06148ef04753611d2ba5909f2ccf988e3d28dd157b90eee0c98b81ec166f4ca SHA512 484fbe58455c63e9f8ebc8d447c2a199b9cb62f3cc549378db92ee826ea92a02f6c34586cda6123d223688353245d7f7ddb256fc3c5d8dbfb832339233090ad1
+DIST thunderbird-115.12.2-en-GB.xpi 690434 BLAKE2B f3b52303456802c14fb33d9658de1b80ad7429aa03c021af9fa9963c700826aaec1d66cab1fe95e0b2d17edca8b0c8b18fc2f55a8c6dc21543be37b6724583d2 SHA512 60fe747a05bc77391f42aafac1f6779d08c74ccb77019ac086b53fd60a98f7232e9c04abc792c367f08d4cf3eeff0e56e91fb5f4289c67971f361bc7a95b6e67
+DIST thunderbird-115.12.2-es-AR.xpi 745004 BLAKE2B 4d9f36ddff7e8fa441dcadbd32af258811507d372d9d303af8872c0c2b03a9143da5ba9b7c9e2fdb316921c51401d865dda0cc44cfde1243054d0d10ecf2fef4 SHA512 f83b92a377c2236b0416e5dfa127525e341be2307358e29354572cd82149e926ee26eb3e6a9e88810b9915ecb84945b4eb841794282a59c9b68fec184efc3926
+DIST thunderbird-115.12.2-es-ES.xpi 707997 BLAKE2B d88cabc4121c32234b5dbfc808233ba7d3b9c71fd8bdf967eab9b56313026d2636fc76d5b051fdb73e4f0b0ed382a00357101dfecbbf9eb1752042e0f947ef4c SHA512 55bb48c80695395a64029909c8a2ee99122d539dcd0ad988be622e10c76d1cd556506368423d78e428114949ecb2172db448b7cefdc7649d62459e79073a77c6
+DIST thunderbird-115.12.2-es-MX.xpi 721554 BLAKE2B 515011281b5e95d9f6a265d6a66df5189f98fb1b5eec6b348c3097fa65bbc3fede1d75797000bffa2292b947759c27020525d9e8fc0a22c443495f455e3fafc1 SHA512 0744737043aa16a010815114f2b7994da94075e478554faeb809d246393095ea5bc90c4f6ef040a4f7ddb375585ea81664d38e2a4c1b83c292066f7c1a845b75
+DIST thunderbird-115.12.2-et.xpi 681749 BLAKE2B d05d212f1dd090cabc98efe014e881fd4cd64be08f9b2ea7e8f04c199e5a81b9c3bbb543c9a182c446bf363bd27ba37f451055d50315cb5c7a4ed43f277b99f0 SHA512 feef15d79d9ff72ffcb22a567b9d9ed42b0953ccaecb435caf006b2ebece7b5804248ce2e9af3667eaf6645201f9f074da38ca1a2032aa68b4c7864eccab4ee2
+DIST thunderbird-115.12.2-eu.xpi 713611 BLAKE2B c6347a6e026f72c55d80a8c9a3248b6a93ef7c60c044e57d60cd4ecd4f6ee02bb9045eb7afb6cb0e3805f0985e668d0197dc86bd965da5358fccd7afd1ad76a1 SHA512 24c57d84b574488b899a06d8005311d1aba8369356b120fb2eea8158e1603857691f1cf49d2ab72c3d403bd1f2c10f108e89fed9872c65c0797dbe1d59b5bc95
+DIST thunderbird-115.12.2-fi.xpi 720333 BLAKE2B 8820d502051243d2fbdd73b0506f0ad26f6f2933dc9a1291d7c6ca5af696fb74e92a46ff7fa3f86a5de72805a8745bd521c7d3472c8a37005b85ef9ccdb2975a SHA512 eef04d8d3743f34d37d420da646a9c90fce606627b597f076c68f442ca8424762b2bf2212f797c37e7cca5f18476f59ccecf51c85c464cc8f2c1327d510de1d1
+DIST thunderbird-115.12.2-fr.xpi 757741 BLAKE2B 2d830cf28855abdd4dd43c1358e36c1217624ea7c32cf0391e1e778c136d23899e3e63d191259d988970c90eff73ea2a0005850224633f0f52b6b67bb8ddd4be SHA512 2893e7d9515fee8eb4e46a42245dd3abecfe8ebdb9d7d3489d1b001da96fbd984c507da95d02a3fe9dce53cf34d5b50826408ddf107ba0ceae4e3bb851aa933b
+DIST thunderbird-115.12.2-fy-NL.xpi 739634 BLAKE2B f6139e25377bc56887958f58cd5e761267ffda36aabd94d7b82624774535cb1d09c2b067dc4e3c056e4f9181af16d5c8dc23bff9eea723320efa84c83af5c8f1 SHA512 9ea35c621c53426649da2a86719599adfce16f87e31ab2b16f311ea3fe43a5592799cac9a50018b7de5026a597ffd7fe2caa1baa601561e39d88f1f2a391046a
+DIST thunderbird-115.12.2-ga-IE.xpi 611161 BLAKE2B 915cc52ea669b58001b5b75f82526d2bcf78b2f088f05131140fc787ef1bf2e0dc2f9780540e315246bd80446643433ca098fa99b4ac9a212c863caa72f5d4af SHA512 cd560f831586d2db6fe01c8705629ee332a4ebc5cf5142317be82ae45986dbf7c76828d3edca744ff862a99b3c7544c766a9146940644e0e922c6130d98a23da
+DIST thunderbird-115.12.2-gd.xpi 714246 BLAKE2B cc08ed5a17d36cf377d4244366012a6d8fa059f5333526197ec470cef1b8aa52eb2947ee0a1867ee0f8d69baaed16a28b9fdc8e03e20a196c2e7aa8bd53139e4 SHA512 5d984349b33b47712cb89a94b49559f595569f6c714eebb397de7da55986adc541b1d16d081d6745edd24ad7dc17f0e727c376ef1802317495853d47447dc5e8
+DIST thunderbird-115.12.2-gl.xpi 726198 BLAKE2B 0a18a90d4fa76f9cdea8eabc4c6642cab4daf713d7e7c8e3145f90c8fd038a8e9307720f6c2998ee5d01ccaf8128e7ad041616e15e751cc54946d52ebc73ed8f SHA512 08c65f5b8376ef2bdfdd06068dc13070b7fed843602701ceaaab0f274308f4bc53248ae602fc2cdbe4203c574f03982c75202ffaa8fc2197a4beb0928ecc3769
+DIST thunderbird-115.12.2-he.xpi 692095 BLAKE2B f248df354ff71feb01e6e526586e9e4311154185c5b78974e76ee4eccaac7463a59a785f554571ab8fa0da50c2d8b595a78c53b6b4a1436b859e658efa32b10c SHA512 3a49228754cfe16654b860cc38538ed724c85b1d54c3bafab649bad6db2d84785f69e5a50217b9967d660b2536833c249aeaa9a3e483ee5fb302b41b655c654d
+DIST thunderbird-115.12.2-hr.xpi 689196 BLAKE2B 2cbb7f5e48a831f5f0ded359cdbbe46e381069bd07d9ec96c0b87475d1f7fe9cb217dae17f2b2148016977bd2f6fff912c88a20292db1df283211465cbefa322 SHA512 fb1d60e97fbf7de0a7d2e72b53cde8f0e23fcc35b42f450d293bf56a4cb42fffa592c38ebc729977aa824c61fa0a73307bcfae8fa86c484f760173b2de578cba
+DIST thunderbird-115.12.2-hsb.xpi 766502 BLAKE2B 8f9d46860660a4b1d5ed286e389af851a9917c5c26ea3b28bf3b6c41f0bc80403cd984a64c0bca66171f637cbd3d9587d8442c29e3621c12b39ce1db01750ad1 SHA512 0cc47e330a92b0896ba51dbe8e6f482e47559caff3330a669539af876dafc2ef0f94ce366b0e95a82297a8e30b3bdb2eafd588dcef07c4a987e162b6b8af6835
+DIST thunderbird-115.12.2-hu.xpi 769135 BLAKE2B 14698c80c79d8e752616029264ab1bb74ae8cfdaab842ed9a89e629709d46f42d0ab6ea4171fd2f1e067fa120851443d1bcf7eee4bd2767a3154c5184aaa260b SHA512 265e2dc3388fd5b1f2cabb58bd28debbca813be75ccca68220fa2cdcff20c27b0a5a5a34bd839a90d67abdc25118f4c97876f043cc4dac58e91ed40821a69810
+DIST thunderbird-115.12.2-id.xpi 653754 BLAKE2B ed68129f23742e76e4969dd7fe94c6ce276ca6588e0e8fd57ccfbb6845da3fed89b726de1604ade3c4569fce13988cf8ed6be97c3b3fbf0f8a28d585027bc593 SHA512 174cbce1ded34d3b4a386f6ff525c91a6936ce63fe7adbeb614cbc444fcb0de53094acc443122e292df271ad7d46f4342a65e9ebc4546a85ee8ce70afffd7d5a
+DIST thunderbird-115.12.2-is.xpi 727097 BLAKE2B 20e01b64d96863b1ec06f2f59c3241e037cae1076ce80e0ee3f613fe6484852f2d64a60c0d024b869931271b75d6975621f6e4118cd62fbc186869108b1036b1 SHA512 f11186de66b680052139771e0cf95d0d1cdd451ef53bd5f65e85a3cdfb9ea910c97eeaa62b57bfb1fe1d3e3f98e77716b7aa0895575341eeb20ad033220fc35a
+DIST thunderbird-115.12.2-it.xpi 676206 BLAKE2B 46378ba33837c39cce923457ac83e7b00b4126f57b41dbf26a0821091eef337bc545e371fa3e085f79a2db66ec771df4c4a9131a8bff217555acf22d83bd588b SHA512 72f702e6b5cd994ea2e826f7ddc316ba957194bea745d2fbd024d180d9abb1b649b64d2af56c04a48178f9db601454f8a8c46850f42b2132643520bc4e7aac54
+DIST thunderbird-115.12.2-ja.xpi 804931 BLAKE2B fbc1c8cf610fe4ced6ee6d61237d2850c54e3b08eceb0b1505ff828553cb598b22421e3a4f6504700337f7b537fb5a3ad54c1cb875b42d71ab0d3cf63a292909 SHA512 7466766babc9b53d2ab76badc095039a3f56b7117f7506faea873f76f9850dfc15bea305a2df20bcafeba3460d9438b864a4980c5ed247830cf2cfd0917214e7
+DIST thunderbird-115.12.2-ka.xpi 786093 BLAKE2B 5db283b38dfb41b2bfef7a030bb134ec8579ff5e31e46b3a1a86067a3bf4cb0f38084699885585ffbedf07dbf5f40c640a7bf56648f181213673aa8867c038ba SHA512 cad037a7e410055bca07bd1e61e855e646d87ed65caf8b326b777a5ec3b51ac8df517637230928684be098f34aa8b96ca5a2660198c1b46aa71c979a1843223c
+DIST thunderbird-115.12.2-kab.xpi 714606 BLAKE2B 09f8914d90f733032d367f809a1c4ad65e6b50f5b177b2766c3b5c7cdbdd28c4c51a73fe14a0db277f47e686e7e82c455200ae04307120d753f828ef4de8b3e6 SHA512 84111c576b73fc6021397a8248ef53d4af5f00d6a824b2430c78313a5751bc02e0e294f5a2b492626bbad7753bb0411107b6ce4a89ea17684cac8af399cd6f68
+DIST thunderbird-115.12.2-kk.xpi 842880 BLAKE2B a674587d32d1a3b7fedc3ef641f21066b9385d2f0be10ed9fb9bbb327e30c57dcb90bf5aaa49ee38c08ddff5ac928535b56543f5bd1c7c0a1919505a22de4ac4 SHA512 4ee2c81f956199f9e8e05f7d6d02f042ffca1743d1d855fe06fef50d64d66e5ac2129d0b2d5e557d0d5cca52cceeff9fe166a1a3c248333b5bdf9aa1e0cda37e
+DIST thunderbird-115.12.2-ko.xpi 746226 BLAKE2B 530f4388a54a4f3d0ec8edeb0efe1da2f39fe0621fbfbf6fcfd4a0efe11cebecc2eae9c9e588cd01549f098dfc3b7db733c1413d3364447eacb89d23505c4a8f SHA512 4faf03d415f74a1a748c08f55f064609b2ca686ca06d22c195c7caff9cc46511ef6fa5667b6d12ac45d48bd22d586576ef093b3de5ff263e3e443b129a992d35
+DIST thunderbird-115.12.2-lt.xpi 690574 BLAKE2B a1e02f99d6ae956bef73f78e35647102cc1f4751b1be866256948b6c7975f9299813ad9ddd211c728c09f6ad7561ba0a0bc69993d9a3904c6151413d41bb20fc SHA512 bd1bdf2feb110275da03aff0abbc2097e69866f501d4193c6dea138505df04975a129b2d3d3bd59823ac98a978220b3a5e02451e0e8e3d36b85339dd4b64228a
+DIST thunderbird-115.12.2-lv.xpi 627157 BLAKE2B 6ac94472c5fe77d97e02ea8b6f25ee33be7eab0e0798fe856cd853a822e0f00b044bc86dc8d3e551d29075d1577436fae88be03be46a93cb63748bcbd8db1f00 SHA512 7d88a5dff9bf1cb001449264e6acbe4cdfd7e5e80cabf83ec2bf3178733c06c7a3ddf708d5cf9ddd6defc7eb10ca6d6b1d5917d356e60f929ddbc1621cba4ba0
+DIST thunderbird-115.12.2-ms.xpi 575470 BLAKE2B 6dc225b958e8f12fd962e3a428a813fedcb9a6de86be3490cac2e43fd2b0c66b1505fea34e70e8607a5974060cc7719c6c4464051e44f11d46920d5912039a0e SHA512 efc276639f252840f50818be90cad8e0f7ff8e6a24f9632bb23368180db7d95773b65083515000b2a8783c5b9b4e7fb93e00f647f3c5cbfa74b271a0f403a281
+DIST thunderbird-115.12.2-nb-NO.xpi 693901 BLAKE2B eb00c30a297b98f502bd4f5c6df4e06d3e2bc0ce01cc1fdb88f34b88d2b1557f5be9211e00b91b282cde0d639c29409d18e4769f32264aaea78c4598d34cd243 SHA512 1227d0a6cea83bc1bfd70377d0cca7d62186e5d72638ee823cad939a07b7cdbf3d4019846cf12c305420b1e069bbe4d57393553e03c132f0f6a70979867f7bfa
+DIST thunderbird-115.12.2-nl.xpi 730834 BLAKE2B 0c54fa88595a72ffe9d1595640f3b552e35f188e470e4d9f3d24d6049bf6e11525d53cbcf69307e275ca83c1511965d6baf9d98228fa53198a8ba3a840ecf02d SHA512 b23d34e8285f7dda2d9a045f56734bf0a8cdec8913be2308d78c545068f373e280a7654032713d999241d244e7ab634ea4ce41a6d53b47f1f751fd6a6b8904db
+DIST thunderbird-115.12.2-nn-NO.xpi 696720 BLAKE2B 47fc425dfeda27ff7327dfffc6cb9af919ac1659d94e95847cfb0b8c0f2857f7cec45efca68703f979d17716e1e8defb2a4d88a688af89e905ac930ffc7b891c SHA512 86b1cf18b2b0b4363782aca012046657046f8c685871e237f469e47722d7e712caba2de397b3f09ea6d107efde0bb7af9b6781b092ba840e73eb569b2d5f6198
+DIST thunderbird-115.12.2-pa-IN.xpi 683514 BLAKE2B 8f342a49e540a03613fcfd1c6e992b6cc911b4de83c75af1cd090134bb81a43ca997c02c10698feda1f85a44efb70dd5975f5a73e84a49068d2d3376f2fd091c SHA512 7637c0ec69cfd25f6c925e41fced6269afddf80174b7b4b762540616cf02f1e6fdc2735ad463b48f64cd3cbae86c25575c52a302c9fec210c151c03f84ffb2b8
+DIST thunderbird-115.12.2-pl.xpi 749665 BLAKE2B e371e1024d9ff43df43a66aff644583468e5f30148bc65e33a35f5e68b71493ed61df54503924b7db319c8afb64c364168bbfea0f7ab0c1ffc43487322f622ae SHA512 df8c7aa8a8385056858db94792ad89306816b8de18dcfe20e37facb3274a00dccd5171be6953eac400216eadc23fe347b9eb112fa2cd1f861bcebfc73aa727d6
+DIST thunderbird-115.12.2-pt-BR.xpi 738425 BLAKE2B bfdb84bca0e1586c461e2c696f4ee0ed4ae5fb9c72143d7b76d9a5cd04f351d779bc65c8130a2592fb8136fc76e57d6bb494198e93ed6805a7db1150b1af5454 SHA512 26f550574e1990d8bccdf383a4a42fb591e02b8cbc327e9cc002264cbab9ec9ec919a6a05820b686d85a5a49d2167516facd0277fdab6830306dab18c147cfc3
+DIST thunderbird-115.12.2-pt-PT.xpi 728871 BLAKE2B 60aab8a99d118bc88150d0f03f530ee39318c0a746ba86584b14c4460857292f982eb56b5b675e56884f0644edfa9e4b07e9ec663c12056c8a3746d6fee8d44a SHA512 0d9530955656abd55bacbb02f0e56ed88ae699f08f38c170aa6f615796584bed2701371d486bc1fe66fe85a8d9b1c9d3576337cf367b7f8175bd054fa2109ea3
+DIST thunderbird-115.12.2-rm.xpi 732590 BLAKE2B 36bb3031ea1023029d2a34e89d427147d6c76554bac3ea3029c5ec2dab72fe829aedcd2e31add32e586cf0de7bce22864d67eba303e496c432728a758a5e2a55 SHA512 1e9c12e284fbf3666c834b7049c57910787b289ed92d4e6d2ec4246bc53c79ccc2c5e8d6fb723e8b6085dbe8fa813ebbe134eb9a2b24e43758d4785cc3f16cbc
+DIST thunderbird-115.12.2-ro.xpi 661832 BLAKE2B db45513e40e7e8c3f44bcb608c71a122e865d9afd03ff750177e6e9bc76cd0c22e724b844e9576a591f480c2e543f958d0f527b85a8f69814358797621897e42 SHA512 b850d5f373a218bff7a9829d70a19961cd36bdc629a43933898297912cfbaf0987fe75dd0e13d869bfe88e08761e530b758f56f9d675371227233478b3199140
+DIST thunderbird-115.12.2-ru.xpi 857136 BLAKE2B 506eccfe3b24a2a7030a92a500eb360ad3fb654f6980396d6be7683522f145f807e505b5af620168647dc3a9e997356da010b4894c731b4f6ae1e4c1b2318269 SHA512 825c988ddb1818a1b3f0683d14533691aab4993954471320d10097bccc337000c9b7336f8a59bd0a97ac340d88fae63919fe6e9723c337cd90c0c0f4549c9d25
+DIST thunderbird-115.12.2-sk.xpi 769055 BLAKE2B 341b722c8770e8bfd2b83da1ab37aa9ffdc71529a208af457bbfac726c1665806f469bd28647cd5119078f5778f30035ba91244046f0f268f7845d0a964f8106 SHA512 73fce4c10cfb99a819fe3bae51adbd069a6a8ac9949965a175ebc198500d9cac179f47e10112ada3866a68f56c461ba0d922ec0c9fe950e52b9f66ec4a20e5e8
+DIST thunderbird-115.12.2-sl.xpi 729110 BLAKE2B b1c850bd69e080cffec79bc6268c76b0c568af467a7b37069eba573105f86bbccd157482dbe7b6f2dffdbc060d4e7e17f9799001467738cf48be69602def51a8 SHA512 036f901c8d04357795e374a76ebcc38900a42857505adee3566ce613307cccc40ef217ec2e0ea1a63a778fd87f3c0c5182d489997c8284e3b1adf701ce48f5ea
+DIST thunderbird-115.12.2-sq.xpi 753635 BLAKE2B dbfca3f5c0ea280eac60f2e0f20527ce6b5b498b8c8fef3c4f0de7b35f69ba957a9e84be983e0f3fc43e1bd62af55e20f42038b051df40db080de17f677d2175 SHA512 c98e7b05aaed323213ebbdf7401e0c8fd48bdd299265d41cdb8eec05ecfc39675ba0b8b7ca28ea88c2b2b0b289accf63e98e2fb91f24906b1abe059df50dde6d
+DIST thunderbird-115.12.2-sr.xpi 757455 BLAKE2B c40d6ba01123e3aa50df50b61ca247262ff47b9e4ad2418fb632bd928c550f3da01286d03930ddc3561c9d5b5ce8d2b1c904ce3b3f2e494f6d21e148720ebc35 SHA512 4bd9514ccaf7e174f0ec50d3b8c31bef0f9c01ab488f8edd886d26776f5a0764f205a77a128d3eeac5260d76c573a3dd7f945396749e5f2fa0339dd5ff76fe65
+DIST thunderbird-115.12.2-sv-SE.xpi 733956 BLAKE2B 32450b332c3f81f4503a3b670077dcd536dc35568f921544789ed8e4691112796c994ba0b1e7d1f8837df6e8db534956c5215deea979394205bb7df413770252 SHA512 1765e754bc807727292e191a03f37e20413c165d4a5a45957960bc97ea7b3cf91976aabdd840aa6f07c638f27f919d512d5db99b5a83798e994925b7aad656d3
+DIST thunderbird-115.12.2-th.xpi 804660 BLAKE2B 12508fb815e44e730f8d1b2d2114fb46b7faa8a1089b256c422e14b7b69145c26143abc6150ddd1b6fd933ef283013829ff5066ed091261cec4cc41a5ad1fdaf SHA512 dc0fd4683c4f1eaf5f19dca295fd675c15f776a8ad0a669c932d52b6d978e3ec45e8187c2f7ae66fa6905fe6d35f4a492fd1ff093cf6080d473b216d3218201c
+DIST thunderbird-115.12.2-tr.xpi 743475 BLAKE2B 2a0495286624c41b45ec0528e5c459a7347429c8f2dcab88a1d5fad1569ac9b80b83f3e2dfff17c89734978b4918a40c0cd9766ae787294af27f5d9cb4a68742 SHA512 89e182502e8627bcc5ab63ecf0157237dbddc888d257a1df67d2de2b350ac7ac475cbea8e57b004685febfbadcad1463645c34be0576c1255dfc25445ede7c54
+DIST thunderbird-115.12.2-uk.xpi 846640 BLAKE2B 880b87693d467a0172e47132645517ca44d1185c74655426c534549482e519584fb3c3a279c8f1a981567b44c07005aa228b3368b7f08e3f9fa9e41ab108cef1 SHA512 7b7837f3afcf82a7beffd1603c000166d99d7d7a081af7a0aaf9c9d5b3a77345ba0f0f91b2c829f1d2a6a00c4eb92d02ac875c59661ce90a9d2afab39b101a3d
+DIST thunderbird-115.12.2-uz.xpi 588507 BLAKE2B 1d5864a0319cc3d61c9c3dc40e41f57befa2a20aef3da0003673f02095edf2ddb2786d70a17920a816d84b75a70e51ec342bb0259b749f62b4bba6cd6d0ffbb6 SHA512 206aef3969363b51bb924a18f9c0ff965c9be29a748837e2f57a3e2657a146e6b4311afb0066439b52c485623a422d4df7a86e32887a5b3018f460f37ec65ada
+DIST thunderbird-115.12.2-vi.xpi 772901 BLAKE2B 8b0edce2bee981b28b57fa675eb096ee7e5abeb9bb80048cdb7cc1ed902f1e2f74a4e3af173cbab63f0b8e2e2ea1882289fed2871ec35b3879c644d5fb1b367c SHA512 9727f8dfe69a4eea306b928ac45edd778521550a53ae2844645390cff58eaeb79582321c5fca0dc0943276a85f0a4f74d1cde9edca4eda68cd223d844f0e0183
+DIST thunderbird-115.12.2-zh-CN.xpi 771966 BLAKE2B addabe3b5fc546bf7eb7ab176686bde5af5f800e5841d0a3481fca2e160a53942e6384579bc0524cf4f24079056b067d6c1f0b937b1699118daaadf5d30ca150 SHA512 2134ef278fab4904b121496022d3f930aee083b41f2d57ae0bdcaad640bc8573bbc6204e2c010e061eb054b82d3991711a53dfa1a694282d520586eb5af50c86
+DIST thunderbird-115.12.2-zh-TW.xpi 776442 BLAKE2B 92eabe92027acdaa8a87accfcbf755d50579f948e3ac565296670eb7ff6860a60e96fca6063f390415dd33691fbf4ff8084e69b1dbba5a437fdd4e53cf35b7a8 SHA512 9b8a947ddd6038c1d13d2d909de8e0c5b0a4c9f8fe48fe2f20f04c714811cc124e90b0cd77e9d9deb5e67f864063fca2c671a463b012385c03c9708ac4a79b0c
+DIST thunderbird-bin_i686-115.12.2.tar.bz2 83038989 BLAKE2B 3a236dabd528d8595014f89a83dc7deba67af00b7e104dc86f9acaf328eba909a798206f9f8a5f441bacd89f031c4071f02aa46174bb750994fbec7081194240 SHA512 bed5c8251f18a5930ac6c79d2d8be2e5170659a55889c4a2202d9c894253811f4ac676e33ceb5142bce6ec65ab7a61496909fd892bd61c56b1d081bff9257e4e
+DIST thunderbird-bin_x86_64-115.12.2.tar.bz2 80751602 BLAKE2B 510e620c2dcbc2c957e5d9962460538455fbc7f46b7e7d66a707c86bb36a8a63fb2971a7cde9fc8644a0800f7ab0ea5280b041702716146f9c5a004d220ac1e5 SHA512 5a90d172d9f49fe1220aa0f36a44e6b7f60dac89801d037874fcc88d88f998a75081c32b5486064e5828d6735cc7ddc6a9cb1d837d3f2531d3cda761fb67eac0
+EBUILD thunderbird-bin-115.12.2.ebuild 9025 BLAKE2B b920c9d10cd4ab8c4e9167f777fef46e6cd254c8a7c41955bf68bfa609b3f81170147b2e46910a29db50b9cc655200421524f2918b63ab7c43f370362432830a SHA512 93b42f57a301b7bc9433a7c93d042e7f8728f6bdf004cd5e3d9ba64f18059adce79cf534ee3686246534ab3509ff5cd4a2f5fc20cd9945071431f0ac675a520f
 MISC metadata.xml 255 BLAKE2B f54493c82293ca95a1ffd16d6199055650b0aaa18234716339235bab3f14a87327cb04fac6b543f973b3fef8047412e54edf72bf0b8a9424f4aa1d2eb0feec30 SHA512 28c0ab3671ed2c65cd9694181f7f9c4a8bea53dee0a0a06f0d9086166317a87611017b105d5150167597c45a7dd8921182fd6bf9d1b3fc7408c0e94f36189e33
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-115.11.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-115.12.2.ebuild
index 0ddec45f3444..0ddec45f3444 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-115.11.1.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-115.12.2.ebuild
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 7a6719b2b196..6b99ff322f1f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index da98f852c87a..0a2d089c4e56 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -14,6 +14,6 @@ DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e896
 EBUILD geeqie-2.1-r1.ebuild 3277 BLAKE2B e9a43ed274613dd5a98552d1d83768cffbc0be641d1661d6bd9b5d4b599e210d48dd6fe771c03d90abfc895bd582901e1ac0c4c224edbe96c6139f75e0b40e87 SHA512 f1a090d18fe0f6bb6ab3f7ecb6c42a996fcfbe05457f97ae00cff4d44da057107acd982616ffc307208bc893235ec5b1bcaeee79eefbae177a445a1f465e54da
 EBUILD geeqie-2.2.ebuild 3284 BLAKE2B 3c81435058a54a3da139b128db23b2adc7a378c9fb6a7f81cc9405b427ad66696f94c42bf39fb65583d79a8ac7428c2130a4e780410643fe6511457d4b3bea67 SHA512 db41ac9bfe390f64c6352a33f9c2181d3fe27d0e15c256cabef7ab026d4398342f0de05c4f29466634ec419d07f2c13b6294551e27dcb47df66c221f55aa6641
 EBUILD geeqie-2.3.ebuild 3376 BLAKE2B 515083b0ecb99fa9c2d6f92d9df2ef9c8f1e72436c290bb02311cfe73bcb0a92f0334df33c1453a709cf94277cddb99deaf9ba9276895524ec42126ef44616f5 SHA512 4906e493fe819d29e6c94dcb452b8f2382a0e01f59b60b8fb0afd0ac8c79f27c2befd23ed6366fd4e76a6da6dafc75d24aaab552f93ca0fad7a3b38f5d6c4e7d
-EBUILD geeqie-2.4.ebuild 3342 BLAKE2B ba2e5484201f6d834d3a5ff70cc28a2bab369bdc2286a27285b86ceb33b54325b47e4d03b00a5b98ee00039bcd50c57b917e7faea4570dca1405265590c5ba20 SHA512 b7af3c8f7479996f9228c6c36269e33975356245b018654f140b16ef84a0a327c867677e5ecce9020759fe3fa181918145eaa5e9b1fcfbcbd8ecc79a094baa59
+EBUILD geeqie-2.4.ebuild 3340 BLAKE2B 62a26c71d0d3e2c71fff2c6761f69bd5b6e82a364ff5f5c391eaa688b2ff5668a36b68d104155a7b3c2dd364ef15301abe494401fca2b0cf556f2501b38085fa SHA512 ab810bd8277a102a72569909d0d925095141438d341cf3d592e4a4c3336a7e7d9a6d344dee87c2cdfd8fe13c7443e471e2aa79954b54545996a65b46a9d52905
 EBUILD geeqie-9999.ebuild 3055 BLAKE2B 450d32bd793aa6436b3ab676758758e57f1bd34fa38ceafbd14a3df436611cc0f25a1c93f05f51104089e2c76a82f2605f00467e0aedf41032645d5e236f6421 SHA512 c1695fa7e9fe635f5799677c13014f4792ca2463654d1faeb967fd9fa6f89a757892316386797590632f3a233eb19daff8e724cd59d937294e2f48c79246d26c
 MISC metadata.xml 816 BLAKE2B ed50c576f068626d95d99899b17508b7c48567707ff020988dc611be9b482893f008f904ce460565ed0f263c76f2e274640f6e662f827d0879de5a59a93e8c3b SHA512 45458e31201d1baee61f48fe452c3577bcb74fea6569d1afdd8787aff6714d3400f501d1dc6b3de31ea1d5151326d48593f5bb219ec5cfed603cfe8835690dcd
diff --git a/media-gfx/geeqie/geeqie-2.4.ebuild b/media-gfx/geeqie/geeqie-2.4.ebuild
index 2b9b96fbe6a9..f533a7ba88cb 100644
--- a/media-gfx/geeqie/geeqie-2.4.ebuild
+++ b/media-gfx/geeqie/geeqie-2.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
 
 RDEPEND="gnome-extra/zenity
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 8e9d5c9a0d10..a48df75e770d 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b481c2c3a420..abb0ff7587b4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Jun 2024 22:40:09 +0000
+Thu, 27 Jun 2024 06:11:13 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 693b1947656d..35e0f316287c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 575523 BLAKE2B de41364df787e2652a1f6dda37e1513a8953f61c0ade9d1ba90db51415db460a2dd55ec567c2c851c28aaf7ffaa4763a80e748ea9a9d8f30ff1696ea4f17f233 SHA512 717db93df5303c6328fa1610a5166072155b52c981dab3121e3399b951cd8877d22fba9534692b8b7da38c227d9e195296abdf7536518c7808a22fe65a776a5f
-TIMESTAMP 2024-06-25T22:40:15Z
+TIMESTAMP 2024-06-27T06:11:16Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZ7R09fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZ9AoVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAK5g/7BkPu52oi0FRUoFi6YeJ6D9iEtZk5S0uWFdwg9y+YWcph694bpWz7QYol
-Q43GOm2t3J+RV/MD7COD3oHvvNTX/EgIOTbwgMPefUxDYYE5872Mnw0TLEr7lXqL
-zaKWWRUvgVuRfyCYxQP73l94kgt47HfZsUYtYt/TPVCvemm4faQM8nQkN8e4ds6p
-GwtU1c6LOE3kKmuLSvzbWtK9h85SON9ZfAS+xiBsyzOYGfFDqQw4oyGmPF7s/9Rw
-J3ONtf6lncU1AzbhJE58BRuIrcvmwvMCjn5hkM8Z5wg9ZU1hCuX0YOk3Q8m2SC/3
-WusupSZYeJ/kVU8IAQmTZvVJUpNMwN3OV1RdVCZKJglhJmAVExm4wqBMSoj1/DPt
-bB9iA3aKQKKlUZabddLBLG1AkJ2+yD0abz7kKfn/hi9WdTC6C6VE8eVo9yn2DWxG
-B1k9dW+Cqm+pEP+x7wJhEPH206EeXVNq2ckqDCqpyO9/9itafwn9oyhYH1QoQukt
-amrPz5EsjiRaEXS5a8swOOgs6zDGT49mwyjFLgnadqyjtVjsSHOtcJ6g5DcVCItk
-4Qt/blD+7Rz+iNADTLq2LNzVGZbgyoy38CmKwppiM2NTJWsbQRzo14PerabX50s/
-IX/MVyEWs47melvLeIXwkRLKGKr/dasG+37n2aUljR+0RyQE2nM=
-=LX8X
+klAulxAAnoqpxSkwg2WUSgPNq2wdEYgx1pHcbuw0YqmhJmLd2I+Dg3OWmaeMmehi
+bemELphRikR6R2o2u+RquiYfyM1EQLFWrvJM8+PlqjmvddRfdxzxGlqk6koHGJzP
+0vmYxGi+Lc6Fo8cs8e0p7jiBXASv+fgJ35Mer0omaeTQLKQR/Sk6JDtjokNN0dDz
+HQLcqBRpW5UuSpXlKVYRbUvFZOF5KfykaPs2fmHRMGc1ILCscwkgK+7V6K049e4j
+PrYVkWvor4oNta0vOfTsoy5wJ9C5ZeCGjc/dREGr13qxYpw+C43t18VTMtk1qIzs
+x0+vjMri14uegMQ7M4QV3EVj+5kAsvCKi4fh1KSs4qu3W1iiW4s31oCbiWONj5zk
++lFkJ2Y9i6nVZG6nDrdsE3QVjUfiQqCYnIHkqghuCHbGxsKfBhQ06Ku/Eprur9mB
+iAMwdMvarHtYundyBSGgNuaqnq/hjtpv7zouiovUVjoYf4uVfb/Z7dFJyQPRRFkN
+l5s79XUvPh1CiC2kpsHsiCFZR23W6NtYODaespBFjI781OiL2/I5dW9JU3COfUJy
+2LIhyBHRxS0a6miLwalA4ajFlM37MwJyS6IV+1HzpL909t9kGcO354KcgWMiDSg9
+SXPf+QgEm11DMdPRIuUIt+KcGNLYR3RxFFVxF+4xmHaxzfhsNU8=
+=jrE5
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b481c2c3a420..6c926fe0dfde 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Jun 2024 22:40:09 +0000
+Thu, 27 Jun 2024 06:11:14 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 938dd1b232ef..d9554c659a43 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index dd850ff0cbaf..29b0401c51c8 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.6-r1 b/metadata/md5-cache/app-accessibility/brltty-6.6-r1
index 6094149a7c54..e885f7f35e4f 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.6-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-6.6-r1
@@ -12,5 +12,5 @@ RDEPEND=acct-group/brltty acct-user/brltty dev-libs/libpcre2[pcre32] bluetooth?
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.6.tar.xz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	findlib	49d5365fca4dea46f13825b9d763c89e	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	findlib	49d5365fca4dea46f13825b9d763c89e	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=8223ff25c921a326cdfe865c96d53095
diff --git a/metadata/md5-cache/app-accessibility/freetts-1.2.2-r2 b/metadata/md5-cache/app-accessibility/freetts-1.2.2-r2
index c6fb1f67ca89..51c7fc30372e 100644
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.2-r2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.2-r2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=d
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/freetts/freetts-1.2.2-src.zip
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=2d5cfc72e43732f7d1907fedddfc3dcb
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 3df64d25d125..7ab34e805c54 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.33.15 b/metadata/md5-cache/app-admin/awscli-1.33.15
new file mode 100644
index 000000000000..d48232a4c87e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.33.15
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.133[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+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
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.34.133[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.33.15.tar.gz -> aws-cli-1.33.15.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=0b93d65db2a37b8a80a66b542751297c
diff --git a/metadata/md5-cache/app-admin/awscli-1.33.16 b/metadata/md5-cache/app-admin/awscli-1.33.16
new file mode 100644
index 000000000000..03a60d4941dc
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.33.16
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.134[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+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
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.34.134[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.33.16.tar.gz -> aws-cli-1.33.16.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=0b93d65db2a37b8a80a66b542751297c
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.17.16 b/metadata/md5-cache/app-admin/logstash-bin-7.17.16
index 0024daf3fdf8..e5823a212e08 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-7.17.16
+++ b/metadata/md5-cache/app-admin/logstash-bin-7.17.16
@@ -11,5 +11,5 @@ RDEPEND=acct-group/logstash acct-user/logstash virtual/jre >=dev-java/java-confi
 RESTRICT=strip
 SLOT=0
 SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.17.16-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.17.16-linux-x86_64.tar.gz )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d20b5f2cba87e940d3fc7a8755e0a92f
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 29033949cb5e..f3bd90d2b0c0 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/lxc-6.0.1 b/metadata/md5-cache/app-containers/lxc-6.0.1
new file mode 100644
index 000000000000..a06924edfe89
--- /dev/null
+++ b/metadata/md5-cache/app-containers/lxc-6.0.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig man? ( app-text/docbook2X ) verify-sig? ( sec-keys/openpgp-keys-linuxcontainers ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile configure install postinst setup test unpack
+DEPEND=acct-group/lxc acct-user/lxc apparmor? ( sys-libs/libapparmor ) caps? ( sys-libs/libcap[static-libs] ) io-uring? ( >=sys-libs/liburing-2:= ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/dbus sys-apps/systemd:= ) tools? ( sys-libs/libcap[static-libs] ) sys-kernel/linux-headers
+DESCRIPTION=A userspace interface for the Linux kernel containment features
+EAPI=8
+HOMEPAGE=https://linuxcontainers.org/ https://github.com/lxc/lxc
+INHERIT=bash-completion-r1 linux-info meson optfeature systemd toolchain-funcs verify-sig
+IUSE=apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd test +tools verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1 LGPL-3
+RDEPEND=acct-group/lxc acct-user/lxc apparmor? ( sys-libs/libapparmor ) caps? ( sys-libs/libcap[static-libs] ) io-uring? ( >=sys-libs/liburing-2:= ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/dbus sys-apps/systemd:= ) tools? ( sys-libs/libcap[static-libs] )
+RESTRICT=!test? ( test )
+SLOT=0/1.8
+SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-6.0.1.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-6.0.1.tar.gz.asc )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=5476d041a9a9707c9d748c301fde334b
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index eb3babaa78b3..a77fe558a3e1 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/jacksum-3.7.0 b/metadata/md5-cache/app-crypt/jacksum-3.7.0
index 0f3595af804d..cd1a83e4e490 100644
--- a/metadata/md5-cache/app-crypt/jacksum-3.7.0
+++ b/metadata/md5-cache/app-crypt/jacksum-3.7.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jonelo/jacksum/archive/v3.7.0.tar.gz -> jacksum-3.7.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=280abbab0a1621d3106026d34743d817
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 20af929c72f1..24edd2bdccd1 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/gvim-9.1.0366 b/metadata/md5-cache/app-editors/gvim-9.1.0366
index 86c053615bf7..a105f3c69bdc 100644
--- a/metadata/md5-cache/app-editors/gvim-9.1.0366
+++ b/metadata/md5-cache/app-editors/gvim-9.1.0366
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
 INHERIT=bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils
 IUSE=acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=~app-editors/vim-core-9.1.0366 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ( dev-lang/ruby:3.2 virtual/rubygems[ruby_targets_ruby32(-)] ) ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.1.0366.tar.gz -> vim-9.1.0366.tar.gz https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-9.0.2092-patches/vim-9.0.2092-patches.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=29778cff047e6e482cce459655c65721
+_md5_=21a1fb2348f37cdcea904e58ce28e6f7
diff --git a/metadata/md5-cache/app-editors/jedit-5.6.0-r1 b/metadata/md5-cache/app-editors/jedit-5.6.0-r1
index 5c1e18f7f0a5..b26ac2831ed4 100644
--- a/metadata/md5-cache/app-editors/jedit-5.6.0-r1
+++ b/metadata/md5-cache/app-editors/jedit-5.6.0-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jsr305:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/jedit/jedit/5.6.0/jedit5.6.0source.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4e7c3beb087ae43f7b56b80e5e2e448a
diff --git a/metadata/md5-cache/app-editors/vim-9.1.0366 b/metadata/md5-cache/app-editors/vim-9.1.0366
index 8809624edcaa..e10a2ed6be4b 100644
--- a/metadata/md5-cache/app-editors/vim-9.1.0366
+++ b/metadata/md5-cache/app-editors/vim-9.1.0366
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
 INHERIT=vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils
 IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( 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 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.1.0366 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( ( dev-lang/ruby:3.1 virtual/rubygems[ruby_targets_ruby31(-)] ) ( dev-lang/ruby:3.2 virtual/rubygems[ruby_targets_ruby32(-)] ) ) ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
@@ -14,4 +14,4 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_s
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.1.0366.tar.gz -> vim-9.1.0366.tar.gz https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-9.0.2092-patches/vim-9.0.2092-patches.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b0281efce23b8677dffb023fa6cd20ed
+_md5_=f5e5cdde5daeed11b21b60308d67df21
diff --git a/metadata/md5-cache/app-editors/vim-core-9.1.0366-r1 b/metadata/md5-cache/app-editors/vim-core-9.1.0366-r1
index 208511e2a43b..e4c6c4d7b918 100644
--- a/metadata/md5-cache/app-editors/vim-core-9.1.0366-r1
+++ b/metadata/md5-cache/app-editors/vim-core-9.1.0366-r1
@@ -6,9 +6,9 @@ EAPI=8
 HOMEPAGE=https://www.vim.org https://github.com/vim/vim
 INHERIT=bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils
 IUSE=nls acl minimal
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=vim
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.1.0366.tar.gz -> vim-9.1.0366.tar.gz https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-9.0.2092-patches/vim-9.0.2092-patches.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6178b81451d872e35619483f5074e09b
+_md5_=e38e8ba7781ccca9ebe2ead707eb7ecf
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 7576fe9d35e8..5d772433f991 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.50-r3 b/metadata/md5-cache/app-emulation/virtualbox-6.1.50-r3
index fbb66b311ff1..4b7c18328582 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.50-r3
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.50-r3
@@ -13,5 +13,5 @@ RDEPEND=acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.50 >=dev-libs
 REQUIRED_USE=java? ( sdk ) python? ( sdk ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) vboxwebsrv? ( java )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.50/VirtualBox-6.1.50.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=023b33b9e670854bf312c2b349423216
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.18-r1 b/metadata/md5-cache/app-emulation/virtualbox-7.0.18-r1
index e0f98227bf62..f89eef621edd 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-7.0.18-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-7.0.18-r1
@@ -13,5 +13,5 @@ RDEPEND=acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.18 dev-libs/l
 REQUIRED_USE=java? ( sdk ) python? ( sdk ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) vboxwebsrv? ( java )
 SLOT=0/7.0
 SRC_URI=https://download.virtualbox.org/virtualbox/7.0.18/VirtualBox-7.0.18.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.16.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.18.tar.xz ) )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=357a07cabd74b2f05e94fcdc50c86ab1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-9999 b/metadata/md5-cache/app-emulation/virtualbox-9999
index b60848058a7e..7df42f2dbba7 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-9999
+++ b/metadata/md5-cache/app-emulation/virtualbox-9999
@@ -13,5 +13,5 @@ RDEPEND=acct-group/vboxusers app-arch/xz-utils dev-libs/libtpms dev-libs/libxml2
 REQUIRED_USE=java? ( sdk ) python? ( sdk ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) vboxwebsrv? ( java )
 SLOT=0/9999
 SRC_URI=https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.1.0_pre20240419.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.16.tar.xz ) )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	367e103a74bf77e6a8da7894d999fa3c	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	linux-info	e967b81f54be6f49f4219a57ce7db437	linux-mod-r1	9ccd2b29cd75bd48092f8f46b07fc935	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	subversion	44c6a1cae0381c100a526e3b348622cd	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	367e103a74bf77e6a8da7894d999fa3c	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	linux-info	e967b81f54be6f49f4219a57ce7db437	linux-mod-r1	9ccd2b29cd75bd48092f8f46b07fc935	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	subversion	44c6a1cae0381c100a526e3b348622cd	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b5fb7be3a9b074d4ee5fda9cbdd72ccb
diff --git a/metadata/md5-cache/app-emulation/virtualbox-kvm-7.0.18_pre20240617 b/metadata/md5-cache/app-emulation/virtualbox-kvm-7.0.18_pre20240617
index aa8004980547..d6f853d0ad78 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-kvm-7.0.18_pre20240617
+++ b/metadata/md5-cache/app-emulation/virtualbox-kvm-7.0.18_pre20240617
@@ -12,5 +12,5 @@ RDEPEND=!app-emulation/virtualbox acct-group/vboxusers dev-libs/libtpms dev-libs
 REQUIRED_USE=java? ( sdk ) python? ( sdk ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) vboxwebsrv? ( java )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.16.tar.bz2 https://github.com/cyberus-technology/virtualbox-kvm/archive/dev-20240617.tar.gz -> virtualbox-kvm-7.0.18_pre20240617.tar.gz https://download.virtualbox.org/virtualbox/7.0.18/VirtualBox-7.0.18.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.18.tar.xz ) )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b86e9d0710d93bdfa8255de473d98917
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 0357f0a5ea7a..1581a92e77dd 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-4.11.1-r2 b/metadata/md5-cache/app-forensics/sleuthkit-4.11.1-r2
index 1c38d1ffbb37..f54e9639b8ac 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.11.1-r2
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.11.1-r2
@@ -12,5 +12,5 @@ RDEPEND=dev-db/sqlite:3 dev-lang/perl:* aff? ( app-forensics/afflib ) ewf? ( sys
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.11.1/sleuthkit-4.11.1.tar.gz java? ( http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar ) ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=814fa62f89a42a8e4104464f6aec8cf7
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-4.12.1-r1 b/metadata/md5-cache/app-forensics/sleuthkit-4.12.1-r1
index f8ce2c2f45b7..50ba9d0f312b 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.12.1-r1
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.12.1-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-db/sqlite:3 dev-lang/perl:* aff? ( app-forensics/afflib ) ewf? ( sys
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.12.1/sleuthkit-4.12.1.tar.gz java? ( https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.42.0.0/sqlite-jdbc-3.42.0.0.jar ) ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=e933c2dc388dc5bdaefbb0ed6a93f3dc
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 4c5d3bd142b4..f84190738128 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/collectd-5.12.0-r10 b/metadata/md5-cache/app-metrics/collectd-5.12.0-r10
index e29cb124370c..48ac5856badf 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.12.0-r10
+++ b/metadata/md5-cache/app-metrics/collectd-5.12.0-r10
@@ -12,5 +12,5 @@ RDEPEND=acct-group/collectd acct-user/collectd dev-libs/libgcrypt:= dev-libs/lib
 REQUIRED_USE=collectd_plugins_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) collectd_plugins_python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) collectd_plugins_smart? ( udev ) contrib? ( perl )
 SLOT=0
 SRC_URI=https://github.com/collectd/collectd/releases/download/collectd-5.12.0/collectd-5.12.0.tar.bz2
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	fcaps	c0a086b957a1b183a8d136eabf02f191	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	fcaps	c0a086b957a1b183a8d136eabf02f191	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=38cf423f6e6f859ee27a9b36a8573967
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 1090f03b37e6..b51913c09d1d 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/check-jsonschema-0.21.0-r1 b/metadata/md5-cache/app-misc/check-jsonschema-0.21.0-r1
deleted file mode 100644
index 9af7bd05334f..000000000000
--- a/metadata/md5-cache/app-misc/check-jsonschema-0.21.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ruamel-yaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ruamel-yaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] dev-python/furo[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/furo[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] dev-python/furo[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A CLI and set of pre-commit hooks for jsonschema validation
-EAPI=8
-HOMEPAGE=https://pypi.org/project/check-jsonschema/ https://github.com/python-jsonschema/check-jsonschema
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
-LICENSE=Apache-2.0
-RDEPEND=dev-python/ruamel-yaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-jsonschema/check-jsonschema/archive/refs/tags/0.21.0.tar.gz -> check-jsonschema-0.21.0.gh.tar.gz
-_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=93008ad6a0c21c23fab5e5b31322f2b4
diff --git a/metadata/md5-cache/app-misc/check-jsonschema-0.28.4 b/metadata/md5-cache/app-misc/check-jsonschema-0.28.4
deleted file mode 100644
index 4875889fe264..000000000000
--- a/metadata/md5-cache/app-misc/check-jsonschema-0.28.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/ruamel-yaml-0.18.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-4.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/regress[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/json5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/responses-0.25.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/ruamel-yaml-0.18.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-4.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/regress[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinx-issues[python_targets_python3_12(-)] dev-python/furo[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] dev-python/furo[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/furo[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] dev-python/furo[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A CLI and set of pre-commit hooks for jsonschema validation
-EAPI=8
-HOMEPAGE=https://pypi.org/project/check-jsonschema/ https://github.com/python-jsonschema/check-jsonschema
-INHERIT=optfeature distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~riscv
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/ruamel-yaml-0.18.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-4.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/regress[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-jsonschema/check-jsonschema/archive/refs/tags/0.28.4.tar.gz -> check-jsonschema-0.28.4.gh.tar.gz
-_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0ebbdde0b5d58f67b8df0b664af1b9d9
diff --git a/metadata/md5-cache/app-misc/check-jsonschema-0.28.4-r1 b/metadata/md5-cache/app-misc/check-jsonschema-0.28.4-r1
new file mode 100644
index 000000000000..6be4077755f7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/check-jsonschema-0.28.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/ruamel-yaml-0.18.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-4.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/regress[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/json5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/responses-0.25.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/ruamel-yaml-0.18.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-4.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/regress[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinx-issues[python_targets_python3_12(-)] dev-python/furo[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] dev-python/furo[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/furo[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] dev-python/furo[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A CLI and set of pre-commit hooks for jsonschema validation
+EAPI=8
+HOMEPAGE=https://pypi.org/project/check-jsonschema/ https://github.com/python-jsonschema/check-jsonschema
+INHERIT=optfeature distutils-r1
+IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/ruamel-yaml-0.18.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-4.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/regress[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-jsonschema/check-jsonschema/archive/refs/tags/0.28.4.tar.gz -> check-jsonschema-0.28.4.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8a47b200b6936dc3b32564294286f1a5
diff --git a/metadata/md5-cache/app-misc/jaq-1.2.0 b/metadata/md5-cache/app-misc/jaq-1.2.0
deleted file mode 100644
index 0df7821e43d0..000000000000
--- a/metadata/md5-cache/app-misc/jaq-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.63 >=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=Just another JSON query tool
-EAPI=8
-HOMEPAGE=https://github.com/01mf02/jaq
-INHERIT=cargo
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=MIT BSD EPL-2.0 MIT Unicode-DFS-2016 || ( Apache-2.0 Boost-1.0 )
-SLOT=0
-SRC_URI=https://github.com/01mf02/jaq/archive/refs/tags/v1.2.0.tar.gz -> jaq-1.2.0.gh.tar.gz https://crates.io/api/v1/crates/ahash/0.8.6/download -> ahash-0.8.6.crate https://crates.io/api/v1/crates/aho-corasick/1.1.2/download -> aho-corasick-1.1.2.crate https://crates.io/api/v1/crates/allocator-api2/0.2.16/download -> allocator-api2-0.2.16.crate https://crates.io/api/v1/crates/ariadne/0.3.0/download -> ariadne-0.3.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/base64/0.21.5/download -> base64-0.21.5.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chumsky/0.9.3/download -> chumsky-0.9.3.crate https://crates.io/api/v1/crates/clap/4.0.22/download -> clap-4.0.22.crate https://crates.io/api/v1/crates/clap_derive/4.0.21/download -> clap_derive-4.0.21.crate https://crates.io/api/v1/crates/clap_lex/0.3.2/download -> clap_lex-0.3.2.crate https://crates.io/api/v1/crates/colored_json/3.0.1/download -> colored_json-3.0.1.crate https://crates.io/api/v1/crates/dyn-clone/1.0.11/download -> dyn-clone-1.0.11.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/env_logger/0.10.0/download -> env_logger-0.10.0.crate https://crates.io/api/v1/crates/equivalent/1.0.0/download -> equivalent-1.0.0.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/getrandom/0.2.10/download -> getrandom-0.2.10.crate https://crates.io/api/v1/crates/hashbrown/0.14.2/download -> hashbrown-0.14.2.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.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/hifijson/0.2.0/download -> hifijson-0.2.0.crate https://crates.io/api/v1/crates/indexmap/2.1.0/download -> indexmap-2.1.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.9/download -> itoa-1.0.9.crate https://crates.io/api/v1/crates/libc/0.2.147/download -> libc-0.2.147.crate https://crates.io/api/v1/crates/libm/0.2.8/download -> libm-0.2.8.crate https://crates.io/api/v1/crates/libmimalloc-sys/0.1.35/download -> libmimalloc-sys-0.1.35.crate https://crates.io/api/v1/crates/log/0.4.20/download -> log-0.4.20.crate https://crates.io/api/v1/crates/memchr/2.6.4/download -> memchr-2.6.4.crate https://crates.io/api/v1/crates/memmap2/0.9.0/download -> memmap2-0.9.0.crate https://crates.io/api/v1/crates/mimalloc/0.1.39/download -> mimalloc-0.1.39.crate https://crates.io/api/v1/crates/once_cell/1.18.0/download -> once_cell-1.18.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.69/download -> proc-macro2-1.0.69.crate https://crates.io/api/v1/crates/quote/1.0.29/download -> quote-1.0.29.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/regex-automata/0.3.7/download -> regex-automata-0.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.7.5/download -> regex-syntax-0.7.5.crate https://crates.io/api/v1/crates/regex/1.9.4/download -> regex-1.9.4.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.14/download -> ryu-1.0.14.crate https://crates.io/api/v1/crates/serde/1.0.190/download -> serde-1.0.190.crate https://crates.io/api/v1/crates/serde_derive/1.0.190/download -> serde_derive-1.0.190.crate https://crates.io/api/v1/crates/serde_json/1.0.108/download -> serde_json-1.0.108.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.38/download -> syn-2.0.38.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.8/download -> time-macros-0.2.8.crate https://crates.io/api/v1/crates/time/0.3.20/download -> time-0.3.20.crate https://crates.io/api/v1/crates/unicode-ident/1.0.10/download -> unicode-ident-1.0.10.crate https://crates.io/api/v1/crates/unicode-width/0.1.11/download -> unicode-width-0.1.11.crate https://crates.io/api/v1/crates/urlencoding/2.1.3/download -> urlencoding-2.1.3.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/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate https://crates.io/api/v1/crates/zerocopy-derive/0.7.20/download -> zerocopy-derive-0.7.20.crate https://crates.io/api/v1/crates/zerocopy/0.7.20/download -> zerocopy-0.7.20.crate
-_eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=31675730eb63ecffae323aabaedf8fda
diff --git a/metadata/md5-cache/app-misc/jaq-1.3.0 b/metadata/md5-cache/app-misc/jaq-1.3.0
deleted file mode 100644
index ae774f42c0ca..000000000000
--- a/metadata/md5-cache/app-misc/jaq-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.64 >=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=Just another JSON query tool
-EAPI=8
-HOMEPAGE=https://github.com/01mf02/jaq
-INHERIT=cargo
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=MIT BSD EPL-2.0 MIT Unicode-DFS-2016 || ( Apache-2.0 Boost-1.0 )
-SLOT=0
-SRC_URI=https://github.com/01mf02/jaq/archive/refs/tags/v1.3.0.tar.gz -> jaq-1.3.0.gh.tar.gz https://crates.io/api/v1/crates/ahash/0.8.6/download -> ahash-0.8.6.crate https://crates.io/api/v1/crates/aho-corasick/1.1.2/download -> aho-corasick-1.1.2.crate https://crates.io/api/v1/crates/allocator-api2/0.2.16/download -> allocator-api2-0.2.16.crate https://crates.io/api/v1/crates/ariadne/0.4.0/download -> ariadne-0.4.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/base64/0.21.5/download -> base64-0.21.5.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chumsky/0.9.3/download -> chumsky-0.9.3.crate https://crates.io/api/v1/crates/clap/4.0.22/download -> clap-4.0.22.crate https://crates.io/api/v1/crates/clap_derive/4.0.21/download -> clap_derive-4.0.21.crate https://crates.io/api/v1/crates/clap_lex/0.3.2/download -> clap_lex-0.3.2.crate https://crates.io/api/v1/crates/colored_json/3.0.1/download -> colored_json-3.0.1.crate https://crates.io/api/v1/crates/dyn-clone/1.0.11/download -> dyn-clone-1.0.11.crate https://crates.io/api/v1/crates/env_logger/0.10.0/download -> env_logger-0.10.0.crate https://crates.io/api/v1/crates/equivalent/1.0.0/download -> equivalent-1.0.0.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/getrandom/0.2.10/download -> getrandom-0.2.10.crate https://crates.io/api/v1/crates/hashbrown/0.14.2/download -> hashbrown-0.14.2.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.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/hifijson/0.2.0/download -> hifijson-0.2.0.crate https://crates.io/api/v1/crates/indexmap/2.1.0/download -> indexmap-2.1.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/1.0.9/download -> itoa-1.0.9.crate https://crates.io/api/v1/crates/libc/0.2.147/download -> libc-0.2.147.crate https://crates.io/api/v1/crates/libm/0.2.8/download -> libm-0.2.8.crate https://crates.io/api/v1/crates/libmimalloc-sys/0.1.35/download -> libmimalloc-sys-0.1.35.crate https://crates.io/api/v1/crates/log/0.4.20/download -> log-0.4.20.crate https://crates.io/api/v1/crates/memchr/2.6.4/download -> memchr-2.6.4.crate https://crates.io/api/v1/crates/memmap2/0.9.0/download -> memmap2-0.9.0.crate https://crates.io/api/v1/crates/mimalloc/0.1.39/download -> mimalloc-0.1.39.crate https://crates.io/api/v1/crates/once_cell/1.18.0/download -> once_cell-1.18.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.69/download -> proc-macro2-1.0.69.crate https://crates.io/api/v1/crates/quote/1.0.29/download -> quote-1.0.29.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/regex-automata/0.3.7/download -> regex-automata-0.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.7.5/download -> regex-syntax-0.7.5.crate https://crates.io/api/v1/crates/regex/1.9.4/download -> regex-1.9.4.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.14/download -> ryu-1.0.14.crate https://crates.io/api/v1/crates/serde/1.0.190/download -> serde-1.0.190.crate https://crates.io/api/v1/crates/serde_derive/1.0.190/download -> serde_derive-1.0.190.crate https://crates.io/api/v1/crates/serde_json/1.0.108/download -> serde_json-1.0.108.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.38/download -> syn-2.0.38.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.8/download -> time-macros-0.2.8.crate https://crates.io/api/v1/crates/time/0.3.20/download -> time-0.3.20.crate https://crates.io/api/v1/crates/unicode-ident/1.0.10/download -> unicode-ident-1.0.10.crate https://crates.io/api/v1/crates/unicode-width/0.1.11/download -> unicode-width-0.1.11.crate https://crates.io/api/v1/crates/urlencoding/2.1.3/download -> urlencoding-2.1.3.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/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate https://crates.io/api/v1/crates/zerocopy-derive/0.7.32/download -> zerocopy-derive-0.7.32.crate https://crates.io/api/v1/crates/zerocopy/0.7.32/download -> zerocopy-0.7.32.crate
-_eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3a6ad721edc222d01e8ac9fe70288637
diff --git a/metadata/md5-cache/app-misc/jaq-1.5.0 b/metadata/md5-cache/app-misc/jaq-1.5.0
new file mode 100644
index 000000000000..51f89667c59e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/jaq-1.5.0
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.64 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Just another JSON query tool
+EAPI=8
+HOMEPAGE=https://github.com/01mf02/jaq
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=MIT BSD MIT Unicode-DFS-2016 || ( Apache-2.0 Boost-1.0 )
+SLOT=0
+SRC_URI=https://github.com/01mf02/jaq/archive/refs/tags/v1.5.0.tar.gz -> jaq-1.5.0.gh.tar.gz https://crates.io/api/v1/crates/ahash/0.8.7/download -> ahash-0.8.7.crate https://crates.io/api/v1/crates/aho-corasick/1.1.2/download -> aho-corasick-1.1.2.crate https://crates.io/api/v1/crates/allocator-api2/0.2.16/download -> allocator-api2-0.2.16.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/base64/0.22.0/download -> base64-0.22.0.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.14.0/download -> bumpalo-3.14.0.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chumsky/0.9.3/download -> chumsky-0.9.3.crate https://crates.io/api/v1/crates/clap/4.0.22/download -> clap-4.0.22.crate https://crates.io/api/v1/crates/clap_derive/4.0.21/download -> clap_derive-4.0.21.crate https://crates.io/api/v1/crates/clap_lex/0.3.2/download -> clap_lex-0.3.2.crate https://crates.io/api/v1/crates/codesnake/0.1.0/download -> codesnake-0.1.0.crate https://crates.io/api/v1/crates/console_log/1.0.0/download -> console_log-1.0.0.crate https://crates.io/api/v1/crates/dyn-clone/1.0.11/download -> dyn-clone-1.0.11.crate https://crates.io/api/v1/crates/env_logger/0.10.0/download -> env_logger-0.10.0.crate https://crates.io/api/v1/crates/equivalent/1.0.0/download -> equivalent-1.0.0.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/getrandom/0.2.10/download -> getrandom-0.2.10.crate https://crates.io/api/v1/crates/hashbrown/0.14.2/download -> hashbrown-0.14.2.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.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/hifijson/0.2.0/download -> hifijson-0.2.0.crate https://crates.io/api/v1/crates/indexmap/2.1.0/download -> indexmap-2.1.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/1.0.9/download -> itoa-1.0.9.crate https://crates.io/api/v1/crates/js-sys/0.3.69/download -> js-sys-0.3.69.crate https://crates.io/api/v1/crates/libc/0.2.147/download -> libc-0.2.147.crate https://crates.io/api/v1/crates/libm/0.2.8/download -> libm-0.2.8.crate https://crates.io/api/v1/crates/libmimalloc-sys/0.1.35/download -> libmimalloc-sys-0.1.35.crate https://crates.io/api/v1/crates/log/0.4.20/download -> log-0.4.20.crate https://crates.io/api/v1/crates/memchr/2.6.4/download -> memchr-2.6.4.crate https://crates.io/api/v1/crates/memmap2/0.9.0/download -> memmap2-0.9.0.crate https://crates.io/api/v1/crates/mimalloc/0.1.39/download -> mimalloc-0.1.39.crate https://crates.io/api/v1/crates/once_cell/1.18.0/download -> once_cell-1.18.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.69/download -> proc-macro2-1.0.69.crate https://crates.io/api/v1/crates/quote/1.0.29/download -> quote-1.0.29.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/regex-automata/0.3.7/download -> regex-automata-0.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.7.5/download -> regex-syntax-0.7.5.crate https://crates.io/api/v1/crates/regex/1.9.4/download -> regex-1.9.4.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.14/download -> ryu-1.0.14.crate https://crates.io/api/v1/crates/serde/1.0.190/download -> serde-1.0.190.crate https://crates.io/api/v1/crates/serde_derive/1.0.190/download -> serde_derive-1.0.190.crate https://crates.io/api/v1/crates/serde_json/1.0.108/download -> serde_json-1.0.108.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.38/download -> syn-2.0.38.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.8/download -> time-macros-0.2.8.crate https://crates.io/api/v1/crates/time/0.3.20/download -> time-0.3.20.crate https://crates.io/api/v1/crates/unicode-ident/1.0.10/download -> unicode-ident-1.0.10.crate https://crates.io/api/v1/crates/unicode-width/0.1.13/download -> unicode-width-0.1.13.crate https://crates.io/api/v1/crates/urlencoding/2.1.3/download -> urlencoding-2.1.3.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/wasm-bindgen-backend/0.2.92/download -> wasm-bindgen-backend-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.92/download -> wasm-bindgen-macro-support-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.92/download -> wasm-bindgen-macro-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.92/download -> wasm-bindgen-shared-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.92/download -> wasm-bindgen-0.2.92.crate https://crates.io/api/v1/crates/web-sys/0.3.69/download -> web-sys-0.3.69.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/yansi/1.0.1/download -> yansi-1.0.1.crate https://crates.io/api/v1/crates/zerocopy-derive/0.7.32/download -> zerocopy-derive-0.7.32.crate https://crates.io/api/v1/crates/zerocopy/0.7.32/download -> zerocopy-0.7.32.crate
+_eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5498050149ca2b14fb1b602eb63f3c26
diff --git a/metadata/md5-cache/app-misc/rundeck-cli-bin-2.0.1 b/metadata/md5-cache/app-misc/rundeck-cli-bin-2.0.1
index 76a9b1cfd6a3..d905c1a1be09 100644
--- a/metadata/md5-cache/app-misc/rundeck-cli-bin-2.0.1
+++ b/metadata/md5-cache/app-misc/rundeck-cli-bin-2.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/rundeck/rundeck-cli/releases/download/v2.0.1/rundeck-cli-2.0.1-all.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5a6db1938fc115a535c8c6d0b8d8c0cf
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 99bc5f6cb1f4..d47d0a571d7d 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/homebank-5.8.1 b/metadata/md5-cache/app-office/homebank-5.8.1
index acbc750a7286..1108626aeda6 100644
--- a/metadata/md5-cache/app-office/homebank-5.8.1
+++ b/metadata/md5-cache/app-office/homebank-5.8.1
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.gethomebank.org/ https://launchpad.net/homebank
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg
 IUSE=+ofx
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.39:2 net-libs/libsoup:3.0 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3:= )
 SLOT=0
 SRC_URI=https://www.gethomebank.org/public/sources/homebank-5.8.1.tar.gz
 _eclasses_=xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e53a28c7bd9a1d33a12c219935c91195
+_md5_=7ba55cf198472933b033afcb02d21562
diff --git a/metadata/md5-cache/app-office/libreoffice-24.2.4.2-r1 b/metadata/md5-cache/app-office/libreoffice-24.2.4.2-r1
index 45eabf7d153c..af1935f02363 100644
--- a/metadata/md5-cache/app-office/libreoffice-24.2.4.2-r1
+++ b/metadata/md5-cache/app-office/libreoffice-24.2.4.2-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-24.2.3.2-icu-74.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-24.2.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-24.2.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/24.2.//libreoffice-24.2.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/24.2.//libreoffice-help-24.2.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/24.2.4.2/src/libreoffice-24.2.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/24.2.4.2/src/libreoffice-help-24.2.4.2.tar.xz https://dev-www.libreoffice.org/src//dragonbox-1.1.3.tar.gz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//frozen-1.1.1.tar.gz https://dev-www.libreoffice.org/src//skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz https://dev-www.libreoffice.org/src//zxcvbn-c-2.5.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//Java-WebSocket-1.5.4.tar.gz https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=310dfa2bc220cb269a83810f4043a4f9
diff --git a/metadata/md5-cache/app-office/libreoffice-24.2.4.2-r10 b/metadata/md5-cache/app-office/libreoffice-24.2.4.2-r10
index b35de876e632..07d08b159936 100644
--- a/metadata/md5-cache/app-office/libreoffice-24.2.4.2-r10
+++ b/metadata/md5-cache/app-office/libreoffice-24.2.4.2-r10
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-24.2.3.2-icu-74.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-24.2.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-24.2.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/24.2.//libreoffice-24.2.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/24.2.//libreoffice-help-24.2.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/24.2.4.2/src/libreoffice-24.2.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/24.2.4.2/src/libreoffice-help-24.2.4.2.tar.xz https://dev-www.libreoffice.org/src//dragonbox-1.1.3.tar.gz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//frozen-1.1.1.tar.gz https://dev-www.libreoffice.org/src//skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz https://dev-www.libreoffice.org/src//zxcvbn-c-2.5.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//Java-WebSocket-1.5.4.tar.gz https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a1c2677807b642adf418efea857ddfb5
diff --git a/metadata/md5-cache/app-office/libreoffice-24.2.9999 b/metadata/md5-cache/app-office/libreoffice-24.2.9999
index d41731e81f6b..c737451118bb 100644
--- a/metadata/md5-cache/app-office/libreoffice-24.2.9999
+++ b/metadata/md5-cache/app-office/libreoffice-24.2.9999
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//dragonbox-1.1.3.tar.gz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//frozen-1.1.1.tar.gz https://dev-www.libreoffice.org/src//skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz https://dev-www.libreoffice.org/src//zxcvbn-c-2.5.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//Java-WebSocket-1.5.4.tar.gz https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=835144705eaf4d0ea14fee5ef619fbe6
diff --git a/metadata/md5-cache/app-office/libreoffice-7.6.4.1 b/metadata/md5-cache/app-office/libreoffice-7.6.4.1
index 7b601f994990..be66cf87679a 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.6.4.1
+++ b/metadata/md5-cache/app-office/libreoffice-7.6.4.1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.6.4.1.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.6.4.1.tar.xz https://download.documentfoundation.org/libreoffice/src/7.6.4//libreoffice-7.6.4.1.tar.xz https://download.documentfoundation.org/libreoffice/src/7.6.4//libreoffice-help-7.6.4.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.6.4.1/src/libreoffice-7.6.4.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.6.4.1/src/libreoffice-help-7.6.4.1.tar.xz https://dev-www.libreoffice.org/src//dragonbox-1.1.3.tar.gz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//frozen-1.1.1.tar.gz https://dev-www.libreoffice.org/src//skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7d35e2fa55759d508364bcb1fc20793d
diff --git a/metadata/md5-cache/app-office/libreoffice-7.6.7.2 b/metadata/md5-cache/app-office/libreoffice-7.6.7.2
index a8ae1ecad2eb..91347f94938c 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.6.7.2
+++ b/metadata/md5-cache/app-office/libreoffice-7.6.7.2
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.6.7.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.6.7.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.6.7//libreoffice-7.6.7.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.6.7//libreoffice-help-7.6.7.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.6.7.2/src/libreoffice-7.6.7.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.6.7.2/src/libreoffice-help-7.6.7.2.tar.xz https://dev-www.libreoffice.org/src//dragonbox-1.1.3.tar.gz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//frozen-1.1.1.tar.gz https://dev-www.libreoffice.org/src//skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a7d67b47bbc4e26f318bc8075687856f
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index d41731e81f6b..c737451118bb 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//dragonbox-1.1.3.tar.gz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//frozen-1.1.1.tar.gz https://dev-www.libreoffice.org/src//skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz https://dev-www.libreoffice.org/src//zxcvbn-c-2.5.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//Java-WebSocket-1.5.4.tar.gz https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=835144705eaf4d0ea14fee5ef619fbe6
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-7.6.4.1 b/metadata/md5-cache/app-office/libreoffice-bin-7.6.4.1
index 238b18af89a9..ca006522da1b 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-7.6.4.1
+++ b/metadata/md5-cache/app-office/libreoffice-bin-7.6.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python3_1
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-7.6.4.1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-7.6.4.1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-7.6.4.1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-7.6.4.1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-7.6.4.1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-7.6.4.1.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-7.6.4.1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-7.6.4.1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-java-7.6.4.1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-7.6.4.1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-7.6.4.1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-java-7.6.4.1.xd3 ) ) ) )
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=517f42a71aaca11a898cbb24e0bef85b
diff --git a/metadata/md5-cache/app-office/moneydance-2024.5117 b/metadata/md5-cache/app-office/moneydance-2024.5117
index 4a5caf500eb6..51c0408fbae0 100644
--- a/metadata/md5-cache/app-office/moneydance-2024.5117
+++ b/metadata/md5-cache/app-office/moneydance-2024.5117
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-java/openjdk-bin:17 dev-java/openjdk:17 ) >=dev-java/java-confi
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://infinitekind.com/stabledl/2024_5117/Moneydance_linux_amd64.tar.gz -> moneydance-2024.5117-amd64.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=388245e45ccde3e9d12e8a9e40094edf
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index a606fa28aaad..3592f3776d27 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/java-ebuilder-0.5.1-r1 b/metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1
index defc024abe28..f3e24c0be1c3 100644
--- a/metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1
+++ b/metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* sys-process/parallel >=dev-java/maven-bin-3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/java-ebuilder.git/snapshot/java-ebuilder-0.5.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=c8ecdbeb35fd50371d7b329792a290de
diff --git a/metadata/md5-cache/app-portage/java-ebuilder-9999 b/metadata/md5-cache/app-portage/java-ebuilder-9999
index 6f6955758375..ea6abfee93c1 100644
--- a/metadata/md5-cache/app-portage/java-ebuilder-9999
+++ b/metadata/md5-cache/app-portage/java-ebuilder-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=virtual/jre-1.8:* sys-process/parallel >=dev-java/maven-bin-3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=236bc1b36bdbe638ac48bded5871d084
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 28b2fbd406ed..3145a7a87050 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.13-r2 b/metadata/md5-cache/app-text/hyperestraier-1.4.13-r2
index dcc55bf8dd78..1f90ba0e8ca6 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13-r2
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=d4d0f7781fc8186cfe22b2c2d6072277
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.8.2-r1 b/metadata/md5-cache/app-text/jabref-bin-3.8.2-r1
index 508a7658b453..f167e582d295 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.8.2-r1
+++ b/metadata/md5-cache/app-text/jabref-bin-3.8.2-r1
@@ -10,5 +10,5 @@ LICENSE=MIT JSON
 RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/JabRef/jabref/releases/download/v3.8.2/JabRef-3.8.2.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=6fa8e9234f05872ef0f8ee0e22587164
diff --git a/metadata/md5-cache/app-text/jabref-bin-4.3.1-r1 b/metadata/md5-cache/app-text/jabref-bin-4.3.1-r1
index f302cd788317..559be94db1c2 100644
--- a/metadata/md5-cache/app-text/jabref-bin-4.3.1-r1
+++ b/metadata/md5-cache/app-text/jabref-bin-4.3.1-r1
@@ -10,5 +10,5 @@ LICENSE=MIT JSON
 RDEPEND=dev-java/openjdk:8[javafx] virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/JabRef/jabref/releases/download/v4.3.1/JabRef-4.3.1.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=86124901880ae1398c0dc2af6e18b1da
diff --git a/metadata/md5-cache/app-text/languagetool-6.3 b/metadata/md5-cache/app-text/languagetool-6.3
index 46f277dc7f37..bb696b7df66a 100644
--- a/metadata/md5-cache/app-text/languagetool-6.3
+++ b/metadata/md5-cache/app-text/languagetool-6.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8 dev-java/commons-cli:1 dev-java/commons-collections:4 dev-java/commons-io:1 dev-java/commons-lang:3.6 dev-java/commons-logging:0 dev-java/hamcrest-core:1.3 dev-java/jcommander:0 dev-java/jna:4 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://languagetool.org/download/LanguageTool-6.3.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b248645be2936ff0d6d6d77b70f441e1
diff --git a/metadata/md5-cache/app-text/lesspipe-2.11-r1 b/metadata/md5-cache/app-text/lesspipe-2.11-r1
index 386b1c0834d8..ce188444e3c4 100644
--- a/metadata/md5-cache/app-text/lesspipe-2.11-r1
+++ b/metadata/md5-cache/app-text/lesspipe-2.11-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/wofr06/lesspipe/archive/v2.11.tar.gz -> lesspipe-2.11.tar.gz
 _eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c
-_md5_=6bbcdf68c27351d49762a302a199bed4
+_md5_=9118bbfccf405f755eaf9f962bb761d7
diff --git a/metadata/md5-cache/app-text/lesspipe-2.12 b/metadata/md5-cache/app-text/lesspipe-2.12
index 5d45b60ec10c..ca497afe1f4e 100644
--- a/metadata/md5-cache/app-text/lesspipe-2.12
+++ b/metadata/md5-cache/app-text/lesspipe-2.12
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/wofr06/lesspipe/archive/v2.12.tar.gz -> lesspipe-2.12.tar.gz
 _eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c
-_md5_=af513ee81689d9174af33f9a27695894
+_md5_=85e746b53216a46d69027503f4a2d0e9
diff --git a/metadata/md5-cache/app-text/lesspipe-2.13 b/metadata/md5-cache/app-text/lesspipe-2.13
index 6e01f7423f1e..dfbde3e84921 100644
--- a/metadata/md5-cache/app-text/lesspipe-2.13
+++ b/metadata/md5-cache/app-text/lesspipe-2.13
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/wofr06/lesspipe/archive/v2.13.tar.gz -> lesspipe-2.13.tar.gz
 _eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c
-_md5_=b7f555fedc7434bf974578c7645567ad
+_md5_=3c959dd3f8cfb39aa9b626bcfb3044fd
diff --git a/metadata/md5-cache/app-text/pdftk-3.3.3-r2 b/metadata/md5-cache/app-text/pdftk-3.3.3-r2
index 0daddbd2943a..9233b7c6e014 100644
--- a/metadata/md5-cache/app-text/pdftk-3.3.3-r2
+++ b/metadata/md5-cache/app-text/pdftk-3.3.3-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/bcprov:1.74 dev-java/commons-lang:3.6 >=dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/pdftk-java/pdftk/-/archive/v3.3.3/pdftk-v3.3.3.tar.bz2
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=32aba0ea46483c17e82429246e75f5d8
diff --git a/metadata/md5-cache/app-text/pdftk-3.3.3_p20231025 b/metadata/md5-cache/app-text/pdftk-3.3.3_p20231025
index 3ce938d1c309..5698e526f71a 100644
--- a/metadata/md5-cache/app-text/pdftk-3.3.3_p20231025
+++ b/metadata/md5-cache/app-text/pdftk-3.3.3_p20231025
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/bcprov:0 dev-java/commons-lang:3.6 >=dev-ja
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/pdftk-java/pdftk/-/archive/3f1918c831c919d0a8fcf18c36cf40118398b995.tar.bz2 -> pdftk-3.3.3_p20231025.tar.bz2
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=00602842b0e8531beaded20f997dfd0b
diff --git a/metadata/md5-cache/app-text/pdftk-9999 b/metadata/md5-cache/app-text/pdftk-9999
index 924629704ee1..bd782428e946 100644
--- a/metadata/md5-cache/app-text/pdftk-9999
+++ b/metadata/md5-cache/app-text/pdftk-9999
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/bcprov:0 dev-java/commons-lang:3.6 >=dev-ja
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/pdftk-java/pdftk/-/commit/3f1918c831c919d0a8fcf18c36cf40118398b995.patch -> pdftk-9999-bc176.patch
-_eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a611cefbdc1ed0fed5ed77007365abe1
diff --git a/metadata/md5-cache/app-text/spellutils-0.7-r1 b/metadata/md5-cache/app-text/spellutils-0.7-r1
new file mode 100644
index 000000000000..c6ce96a205a6
--- /dev/null
+++ b/metadata/md5-cache/app-text/spellutils-0.7-r1
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
+DEFINED_PHASES=compile configure prepare
+DEPEND=nls? ( virtual/libintl )
+DESCRIPTION=spellutils includes 'newsbody' (useful for spellchecking in mails, etc.)
+EAPI=8
+HOMEPAGE=http://home.worldonline.dk/byrial/spellutils/
+INHERIT=autotools toolchain-funcs
+IUSE=nls
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=http://home.worldonline.dk/byrial/spellutils/spellutils-0.7.tar.bz2
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=6558570b0d69a5b91ecce708653dfedd
diff --git a/metadata/md5-cache/app-text/trang-20181222 b/metadata/md5-cache/app-text/trang-20181222
index 0a9cd11bc814..3a56136ab145 100644
--- a/metadata/md5-cache/app-text/trang-20181222
+++ b/metadata/md5-cache/app-text/trang-20181222
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/xerces:2 dev-java/xml-commons-resolver:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/relaxng/jing-trang/archive/V20181222.tar.gz -> trang-20181222.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=d3b2a0ce976735b9eb69599aac0a8b8c
diff --git a/metadata/md5-cache/app-text/trang-20220510-r1 b/metadata/md5-cache/app-text/trang-20220510-r1
index 51ca2f4562ba..0dc49e6b275e 100644
--- a/metadata/md5-cache/app-text/trang-20220510-r1
+++ b/metadata/md5-cache/app-text/trang-20220510-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/xerces:2 dev-java/xml-commons-resolver:0 >=virtual/jre-1.8:* >=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/relaxng/jing-trang/archive/V20220510.tar.gz -> trang-20220510.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=1856d3b86b1043f07280b8e9d626a6a6
diff --git a/metadata/md5-cache/dev-build/Manifest.gz b/metadata/md5-cache/dev-build/Manifest.gz
index 3d3e22d546e4..72de94dd7698 100644
--- a/metadata/md5-cache/dev-build/Manifest.gz
+++ b/metadata/md5-cache/dev-build/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/rocminfo-5.3.3 b/metadata/md5-cache/dev-build/rocm-cmake-6.1.1
index 47ea14541d4c..740a7df1fb2a 100644
--- a/metadata/md5-cache/dev-util/rocminfo-5.3.3
+++ b/metadata/md5-cache/dev-build/rocm-cmake-6.1.1
@@ -1,14 +1,13 @@
 BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-5.3.3
-DESCRIPTION=ROCm Application for Reporting System Info
+DESCRIPTION=Radeon Open Compute CMake Modules
 EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/rocminfo
+HOMEPAGE=https://github.com/ROCm/rocm-cmake
 INHERIT=cmake
 KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-libs/rocr-runtime-5.3.3
-SLOT=0/5.3
-SRC_URI=https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-5.3.3.tar.gz -> rocminfo-5.3.3.tar.gz
+LICENSE=MIT
+RESTRICT=test
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/rocm-cmake/archive/rocm-6.1.1.tar.gz -> rocm-cmake-6.1.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7f1ebb77644aa7c9db86fc1d66c7b459
+_md5_=a10fb69585987bc62913937debdbdffb
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 92cc9d0e3ade..54bd847e886d 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.14.0-r1 b/metadata/md5-cache/dev-cpp/gtest-1.14.0-r1
index 42fd130e4c7f..4e6005695d91 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.14.0-r1
+++ b/metadata/md5-cache/dev-cpp/gtest-1.14.0-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/googletest
 INHERIT=cmake-multilib flag-o-matic python-any-r1 toolchain-funcs
 IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz -> gtest-1.14.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4f3bbb1b7eb1c93d5deea762ca624301
+_md5_=13d8540146c7f662f4a7818873372fbc
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 73b28ab3c5d7..7315fdcae13c 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/apgdiff-2.7.0 b/metadata/md5-cache/dev-db/apgdiff-2.7.0
index a448157e1826..7e1abf7b54f1 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.7.0
+++ b/metadata/md5-cache/dev-db/apgdiff-2.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fordfrog/apgdiff/archive/refs/tags/release_2.7.0.tar.gz -> apgdiff-2.7.0-sources.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=276826446ef42e379bd1ed91fc028fb2
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r4 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r4
index 48101f93bd61..398bca0b52d4 100644
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r4
+++ b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r4
@@ -12,5 +12,5 @@ RDEPEND=acct-group/hsqldb acct-user/hsqldb dev-java/jakarta-servlet-api:4 virtua
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/hsqldb/hsqldb_1_8_1_3.zip
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=e0546269c4a341fef6f2018efe67b59f
diff --git a/metadata/md5-cache/dev-db/mariadb-10.11.5 b/metadata/md5-cache/dev-db/mariadb-10.11.5
index 9ccf186ec170..0bd6849d26fb 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.11.5
+++ b/metadata/md5-cache/dev-db/mariadb-10.11.5
@@ -14,5 +14,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.11/18
 SRC_URI=mirror://mariadb/mariadb-10.11.5/source/mariadb-10.11.5.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.11.3-patches-01.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a03732d9466813ce834e688d5fa7e55e
diff --git a/metadata/md5-cache/dev-db/mariadb-10.11.7 b/metadata/md5-cache/dev-db/mariadb-10.11.7
index 07a4016c4666..ad40710a8f82 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.11.7
+++ b/metadata/md5-cache/dev-db/mariadb-10.11.7
@@ -14,5 +14,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.11/18
 SRC_URI=mirror://mariadb/mariadb-10.11.7/source/mariadb-10.11.7.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.11.6-patches-01.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=916dc884a66761bd3a7bcdc6348f4909
diff --git a/metadata/md5-cache/dev-db/mariadb-10.11.8 b/metadata/md5-cache/dev-db/mariadb-10.11.8
index 61afb2734caf..1edf3af81319 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.11.8
+++ b/metadata/md5-cache/dev-db/mariadb-10.11.8
@@ -14,5 +14,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.11/18
 SRC_URI=mirror://mariadb/mariadb-10.11.8/source/mariadb-10.11.8.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/main/mariadb/mariadb-10.11.6-patches-01.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b942a920edf1d48e54c0bcd00b857345
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.14 b/metadata/md5-cache/dev-db/mariadb-10.6.14
index d4687c2c293e..407076ec2478 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.14
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.14
@@ -14,5 +14,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.6/18
 SRC_URI=mirror://mariadb/mariadb-10.6.14/source/mariadb-10.6.14.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.13-patches-01.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d5247927dfcf933c148b0c4f4b8d2990
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.15 b/metadata/md5-cache/dev-db/mariadb-10.6.15
index bb07d7c9b9c6..b94f7551cc5d 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.15
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.15
@@ -14,5 +14,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.6/18
 SRC_URI=mirror://mariadb/mariadb-10.6.15/source/mariadb-10.6.15.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.13-patches-01.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4c057e536105e1143f338a1206d3beed
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.17 b/metadata/md5-cache/dev-db/mariadb-10.6.17
index ca26bf241bc9..9c877ad99e73 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.17
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.17
@@ -14,5 +14,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.6/18
 SRC_URI=mirror://mariadb/mariadb-10.6.17/source/mariadb-10.6.17.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.16-patches-01.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d3d1edb1942545510b18ccfe87a1346b
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.18 b/metadata/md5-cache/dev-db/mariadb-10.6.18
index 64d723fe475d..75492b406cd2 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.18
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.18
@@ -14,5 +14,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.6/18
 SRC_URI=mirror://mariadb/mariadb-10.6.18/source/mariadb-10.6.18.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/main/mariadb/mariadb-10.6.16-patches-01.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7b8c636d4fe159de230dd53c5931baf5
diff --git a/metadata/md5-cache/dev-db/mariadb-11.4.2 b/metadata/md5-cache/dev-db/mariadb-11.4.2
index 5b797a52e86e..79c6e185910e 100644
--- a/metadata/md5-cache/dev-db/mariadb-11.4.2
+++ b/metadata/md5-cache/dev-db/mariadb-11.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=11.4/18
 SRC_URI=mirror://mariadb/mariadb-11.4.2/source/mariadb-11.4.2.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/main/mariadb/mariadb-11.4.2-patches-01.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=63c53c0e9c95e5165e1b2cf1228dce10
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r5 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r5
index 0674f481940d..7483655df259 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r5
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r5
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.8:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=cc74c566580b9c7efa2549bddbc8f54b
diff --git a/metadata/md5-cache/dev-db/sqlcl-bin-23.4.0.023.2321 b/metadata/md5-cache/dev-db/sqlcl-bin-23.4.0.023.2321
index 8fc5cf1c1059..991c57442443 100644
--- a/metadata/md5-cache/dev-db/sqlcl-bin-23.4.0.023.2321
+++ b/metadata/md5-cache/dev-db/sqlcl-bin-23.4.0.023.2321
@@ -11,5 +11,5 @@ RDEPEND=dev-db/oracle-instantclient dev-java/java-config:2 >=virtual/jre-11 >=de
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-23.4.0.023.2321.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=ef637bc17aca3fa9021c1c69acdc3f6e
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-23.1.1.345.2114 b/metadata/md5-cache/dev-db/sqldeveloper-23.1.1.345.2114
index 6c16f61ec259..7af3dc606ed6 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-23.1.1.345.2114
+++ b/metadata/md5-cache/dev-db/sqldeveloper-23.1.1.345.2114
@@ -12,5 +12,5 @@ RDEPEND=dev-java/openjdk:11[javafx] virtual/jre:11 mssql? ( dev-java/jtds:1.3 )
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=sqldeveloper-23.1.1.345.2114-no-jre.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=deab13d2b28e5a5a038174e0cf728137
diff --git a/metadata/md5-cache/dev-debug/Manifest.gz b/metadata/md5-cache/dev-debug/Manifest.gz
index 54d5bc0273a0..24795aadf436 100644
--- a/metadata/md5-cache/dev-debug/Manifest.gz
+++ b/metadata/md5-cache/dev-debug/Manifest.gz
diff --git a/metadata/md5-cache/dev-debug/lldb-18.1.7 b/metadata/md5-cache/dev-debug/lldb-18.1.7
deleted file mode 100644
index 3376bdf7a601..000000000000
--- a/metadata/md5-cache/dev-debug/lldb-18.1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_10? ( ~dev-python/lit-18.1.7[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-18.1.7[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-18.1.7[python_targets_python3_12(-)] dev-python/psutil[python_targets_python3_12(-)] ) python_single_target_python3_13? ( ~dev-python/lit-18.1.7[python_targets_python3_13(-)] dev-python/psutil[python_targets_python3_13(-)] ) sys-devel/lld ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) 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-18.1.7 ~sys-devel/llvm-18.1.7[debuginfod=]
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org llvm-utils python-single-r1
-IUSE=debug debuginfod +libedit lzma ncurses +python test +xml test verify-sig python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) 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-18.1.7 ~sys-devel/llvm-18.1.7[debuginfod=] python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 )
-RESTRICT=test !test? ( test )
-SLOT=0/18.1
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e80c399f7d5117b16631eba73ee89bfd
diff --git a/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240608 b/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240608
deleted file mode 100644
index 377285513463..000000000000
--- a/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240608
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_10? ( ~dev-python/lit-19.0.0_pre20240608[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-19.0.0_pre20240608[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-19.0.0_pre20240608[python_targets_python3_12(-)] dev-python/psutil[python_targets_python3_12(-)] ) sys-devel/lld ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) 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-19.0.0_pre20240608 ~sys-devel/llvm-19.0.0_pre20240608[debuginfod=]
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org llvm-utils python-single-r1
-IUSE=+debug debuginfod +libedit lzma ncurses +python test +xml test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) 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-19.0.0_pre20240608 ~sys-devel/llvm-19.0.0_pre20240608[debuginfod=] python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
-RESTRICT=test !test? ( test )
-SLOT=0/19.0.0_pre20240608
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1f3ddbe84803769cdeaad8888bbe3604
diff --git a/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240615 b/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240615
deleted file mode 100644
index 5e7ca146f2c3..000000000000
--- a/metadata/md5-cache/dev-debug/lldb-19.0.0_pre20240615
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_10? ( ~dev-python/lit-19.0.0_pre20240615[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-19.0.0_pre20240615[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) python_single_target_python3_12? ( ~dev-python/lit-19.0.0_pre20240615[python_targets_python3_12(-)] dev-python/psutil[python_targets_python3_12(-)] ) sys-devel/lld ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) 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-19.0.0_pre20240615 ~sys-devel/llvm-19.0.0_pre20240615[debuginfod=]
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org llvm-utils python-single-r1
-IUSE=+debug debuginfod +libedit lzma ncurses +python test +xml test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) 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-19.0.0_pre20240615 ~sys-devel/llvm-19.0.0_pre20240615[debuginfod=] python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
-RESTRICT=test !test? ( test )
-SLOT=0/19.0.0_pre20240615
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1f3ddbe84803769cdeaad8888bbe3604
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 854c06754a05..3965e796ade6 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/arduino-1.8.19 b/metadata/md5-cache/dev-embedded/arduino-1.8.19
index 45a1c7ed1657..8a9f2e01466d 100644
--- a/metadata/md5-cache/dev-embedded/arduino-1.8.19
+++ b/metadata/md5-cache/dev-embedded/arduino-1.8.19
@@ -10,5 +10,5 @@ RDEPEND=dev-embedded/arduino-builder >=dev-util/astyle-3.1[java] dev-embedded/ar
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/arduino/Arduino/archive/1.8.19.tar.gz -> arduino-1.8.19.tar.gz https://downloads.arduino.cc/cores/avr-1.8.3.tar.bz2 -> arduino-avr-1.8.3.tar.bz2 https://github.com/arduino/arduino-examples/archive/refs/tags/1.9.1.zip -> arduino-examples-1.9.1.zip https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.12.0/WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip -> arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=af1bbe62a9fad5512dc9cbfc04bfbebe
diff --git a/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0-r1 b/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0-r1
index 31cb75363cf8..415618411387 100644
--- a/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0-r1
+++ b/metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/libserialport-0.1.1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/arduino/listSerialPortsC/archive/1.4.0.tar.gz -> arduino-listserialportsc-1.4.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=6b904b616f39ce42b1c248beff623ae1
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 7a6e5c69bce4..48145db29047 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/angus-activation-1.0.0-r1 b/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
index 2eaa58af1a37..1b293c527c6c 100644
--- a/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/angus-activation/archive/1.0.0.tar.gz -> angus-activation-1.0.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b16ce2302a00a68ea3ee76320ecdd221
diff --git a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1 b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
index f7522832a7d4..bc2ddc3b9ec3 100644
--- a/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
+++ b/metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/mojohaus/animal-sniffer/archive/animal-sniffer-parent-1.15.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5365b105212193b14dbba1b0a2109750
diff --git a/metadata/md5-cache/dev-java/ant-1.10.14-r3 b/metadata/md5-cache/dev-java/ant-1.10.14-r3
index bce98dfd48ad..ba680fd3b8d7 100644
--- a/metadata/md5-cache/dev-java/ant-1.10.14-r3
+++ b/metadata/md5-cache/dev-java/ant-1.10.14-r3
@@ -14,5 +14,5 @@ REQUIRED_USE=junit4? ( junit ) test? ( bsf ) testutil? ( junit )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.14-src.tar.xz verify-sig? ( https://downloads.apache.org/ant/source/apache-ant-1.10.14-src.tar.xz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=c53456914a929d88dd050d3cf869a751
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r2 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r2
index c7a48b24bed7..1eead304734f 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r2
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/ant-ivy:2 dev-java/bcel:0 dev-java/
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz -> ant-contrib-1.0_beta6_pre20201123.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=fed5230592047dec2f3444eb06c4b57d
diff --git a/metadata/md5-cache/dev-java/ant-core-1.10.14 b/metadata/md5-cache/dev-java/ant-core-1.10.14
index 938cf77d08aa..6bf1bf1b0c5f 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.10.14
+++ b/metadata/md5-cache/dev-java/ant-core-1.10.14
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-maco
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=4a7a09f7f7a137b4887e37ac4fd15f34
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r2 b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r2
index 8624e1752b4b..71ba02951074 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r2
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/h
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://archive.apache.org/dist/ant/ivy/2.5.0/apache-ivy-2.5.0-src.tar.gz
-_eclasses_=java-osgi	b1d0d0f01a98e464d86fd1ed8eddf07b	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-osgi	b1d0d0f01a98e464d86fd1ed8eddf07b	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=98beb35c28526a841061d16f2341e735
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r9 b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
index 9f9d0ac8c903..7782e6edf18b 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r9
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r9
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=48fb8dc5008da2dab11a5f53ef0ea086
diff --git a/metadata/md5-cache/dev-java/antlr-3.2-r2 b/metadata/md5-cache/dev-java/antlr-3.2-r2
index 63fa94775a18..2b42840f5c9b 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2-r2
+++ b/metadata/md5-cache/dev-java/antlr-3.2-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.8:
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://www.antlr3.org/download/antlr-3.2.tar.gz https://www.antlr3.org/download/antlr-3.2.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=950f7774774ee75ee256b31fc6936846
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.3 b/metadata/md5-cache/dev-java/antlr-3.5.3
index b395451f18ab..32883099fd7a 100644
--- a/metadata/md5-cache/dev-java/antlr-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-3.5.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 ~dev-java/antlr-tool-3.5.3:3.5 >=dev-java/java-config-2.2.0-r3
 SLOT=3.5
 SRC_URI=https://github.com/antlr/antlr3/archive/3.5.3.tar.gz -> antlr-3.5.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=280464e8a1e851288b6cc1b0c18799af
diff --git a/metadata/md5-cache/dev-java/antlr-4.9.3 b/metadata/md5-cache/dev-java/antlr-4.9.3
index 31cbf9eb6442..3ccf550a44ba 100644
--- a/metadata/md5-cache/dev-java/antlr-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-4.9.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-4.9.3:4 ~dev-java/antlr-tool-4.9.3:4 >=dev-java/java-config-2.2.0-r3
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1f7f67a024d27ca1637ef47568f21bb2
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-3.5.3 b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
index 49e4487e723b..6fe21c85a036 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-3.5.3
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=dev-java/stringtemplate-3.2.1:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.5
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.3/antlr-runtime-3.5.3-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=fb3a34e1933a20bfb2882d4c7a9470ec
diff --git a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3 b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
index eec8b5b8e66c..b024f87a8959 100644
--- a/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-runtime-4.9.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=24940d00dbb98aa66e931290836ae633
diff --git a/metadata/md5-cache/dev-java/antlr-tool-3.5.3-r1 b/metadata/md5-cache/dev-java/antlr-tool-3.5.3-r1
index 4328639d981a..35bee5b60dc4 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-3.5.3-r1
+++ b/metadata/md5-cache/dev-java/antlr-tool-3.5.3-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-3.5.3:3.5 dev-java/stringtem
 RESTRICT=!test? ( test )
 SLOT=3.5
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/antlr/3.5.3/antlr-3.5.3-sources.jar -> antlr-tool-3.5.3-sources.jar https://github.com/antlr/antlr3/archive/3.5.3.tar.gz -> antlr-3.5.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=bf7dad734e125d4df5a3e8b3e9ea13ea
diff --git a/metadata/md5-cache/dev-java/antlr-tool-4.9.3-r2 b/metadata/md5-cache/dev-java/antlr-tool-4.9.3-r2
index ea06b1028d29..b3d4ced1ecc4 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-4.9.3-r2
+++ b/metadata/md5-cache/dev-java/antlr-tool-4.9.3-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/antlr-runtime-4.9.3:4 dev-java/antlr-runti
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.9.3.tar.gz -> antlr-4.9.3.tar.gz https://repo1.maven.org/maven2/org/antlr/antlr4/4.9.3/antlr4-4.9.3-sources.jar -> antlr-tool-4.9.3-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5fc4165d87e5e178b5a5a269d1a2643c
diff --git a/metadata/md5-cache/dev-java/antunit-1.4.1-r1 b/metadata/md5-cache/dev-java/antunit-1.4.1-r1
index 46eca3573522..e29dbc48c346 100644
--- a/metadata/md5-cache/dev-java/antunit-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/antunit-1.4.1-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-java/ant-1.10.14:0 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/ant/antlibs/antunit/source/apache-ant-antunit-1.4.1-src.tar.bz2 verify-sig? ( https://downloads.apache.org/ant/antlibs/antunit/source/apache-ant-antunit-1.4.1-src.tar.bz2.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=1306ed01f2670b067c62828d715474a9
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r3 b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
index fe9ef5431fec..581351c77b10 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r3
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0bcbc7cba4df84544947602428a6dd59
diff --git a/metadata/md5-cache/dev-java/apache-rat-0.15-r1 b/metadata/md5-cache/dev-java/apache-rat-0.15-r1
index a7668e763738..a1ce08bc8baa 100644
--- a/metadata/md5-cache/dev-java/apache-rat-0.15-r1
+++ b/metadata/md5-cache/dev-java/apache-rat-0.15-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-java/ant-1.10.14:0 dev-java/commons-cli:1 dev-java/commons-collect
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/creadur/apache-rat-0.15/apache-rat-0.15-src.tar.bz2 verify-sig? ( https://archive.apache.org/dist/creadur/apache-rat-0.15/apache-rat-0.15-src.tar.bz2.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=85a87c5894ae171f7d02e61010f32026
diff --git a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1 b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1
index 8820c8c0fec6..cd91d17cfdc9 100644
--- a/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/apiguardian-api-1.1.2-r1
@@ -10,5 +10,5 @@ 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=https://github.com/apiguardian-team/apiguardian/archive/r1.1.2.tar.gz -> apiguardian-api-1.1.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5f020dc4845edbebc486fb168740816f
diff --git a/metadata/md5-cache/dev-java/asm-9.6 b/metadata/md5-cache/dev-java/asm-9.6
index 564a10b385d7..9acbaa5b81dd 100644
--- a/metadata/md5-cache/dev-java/asm-9.6
+++ b/metadata/md5-cache/dev-java/asm-9.6
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_6/asm-ASM_9_6.tar.bz2
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=909cc64ed4d51252a44271f88f85a138
diff --git a/metadata/md5-cache/dev-java/aspectj-1.9.7-r1 b/metadata/md5-cache/dev-java/aspectj-1.9.7-r1
index 32f6d313cf93..a2286e929850 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.9.7-r1
+++ b/metadata/md5-cache/dev-java/aspectj-1.9.7-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/asm:9 dev-java/commons-logging:0 dev-java/jakarta-regexp:1.4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-aspectj/aspectj/archive/V1_9_7.tar.gz -> aspectj-1.9.7.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=29854c29fb0b36371ed71b08eba72a51
diff --git a/metadata/md5-cache/dev-java/assertj-core-3.10.0 b/metadata/md5-cache/dev-java/assertj-core-3.10.0
index a3bfa01d5a17..9107c2d963c5 100644
--- a/metadata/md5-cache/dev-java/assertj-core-3.10.0
+++ b/metadata/md5-cache/dev-java/assertj-core-3.10.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/byte-buddy-1.12.12:0 >=dev-java/java-conf
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/assertj/assertj-core/archive/assertj-core-3.10.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=2d7798708bdc2edb66c9421153a5a1ba
diff --git a/metadata/md5-cache/dev-java/auto-service-annotations-1.1.1 b/metadata/md5-cache/dev-java/auto-service-annotations-1.1.1
index 9ba785c70cb1..886e3d415acb 100644
--- a/metadata/md5-cache/dev-java/auto-service-annotations-1.1.1
+++ b/metadata/md5-cache/dev-java/auto-service-annotations-1.1.1
@@ -10,5 +10,5 @@ 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=https://github.com/google/auto/archive/auto-service-1.1.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=376bf5508763da548beee9ae8c7fd0bd
diff --git a/metadata/md5-cache/dev-java/batik-1.17-r1 b/metadata/md5-cache/dev-java/batik-1.17-r1
index 80d002e99bdd..c34484f4e238 100644
--- a/metadata/md5-cache/dev-java/batik-1.17-r1
+++ b/metadata/md5-cache/dev-java/batik-1.17-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jacl:0 dev-java/rhino:1.6 dev-java/xalan:0 dev-java/xml-commons
 RESTRICT=!test? ( test )
 SLOT=1.16
 SRC_URI=mirror://apache/xmlgraphics/batik/source/batik-src-1.17.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/batik/source/batik-src-1.17.tar.gz.asc )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ec63b044daf82c13d3a5d3585dd0d4e3
diff --git a/metadata/md5-cache/dev-java/bcel-6.6.0 b/metadata/md5-cache/dev-java/bcel-6.6.0
index 5cb4efffd522..fa0a0d4f980a 100644
--- a/metadata/md5-cache/dev-java/bcel-6.6.0
+++ b/metadata/md5-cache/dev-java/bcel-6.6.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/commons/bcel/source/bcel-6.6.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/bcel/source/bcel-6.6.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=43f511e48c4e117b3c0a06ed92d7af1e
diff --git a/metadata/md5-cache/dev-java/bcmail-1.77-r1 b/metadata/md5-cache/dev-java/bcmail-1.77-r1
index 2a95d9f81793..1c772322ce2c 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.77-r1
+++ b/metadata/md5-cache/dev-java/bcmail-1.77-r1
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcpkix-1.77:0 ~dev-java/bcprov-1.77:0 ~dev-java/bcutil-1.77:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv77.tar.gz -> bc-java-r1rv77.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=645f49e2fe428dd1be62b2ba9dad3b27
diff --git a/metadata/md5-cache/dev-java/bcpg-1.77 b/metadata/md5-cache/dev-java/bcpg-1.77
index 0320f534cb46..8d75c72215b3 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.77
+++ b/metadata/md5-cache/dev-java/bcpg-1.77
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.77:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv77.tar.gz -> bc-java-r1rv77.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=82b3ee49eeced55207fa3e9a381e7397
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.77 b/metadata/md5-cache/dev-java/bcpkix-1.77
index 6fed8d2eb5e8..3315cff4900f 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.77
+++ b/metadata/md5-cache/dev-java/bcpkix-1.77
@@ -12,5 +12,5 @@ RDEPEND=~dev-java/bcprov-1.77:0 ~dev-java/bcutil-1.77:0 >=virtual/jre-1.8:* >=de
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv77.tar.gz -> bc-java-r1rv77.tar.gz test? ( https://github.com/bcgit/bc-test-data/archive/r1rv77.tar.gz -> bc-test-data-r1rv77.tar.gz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=4e106bf83f16269fa24d6cc38f83ca18
diff --git a/metadata/md5-cache/dev-java/bcprov-1.74 b/metadata/md5-cache/dev-java/bcprov-1.74
index a38b6f70ce43..8c5c76ff789b 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.74
+++ b/metadata/md5-cache/dev-java/bcprov-1.74
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=1.74
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv74.tar.gz -> bc-java-r1rv74.tar.gz test? ( https://github.com/bcgit/bc-test-data/archive/r1rv74.tar.gz -> bc-test-data-r1rv74.tar.gz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=cdb4e6c51b1243b566128afed52cf1d9
diff --git a/metadata/md5-cache/dev-java/bcprov-1.77 b/metadata/md5-cache/dev-java/bcprov-1.77
index 794aa3c8d9cb..d7e3b772f82c 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.77
+++ b/metadata/md5-cache/dev-java/bcprov-1.77
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv77.tar.gz -> bc-java-r1rv77.tar.gz test? ( https://github.com/bcgit/bc-test-data/archive/r1rv77.tar.gz -> bc-test-data-r1rv77.tar.gz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d3614dd9edf0c453aa0512616c684964
diff --git a/metadata/md5-cache/dev-java/bcutil-1.77 b/metadata/md5-cache/dev-java/bcutil-1.77
index f5070debed77..078c7efd6542 100644
--- a/metadata/md5-cache/dev-java/bcutil-1.77
+++ b/metadata/md5-cache/dev-java/bcutil-1.77
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.77:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv77.tar.gz -> bc-java-r1rv77.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=bd49aa22c37ff90fddf7042b915f3ee2
diff --git a/metadata/md5-cache/dev-java/bnd-7.0.0 b/metadata/md5-cache/dev-java/bnd-7.0.0
index 56e3fdc98fa4..d95c0e638bdc 100644
--- a/metadata/md5-cache/dev-java/bnd-7.0.0
+++ b/metadata/md5-cache/dev-java/bnd-7.0.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=~dev-java/bndlib-7.0.0:0 dev-java/felix-resolver:0 dev-java/guava:0 dev-java/javaparser-core:0 dev-java/jline:2 dev-java/jtwig-core:0 dev-java/osgi-annotation:0 dev-java/osgi-cmpn:8 dev-java/osgi-core:0 dev-java/slf4j-simple:0 dev-java/snakeyaml:0 dev-java/xz-java:0 >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/7.0.0.tar.gz -> aQute.bnd-7.0.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=79b1832224b8a6cd1e740f71b699e0f0
diff --git a/metadata/md5-cache/dev-java/bnd-annotation-6.3.1 b/metadata/md5-cache/dev-java/bnd-annotation-6.3.1
index 3f07bbdf6049..433726c94695 100644
--- a/metadata/md5-cache/dev-java/bnd-annotation-6.3.1
+++ b/metadata/md5-cache/dev-java/bnd-annotation-6.3.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-annotation:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/6.3.1/biz.aQute.bnd.annotation-6.3.1-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=92101930860d7ac7fde9625815b8a92d
diff --git a/metadata/md5-cache/dev-java/bnd-annotation-7.0.0 b/metadata/md5-cache/dev-java/bnd-annotation-7.0.0
index 1e0af6200137..ed5a08288030 100644
--- a/metadata/md5-cache/dev-java/bnd-annotation-7.0.0
+++ b/metadata/md5-cache/dev-java/bnd-annotation-7.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/7.0.0.tar.gz -> aQute.bnd-7.0.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5b301d13d39d3eb8474e71c9484f36db
diff --git a/metadata/md5-cache/dev-java/bnd-ant-7.0.0 b/metadata/md5-cache/dev-java/bnd-ant-7.0.0
index e6c342de5b18..99b456494c8a 100644
--- a/metadata/md5-cache/dev-java/bnd-ant-7.0.0
+++ b/metadata/md5-cache/dev-java/bnd-ant-7.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=>=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/7.0.0.tar.gz -> aQute.bnd-7.0.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=2c541caad9b4a0efb2437f8e17cda27b
diff --git a/metadata/md5-cache/dev-java/bnd-util-7.0.0 b/metadata/md5-cache/dev-java/bnd-util-7.0.0
index e51fd8f4dd30..fc74dbebe369 100644
--- a/metadata/md5-cache/dev-java/bnd-util-7.0.0
+++ b/metadata/md5-cache/dev-java/bnd-util-7.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=dev-java/osgi-annotation:0 >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/7.0.0.tar.gz -> aQute.bnd-7.0.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=81562291309772a249eef498479d7620
diff --git a/metadata/md5-cache/dev-java/bndlib-7.0.0 b/metadata/md5-cache/dev-java/bndlib-7.0.0
index 92d5d48bc760..2e2aa6374bdc 100644
--- a/metadata/md5-cache/dev-java/bndlib-7.0.0
+++ b/metadata/md5-cache/dev-java/bndlib-7.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 EPL-2.0
 RDEPEND=~dev-java/bnd-annotation-7.0.0:0 ~dev-java/bnd-util-7.0.0:0 ~dev-java/libg-7.0.0:0 dev-java/osgi-annotation:0 dev-java/osgi-cmpn:8 dev-java/osgi-core:0 dev-java/slf4j-api:0 >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/7.0.0.tar.gz -> aQute.bnd-7.0.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=dc1c72d32edfbfa1d644442edab6bad3
diff --git a/metadata/md5-cache/dev-java/brotli-dec-0.1.2 b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
index ae18fca2f494..b5d3d10732a0 100644
--- a/metadata/md5-cache/dev-java/brotli-dec-0.1.2
+++ b/metadata/md5-cache/dev-java/brotli-dec-0.1.2
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/brotli/dec/0.1.2/dec-0.1.2-sources.jar -> brotli-dec-0.1.2-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=53d4e3336208c021670f6af4951afa44
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3 b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3
index 6c5db8be33cc..dd9c0453b021 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r3
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://downloads.sourceforge.net/project/browserlaunch2/browserlauncher2/1.3/BrowserLauncher2-all-1_3.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=6980f4df76aae52005da887f43702c95
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r5 b/metadata/md5-cache/dev-java/bsf-2.4.0-r5
index 9f45c3dff9e7..c583eb1b45de 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r5
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r5
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-logging:0 dev-java/xalan:0 javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/commons/bsf/source/bsf-src-2.4.0.tar.gz verify-sig? ( https://downloads.apache.org/commons/bsf/source/bsf-src-2.4.0.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=53d886c400a44ac87adef35693431e4e
diff --git a/metadata/md5-cache/dev-java/bsh-2.1.1 b/metadata/md5-cache/dev-java/bsh-2.1.1
index 1dfe48fea2a1..ffd740e353ae 100644
--- a/metadata/md5-cache/dev-java/bsh-2.1.1
+++ b/metadata/md5-cache/dev-java/bsh-2.1.1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/bsf:2.3 dev-java/jakarta-servlet-api:4 >=virtual/jre-1.8:* >=de
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beanshell/beanshell/archive/2.1.1.tar.gz -> bsh-2.1.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c2b894c1e9522897465b54876842b96f
diff --git a/metadata/md5-cache/dev-java/byte-buddy-1.14.0 b/metadata/md5-cache/dev-java/byte-buddy-1.14.0
index 687d0eb001e5..b2696976fd83 100644
--- a/metadata/md5-cache/dev-java/byte-buddy-1.14.0
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.14.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/raphw/byte-buddy/archive/byte-buddy-1.14.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d84470f756500db38afd88e36d5da887
diff --git a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1 b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
index 3b159d1bffa5..a711382db426 100644
--- a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
+++ b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
@@ -10,5 +10,5 @@ LICENSE=|| ( EPL-1.0 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.8:* dev-java/log4j-12-api:2 dev-java/mchange-commons:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/c3p0/c3p0-src/c3p0-0.9.5.5/c3p0-0.9.5.5.src.tgz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=f98db115129612a22bc71828e41eb3e0
diff --git a/metadata/md5-cache/dev-java/cache2k-api-0.23.1 b/metadata/md5-cache/dev-java/cache2k-api-0.23.1
index b0007c70243a..2e82cf54177b 100644
--- a/metadata/md5-cache/dev-java/cache2k-api-0.23.1
+++ b/metadata/md5-cache/dev-java/cache2k-api-0.23.1
@@ -10,5 +10,5 @@ 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=https://github.com/cache2k/cache2k/archive/v0.23.1.tar.gz -> cache2k-0.23.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=31d195ffd8bdc98b313470c6959a270f
diff --git a/metadata/md5-cache/dev-java/cache2k-core-0.23.1 b/metadata/md5-cache/dev-java/cache2k-core-0.23.1
index 35f4269dffa8..3386b263457a 100644
--- a/metadata/md5-cache/dev-java/cache2k-core-0.23.1
+++ b/metadata/md5-cache/dev-java/cache2k-core-0.23.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/cache2k-api:0 dev-java/commons-logging:0 >=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cache2k/cache2k/archive/v0.23.1.tar.gz -> cache2k-0.23.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=05634d9650e947826e14a0e142aa73ee
diff --git a/metadata/md5-cache/dev-java/caffeine-2.6.2-r1 b/metadata/md5-cache/dev-java/caffeine-2.6.2-r1
index 057a8ff732bb..ee62cd6e04a0 100644
--- a/metadata/md5-cache/dev-java/caffeine-2.6.2-r1
+++ b/metadata/md5-cache/dev-java/caffeine-2.6.2-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/2.6.2/caffeine-2.6.2-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=57e91096dd5bff9c71dc16ed29177e6c
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index 5c168c770559..5b711e4ec136 100644
--- a/metadata/md5-cache/dev-java/cal10n-0.8.1
+++ b/metadata/md5-cache/dev-java/cal10n-0.8.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/cal10n/archive/v_0.8.1.tar.gz -> cal10n-0.8.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0660b455429dbdf902b31d8f1befb67c
diff --git a/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2 b/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
index 7f11f10f0233..63497d5fff81 100644
--- a/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
+++ b/metadata/md5-cache/dev-java/cdi-api-4.0.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/cdi/archive/4.0.1.tar.gz -> cdi-api-4.0.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=19b90d3f7f970c0b52c793432bcfac4a
diff --git a/metadata/md5-cache/dev-java/cglib-3.3.0-r2 b/metadata/md5-cache/dev-java/cglib-3.3.0-r2
index 9f97a9170059..f917bf433cc6 100644
--- a/metadata/md5-cache/dev-java/cglib-3.3.0-r2
+++ b/metadata/md5-cache/dev-java/cglib-3.3.0-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/ant-1.10.14-r3:0 dev-java/asm:9 >=dev-jav
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/cglib/cglib/archive//RELEASE_3_3_0.tar.gz -> cglib-RELEASE_3_3_0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1c8f923134b504c26e7801534c9b2d04
diff --git a/metadata/md5-cache/dev-java/checker-framework-qual-3.43.0 b/metadata/md5-cache/dev-java/checker-framework-qual-3.43.0
index 7e9da05853d1..e07b7f2d37f1 100644
--- a/metadata/md5-cache/dev-java/checker-framework-qual-3.43.0
+++ b/metadata/md5-cache/dev-java/checker-framework-qual-3.43.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/typetools/checker-framework/archive/checker-framework-3.43.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=4cd80a5cf9add23330352b3df16a4f49
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r2 b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r2
index 49aa0739f52b..e2923c1c83c1 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r2
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r2
@@ -12,5 +12,5 @@ RDEPEND=dev-java/commons-collections:0 dev-java/commons-logging:0 >=virtual/jre-
 RESTRICT=!test? ( test )
 SLOT=1.7
 SRC_URI=mirror://apache/commons/beanutils/source/commons-beanutils-1.9.4-src.tar.gz test? ( https://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz ) verify-sig? ( https://downloads.apache.org/commons/beanutils/source/commons-beanutils-1.9.4-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=9b1dc8052b985ac37a7f12899b2fa559
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.5.0 b/metadata/md5-cache/dev-java/commons-cli-1.5.0
index a0b8c37baa1e..a2fb21c5e7db 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.5.0
+++ b/metadata/md5-cache/dev-java/commons-cli-1.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.5.0-src.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=85914dd7c216340154c31bd57ab54e9e
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.16.1 b/metadata/md5-cache/dev-java/commons-codec-1.16.1
index 88b2e968ee70..3e4279a592c8 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.16.1
+++ b/metadata/md5-cache/dev-java/commons-codec-1.16.1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.16.1-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/codec/source/commons-codec-1.16.1-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=c2b5d8fe7a601ce9de204923d1be6bf2
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.2-r2 b/metadata/md5-cache/dev-java/commons-collections-3.2.2-r2
index 9214eb5aef77..198ad65b7198 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.2-r2
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.2-r2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz verify-sig? ( https://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=236cbeb8ebf92c1395c86d2dd2618fad
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.4-r2 b/metadata/md5-cache/dev-java/commons-collections-4.4-r2
index 6d4855e6ef37..e2d09a4e4821 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.4-r2
+++ b/metadata/md5-cache/dev-java/commons-collections-4.4-r2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/collections/source/commons-collections4-4.4-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=70b15b71ada896fc306f37d88d4ff7d2
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.26.1 b/metadata/md5-cache/dev-java/commons-compress-1.26.1
index c68cc50ed5fa..cb88726276b7 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.26.1
+++ b/metadata/md5-cache/dev-java/commons-compress-1.26.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/asm:9 dev-java/brotli-dec:0 dev-java/commons-codec:0 >=dev-java/commons-io-2.15.1:1 dev-java/commons-lang:3.6 dev-java/xz-java:0 dev-java/zstd-jni:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/compress/source/commons-compress-1.26.1-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/compress/source/commons-compress-1.26.1-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=1c952e062ee8f8b58b5658693e9718fe
diff --git a/metadata/md5-cache/dev-java/commons-csv-1.9.0 b/metadata/md5-cache/dev-java/commons-csv-1.9.0
index 9155eda40f0a..72704e7c5459 100644
--- a/metadata/md5-cache/dev-java/commons-csv-1.9.0
+++ b/metadata/md5-cache/dev-java/commons-csv-1.9.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/csv/source/commons-csv-1.9.0-src.tar.gz -> commons-csv-1.9.0-sources.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=ee03a72c337c9e519e3ed23d324e9281
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.3.4 b/metadata/md5-cache/dev-java/commons-daemon-1.3.4
index 989f80193992..200d157720af 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.3.4
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.3.4
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.3.4-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/daemon/source/commons-daemon-1.3.4-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=d686d319d0a709f8dd56c033489fb7e1
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1-r2 b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
index 42b358113504..8425b619e63d 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/commons-beanutils-1.9.4:1.7 >=dev-java/commons-logging-1.2:0
 RESTRICT=!test? ( test )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d9a856c9a26947e6aff0cc6a26b497a4
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r3 b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
index 5683015a6a07..af2b57e567e4 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r3
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r3
@@ -12,5 +12,5 @@ RDEPEND=>=dev-java/cglib-3.3.0:3 >=dev-java/commons-beanutils-1.9.4:1.7 >=dev-ja
 RESTRICT=test !test? ( test )
 SLOT=3.2
 SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz -> commons-digester-3.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=32cba32ff0bd4c3adba31f8ed800b86a
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r3 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r3
index 78f033f7c66d..3a0036085db6 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r3
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=3
 SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz verify-sig? ( https://downloads.apache.org/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=6d179a54999ce0dd9cf46f9937cb8896
diff --git a/metadata/md5-cache/dev-java/commons-imaging-0.97 b/metadata/md5-cache/dev-java/commons-imaging-0.97
index b23314f7c074..a65d147548ac 100644
--- a/metadata/md5-cache/dev-java/commons-imaging-0.97
+++ b/metadata/md5-cache/dev-java/commons-imaging-0.97
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/commons/sanselan/source/apache-sanselan-incubating-0.97-src.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=32319862b1dde70b6027b924fcdfa582
diff --git a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3-r2 b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3-r2
index 5b1203961128..cd0ab690dc6d 100644
--- a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3-r2
+++ b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3-r2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/commons/imaging/source/commons-imaging-1.0-alpha3-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/imaging/source/commons-imaging-1.0-alpha3-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=00beb751257cfe0c790fd93fde06b022
diff --git a/metadata/md5-cache/dev-java/commons-io-2.15.1 b/metadata/md5-cache/dev-java/commons-io-2.15.1
index 2f74f857a0ab..0eebe6a9c848 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.15.1
+++ b/metadata/md5-cache/dev-java/commons-io-2.15.1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.15.1-src.tar.gz verify-sig? ( https://archive.apache.org/dist/commons/io/source/commons-io-2.15.1-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=ff24d66bb9e34c822f897e6bab42527d
diff --git a/metadata/md5-cache/dev-java/commons-junit4-1.2.17 b/metadata/md5-cache/dev-java/commons-junit4-1.2.17
index 0348f0f2e0e5..528f33c0d4d2 100644
--- a/metadata/md5-cache/dev-java/commons-junit4-1.2.17
+++ b/metadata/md5-cache/dev-java/commons-junit4-1.2.17
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/commons-nullanalysis-1.2.17:0 dev-java/jun
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aunkrig/commons/archive/V1.2.17.tar.gz -> unkrig-commons1.2.17.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=f6b48236edef7d1d31fadc2b19014938
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.14.0 b/metadata/md5-cache/dev-java/commons-lang-3.14.0
index c7c60fb3e0ca..ddd2df9444d5 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.14.0
+++ b/metadata/md5-cache/dev-java/commons-lang-3.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.6
 SRC_URI=https://archive.apache.org/dist/commons/lang/source/commons-lang3-3.14.0-src.tar.gz -> commons-lang-3.14.0-src.tar.gz verify-sig? ( https://archive.apache.org/dist/commons/lang/source/commons-lang3-3.14.0-src.tar.gz.asc -> commons-lang-3.14.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=30de2e7ff918b7eb449d99964a7cd433
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.3.1 b/metadata/md5-cache/dev-java/commons-logging-1.3.1
index 024f0fd8409a..e18e72bc4e97 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.3.1
+++ b/metadata/md5-cache/dev-java/commons-logging-1.3.1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jakarta-servlet-api:4 dev-java/slf4j-api:0 log4j? ( dev-java/lo
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.3.1-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/logging/source/commons-logging-1.3.1-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=49618b233a6cf953a83be5d80ed1cd9d
diff --git a/metadata/md5-cache/dev-java/commons-math-3.6.1-r2 b/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
index 0855d591e3e3..2e7a109892ae 100644
--- a/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
+++ b/metadata/md5-cache/dev-java/commons-math-3.6.1-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://repo1.maven.org/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=7e2bb8544741eb020aee274f920b5c98
diff --git a/metadata/md5-cache/dev-java/commons-net-3.10.0 b/metadata/md5-cache/dev-java/commons-net-3.10.0
index 30b2f557bd7f..26f22809eeb9 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.10.0
+++ b/metadata/md5-cache/dev-java/commons-net-3.10.0
@@ -11,5 +11,5 @@ 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/net/source/commons-net-3.10.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/net/source/commons-net-3.10.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=e04662ad33f52fd8325b1b4e865bce92
diff --git a/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17 b/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
index 76fbd8db6348..e2c58c02fa88 100644
--- a/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
+++ b/metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/aunkrig/commons/archive/V1.2.17.tar.gz -> unkrig-commons1.2.17.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b83918bf0874a5e01d61969486095419
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.8.0 b/metadata/md5-cache/dev-java/commons-validator-1.8.0
index 0bebc8ffd027..bb88491fb860 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.8.0
+++ b/metadata/md5-cache/dev-java/commons-validator-1.8.0
@@ -12,5 +12,5 @@ RDEPEND=dev-java/commons-beanutils:1.7 dev-java/commons-digester:2.1 dev-java/co
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.8.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/validator/source/commons-validator-1.8.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=8893176cdb5451e0b1a12936fdeddbdb
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r4 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r4
index 15ce37f1e51b..3823808329b6 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r4
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://archive.apache.org/dist/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=4521ec8c71b6b8aa01cf2baa52c9e4b1
diff --git a/metadata/md5-cache/dev-java/concurrentlinkedhashmap-lru-1.4.2 b/metadata/md5-cache/dev-java/concurrentlinkedhashmap-lru-1.4.2
index 0a57ff186b53..d6bcee131ec6 100644
--- a/metadata/md5-cache/dev-java/concurrentlinkedhashmap-lru-1.4.2
+++ b/metadata/md5-cache/dev-java/concurrentlinkedhashmap-lru-1.4.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/jsr305:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ben-manes/concurrentlinkedhashmap/archive/concurrentlinkedhashmap-lru-1.4.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=017092342008b92234f137c8a895bbbb
diff --git a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20 b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
index 7987d1af1885..96e369647e2c 100644
--- a/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
+++ b/metadata/md5-cache/dev-java/conversant-disruptor-1.2.20
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/conversant/disruptor/archive/1.2.20.tar.gz -> conversant-disruptor-1.2.20.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=7dfbbc14f3b4d030fa22ed4419b26518
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0-r2 b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
index 29b9406eca71..69165d6f527c 100644
--- a/metadata/md5-cache/dev-java/cortado-0.6.0-r2
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9b2debbc537a0092e0ea6d6a4fbe4292
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0-r3 b/metadata/md5-cache/dev-java/cortado-0.6.0-r3
index 44fd9e08681e..8ba603aff2eb 100644
--- a/metadata/md5-cache/dev-java/cortado-0.6.0-r3
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz https://sources.debian.org/data/main/c/cortado/0.6.0-5/debian/patches/sun.audio-Java-9.patch -> cortado-sun.audio-Java-9.patch
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=de51f1607c00514cdd2002704833478c
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2
index 2144f0421dff..aeb6140c69a0 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/ant-1.10.14:0 dev-java/xerces:2 >=dev-jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=5013968c2346afd456d5b76b41cd3290
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r3 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r3
index 47e89b947dc1..139beaa86e81 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r3
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/ant-1.10.14:0 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d9856c202a7c758859ebd501fd82dfd8
diff --git a/metadata/md5-cache/dev-java/dom4j-2.1.4 b/metadata/md5-cache/dev-java/dom4j-2.1.4
index 400d5d6e74d2..5eca4e6cbea5 100644
--- a/metadata/md5-cache/dev-java/dom4j-2.1.4
+++ b/metadata/md5-cache/dev-java/dom4j-2.1.4
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jaxb-api:2 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 >=
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/dom4j/dom4j/archive/version-2.1.4.tar.gz -> dom4j-2.1.4.tar.gz https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=fb6bc14b97fd987c930140032ef03275
diff --git a/metadata/md5-cache/dev-java/easymock-2.5.2 b/metadata/md5-cache/dev-java/easymock-2.5.2
index d299a0f38412..aa492c1a22a3 100644
--- a/metadata/md5-cache/dev-java/easymock-2.5.2
+++ b/metadata/md5-cache/dev-java/easymock-2.5.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2.5
 SRC_URI=https://github.com/easymock/easymock/archive/easymock-2.5.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=6596ee8a8359d0683a88aa56a853df16
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1-r1 b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
index 98e9f59d80c9..79f7dc723902 100644
--- a/metadata/md5-cache/dev-java/easymock-3.3.1-r1
+++ b/metadata/md5-cache/dev-java/easymock-3.3.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/cglib:3 dev-java/junit:4 dev-java/objenesis
 RESTRICT=!test? ( test )
 SLOT=3.2
 SRC_URI=https://github.com/easymock/easymock/archive/refs/tags/easymock-3.3.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8756a40188a88794646f84faaea90d85
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.20 b/metadata/md5-cache/dev-java/eclipse-ecj-4.20
index 5466ff3e8cdc..f1f36012d77b 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.20
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.20
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.20
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/ecjsrc-4.20.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=645ffe234680f8e96b0e16498f5a9f32
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.26-r2 b/metadata/md5-cache/dev-java/eclipse-ecj-4.26-r2
index 0737195fdf20..6bf9570ba2fd 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.26-r2
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.26-r2
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java !dev-java/ant-eclipse-ecj:4.26 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.26
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-4.26.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=86e684c3ded7eaf923e9e32bbd2e2509
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.27-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.27-r1
index 61261444465b..081e19b83557 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.27-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.27-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.27
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/ecjsrc-4.27.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=c9d7c353d262a857529d624fc5f408aa
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.30-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.30-r1
index e52371ab26c3..11198e8485a6 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.30-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.30-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.30
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.30-202312010110/ecjsrc-4.30.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=4f724f4a0d25a1d9c0b13ecbd57e5e5d
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.31 b/metadata/md5-cache/dev-java/eclipse-ecj-4.31
index 5927802c6376..a990f4c9d4e5 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.31
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.31
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.31
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/ecjsrc-4.31.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=764075f44ec9382b8c33d844fab73ce1
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.32 b/metadata/md5-cache/dev-java/eclipse-ecj-4.32
index ddddfa5abdf2..8afed047a3e6 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.32
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.32
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=app-eselect/eselect-java >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.32
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.32-202406010610/ecjsrc-4.32.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=da8e77d48e22665f955547cfc7fa0288
diff --git a/metadata/md5-cache/dev-java/eclipse-jdt-annotation-4.30 b/metadata/md5-cache/dev-java/eclipse-jdt-annotation-4.30
index 3954f80e8aa9..00309dd0757e 100644
--- a/metadata/md5-cache/dev-java/eclipse-jdt-annotation-4.30
+++ b/metadata/md5-cache/dev-java/eclipse-jdt-annotation-4.30
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-jdt/eclipse.jdt.core/archive//R4_30.tar.gz -> eclipse.jdt.core-4.30.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0fb1c93df3424187e0d62014bd170ebd
diff --git a/metadata/md5-cache/dev-java/emma-2.0.5312-r6 b/metadata/md5-cache/dev-java/emma-2.0.5312-r6
index e27d5d9c1f12..ec024dd19c50 100644
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r6
+++ b/metadata/md5-cache/dev-java/emma-2.0.5312-r6
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=dev-java/ant-1.10.14:0 >=virtual/jre-1.8:* launcher? ( !sci-biology/emboss:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/emma/emma-release/2.0.5312/emma-2.0.5312-src.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=96d1dd5d0e2b4da90442806e193f2aed
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.27.1-r1 b/metadata/md5-cache/dev-java/error-prone-annotations-2.27.1-r1
index efb96440b9a3..822c7e675843 100644
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.27.1-r1
+++ b/metadata/md5-cache/dev-java/error-prone-annotations-2.27.1-r1
@@ -10,5 +10,5 @@ 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=https://github.com/google/error-prone/archive/v2.27.1.tar.gz -> error-prone-2.27.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=7f20bfc3a8e6241bfc8005567bd8ce98
diff --git a/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1 b/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
index d605950a7837..3e9cf7aa70c9 100644
--- a/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/fastinfoset-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-fi/archive/2.1.0.tar.gz -> fastinfoset-2.1.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b93a01473a3b85d97ac919e1f953a169
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r4 b/metadata/md5-cache/dev-java/fec-1.0.4-r4
index eb146dbc7dec..a44ed674bcb8 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.4-r4
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r4
@@ -11,5 +11,5 @@ RDEPEND=dev-java/log4j-12-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=367ae75dc05c4448025f00e17507b758
diff --git a/metadata/md5-cache/dev-java/felix-framework-7.0.5-r2 b/metadata/md5-cache/dev-java/felix-framework-7.0.5-r2
index 9c35b4874586..51bd8686405a 100644
--- a/metadata/md5-cache/dev-java/felix-framework-7.0.5-r2
+++ b/metadata/md5-cache/dev-java/felix-framework-7.0.5-r2
@@ -12,5 +12,5 @@ RDEPEND=dev-java/animal-sniffer-annotations:0 >=virtual/jre-1.8:* >=dev-java/jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz verify-sig? ( https://downloads.apache.org/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=1f0ca4ebb4434cc3e4a6665772e057e1
diff --git a/metadata/md5-cache/dev-java/felix-gogo-runtime-1.1.6 b/metadata/md5-cache/dev-java/felix-gogo-runtime-1.1.6
index 7eab7b5ffc43..145bfcfa1c73 100644
--- a/metadata/md5-cache/dev-java/felix-gogo-runtime-1.1.6
+++ b/metadata/md5-cache/dev-java/felix-gogo-runtime-1.1.6
@@ -12,5 +12,5 @@ RDEPEND=dev-java/osgi-annotation:0 dev-java/osgi-cmpn:8 dev-java/osgi-core:0 >=v
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz -> felix-gogo-runtime-1.1.6.tar.gz verify-sig? ( https://dlcdn.apache.org/felix/org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz.asc -> felix-gogo-runtime-1.1.6.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=6893e70aad4525c6e2d0191e3052addd
diff --git a/metadata/md5-cache/dev-java/felix-main-7.0.5-r2 b/metadata/md5-cache/dev-java/felix-main-7.0.5-r2
index 4c4ae4fb6dd8..ccc0ce6dda77 100644
--- a/metadata/md5-cache/dev-java/felix-main-7.0.5-r2
+++ b/metadata/md5-cache/dev-java/felix-main-7.0.5-r2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/felix-framework-7.0.5:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.main-7.0.5-source-release.tar.gz verify-sig? ( https://downloads.apache.org/felix/org.apache.felix.main-7.0.5-source-release.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=adb90d5c6440baf47a0a66f9ffc24171
diff --git a/metadata/md5-cache/dev-java/felix-resolver-2.0.4-r1 b/metadata/md5-cache/dev-java/felix-resolver-2.0.4-r1
index a8988ceb9d20..9aabcfb36fea 100644
--- a/metadata/md5-cache/dev-java/felix-resolver-2.0.4-r1
+++ b/metadata/md5-cache/dev-java/felix-resolver-2.0.4-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.resolver-2.0.4-source-release.tar.gz verify-sig? ( https://downloads.apache.org/felix/org.apache.felix.resolver-2.0.4-source-release.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=e00445483e70a8edc533786657ee69c4
diff --git a/metadata/md5-cache/dev-java/felix-utils-1.11.8-r1 b/metadata/md5-cache/dev-java/felix-utils-1.11.8-r1
index da9ce474575f..543b7eb9c631 100644
--- a/metadata/md5-cache/dev-java/felix-utils-1.11.8-r1
+++ b/metadata/md5-cache/dev-java/felix-utils-1.11.8-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz verify-sig? ( https://downloads.apache.org/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=dad1f25ce39dd1054f1f9a4a5cb60662
diff --git a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1 b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
index 6a19beda86c3..352e2ca1e416 100644
--- a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
+++ b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
@@ -11,5 +11,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-annotations/3.0.1/findbugs-annotations-3.0.1-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a4bc4b2ed30ce42a86deb70f17e35758
diff --git a/metadata/md5-cache/dev-java/fishbowl-1.4.1 b/metadata/md5-cache/dev-java/fishbowl-1.4.1
index e53c7f403af0..4b5f3240b49b 100644
--- a/metadata/md5-cache/dev-java/fishbowl-1.4.1
+++ b/metadata/md5-cache/dev-java/fishbowl-1.4.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/stefanbirkner/fishbowl/archive/fishbowl-1.4.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=7926431a9c1ad7f82f68dfb45fabc973
diff --git a/metadata/md5-cache/dev-java/fontbox-2.0.27 b/metadata/md5-cache/dev-java/fontbox-2.0.27
index 4ddaff718344..b615b2631f49 100644
--- a/metadata/md5-cache/dev-java/fontbox-2.0.27
+++ b/metadata/md5-cache/dev-java/fontbox-2.0.27
@@ -12,5 +12,5 @@ RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-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 https://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=beabd835debe0df66cdc641ad9f639b3
diff --git a/metadata/md5-cache/dev-java/fop-2.9-r1 b/metadata/md5-cache/dev-java/fop-2.9-r1
index e7ba996beac5..c986773fe56b 100644
--- a/metadata/md5-cache/dev-java/fop-2.9-r1
+++ b/metadata/md5-cache/dev-java/fop-2.9-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/batik:1.16 dev-java/commons-io:1 de
 RESTRICT=!test? ( test )
 SLOT=2.8
 SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.9-src.tar.gz https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz verify-sig? ( https://downloads.apache.org/xmlgraphics/fop/source/fop-2.9-src.tar.gz.asc ) test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=2002e2646a69d0109099db1a8d5adf21
diff --git a/metadata/md5-cache/dev-java/freenet-ext-29-r1 b/metadata/md5-cache/dev-java/freenet-ext-29-r1
index 6185ae5073fe..57251dd100fc 100644
--- a/metadata/md5-cache/dev-java/freenet-ext-29-r1
+++ b/metadata/md5-cache/dev-java/freenet-ext-29-r1
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=dev-libs/gmp >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=29
 SRC_URI=https://github.com/hyphanet/contrib/archive/v29.tar.gz -> freenet-ext-29.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=6ec5e7ff989723cc2ba0b7ea2602e2ee
diff --git a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4 b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
index 8c894860cd29..6e79fd81c36d 100644
--- a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
+++ b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/java-getopt:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/gnu-regexp-1.1.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=3e2b517468bb0aaf8aa31524c2242598
diff --git a/metadata/md5-cache/dev-java/gradle-bin-8.4 b/metadata/md5-cache/dev-java/gradle-bin-8.4
index 30250d3213cf..1666405249fe 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-8.4
+++ b/metadata/md5-cache/dev-java/gradle-bin-8.4
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=8.4
 SRC_URI=https://services.gradle.org/distributions/gradle-8.4-all.zip -> gradle-bin-8.4.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1ba35d3f4f459ed1fdf821e693c0178a
diff --git a/metadata/md5-cache/dev-java/gradle-bin-8.5 b/metadata/md5-cache/dev-java/gradle-bin-8.5
index db38c452dab7..43f1658f48e0 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-8.5
+++ b/metadata/md5-cache/dev-java/gradle-bin-8.5
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=8.5
 SRC_URI=https://services.gradle.org/distributions/gradle-8.5-all.zip -> gradle-bin-8.5.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1ba35d3f4f459ed1fdf821e693c0178a
diff --git a/metadata/md5-cache/dev-java/gradle-bin-8.7 b/metadata/md5-cache/dev-java/gradle-bin-8.7
index 8dee85dfcb34..2d460e6fba5f 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-8.7
+++ b/metadata/md5-cache/dev-java/gradle-bin-8.7
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=8.7
 SRC_URI=https://services.gradle.org/distributions/gradle-8.7-all.zip -> gradle-bin-8.7.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1ba35d3f4f459ed1fdf821e693c0178a
diff --git a/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2 b/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
index 641f0a7e7cb1..6124bee86101 100644
--- a/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
+++ b/metadata/md5-cache/dev-java/greenmail-2.0.0_alpha2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation-api:2 dev-java/jakarta-mail:0 dev-java/junit:4 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/greenmail-mail-test/greenmail/archive/release-2.0.0-alpha-2.tar.gz -> greenmail-2.0.0_alpha2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b9df8132f54d1cc77e67c59f605680b2
diff --git a/metadata/md5-cache/dev-java/gson-2.10.2_pre20231128-r1 b/metadata/md5-cache/dev-java/gson-2.10.2_pre20231128-r1
index ebf326ebbc4c..0083056e7cd9 100644
--- a/metadata/md5-cache/dev-java/gson-2.10.2_pre20231128-r1
+++ b/metadata/md5-cache/dev-java/gson-2.10.2_pre20231128-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/gson/archive/b17b1a0e98dcaf4b61823e1f0c29dda44c0ea3d5.tar.gz -> gson-2.10.2_pre20231128.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5fa95df7f53e9b88e3fc90b7166ee911
diff --git a/metadata/md5-cache/dev-java/guava-33.2.0 b/metadata/md5-cache/dev-java/guava-33.2.0
index a6dc777855a4..1d8702f1f269 100644
--- a/metadata/md5-cache/dev-java/guava-33.2.0
+++ b/metadata/md5-cache/dev-java/guava-33.2.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/error-prone-annotations-2.27.1:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v33.2.0.tar.gz -> guava-33.2.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=f8fe77713e8d9c9c4c29cece89c8a37b
diff --git a/metadata/md5-cache/dev-java/guava-testlib-33.2.0 b/metadata/md5-cache/dev-java/guava-testlib-33.2.0
index b5fba270e066..43aeae067349 100644
--- a/metadata/md5-cache/dev-java/guava-testlib-33.2.0
+++ b/metadata/md5-cache/dev-java/guava-testlib-33.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/error-prone-annotations-2.27.1:0 ~dev-java/guava-33.2.0:0 dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v33.2.0.tar.gz -> guava-33.2.0.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.jar )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=329d4bf3ad3499608a9fbd25f97f38d7
diff --git a/metadata/md5-cache/dev-java/guice-5.1.0-r1 b/metadata/md5-cache/dev-java/guice-5.1.0-r1
index 7cb89b38a3ea..94a03623a1e7 100644
--- a/metadata/md5-cache/dev-java/guice-5.1.0-r1
+++ b/metadata/md5-cache/dev-java/guice-5.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/aopalliance:1 dev-java/asm:9 dev-java/error
 RESTRICT=test !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/google/guice/archive/5.1.0.tar.gz -> guice-5.1.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0fd9a5f36eb50e6c080c06ac0f7212fe
diff --git a/metadata/md5-cache/dev-java/hamcrest-2.2-r1 b/metadata/md5-cache/dev-java/hamcrest-2.2-r1
index 344f017c3fe0..39db8cfe5b0e 100644
--- a/metadata/md5-cache/dev-java/hamcrest-2.2-r1
+++ b/metadata/md5-cache/dev-java/hamcrest-2.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/v2.2.tar.gz -> hamcrest-2.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c1a6c708d79dae9b3a1cda0bd8971442
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4 b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
index 6a2de0214396..99fedb6ce545 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.1-r4
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.1.tar.gz -> hamcrest-core-1.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=256f3602ef99cd08a39d6f66f124e7aa
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3 b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3
index 17901c99c144..fa9444a2cf88 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.3-r3
@@ -11,5 +11,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5f6f53542f0b38b80d70c6316ae7ce8f
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4 b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4
index 2cdcf41b01b9..b260a72200db 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r4
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=82c4192babddf478374f5cab7cca984d
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3 b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3
index 3499832c5fac..cef078521243 100644
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3
+++ b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r3
@@ -11,5 +11,5 @@ LICENSE=BSD-2
 RDEPEND=dev-java/hamcrest-core:1.3 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-1.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5cc69385ac64a49c82035e357d933a72
diff --git a/metadata/md5-cache/dev-java/hashcash-1.1 b/metadata/md5-cache/dev-java/hashcash-1.1
index 69681e0af066..31e25267f43e 100644
--- a/metadata/md5-cache/dev-java/hashcash-1.1
+++ b/metadata/md5-cache/dev-java/hashcash-1.1
@@ -10,5 +10,5 @@ LICENSE=GregoryRubin
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://www.nettgryppa.com/code/HashCash.java
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=fad55f7ae2718f5dae9444d4e2bbf91f
diff --git a/metadata/md5-cache/dev-java/hawtjni-runtime-1.18 b/metadata/md5-cache/dev-java/hawtjni-runtime-1.18
index 7f57096bddb3..e83409bdfc6b 100644
--- a/metadata/md5-cache/dev-java/hawtjni-runtime-1.18
+++ b/metadata/md5-cache/dev-java/hawtjni-runtime-1.18
@@ -10,5 +10,5 @@ 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=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.18.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=4124437359740c8d9cb9da5c6f7fb6ec
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.29-r1 b/metadata/md5-cache/dev-java/htmlcleaner-2.29-r1
index 193988f257eb..77062705201f 100644
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.29-r1
+++ b/metadata/md5-cache/dev-java/htmlcleaner-2.29-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jdom:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sour
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/htmlcleaner/htmlcleaner/htmlcleaner%20v2.29/htmlcleaner-src-2.29.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8cdb507a8962485dcc12599678f89d9d
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r2 b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r2
index 4e3e84827f55..f07111eee170 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r2
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r2
@@ -12,5 +12,5 @@ RDEPEND=dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcore:0
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz verify-sig? ( https://downloads.apache.org/httpcomponents/httpclient/source/httpcomponents-client-4.5.13-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=f7f6f6cece0624163c104045038aab99
diff --git a/metadata/md5-cache/dev-java/httpcore-4.4.14-r1 b/metadata/md5-cache/dev-java/httpcore-4.4.14-r1
index d4f26d800ad4..e0a899b41808 100644
--- a/metadata/md5-cache/dev-java/httpcore-4.4.14-r1
+++ b/metadata/md5-cache/dev-java/httpcore-4.4.14-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz verify-sig? ( https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=62d1ecd5e4302af72b93e87d023cb789
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
index 935aaa7562f4..99b0367b7759 100644
--- a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=virtual/jdk:1.8 >=media-sound/pulseaudio-0.9.11 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=cd60742967283b0b3d0b1f94e4991c04
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
index ba1d4de4c186..138ddcc1612c 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.8.8-r1
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8:* >=dev-java/java-con
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.8.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	67ea64209e3442a3a0e095f048d43a62	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	67ea64209e3442a3a0e095f048d43a62	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2552f7cc6c69a27db6c20d28b6d99381
diff --git a/metadata/md5-cache/dev-java/icu4j-75.1 b/metadata/md5-cache/dev-java/icu4j-75.1
index 882903e180fd..38de7854b950 100644
--- a/metadata/md5-cache/dev-java/icu4j-75.1
+++ b/metadata/md5-cache/dev-java/icu4j-75.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unicode-org/icu/archive/release-75-1.tar.gz -> icu4j-75.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1be7797ab1b60e04f9e89e98ab3c0ed4
diff --git a/metadata/md5-cache/dev-java/identicon-1.0 b/metadata/md5-cache/dev-java/identicon-1.0
index 64d0148b51f4..f853ea8b8c02 100644
--- a/metadata/md5-cache/dev-java/identicon-1.0
+++ b/metadata/md5-cache/dev-java/identicon-1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-java/cache2k-api:0 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/PauloMigAlmeida/identicon/archive/96902d3c7c9733d9da4cce9c5ed424557fc2ec3c.tar.gz -> identicon-1.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=2e1aa27536bc93fdd49157cb86c86312
diff --git a/metadata/md5-cache/dev-java/injection-api-2.0.1 b/metadata/md5-cache/dev-java/injection-api-2.0.1
index ad8f82e34c62..c982a04f1cfe 100644
--- a/metadata/md5-cache/dev-java/injection-api-2.0.1
+++ b/metadata/md5-cache/dev-java/injection-api-2.0.1
@@ -10,5 +10,5 @@ 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=https://github.com/eclipse-ee4j/injection-api/archive/2.0.1.tar.gz -> injection-api-2.0.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=70ee83e00158f1bb21c72545d2f43857
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r6 b/metadata/md5-cache/dev-java/iso-relax-20050331-r6
index e1b34d8abb91..e09f504c117b 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r6
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r6
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/iso-relax-20050331.tar.bz2
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c88f04e67d3e31090dc7fc8ebc06296f
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12 b/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
index 54f397ee92cb..2413b2574b8f 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/3.0.12.tar.gz -> jaxb-istack-commons-3.0.12.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1a756e19f31ab7f270a914847a3184ec
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1 b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
index a0b83a8183b2..2d203631c366 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/4.1.1.tar.gz -> jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c4d9deeb2ade4e71cae767046f3da2a1
diff --git a/metadata/md5-cache/dev-java/j2objc-annotations-3.0.0-r1 b/metadata/md5-cache/dev-java/j2objc-annotations-3.0.0-r1
index aa794bbf14d2..a5962d2fedfb 100644
--- a/metadata/md5-cache/dev-java/j2objc-annotations-3.0.0-r1
+++ b/metadata/md5-cache/dev-java/j2objc-annotations-3.0.0-r1
@@ -10,5 +10,5 @@ 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=https://github.com/google/j2objc/archive/3.0.0.tar.gz -> j2objc-3.0.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=7c36df9d225e737151f4fcc81f4b8fbe
diff --git a/metadata/md5-cache/dev-java/jackcess-4.0.0 b/metadata/md5-cache/dev-java/jackcess-4.0.0
index 37f9e0d86a1c..7355d120f189 100644
--- a/metadata/md5-cache/dev-java/jackcess-4.0.0
+++ b/metadata/md5-cache/dev-java/jackcess-4.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/commons-
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jahlborn/jackcess/archive/refs/tags/jackcess-4.0.0.tar.gz -> jackcess-4.0.0-sources.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=fd99cefd0c2a4a69979b4f073dad2243
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3
index e0f6d2aa4c53..be0ea6a7ea6f 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8d15c4e0f6ad1bf14b3e7aa0cff332c8
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.13.4 b/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
index 223f5b784149..c3f6558d9552 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=01744e32eb429a6bdb099cdd01148416
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.4 b/metadata/md5-cache/dev-java/jackson-core-2.13.4
index 7586c9665232..e49ad04c3eff 100644
--- a/metadata/md5-cache/dev-java/jackson-core-2.13.4
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=27d6ce84bbecfa62c456d0dff55d15ac
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1 b/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
index d1e7d294f5d8..6ec9736260b8 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.4.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jackson-core-2.13.4:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.4.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1beae1ec3e358073c387e888ab7c5c79
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
index 23a1191ccfaf..0c66e3524083 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jac
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a556215f64a068c6ff8526cdaf42f060
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
index f1f1dfa5fcb3..f38000a7480f 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=23becb40922325710ba33cc37a83046e
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
index 08ebeb24e86c..d8f46f26d8d4 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/jackson-annotations-2.13.4:2 ~dev-java/jac
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.4.tar.gz -> jackson-module-jakarta-xmlbind-2.13.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c7e07827ca3d7f9ab81ce2586209c9a7
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r2 b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
index 91c2f83f50e8..2cb769c41cf0 100644
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r2
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1-r2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/tcljava/jacl/1.4.1/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=752ce194d6d8df70e6958043c016a729
diff --git a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
index 84fb252d63c0..363f0b4dd277 100644
--- a/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
+++ b/metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jai-imageio/jai-imageio-core/archive/refs/tags/jai-imageio-core-1.4.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e5cd2fcf459b16f769f8d218ff456f1e
diff --git a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0 b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
index d3134e699e60..35190efc93e0 100644
--- a/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
+++ b/metadata/md5-cache/dev-java/jai-imageio-jpeg2000-1.4.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jai-imageio-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jai-imageio/jai-imageio-jpeg2000/archive/refs/tags/jai-imageio-jpeg2000-1.4.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=29d1ba28d03d99db56ce402c2535dff7
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1 b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
index a2fee3b92b08..7656bf4fac73 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/jakartaee/jaf-api/archive/1.2.2.tar.gz -> jakarta-activation-1.2.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=ff3b4c1d66bb1cce7b6ad17c777b90a1
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1 b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
index e9cb47ee4e13..176d621c6acb 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jakartaee/jaf-api/archive/2.0.1.tar.gz -> jakarta-activation-2.0.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1c30bbe29760b48dd6d83974ebca7f9e
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1 b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
index 430f89f0c354..3440b60c0091 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/jakartaee/jaf-api/archive/1.2.2.tar.gz -> jakarta-activation-1.2.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c78fbd58436974440df89f0c99a202be
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1
index 4a15f999efde..06f0a8970af5 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jakartaee/jaf-api/archive/2.1.1.tar.gz -> jakarta-activation-api-2.1.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=6d2f859a5591fa6ba3c10133e6dc2fe9
diff --git a/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
index 86d1c73e3c27..db448c382fb6 100644
--- a/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
+++ b/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/common-annotations-api/archive/2.1.1.tar.gz -> jakarta-annotations-api-2.1.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=ad8892a8f51d782522e4f2249619a388
diff --git a/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1 b/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
index 3737220f1cfa..347387468cbe 100644
--- a/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
+++ b/metadata/md5-cache/dev-java/jakarta-el-api-5.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=https://github.com/jakartaee/expression-language/archive/5.0.1-RELEASE-api.tar.gz -> jakarta-el-api-5.0.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=07fa9f90f0e0056d7914119cd29e1324
diff --git a/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0 b/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
index 05a29fef25a5..e0bff585de89 100644
--- a/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
+++ b/metadata/md5-cache/dev-java/jakarta-interceptors-2.1.0
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/interceptors/archive/2.1.0-RELEASE.tar.gz -> jakarta-interceptors-2.1.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=52a655ead01220649dc1647d958d5827
diff --git a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1 b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
index 093a972d6bc0..1c7f9fa635a2 100644
--- a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
+++ b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
@@ -10,5 +10,5 @@ LICENSE=|| ( EPL-2.0 GPL-2-with-classpath-exception )
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jsonp/archive/1.1-1.1.6-RELEASE.tar.gz -> jakarta-json-api-1.1.6.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=16e7a8330d20712e4a37c8dfb8291e1f
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-2.0.1 b/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
index 4a483c70faaf..83a3ba5e6fa9 100644
--- a/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
+++ b/metadata/md5-cache/dev-java/jakarta-mail-2.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/mail-api/archive/2.0.1.tar.gz -> jakarta-mail-2.0.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=82072f766e0885b47e3ab89be8d160ae
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.3 b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.3
index afdfd8efb78e..e09306606b9b 100644
--- a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.3
+++ b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/mail-api/archive/2.1.3.tar.gz -> jakarta-mail-api-2.1.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=4daa223fa9e6b57c6b6d0772ab634fda
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
index 13681aabe3dd..f4b42be91c4b 100644
--- a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=https://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=accb98c4294f45c840a7ebc889b1fa35
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3 b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
index d1bb8c87a312..151c4ba5b5ad 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r3
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=eec8e1c95475a8fbfe15b0d0939ed878
diff --git a/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4 b/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
index abee18bb5d7a..a642c9eaadfb 100644
--- a/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
+++ b/metadata/md5-cache/dev-java/jakarta-servlet-api-4.0.4
@@ -10,5 +10,5 @@ LICENSE=|| ( GPL-2 GPL-2-with-classpath-exception )
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/jakartaee/servlet/archive/4.0.4-RELEASE.tar.gz -> jakarta-servlet-api-4.0.4-RELEASE.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=f896dde4a1aa06afdf3cc58cb1ec6b6c
diff --git a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0 b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
index f6c1c01614e5..b0fd492c4bce 100644
--- a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
+++ b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://github.com/jakartaee/servlet/archive/6.0.0-RELEASE.tar.gz -> jakarta-servlet-api-6.0.0-RELEASE.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a2e13785d9e40e2220de63b1b386fda0
diff --git a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r2 b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r2
index cb2a20aa6ed8..86c559b0803a 100644
--- a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r2
+++ b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-api-1.2.2-r1:1 >=dev-j
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jakartaee/saaj-api/archive/1.4.2.tar.gz -> jakarta-xml-soap-api-1.4.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=57a559a53b8307abfa23c0ae58d581b9
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.8-r1 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.8-r1
index 2881c94c8128..04929b4af693 100644
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.8-r1
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.8-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/ant-1.10.14-r1:0 dev-java/bcel:0 >=dev-java/commons-compress-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.8/source/jakartaee-migration-1.0.8-src.tar.gz -> jakartaee-migration-1.0.8-sources.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a6751608e6b44ebb5ad2baa5c5ad2061
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r7 b/metadata/md5-cache/dev-java/jal-20031117-r7
index 9675a3a0e205..007d7520d6bc 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r7
+++ b/metadata/md5-cache/dev-java/jal-20031117-r7
@@ -10,5 +10,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/jal-20031117.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=48421c3551f54bb15d5849edc9b0c8f4
diff --git a/metadata/md5-cache/dev-java/jansi-1.13 b/metadata/md5-cache/dev-java/jansi-1.13
index bd4c669369d1..f5c475db0f05 100644
--- a/metadata/md5-cache/dev-java/jansi-1.13
+++ b/metadata/md5-cache/dev-java/jansi-1.13
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi/archive/jansi-project-1.13.tar.gz -> jansi-1.13.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=ee1233c04a41ea2639d3127438b6cc82
diff --git a/metadata/md5-cache/dev-java/jansi-2.4.0-r1 b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
index 3f94e04b00a8..1c7ca7a12e8f 100644
--- a/metadata/md5-cache/dev-java/jansi-2.4.0-r1
+++ b/metadata/md5-cache/dev-java/jansi-2.4.0-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/fusesource/jansi/archive/refs/tags/jansi-2.4.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=7c3b952cdf55a9fb767e8b28506fb677
diff --git a/metadata/md5-cache/dev-java/jansi-native-1.8 b/metadata/md5-cache/dev-java/jansi-native-1.8
index c63c7ce1a94f..d376bd8e2d2e 100644
--- a/metadata/md5-cache/dev-java/jansi-native-1.8
+++ b/metadata/md5-cache/dev-java/jansi-native-1.8
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/hawtjni-runtime:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi-native/archive/jansi-native-1.8.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
 _md5_=758fbbc82194cc75be177b62685c36a1
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.5-r3 b/metadata/md5-cache/dev-java/java-dep-check-0.5-r3
index c366cecb08a7..d30c60c5beff 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.5-r3
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.5-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PDEPEND=dev-java/javatoolkit:0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/asm:9 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d36304e84699a333005b68a7ae5a1ef3
diff --git a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0 b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
index 9732b91f8b72..97e9b684428c 100644
--- a/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
+++ b/metadata/md5-cache/dev-java/java-diff-utils-1.3.0
@@ -11,5 +11,5 @@ 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=https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0-sources.jar -> java-diff-utils-1.3.0-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8a28218570abaa15bfa2f5a82611068b
diff --git a/metadata/md5-cache/dev-java/java-diff-utils-4.12 b/metadata/md5-cache/dev-java/java-diff-utils-4.12
index 0a7646c60ffd..388e7af7ed8f 100644
--- a/metadata/md5-cache/dev-java/java-diff-utils-4.12
+++ b/metadata/md5-cache/dev-java/java-diff-utils-4.12
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/java-diff-utils/java-diff-utils/archive/java-diff-utils-parent-4.12.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d2d8e2b481643d5d0de6cf64dcfeebd4
diff --git a/metadata/md5-cache/dev-java/java-getopt-1.0.14-r2 b/metadata/md5-cache/dev-java/java-getopt-1.0.14-r2
index 871c10f4ab6a..e9eb263a0d55 100644
--- a/metadata/md5-cache/dev-java/java-getopt-1.0.14-r2
+++ b/metadata/md5-cache/dev-java/java-getopt-1.0.14-r2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.14.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a323be115ea380da47d2a0ab7324c4b9
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r1 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r1
index 572c7992d3a8..0ceb0483c999 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r1
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://download.tanukisoftware.com/wrapper/3.5.50/wrapper_3.5.50_src.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=0289e85479573729c116bd0e84ef1649
diff --git a/metadata/md5-cache/dev-java/javacc-4.1 b/metadata/md5-cache/dev-java/javacc-4.1
index e39e459e9e91..c36663f6622b 100644
--- a/metadata/md5-cache/dev-java/javacc-4.1
+++ b/metadata/md5-cache/dev-java/javacc-4.1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/junit:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/javacc/javacc/archive/release_41.tar.gz -> javacc-4.1.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=a43ca107fc6c5ac83818098113698f5c
diff --git a/metadata/md5-cache/dev-java/javacc-7.0.13 b/metadata/md5-cache/dev-java/javacc-7.0.13
index 1d1ad6611dcd..947793b70545 100644
--- a/metadata/md5-cache/dev-java/javacc-7.0.13
+++ b/metadata/md5-cache/dev-java/javacc-7.0.13
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=7.0.13
 SRC_URI=https://github.com/javacc/javacc/archive/javacc-7.0.13.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=e43ba9cb77ce79062a9cd38ce9429093
diff --git a/metadata/md5-cache/dev-java/javacc-7.0.4 b/metadata/md5-cache/dev-java/javacc-7.0.4
index da719bcb2913..212c324d52ec 100644
--- a/metadata/md5-cache/dev-java/javacc-7.0.4
+++ b/metadata/md5-cache/dev-java/javacc-7.0.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=7.0.4
 SRC_URI=https://github.com/javacc/javacc/archive/7.0.4.tar.gz -> javacc-7.0.4.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=55a5cf8bd06f45481eab744ad4f710ed
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
index 2e28b5ac35e5..cb78debf58f7 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
+++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=b7861a015fa8d672bd4aa7c7aa5ac1b6
diff --git a/metadata/md5-cache/dev-java/javacup-11b_p20160615 b/metadata/md5-cache/dev-java/javacup-11b_p20160615
index 9a60d146aad0..f42bbf2472dc 100644
--- a/metadata/md5-cache/dev-java/javacup-11b_p20160615
+++ b/metadata/md5-cache/dev-java/javacup-11b_p20160615
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20160615.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=589ce87edbcbdee899dae4ecfa8d4626
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3
index cc016b4d97e1..47d2d7d98ed2 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.8:* dev-java/javax-jsp-api:2.0 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/javaee/javahelp/archive/3ca862d8626096770598a3a256886d205246f4a4.tar.gz -> javahelp-2.0.05_p20170719.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=affaa6213111dd69d75e3f3d70a021a5
diff --git a/metadata/md5-cache/dev-java/javaparser-core-3.13.10 b/metadata/md5-cache/dev-java/javaparser-core-3.13.10
index 57bdd33df3a8..6b0377e23ae6 100644
--- a/metadata/md5-cache/dev-java/javaparser-core-3.13.10
+++ b/metadata/md5-cache/dev-java/javaparser-core-3.13.10
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/javaparser/javaparser/archive/v3.13.10.tar.gz -> javaparser-3.13.10.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=59bfe08441776070d2e6f6098a20aba7
diff --git a/metadata/md5-cache/dev-java/javassist-3.29.2 b/metadata/md5-cache/dev-java/javassist-3.29.2
index 4eced8b4492d..05b5a2cc75b0 100644
--- a/metadata/md5-cache/dev-java/javassist-3.29.2
+++ b/metadata/md5-cache/dev-java/javassist-3.29.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_29_2_ga.tar.gz -> javassist-3.29.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8aece1c5cd2cf76569b48bab5d6df69e
diff --git a/metadata/md5-cache/dev-java/javax-el-api-2.2 b/metadata/md5-cache/dev-java/javax-el-api-2.2
index 69855dc2381e..56592a86441f 100644
--- a/metadata/md5-cache/dev-java/javax-el-api-2.2
+++ b/metadata/md5-cache/dev-java/javax-el-api-2.2
@@ -10,5 +10,5 @@ LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=https://repo1.maven.org/maven2/javax/el/el-api/2.2/el-api-2.2-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=34ea57cbe7c32d0ba938baf7e024f944
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r4 b/metadata/md5-cache/dev-java/javax-inject-1-r4
index d2a914d90309..0fa343050d1e 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1-r4
+++ b/metadata/md5-cache/dev-java/javax-inject-1-r4
@@ -10,5 +10,5 @@ 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=http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar -> javax-inject-1.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d3143b886eb166ae748f79f144ce16dd
diff --git a/metadata/md5-cache/dev-java/javax-jms-api-2.0.3 b/metadata/md5-cache/dev-java/javax-jms-api-2.0.3
index e8dd3e4e7bfe..b5034ce698ea 100644
--- a/metadata/md5-cache/dev-java/javax-jms-api-2.0.3
+++ b/metadata/md5-cache/dev-java/javax-jms-api-2.0.3
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/messaging/archive/2.0.3-RELEASE.tar.gz -> javax-jms-api-2.0.3-RELEASE.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1ced834445483cce34ed735111921f4d
diff --git a/metadata/md5-cache/dev-java/javax-jsp-api-2.0 b/metadata/md5-cache/dev-java/javax-jsp-api-2.0
index 654d180782db..c992c81f18fb 100644
--- a/metadata/md5-cache/dev-java/javax-jsp-api-2.0
+++ b/metadata/md5-cache/dev-java/javax-jsp-api-2.0
@@ -10,5 +10,5 @@ LICENSE=CDDL GPL-2-with-classpath-exception
 RDEPEND=dev-java/javax-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/2.0/jsp-api-2.0-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=97e3634407bd95afeed588a9129b89e5
diff --git a/metadata/md5-cache/dev-java/javax-jsp-api-2.2 b/metadata/md5-cache/dev-java/javax-jsp-api-2.2
index 2b3547f8e29f..e69fe5aa73e7 100644
--- a/metadata/md5-cache/dev-java/javax-jsp-api-2.2
+++ b/metadata/md5-cache/dev-java/javax-jsp-api-2.2
@@ -10,5 +10,5 @@ LICENSE=CDDL GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* dev-java/javax-el-api:2.2 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/2.2/jsp-api-2.2-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=7f90fe0b658c1a131aa73c781bdc45c7
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.6.7-r2 b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r2
index 192d16e0be51..bcde086f02a2 100644
--- a/metadata/md5-cache/dev-java/javax-mail-1.6.7-r2
+++ b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/mail-api/archive/1.6.7.tar.gz -> javax-mail-1.6.7.tar.gz https://github.com/jakartaee/mail-api/commit/86ee859eb1.patch -> javax-mail-1.6.7-java21.patch
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=2c327b1bef5bbb4822be8333f980ee67
diff --git a/metadata/md5-cache/dev-java/javax-persistence-api-2.2-r1 b/metadata/md5-cache/dev-java/javax-persistence-api-2.2-r1
index f86edf947345..09bea17905d6 100644
--- a/metadata/md5-cache/dev-java/javax-persistence-api-2.2-r1
+++ b/metadata/md5-cache/dev-java/javax-persistence-api-2.2-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0 BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/javax/persistence/javax.persistence-api/2.2/javax.persistence-api-2.2-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=41324fa94e6129810f9acf1f22bf8024
diff --git a/metadata/md5-cache/dev-java/javax-servlet-api-2.2 b/metadata/md5-cache/dev-java/javax-servlet-api-2.2
index d4f7a6ba3594..a7f5ddb1ddb2 100644
--- a/metadata/md5-cache/dev-java/javax-servlet-api-2.2
+++ b/metadata/md5-cache/dev-java/javax-servlet-api-2.2
@@ -10,5 +10,5 @@ LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/servlet-api/2.2/servlet-api-2.2-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=3235f781d97da21cc7e347e435d52405
diff --git a/metadata/md5-cache/dev-java/javax-servlet-api-2.5 b/metadata/md5-cache/dev-java/javax-servlet-api-2.5
index 47165b31c729..f4ceb8ce401f 100644
--- a/metadata/md5-cache/dev-java/javax-servlet-api-2.5
+++ b/metadata/md5-cache/dev-java/javax-servlet-api-2.5
@@ -10,5 +10,5 @@ LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c7d63c74182bce03ec8ccc4014935b54
diff --git a/metadata/md5-cache/dev-java/javax-servlet-api-3.0.1 b/metadata/md5-cache/dev-java/javax-servlet-api-3.0.1
index e781a10c1e66..08a36b0090e9 100644
--- a/metadata/md5-cache/dev-java/javax-servlet-api-3.0.1
+++ b/metadata/md5-cache/dev-java/javax-servlet-api-3.0.1
@@ -10,5 +10,5 @@ LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e6c98119b310e9c68946873c96566ae8
diff --git a/metadata/md5-cache/dev-java/javax-servlet-api-3.1.0 b/metadata/md5-cache/dev-java/javax-servlet-api-3.1.0
index 063195ba73d9..35d6ea1529c9 100644
--- a/metadata/md5-cache/dev-java/javax-servlet-api-3.1.0
+++ b/metadata/md5-cache/dev-java/javax-servlet-api-3.1.0
@@ -10,5 +10,5 @@ LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e2d5fb7c0ac8edade4ad9c35f5bf17c6
diff --git a/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4 b/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
index 1f48d8a222c1..84db601a6b2b 100644
--- a/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
+++ b/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-servlet-api:4 dev-java/jakarta-xml-soap-api:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jax-rpc-api/archive/1.1.4.tar.gz -> jax-rpc-api-1.1.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=7705f3bf87befa49a6a52ee71cfb24df
diff --git a/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r2 b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r2
index d7b3a868db65..c752d0adcb0e 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r2
+++ b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-co
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jakartaee/jaxb-api/archive/2.3.3.tar.gz -> jaxb-api-2.3.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=4b806ba81008081d8590bea31774761d
diff --git a/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1 b/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
index 230457982271..0ab2ff45a76c 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
+++ b/metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/3.0.1.tar.gz -> jaxb-api-3.0.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=189e24d7f81c9503e4d29c01dd6706b9
diff --git a/metadata/md5-cache/dev-java/jaxb-api-4.0.2 b/metadata/md5-cache/dev-java/jaxb-api-4.0.2
index 665629ac4521..f668532315c8 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-4.0.2
+++ b/metadata/md5-cache/dev-java/jaxb-api-4.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-11:* >=dev-java/java-config-
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/jakartaee/jaxb-api/archive/4.0.2.tar.gz -> jaxb-api-4.0.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=444ade165e2d16d2a9cb2d6744d1bcd6
diff --git a/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8 b/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
index 5a943488931e..109baf7e562d 100644
--- a/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
+++ b/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/fastinfoset:0 dev-java/istack-commons-runti
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/2.3.8-RI.tar.gz -> jaxb-ri-2.3.8.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=639b40c83b8f51375bd330f6e5d850aa
diff --git a/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1 b/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
index ca4a61e50e8f..7f723301ff00 100644
--- a/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
+++ b/metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zi
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/4.0.0-RI.tar.gz -> jaxb-ri-4.0.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=be0384ebec034698b0cc7fadfac21251
diff --git a/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3 b/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
index 9ef9bb3e82a8..32b143742396 100644
--- a/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
+++ b/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-stax-ex/archive/1.8.3.tar.gz -> jaxb-stax-ex-1.8.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=2fb51f1ba831399b6598c583c33110bf
diff --git a/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1 b/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
index 0b80489663ce..c3b2486568fc 100644
--- a/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-stax-ex/archive/2.1.0.tar.gz -> jaxb-stax-ex-2.1.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8ce9422c25c8484b4dd45329151adf98
diff --git a/metadata/md5-cache/dev-java/jaxen-2.0.0 b/metadata/md5-cache/dev-java/jaxen-2.0.0
index f1239eae35bc..4f59a4ce65ce 100644
--- a/metadata/md5-cache/dev-java/jaxen-2.0.0
+++ b/metadata/md5-cache/dev-java/jaxen-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( dom4j jdom xom )
 RESTRICT=!test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/jaxen-xpath/jaxen/archive/v2.0.0.tar.gz -> jaxen-2.0.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b62beabc47d40afe687cec4965a8c866
diff --git a/metadata/md5-cache/dev-java/jaxrs-api-2.1.6-r1 b/metadata/md5-cache/dev-java/jaxrs-api-2.1.6-r1
index a246f8690653..3781818462f1 100644
--- a/metadata/md5-cache/dev-java/jaxrs-api-2.1.6-r1
+++ b/metadata/md5-cache/dev-java/jaxrs-api-2.1.6-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/rest/archive/2.1.6.tar.gz -> jaxrs-api-2.1.6.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=de04ec1613a87be88e70a09bc2277fbe
diff --git a/metadata/md5-cache/dev-java/jaxws-api-2.3.3 b/metadata/md5-cache/dev-java/jaxws-api-2.3.3
index b90b65ce6343..670ec9471eb5 100644
--- a/metadata/md5-cache/dev-java/jaxws-api-2.3.3
+++ b/metadata/md5-cache/dev-java/jaxws-api-2.3.3
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jax-ws-api/archive/2.3.3.tar.gz -> jaxws-api-2.3.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=520b92f115908b456c7f99746eb67b1f
diff --git a/metadata/md5-cache/dev-java/jbcrypt-0.4 b/metadata/md5-cache/dev-java/jbcrypt-0.4
index 6d78a91d1f67..58d55f4d4d02 100644
--- a/metadata/md5-cache/dev-java/jbcrypt-0.4
+++ b/metadata/md5-cache/dev-java/jbcrypt-0.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.mindrot.org/files/jBCrypt/jBCrypt-0.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=ad7fe37bc5431d12ef0b47aa728dd0bd
diff --git a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3 b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
index 51b08338799c..41bccef88c5b 100644
--- a/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
+++ b/metadata/md5-cache/dev-java/jbig2-imageio-3.0.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.apache.org/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=3ed85986046b86bfe4923b43b92aa74a
diff --git a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r2 b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r2
index 931d57b2ba89..f3f4de70c73f 100644
--- a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r2
+++ b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r2
@@ -11,5 +11,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/bitcollider/jBitcollider%20%28Java%29/0.8/jBitcollider-0.8.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=6740b983791a3bbbe7e0105d0f4e9141
diff --git a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1 b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
index cfb97265d75a..c874953e64f2 100644
--- a/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
+++ b/metadata/md5-cache/dev-java/jboss-jms-api-1.0.1
@@ -10,5 +10,5 @@ LICENSE=CDDL GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://github.com/jboss/jboss-jms-api_spec/archive/jboss-jms-api_1.1_spec-1.0.1.Final.tar.gz -> jboss-jms-api-1.0.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5d60f8328a4acde2dd87178749caf147
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4-r1 b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
index 468433772a2c..45535a6f2e85 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4-r1
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.8:* >=dev-java/java-config-2
 RESTRICT=test
 SLOT=1.2
 SRC_URI=https://www.toedter.com/download/jcalendar-1.4.zip
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=cea34c9f66e014bc4174572339efe672
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4-r2 b/metadata/md5-cache/dev-java/jcalendar-1.4-r2
index 3f67d6e72c7f..0ae3f6bae625 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4-r2
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=https://www.toedter.com/download/jcalendar-1.4.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=4011eaa3d354d61608812812b5d8afe5
diff --git a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1 b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
index d6f27ffcf2a6..b44e75ff6ab2 100644
--- a/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
+++ b/metadata/md5-cache/dev-java/jchart2d-3.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b51d10b2a3029c51021c771ebde13e6e
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.19-r2 b/metadata/md5-cache/dev-java/jcifs-1.3.19-r2
index 2a0627e2dd28..7296e952fa72 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.19-r2
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.19-r2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/jakarta-servlet-api:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://jcifs.samba.org/src/jcifs-1.3.19.tgz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5b01b6a6bbfe690746c94dc81353e15d
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.1-r1 b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
index c6e0773644dd..56da94c46646 100644
--- a/metadata/md5-cache/dev-java/jclasslib-3.1-r1
+++ b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ingokegel/jclasslib/archive/3.1.tar.gz -> jclasslib-3.1.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=e8fc11b9dda2ea2bc79f400b074596a3
diff --git a/metadata/md5-cache/dev-java/jcommander-1.64-r1 b/metadata/md5-cache/dev-java/jcommander-1.64-r1
index e438bf493d3a..2969a8b60ece 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.64-r1
+++ b/metadata/md5-cache/dev-java/jcommander-1.64-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=1.64
 SRC_URI=https://github.com/cbeust/jcommander/archive/1.64.tar.gz -> jcommander-1.64.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=def15d9965e322451da503a7952412e3
diff --git a/metadata/md5-cache/dev-java/jcommander-1.82 b/metadata/md5-cache/dev-java/jcommander-1.82
index 4e2f23afe555..2914ba701bcb 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.82
+++ b/metadata/md5-cache/dev-java/jcommander-1.82
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cbeust/jcommander/archive/1.82.tar.gz -> jcommander-1.82.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=78b36510eb443bcc396ec20166e65ae3
diff --git a/metadata/md5-cache/dev-java/jctools-core-4.0.3 b/metadata/md5-cache/dev-java/jctools-core-4.0.3
index 864989a26ee6..21028dcecfad 100644
--- a/metadata/md5-cache/dev-java/jctools-core-4.0.3
+++ b/metadata/md5-cache/dev-java/jctools-core-4.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/JCTools/JCTools/archive/v4.0.3.tar.gz -> jctools-4.0.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0d3a65c001506d8ca5af20d9f53d4522
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0-r1 b/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0-r1
index 78fc95d29ee7..23a2eb117c67 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0-r1
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-MySQL-FLOSS-exception
 RDEPEND=dev-java/c3p0:0 <dev-java/protobuf-java-3.26.0:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-8.1.0.tar.gz https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/2.47.0/oci-java-sdk-common-2.47.0.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=54e6974a1fca6dec1821adefbf064030
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-8.3.0 b/metadata/md5-cache/dev-java/jdbc-mysql-8.3.0
index 6cdac46c51cd..bff85afd07af 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-8.3.0
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-8.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/c3p0:0 >=dev-java/protobuf-java-3.25:0 <dev-java/protobuf-java-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-8.3.0.tar.gz https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/3.29.0/oci-java-sdk-common-3.29.0.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=da0af3efe9e1e799f0e13200ba7c6ead
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-42.7.3 b/metadata/md5-cache/dev-java/jdbc-postgresql-42.7.3
index ea10765809b3..b9d30401c4f4 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-42.7.3
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-42.7.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-42.7.3.src.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=22a244145bf92e3fba24a37ead327df1
diff --git a/metadata/md5-cache/dev-java/jdepend-2.10-r1 b/metadata/md5-cache/dev-java/jdepend-2.10-r1
index b459de3b373b..09700c7c34cf 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.10-r1
+++ b/metadata/md5-cache/dev-java/jdepend-2.10-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clarkware/jdepend/archive/2.10.tar.gz -> jdepend-2.10.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=f4d3a5121ae03f49f23bd13842455159
diff --git a/metadata/md5-cache/dev-java/jdisasm-1.0.6 b/metadata/md5-cache/dev-java/jdisasm-1.0.6
index bae8e5d90b9a..9e900cf5cab7 100644
--- a/metadata/md5-cache/dev-java/jdisasm-1.0.6
+++ b/metadata/md5-cache/dev-java/jdisasm-1.0.6
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-nullanalysis:0 >=dev-java/java-conf
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aunkrig/jdisasm/archive/5e354d659e4320d154b3f1fbff24c89c1ba48987.tar.gz -> jdisasm-1.0.6.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=3d5f950cf0c07cab5cc6d7ceab608f73
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3-r1 b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
index 525550dde044..c97fc5d9172a 100644
--- a/metadata/md5-cache/dev-java/jdom-1.1.3-r1
+++ b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
@@ -10,5 +10,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=15279c6eb7b16492a9dae6bc7ef27c76
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3-r2 b/metadata/md5-cache/dev-java/jdom-1.1.3-r2
index f492a6e7f1e2..50c57d9d7e19 100644
--- a/metadata/md5-cache/dev-java/jdom-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/jdom-1.1.3-r2
@@ -10,5 +10,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=6aa8eee39fccd287e46cbcb161bd1431
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6.1 b/metadata/md5-cache/dev-java/jdom-2.0.6.1
index 247b724fa3d3..4c409d5555af 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6.1
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/iso-relax:0 dev-java/jaxen:1.2 dev-java/xal
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0f5018591f6875a647b3fdee49be86f6
diff --git a/metadata/md5-cache/dev-java/jeromq-0.5.2 b/metadata/md5-cache/dev-java/jeromq-0.5.2
index 995b8ca22a45..c225eacb61d0 100644
--- a/metadata/md5-cache/dev-java/jeromq-0.5.2
+++ b/metadata/md5-cache/dev-java/jeromq-0.5.2
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jnacl:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/jeromq/archive/v0.5.2.tar.gz -> jeromq-0.5.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=cbdf1b7c47907d1fd626e6f811fc62be
diff --git a/metadata/md5-cache/dev-java/jffi-1.3.10 b/metadata/md5-cache/dev-java/jffi-1.3.10
index 0ef24de0490f..578c07fcdbef 100644
--- a/metadata/md5-cache/dev-java/jffi-1.3.10
+++ b/metadata/md5-cache/dev-java/jffi-1.3.10
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4.2-r2:= >=dev-java/java-config-
 RESTRICT=!test? ( test )
 SLOT=1.3
 SRC_URI=https://github.com/jnr/jffi/archive/jffi-1.3.10.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=7ac4d88379b0b6230b7e2e8100050edf
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1-r2 b/metadata/md5-cache/dev-java/jflex-1.6.1-r2
index ad21503ab0c0..a1c4a308f3a3 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1-r2
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* vim-syntax? ( || ( app-editors/vim app-editors/gvim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=95be12dd682de6f5a3bae54c3c477453
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1-r3 b/metadata/md5-cache/dev-java/jflex-1.6.1-r3
index 08fdbfd41dfb..3e5296d3be6a 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1-r3
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( ant-task )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=de05d7d88d34ddd159eeaddb43cfdddd
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1 b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
index d896f5af4eef..78dabab25c7d 100644
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=1.8
 SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d52a14c07ec78008e65c2d3c455d6c4a
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
index 29ecbc5c236f..115e197ec912 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0-r1
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jgoodies-common:1.8 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.6
 SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=10aea06f77390c986abddf2e4041a2ee
diff --git a/metadata/md5-cache/dev-java/jide-oss-3.7.12 b/metadata/md5-cache/dev-java/jide-oss-3.7.12
index 106d43a46ce9..bd427813bacf 100644
--- a/metadata/md5-cache/dev-java/jide-oss-3.7.12
+++ b/metadata/md5-cache/dev-java/jide-oss-3.7.12
@@ -11,5 +11,5 @@ 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/jidesoft/jide-oss/archive/19083238ce00ecbd7370f856cb64ea69dae669a5.tar.gz -> jide-oss-3.7.12.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c56dd1b825e9b9b216e38d167a33cb19
diff --git a/metadata/md5-cache/dev-java/jimfs-1.3.0 b/metadata/md5-cache/dev-java/jimfs-1.3.0
index 0faa04ab5f0c..6a03bcfaf4c8 100644
--- a/metadata/md5-cache/dev-java/jimfs-1.3.0
+++ b/metadata/md5-cache/dev-java/jimfs-1.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/auto-service-annotations:0 dev-java/error-prone-annotations:0 d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/jimfs/archive/v1.3.0.tar.gz -> jimfs-1.3.0.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e46e9ee225748cf77f20951d1e21eba5
diff --git a/metadata/md5-cache/dev-java/jline-2.14.6 b/metadata/md5-cache/dev-java/jline-2.14.6
index cd96aabfc3bc..b501418cebca 100644
--- a/metadata/md5-cache/dev-java/jline-2.14.6
+++ b/metadata/md5-cache/dev-java/jline-2.14.6
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jansi:0 dev-java/jansi-native:0 >=virtual/jre-1.8:* >=dev-java/
 RESTRICT=!test? ( test ) test
 SLOT=2
 SRC_URI=https://github.com/jline/jline2/archive/jline-2.14.6.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5e27aa77287fd305780286a6ca2c1ae1
diff --git a/metadata/md5-cache/dev-java/jmc-8.3.0 b/metadata/md5-cache/dev-java/jmc-8.3.0
index 58af67f1a816..09c79e6387bc 100644
--- a/metadata/md5-cache/dev-java/jmc-8.3.0
+++ b/metadata/md5-cache/dev-java/jmc-8.3.0
@@ -10,5 +10,5 @@ LICENSE=UPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/openjdk/jmc/archive/8.3.0-ga.tar.gz -> jmc-8.3.0.ga.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=7aa9f75bc4f80e6ce158ea9f38647d91
diff --git a/metadata/md5-cache/dev-java/jmh-core-1.37 b/metadata/md5-cache/dev-java/jmh-core-1.37
index ebb7b06a4fd6..84b801faed3a 100644
--- a/metadata/md5-cache/dev-java/jmh-core-1.37
+++ b/metadata/md5-cache/dev-java/jmh-core-1.37
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-math:3 dev-java/jopt-simple:0 >=virtual/jre-1.8:* >=dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openjdk/jmh/archive/1.37.tar.gz -> jmh-1.37.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=77a1403eeb64983b5e01175fb20f8389
diff --git a/metadata/md5-cache/dev-java/jmh-generator-annprocess-1.37 b/metadata/md5-cache/dev-java/jmh-generator-annprocess-1.37
index effac233274e..7c3c5c2b379b 100644
--- a/metadata/md5-cache/dev-java/jmh-generator-annprocess-1.37
+++ b/metadata/md5-cache/dev-java/jmh-generator-annprocess-1.37
@@ -10,5 +10,5 @@ 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=https://github.com/openjdk/jmh/archive/1.37.tar.gz -> jmh-1.37.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=f00623beda0d872da235517f6f05dfeb
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0-r2 b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
index d0bbc68a356e..1cb17016ad4e 100644
--- a/metadata/md5-cache/dev-java/jmock-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0-r2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://jmock.org/downloads/jmock-1.2.0-jars.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=aff79e108dae2fe4b9e30b2acf617385
diff --git a/metadata/md5-cache/dev-java/jmock-2.12.0 b/metadata/md5-cache/dev-java/jmock-2.12.0
index 81ea1cca0485..166905cd6745 100644
--- a/metadata/md5-cache/dev-java/jmock-2.12.0
+++ b/metadata/md5-cache/dev-java/jmock-2.12.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jmock-developers/jmock-library/archive/2.12.0.tar.gz -> jmock-2.12.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1521abaefb5ec042b7d304daf626e49e
diff --git a/metadata/md5-cache/dev-java/jna-5.13.0-r1 b/metadata/md5-cache/dev-java/jna-5.13.0-r1
index 9ff9faee2d79..6f68865f7a91 100644
--- a/metadata/md5-cache/dev-java/jna-5.13.0-r1
+++ b/metadata/md5-cache/dev-java/jna-5.13.0-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4:= >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/java-native-access/jna/archive/5.13.0.tar.gz -> jna-5.13.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=baa09454187fd31064ef8fd3bdde94fb
diff --git a/metadata/md5-cache/dev-java/jna-5.14.0-r1 b/metadata/md5-cache/dev-java/jna-5.14.0-r1
index 41ffd5e494d5..ad7baf151387 100644
--- a/metadata/md5-cache/dev-java/jna-5.14.0-r1
+++ b/metadata/md5-cache/dev-java/jna-5.14.0-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4:= >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/java-native-access/jna/archive/5.14.0.tar.gz -> jna-5.14.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=653e1fc132c71470e52a93f6efe5f868
diff --git a/metadata/md5-cache/dev-java/jnacl-1.0 b/metadata/md5-cache/dev-java/jnacl-1.0
index 59a74a54cc70..7370511d5b29 100644
--- a/metadata/md5-cache/dev-java/jnacl-1.0
+++ b/metadata/md5-cache/dev-java/jnacl-1.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neilalexander/jnacl/archive/v1.0.tar.gz -> jnacl-1.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5e705f6ce84403d0bef9d073976f8796
diff --git a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0 b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
index 0399ef88bf43..4e65ade1fd2e 100644
--- a/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
+++ b/metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-a64asm/archive/refs/tags/jnr-a64asm-1.0.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5989a8289a9d4ccdc925dbb833bf93fa
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.10.4 b/metadata/md5-cache/dev-java/jnr-constants-0.10.4
index ec2a0dd987ec..78a2710c2068 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.10.4
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.10.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-constants/archive/jnr-constants-0.10.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=faa6be1893bf8e4bdf61758b5c0e11fe
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.2.12 b/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
index b6f2e1e5f55d..fcafc71c218d 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.2.12
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/asm:9 >=dev-java/jffi-1.3.8:1.3 dev-java/jnr-a64asm:2 dev-java/jnr-x86asm:1.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/jnr-ffi-2.2.12.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1e272bab07b149a97a96c8484e5ce448
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.2.0 b/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
index 1603002b3df7..3163744565cd 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 s
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-netdb/archive/jnr-netdb-1.2.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=df5501fd7e0f29e0b38f9702b8b75f67
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.1.16 b/metadata/md5-cache/dev-java/jnr-posix-3.1.16
index a9c495d5a0dc..06b5311355f6 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.1.16
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.1.16
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/jnr-ffi-2.2.12:2 dev-java/jnr-constants:0 >=virtual/jre-1.8:*
 RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=https://github.com/jnr/jnr-posix/archive/jnr-posix-3.1.16.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e90a18e75b3157208931975c47c8d182
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2 b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
index 45b675400749..b509026f8a2b 100644
--- a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
+++ b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-x86asm/archive/refs/tags/1.0.2.tar.gz -> jnr-x86asm-1.0.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=39e0820ac165bd3223bf2966ddddad04
diff --git a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2 b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
index 9a686336a9c7..60f6154a014f 100644
--- a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
+++ b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-convert/archive/v2.2.2.tar.gz -> joda-convert-2.2.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=ad7d4d09859c742a3e23f31d33dbd0d7
diff --git a/metadata/md5-cache/dev-java/joda-time-2.11.2 b/metadata/md5-cache/dev-java/joda-time-2.11.2
index f5a24e316841..6c590d82a9fe 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.11.2
+++ b/metadata/md5-cache/dev-java/joda-time-2.11.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/joda-convert:0 >=dev-java/java-config-2.2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/archive/v2.11.2.tar.gz -> joda-time-2.11.2.tar.gz
-_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=bb405335f70a98ffc54c50099f508b2b
diff --git a/metadata/md5-cache/dev-java/jol-core-0.16-r1 b/metadata/md5-cache/dev-java/jol-core-0.16-r1
index f8273fb4a131..7ad92c35c20e 100644
--- a/metadata/md5-cache/dev-java/jol-core-0.16-r1
+++ b/metadata/md5-cache/dev-java/jol-core-0.16-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openjdk/jol/archive/0.16.tar.gz -> jol-0.16.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=44c3b43f7d481c5f616d3b26b4ea5dba
diff --git a/metadata/md5-cache/dev-java/jopt-simple-5.0.4 b/metadata/md5-cache/dev-java/jopt-simple-5.0.4
index b17c46597cda..c567996d00ef 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-5.0.4
+++ b/metadata/md5-cache/dev-java/jopt-simple-5.0.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-5.0.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=bce8e250c8a37943c395146ee848e74c
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
index 369676a33a49..eb22ce2eed8f 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c518f3b0782e0d8a81457374013abe21
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.55 b/metadata/md5-cache/dev-java/jsch-0.1.55
index 608f479bd742..1e2ffa70d2c9 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.55
+++ b/metadata/md5-cache/dev-java/jsch-0.1.55
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=dev-java/jzlib-1.1.3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/jsch/jsch-0.1.55.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=072a49fa90c61d832e42ee0b4c4b5d44
diff --git a/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9 b/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
index de2183cb5835..068fb2b35a95 100644
--- a/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
+++ b/metadata/md5-cache/dev-java/jsch-agent-proxy-0.0.9
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jna:4 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ymnk/jsch-agent-proxy/archive/12c3d64fc2b0a4fd37659369edfdee26e48954e2.tar.gz -> jsch-agent-proxy-0.0.9.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b0513dc0ddcd13800094eca3f9561436
diff --git a/metadata/md5-cache/dev-java/json-20231013-r1 b/metadata/md5-cache/dev-java/json-20231013-r1
index 3fdcb03ea58b..cf54e9e3f070 100644
--- a/metadata/md5-cache/dev-java/json-20231013-r1
+++ b/metadata/md5-cache/dev-java/json-20231013-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://codeload.github.com/stleary/JSON-java/tar.gz/20231013 -> json-20231013.tar.gz test? ( https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/2.1.0/json-path-2.1.0.jar )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=74dd3414b7c11fde418951dc13f939ba
diff --git a/metadata/md5-cache/dev-java/json-20240205-r1 b/metadata/md5-cache/dev-java/json-20240205-r1
index c00bb65f029d..b3c9968ff09b 100644
--- a/metadata/md5-cache/dev-java/json-20240205-r1
+++ b/metadata/md5-cache/dev-java/json-20240205-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://codeload.github.com/stleary/JSON-java/tar.gz/20240205 -> json-20240205.tar.gz test? ( https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/2.9.0/json-path-2.9.0.jar )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=6c12c657733cd07a6333703667b1a081
diff --git a/metadata/md5-cache/dev-java/json-simple-2.3.1 b/metadata/md5-cache/dev-java/json-simple-2.3.1
index 815fd48bb91c..3cc9aee13288 100644
--- a/metadata/md5-cache/dev-java/json-simple-2.3.1
+++ b/metadata/md5-cache/dev-java/json-simple-2.3.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2.3
 SRC_URI=https://github.com/cliftonlabs/json-simple/archive/json-simple-2.3.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=2a59460891eca6c2c492b11da2902411
diff --git a/metadata/md5-cache/dev-java/json-smart-1.3.3 b/metadata/md5-cache/dev-java/json-smart-1.3.3
index 13b447cf7766..637c5628d86d 100644
--- a/metadata/md5-cache/dev-java/json-smart-1.3.3
+++ b/metadata/md5-cache/dev-java/json-smart-1.3.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/netplex/json-smart-v1/archive/1.3.3.tar.gz -> json-smart-1.3.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=44e72e9e758823266b0cdc262329caae
diff --git a/metadata/md5-cache/dev-java/json-smart-2.5.0 b/metadata/md5-cache/dev-java/json-smart-2.5.0
index b8582c04381b..f7798fe459a4 100644
--- a/metadata/md5-cache/dev-java/json-smart-2.5.0
+++ b/metadata/md5-cache/dev-java/json-smart-2.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/netplex/json-smart-v2/archive/2.5.0.tar.gz -> json-smart-2.5.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1723004e8fe10762932bdfa70fbe75c6
diff --git a/metadata/md5-cache/dev-java/jsonrpc2-base-1.38.2 b/metadata/md5-cache/dev-java/jsonrpc2-base-1.38.2
index 0ea227dedafa..0de2c0cd0737 100644
--- a/metadata/md5-cache/dev-java/jsonrpc2-base-1.38.2
+++ b/metadata/md5-cache/dev-java/jsonrpc2-base-1.38.2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/json-smart:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://bitbucket.org/thetransactioncompany/json-rpc-2.0-base/get/1.38.2.tar.bz2 -> jsonrpc2-base-1.38.2.tar.bz2
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d0d434336bd68143e2ee4b39995fe671
diff --git a/metadata/md5-cache/dev-java/jsonrpc2-server-1.11.1 b/metadata/md5-cache/dev-java/jsonrpc2-server-1.11.1
index 9a71efdc0d9a..06f97b45ee02 100644
--- a/metadata/md5-cache/dev-java/jsonrpc2-server-1.11.1
+++ b/metadata/md5-cache/dev-java/jsonrpc2-server-1.11.1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jsonrpc2-base:1 dev-java/json-smart:1 >=virtual/jre-1.8:* >=dev
 RESTRICT=test !test? ( test )
 SLOT=1
 SRC_URI=https://bitbucket.org/thetransactioncompany/json-rpc-2.0-server/get/1.11.1.tar.bz2 -> jsonrpc2-server-1.11.1.tar.bz2
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=47d34d7a7f7e711d5ed5f26dd50e6551
diff --git a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1 b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
index edaaea052f4f..9592caa19990 100644
--- a/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/jsr305-3.0.2-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=f010bcb7603d30304cccc69595761b8d
diff --git a/metadata/md5-cache/dev-java/jstl-1.2.7 b/metadata/md5-cache/dev-java/jstl-1.2.7
index fd19d1f7bc85..e2be22414862 100644
--- a/metadata/md5-cache/dev-java/jstl-1.2.7
+++ b/metadata/md5-cache/dev-java/jstl-1.2.7
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 dev-java/jstl-api:0 dev-java/xalan:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/tags/archive/1.2.7-RELEASE.tar.gz -> jstl-1.2.7.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=55b57419323bb2e550dfd040871f3dc9
diff --git a/metadata/md5-cache/dev-java/jstl-api-1.2.7 b/metadata/md5-cache/dev-java/jstl-api-1.2.7
index 1dfe4f1affc4..5c0d3fa39dae 100644
--- a/metadata/md5-cache/dev-java/jstl-api-1.2.7
+++ b/metadata/md5-cache/dev-java/jstl-api-1.2.7
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=dev-java/javax-el-api:2.2 dev-java/javax-jsp-api:2.2 dev-java/javax-servlet-api:2.5 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/tags/archive/1.2.7-RELEASE.tar.gz -> jstl-1.2.7.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=09c4213112f7456560ae54fee70e5805
diff --git a/metadata/md5-cache/dev-java/jtds-1.3.1-r1 b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
index 23f5c5c4e854..075232af4c22 100644
--- a/metadata/md5-cache/dev-java/jtds-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/jtds-1.3.1-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jcifs:1.1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 s
 RESTRICT=test
 SLOT=1.3
 SRC_URI=https://downloads.sourceforge.net/project/jtds/jtds/1.3.1/jtds-1.3.1-src.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=320e5cdb78d00480a01b1bfe1d6781af
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0-r2 b/metadata/md5-cache/dev-java/jtidy-1.0-r2
index 83f95f402d39..d35dc9732309 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0-r2
+++ b/metadata/md5-cache/dev-java/jtidy-1.0-r2
@@ -11,5 +11,5 @@ LICENSE=HTML-Tidy W3C
 RDEPEND=>=dev-java/ant-1.10.14-r3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/jtidy/JTidy/r938/jtidy-r938-sources.zip -> jtidy-1.0.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=181131b30b305581762c4390eb4b27f6
diff --git a/metadata/md5-cache/dev-java/jtwig-core-5.87.0 b/metadata/md5-cache/dev-java/jtwig-core-5.87.0
index 5b67adcb4985..a2d24d993e52 100644
--- a/metadata/md5-cache/dev-java/jtwig-core-5.87.0
+++ b/metadata/md5-cache/dev-java/jtwig-core-5.87.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jtwig/jtwig-core/archive/5.87.0.RELEASE.tar.gz -> jtwig-core-5.87.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d8517442d34e132ba1b644c9e8391536
diff --git a/metadata/md5-cache/dev-java/jtwig-reflection-5.87.0 b/metadata/md5-cache/dev-java/jtwig-reflection-5.87.0
index e0a45f23e292..591c655b1fcc 100644
--- a/metadata/md5-cache/dev-java/jtwig-reflection-5.87.0
+++ b/metadata/md5-cache/dev-java/jtwig-reflection-5.87.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jtwig/jtwig-reflection/archive/5.87.0.RELEASE.tar.gz -> jtwig-reflection-5.87.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=195a66f3d0a5d0303b86613d9f22e58b
diff --git a/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3 b/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3
index 757680f9d684..9c451ff915a4 100644
--- a/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3
+++ b/metadata/md5-cache/dev-java/jul-to-slf4j-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=599b9d6b63bfc64b83d60d99fae2808f
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r2 b/metadata/md5-cache/dev-java/junit-3.8.2-r2
index 5af8c0580004..3c77ce1f9481 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r2
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/junit/junit/3.8.2/junit3.8.2.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=98fa4b8f88d19111e76183503659efd8
diff --git a/metadata/md5-cache/dev-java/junit-4.13.2_p20240222 b/metadata/md5-cache/dev-java/junit-4.13.2_p20240222
index 9b95d6468863..4cb939177446 100644
--- a/metadata/md5-cache/dev-java/junit-4.13.2_p20240222
+++ b/metadata/md5-cache/dev-java/junit-4.13.2_p20240222
@@ -11,5 +11,5 @@ RDEPEND=dev-java/hamcrest-core:1.3 >=virtual/jre-1.8:* >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/junit-team/junit4/archive/28fa2cae48b365c949935b28967ffb3f388e77ef.tar.gz -> junit-4.13.2_p20240222.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=ef94b48b33e75d8b2693e479f069a049
diff --git a/metadata/md5-cache/dev-java/junit-5.10.2 b/metadata/md5-cache/dev-java/junit-5.10.2
index 79cc21c74f66..d6f69ff608f2 100644
--- a/metadata/md5-cache/dev-java/junit-5.10.2
+++ b/metadata/md5-cache/dev-java/junit-5.10.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/apiguardian-api:0 dev-java/opentest4j:0 dev
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://github.com/junit-team/junit5/archive/r5.10.2.tar.gz -> junit-5.10.2.tar.gz https://sources.debian.org/data/main/j/junit5/5.10.1-1/debian/patches/18-java-compatibility.patch -> junit5-java18-compatibility.patch
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=af958173a26861cd24f3a0b12c1d89e4
diff --git a/metadata/md5-cache/dev-java/junit-clptr-1.2.2 b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
index 39976ce67d57..856ad64ba584 100644
--- a/metadata/md5-cache/dev-java/junit-clptr-1.2.2
+++ b/metadata/md5-cache/dev-java/junit-clptr-1.2.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/bitstrings/junit-clptr/archive/refs/tags/1.2.2.tar.gz -> junit-clptr-1.2.2-sources.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=cf422be6a5523815b02e67c5e3ea8ca8
diff --git a/metadata/md5-cache/dev-java/junit-dataprovider-2.9 b/metadata/md5-cache/dev-java/junit-dataprovider-2.9
index b25f30682bb4..fc8ec5eb21c1 100644
--- a/metadata/md5-cache/dev-java/junit-dataprovider-2.9
+++ b/metadata/md5-cache/dev-java/junit-dataprovider-2.9
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/findbugs-annotations:0 >=dev-java/java-conf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TNG/junit-dataprovider/archive/v2.9.tar.gz -> junit-dataprovider-2.9.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c09c87b5499b157c615b736a11a00218
diff --git a/metadata/md5-cache/dev-java/junitparams-1.1.1-r1 b/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
index 2421a05252c6..3b1f92a10910 100644
--- a/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
+++ b/metadata/md5-cache/dev-java/junitparams-1.1.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-1.1.1.tar.gz -> junitparams-1.1.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=65bbce8fa50be869136354dd1522ad59
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2 b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
index 2194e39256be..520db3668d61 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.3-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ymnk/jzlib/archive/1.1.3.tar.gz -> jzlib-1.1.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=f6dca7b915f3f61939b0acb09017a2eb
diff --git a/metadata/md5-cache/dev-java/kafka-clients-1.1.1 b/metadata/md5-cache/dev-java/kafka-clients-1.1.1
index 01888c548387..997f0735e414 100644
--- a/metadata/md5-cache/dev-java/kafka-clients-1.1.1
+++ b/metadata/md5-cache/dev-java/kafka-clients-1.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/lz4-java-1.4.1:0 >=dev-java/slf4j-api-1.7.25:0 >=dev-java/snappy-1.1.7.1:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/kafka/1.1.1/kafka-1.1.1-src.tgz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e349412855f51dda74f62c8f9d543bb9
diff --git a/metadata/md5-cache/dev-java/leiningen-bin-2.11.2 b/metadata/md5-cache/dev-java/leiningen-bin-2.11.2
index 8ea973e5b20b..2cfb0a57ca32 100644
--- a/metadata/md5-cache/dev-java/leiningen-bin-2.11.2
+++ b/metadata/md5-cache/dev-java/leiningen-bin-2.11.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/technomancy/leiningen/releases/download/2.11.2/leiningen-2.11.2-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.11.2/bin/lein-pkg -> leiningen-2.11.2.sh
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=59e8a91e8728f065e6d02fd3dae2c85d
diff --git a/metadata/md5-cache/dev-java/libg-7.0.0 b/metadata/md5-cache/dev-java/libg-7.0.0
index 64e8e67b3ae7..2d9030512a70 100644
--- a/metadata/md5-cache/dev-java/libg-7.0.0
+++ b/metadata/md5-cache/dev-java/libg-7.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/slf4j-api:0 >=virtual/jre-17:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/7.0.0.tar.gz -> aQute.bnd-7.0.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=f21188e6055911ab8356847d2a4b4e82
diff --git a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4 b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
index 3f32ea763e1b..dadac44fc282 100644
--- a/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
+++ b/metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/LMAX-Exchange/disruptor/archive/3.4.4.tar.gz -> lmax-disruptor-3.4.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b146537d280a8b896c6cc08bc4f64ed5
diff --git a/metadata/md5-cache/dev-java/log4j-12-api-2.19.0 b/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
index dd4528204ec1..a8e840c3fe5b 100644
--- a/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/log4j-api-2.19.0:2 ~dev-java/log4j-core-2.19.0:2 >=virtual/jre
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1f9446a990e19064b14a6d76721a9620
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.19.0 b/metadata/md5-cache/dev-java/log4j-api-2.19.0
index 53bfbfa322cc..7f8c7ffb22fa 100644
--- a/metadata/md5-cache/dev-java/log4j-api-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-api-2.19.0
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz verify-sig? ( https://www.apache.org/dist/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=e41fc7ff0d9775d12bfdaae3085a0e11
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.19.0 b/metadata/md5-cache/dev-java/log4j-core-2.19.0
index 10d3b10aa11e..9ab4620e1eb9 100644
--- a/metadata/md5-cache/dev-java/log4j-core-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-core-2.19.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 d
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=9d8ca8868613ba66dd901fcdb5c11444
diff --git a/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3 b/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3
index 0e45e7270c55..a1c592bbdb57 100644
--- a/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3
+++ b/metadata/md5-cache/dev-java/log4j-over-slf4j-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b901993a7a54d46a3a5ee0cb962d78df
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r4 b/metadata/md5-cache/dev-java/lucene-2.4.1-r4
index 81eb2ed3a872..d376b1d16069 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r4
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r4
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz verify-sig? ( https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz.asc )
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=0e5ebffa70cfedc764ba08c6e8a6f13b
diff --git a/metadata/md5-cache/dev-java/lz4-java-1.8.0-r4 b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r4
index 62bf777bff00..113562831875 100644
--- a/metadata/md5-cache/dev-java/lz4-java-1.8.0-r4
+++ b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r4
@@ -11,5 +11,5 @@ RDEPEND=app-arch/lz4:= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sourc
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lz4/lz4-java/archive/1.8.0.tar.gz -> lz4-java-1.8.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=ddff91c1e288b727984fe87a90ea8467
diff --git a/metadata/md5-cache/dev-java/lzma-22.01 b/metadata/md5-cache/dev-java/lzma-22.01
index 1b868840c53a..f5a790e7c83a 100644
--- a/metadata/md5-cache/dev-java/lzma-22.01
+++ b/metadata/md5-cache/dev-java/lzma-22.01
@@ -11,5 +11,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://7-zip.org/a/lzma2201.7z -> lzma-22.01.7z
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
 _md5_=c1691f5689ab4c5928981f3e5e407225
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95-r3 b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
index c356e6c83766..4b7e5da4fcd5 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.95-r3
+++ b/metadata/md5-cache/dev-java/lzmajio-0.95-r3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/lzma:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/league/lzmajio-0.95/archive/0.95.tar.gz -> lzmajio-0.95.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a7faba087b41216fdacdba3c45dc711c
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.8.8-r1 b/metadata/md5-cache/dev-java/maven-bin-3.8.8-r1
index 129823c27348..9046c7f3595a 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.8.8-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.8.8-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=3.8
 SRC_URI=mirror://apache/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=610db5f480ac3cfbc6d9b24488004669
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.9.6 b/metadata/md5-cache/dev-java/maven-bin-3.9.6
index 8c5b2b938231..905e7bf1f4c3 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.9.6
+++ b/metadata/md5-cache/dev-java/maven-bin-3.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=3.9
 SRC_URI=mirror://apache/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=fb2ed1311cb8edc37a7c898a0d7c723e
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.9.7 b/metadata/md5-cache/dev-java/maven-bin-3.9.7
index fa0f27f65fa6..901f79e44c2f 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.9.7
+++ b/metadata/md5-cache/dev-java/maven-bin-3.9.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=3.9
 SRC_URI=mirror://apache/maven/maven-3/3.9.7/binaries/apache-maven-3.9.7-bin.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5d519708d0fe4023f857649e1209d461
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.9.8 b/metadata/md5-cache/dev-java/maven-bin-3.9.8
index 761d742b3924..996bec7b737e 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.9.8
+++ b/metadata/md5-cache/dev-java/maven-bin-3.9.8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=3.9
 SRC_URI=mirror://apache/maven/maven-3/3.9.8/binaries/apache-maven-3.9.8-bin.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5d519708d0fe4023f857649e1209d461
diff --git a/metadata/md5-cache/dev-java/mchange-commons-0.2.20 b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
index f0a0d6bd77e2..982d5bed31ec 100644
--- a/metadata/md5-cache/dev-java/mchange-commons-0.2.20
+++ b/metadata/md5-cache/dev-java/mchange-commons-0.2.20
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0 LGPL-2.1
 RDEPEND=dev-java/log4j-api:2 dev-java/log4j-12-api:2 dev-java/log4j-core:2 dev-java/slf4j-api:0 dev-java/typesafe-config:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/swaldman/mchange-commons-java/archive/refs/tags/v0.2.20.tar.gz -> mchange-commons-0.2.20.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8ebed4da60f3daa69ceb2c883b13c2b6
diff --git a/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0 b/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
index e762b8a08a6a..d134d642adc2 100644
--- a/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
+++ b/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-annotations-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/marschall/memoryfilesystem/archive/2.3.0.tar.gz -> memoryfilesystem-2.3.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0a08875c58dcd668ede850fa6a6be13d
diff --git a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2 b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
index 2119f47f192c..f0588b7798f7 100644
--- a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
+++ b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/mersennetwister-0_pre23765.tar.bz2
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=86bf981925d944a72a08255619983dd7
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.9 b/metadata/md5-cache/dev-java/metainf-services-1.9
index 29cf78465147..47ba73a2e312 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.9
+++ b/metadata/md5-cache/dev-java/metainf-services-1.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.9.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a863b6624348b4e4434b9b84a7a7c4cf
diff --git a/metadata/md5-cache/dev-java/miglayout-5.3 b/metadata/md5-cache/dev-java/miglayout-5.3
index 0a4fd0a69002..c8bdb11cfafe 100644
--- a/metadata/md5-cache/dev-java/miglayout-5.3
+++ b/metadata/md5-cache/dev-java/miglayout-5.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://github.com/mikaelgrev/miglayout/archive/V5.3.tar.gz -> miglayout-5.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e1f79f15f08d8c704b46734c7c47df83
diff --git a/metadata/md5-cache/dev-java/minidns-core-1.0.4 b/metadata/md5-cache/dev-java/minidns-core-1.0.4
index a8d9a582480c..2ca5e146e583 100644
--- a/metadata/md5-cache/dev-java/minidns-core-1.0.4
+++ b/metadata/md5-cache/dev-java/minidns-core-1.0.4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/MiniDNS/minidns/archive/1.0.4.tar.gz -> minidns-core-1.0.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=70385cf9d0fd33ccb088197c985d7770
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r4 b/metadata/md5-cache/dev-java/mockito-1.9.5-r4
index 897cce008915..455d61c02c78 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r4
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r4
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/ant-1.10.14-r3:0 dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=65a07487cd7d5c4122a54030f9baf5b9
diff --git a/metadata/md5-cache/dev-java/mockito-2.28.2 b/metadata/md5-cache/dev-java/mockito-2.28.2
index b41bf6420049..3b21a62f56f8 100644
--- a/metadata/md5-cache/dev-java/mockito-2.28.2
+++ b/metadata/md5-cache/dev-java/mockito-2.28.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 dev-java/byte-buddy:0 dev-java/objene
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/mockito/mockito/archive/v2.28.2.tar.gz -> mockito-2.28.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=925ca91c709516185c240a8ed7050630
diff --git a/metadata/md5-cache/dev-java/mockito-4.11.0 b/metadata/md5-cache/dev-java/mockito-4.11.0
index fd72f5854152..61a36a02e302 100644
--- a/metadata/md5-cache/dev-java/mockito-4.11.0
+++ b/metadata/md5-cache/dev-java/mockito-4.11.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 dev-java/byte-buddy:0 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/mockito/mockito/archive/v4.11.0.tar.gz -> mockito-4.11.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=229e6f420f458da610051287c9fce3c6
diff --git a/metadata/md5-cache/dev-java/msv-2022.7 b/metadata/md5-cache/dev-java/msv-2022.7
index dd8a783f799f..3790821fc82d 100644
--- a/metadata/md5-cache/dev-java/msv-2022.7
+++ b/metadata/md5-cache/dev-java/msv-2022.7
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=52e706ca10a7d66f6ba1ca038a131112
diff --git a/metadata/md5-cache/dev-java/mvel-2.5.0 b/metadata/md5-cache/dev-java/mvel-2.5.0
index bf869c591f6b..36c4f7f47009 100644
--- a/metadata/md5-cache/dev-java/mvel-2.5.0
+++ b/metadata/md5-cache/dev-java/mvel-2.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2.5
 SRC_URI=https://github.com/mvel/mvel/archive/mvel2-2.5.0.Final.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1c5fc9b4356b3e4ee0d4ce885c1368d3
diff --git a/metadata/md5-cache/dev-java/objenesis-3.3 b/metadata/md5-cache/dev-java/objenesis-3.3
index 7ef707f72f1a..8a57df00a9f5 100644
--- a/metadata/md5-cache/dev-java/objenesis-3.3
+++ b/metadata/md5-cache/dev-java/objenesis-3.3
@@ -10,5 +10,5 @@ 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=https://github.com/easymock/objenesis/archive/3.3.tar.gz -> objenesis-3.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=51c4f7dbd5eb1ef479c46a2865917463
diff --git a/metadata/md5-cache/dev-java/open-test-reporting-events-0.1.0_pre1 b/metadata/md5-cache/dev-java/open-test-reporting-events-0.1.0_pre1
index 8332bc57efdf..1809db2aca9e 100644
--- a/metadata/md5-cache/dev-java/open-test-reporting-events-0.1.0_pre1
+++ b/metadata/md5-cache/dev-java/open-test-reporting-events-0.1.0_pre1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/open-test-reporting-schema-0.1.0_pre1:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ota4j-team/open-test-reporting/archive/r0.1.0-M1.tar.gz -> open-test-reporting-0.1.0-M1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0d157c27e7fbed9171699df78dc22aa5
diff --git a/metadata/md5-cache/dev-java/open-test-reporting-schema-0.1.0_pre1 b/metadata/md5-cache/dev-java/open-test-reporting-schema-0.1.0_pre1
index 2377c98c37c5..e78c4b3a90a2 100644
--- a/metadata/md5-cache/dev-java/open-test-reporting-schema-0.1.0_pre1
+++ b/metadata/md5-cache/dev-java/open-test-reporting-schema-0.1.0_pre1
@@ -10,5 +10,5 @@ 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=https://github.com/ota4j-team/open-test-reporting/archive/r0.1.0-M1.tar.gz -> open-test-reporting-0.1.0-M1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8898da88a64e5a354452886bfd87326e
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.23_p9 b/metadata/md5-cache/dev-java/openjdk-11.0.23_p9
index 0aab47ea777e..6655cbd5b32b 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.23_p9
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.23_p9
@@ -13,5 +13,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=11
 SRC_URI=https://github.com/openjdk/jdk11u/archive/jdk-11.0.23-ga.tar.gz -> openjdk-11.0.23_p9.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.14_p9-riscv.tar.xz ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	java-vm-2	a4e242a071bea6071a08ad3af362c4a4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	java-vm-2	a4e242a071bea6071a08ad3af362c4a4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2b6b7a0f5df227b02668e917c75410d2
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.11_p9 b/metadata/md5-cache/dev-java/openjdk-17.0.11_p9
index fc8f7d37a9a6..935220785dbd 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.11_p9
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.11_p9
@@ -13,5 +13,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=17
 SRC_URI=https://github.com/openjdk/jdk17u/archive/jdk-17.0.11-ga.tar.gz -> openjdk-17.0.11_p9.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.3_p7-riscv.tar.xz ) )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	java-vm-2	a4e242a071bea6071a08ad3af362c4a4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	java-vm-2	a4e242a071bea6071a08ad3af362c4a4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2b0abccdf9e17d7102b87749638033dc
diff --git a/metadata/md5-cache/dev-java/openjdk-21.0.3_p9 b/metadata/md5-cache/dev-java/openjdk-21.0.3_p9
index c842e5e13bab..a01c3802f8d9 100644
--- a/metadata/md5-cache/dev-java/openjdk-21.0.3_p9
+++ b/metadata/md5-cache/dev-java/openjdk-21.0.3_p9
@@ -13,5 +13,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap ) !system-bootstrap? ( || ( ppc64 x86 ) )
 SLOT=21
 SRC_URI=https://github.com/openjdk/jdk21u/archive/jdk-21.0.3-ga.tar.gz -> openjdk-21.0.3_p9.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-21.0.0_p35-x86.tar.xz ) )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	java-vm-2	a4e242a071bea6071a08ad3af362c4a4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	java-vm-2	a4e242a071bea6071a08ad3af362c4a4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4a973e720c39fd9656e8acfb0fe48a0f
diff --git a/metadata/md5-cache/dev-java/openjdk-8.412_p08 b/metadata/md5-cache/dev-java/openjdk-8.412_p08
index a0003f8a53f1..b7bc68a68706 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.412_p08
+++ b/metadata/md5-cache/dev-java/openjdk-8.412_p08
@@ -13,5 +13,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
 SLOT=8
 SRC_URI=https://github.com/openjdk/jdk8u/archive/jdk8u412-ga.tar.gz -> openjdk-8.412_p08.tar.gz !system-bootstrap? ( x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-8.402_p06-x86.tar.xz ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-8.402_p06-ppc64.tar.xz ) ) )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	java-vm-2	a4e242a071bea6071a08ad3af362c4a4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	java-vm-2	a4e242a071bea6071a08ad3af362c4a4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b9f0cbd49613c694ae2c27754cc2ea65
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r3 b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r3
index 098aa8565342..96aa3ae7f3b6 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r3
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r3
@@ -11,5 +11,5 @@ RDEPEND=app-accessibility/at-spi2-core dev-java/swt:4.10[cairo,opengl] dev-libs/
 REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.11+1.tar.bz2 -> openjfx-11.0.11_p1.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.10.3-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=32b6e6186df886a13b8bea51e12b4949
diff --git a/metadata/md5-cache/dev-java/openjfx-8.1000-r2 b/metadata/md5-cache/dev-java/openjfx-8.1000-r2
index 8c6ece8cc0cc..47542b6fa0da 100644
--- a/metadata/md5-cache/dev-java/openjfx-8.1000-r2
+++ b/metadata/md5-cache/dev-java/openjfx-8.1000-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
 RESTRICT=test
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/9f49e3b6147f.tar.bz2 -> openjfx-8.1000.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/openjfx-8.1000-backports.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.10.3-bin.zip
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=eb29dc50f2ff7a0d8006c8158aed3e4b
diff --git a/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1 b/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1
index f4ad1f455670..26b8a90a6bc5 100644
--- a/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/opentest4j-1.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ota4j-team/opentest4j/archive/r1.2.0.tar.gz -> opentest4j-1.2.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c67c7829cc4f727e0e6a8ef230e7f448
diff --git a/metadata/md5-cache/dev-java/osgi-annotation-8.1.0 b/metadata/md5-cache/dev-java/osgi-annotation-8.1.0
index 58ef56837917..063ea54ac314 100644
--- a/metadata/md5-cache/dev-java/osgi-annotation-8.1.0
+++ b/metadata/md5-cache/dev-java/osgi-annotation-8.1.0
@@ -11,5 +11,5 @@ 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=https://docs.osgi.org/download/r8/osgi.annotation-8.1.0.jar -> osgi-annotation-8.1.0.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a03a56d045b6a08896036b2c3878277c
diff --git a/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0-r1 b/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0-r1
index 0214fd56bb1d..29cd2b207905 100644
--- a/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0-r1
+++ b/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=dev-java/cdi-api:0 dev-java/javax-persistence-api:0 dev-java/jakarta-servlet-api:4 dev-java/javax-inject:0 dev-java/jaxrs-api:0 dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=8
 SRC_URI=https://docs.osgi.org/download/r8/osgi.cmpn-8.0.0.jar -> osgi-cmpn-8.0.0.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0de3c8b607e850a72d602d7b852cca27
diff --git a/metadata/md5-cache/dev-java/osgi-core-8.0.0 b/metadata/md5-cache/dev-java/osgi-core-8.0.0
index c6fdaea99a83..2b5c224f47ca 100644
--- a/metadata/md5-cache/dev-java/osgi-core-8.0.0
+++ b/metadata/md5-cache/dev-java/osgi-core-8.0.0
@@ -11,5 +11,5 @@ 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=https://docs.osgi.org/download/r8/osgi.core-8.0.0.jar -> osgi-core-8.0.0.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=37cb8ebdfc7a261503a25c2be40c1e56
diff --git a/metadata/md5-cache/dev-java/osgi-service-log-1.3.0 b/metadata/md5-cache/dev-java/osgi-service-log-1.3.0
index 73bf30928385..d2d241e84ea4 100644
--- a/metadata/md5-cache/dev-java/osgi-service-log-1.3.0
+++ b/metadata/md5-cache/dev-java/osgi-service-log-1.3.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/osgi-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log/1.3.0/org.osgi.service.log-1.3.0-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=f3a8d89ccf80a48597ea6868d1821577
diff --git a/metadata/md5-cache/dev-java/osgi-service-subsystem-1.1.0 b/metadata/md5-cache/dev-java/osgi-service-subsystem-1.1.0
index a06a565afb00..e233eca3686f 100644
--- a/metadata/md5-cache/dev-java/osgi-service-subsystem-1.1.0
+++ b/metadata/md5-cache/dev-java/osgi-service-subsystem-1.1.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/osgi/org.osgi.service.subsystem/1.1.0/org.osgi.service.subsystem-1.1.0-sources.jar -> osgi-service-subsystem-1.1.0-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=dba543529ac4ad3a8ce80f16b422ecfa
diff --git a/metadata/md5-cache/dev-java/owasp-java-encoder-1.2.3 b/metadata/md5-cache/dev-java/owasp-java-encoder-1.2.3
index a275740e958b..c8305bae331c 100644
--- a/metadata/md5-cache/dev-java/owasp-java-encoder-1.2.3
+++ b/metadata/md5-cache/dev-java/owasp-java-encoder-1.2.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OWASP/owasp-java-encoder/archive/v1.2.3.tar.gz -> owasp-java-encoder-1.2.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5934274789efd62d81bb2e83cc09c06d
diff --git a/metadata/md5-cache/dev-java/parboiled-1.4.1 b/metadata/md5-cache/dev-java/parboiled-1.4.1
index ed371202f342..1bd86122a9c4 100644
--- a/metadata/md5-cache/dev-java/parboiled-1.4.1
+++ b/metadata/md5-cache/dev-java/parboiled-1.4.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/asm:9 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/sirthias/parboiled/archive/1.4.1.tar.gz -> parboiled-1.4.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c83cb512917591d7abb264896b68cb9a
diff --git a/metadata/md5-cache/dev-java/pdfbox-2.0.27 b/metadata/md5-cache/dev-java/pdfbox-2.0.27
index f76fe215a9ec..49444d238e28 100644
--- a/metadata/md5-cache/dev-java/pdfbox-2.0.27
+++ b/metadata/md5-cache/dev-java/pdfbox-2.0.27
@@ -13,5 +13,5 @@ RDEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-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	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=24274850be687a530ffdbff6cb6971a6
diff --git a/metadata/md5-cache/dev-java/picocli-4.6.3-r1 b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
index 8ac5733782b8..5ce24340d212 100644
--- a/metadata/md5-cache/dev-java/picocli-4.6.3-r1
+++ b/metadata/md5-cache/dev-java/picocli-4.6.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/remkop/picocli/archive/v4.6.3.tar.gz -> picocli-4.6.3-sources.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e25fb06d87ee8f325d85e36500e9c1d8
diff --git a/metadata/md5-cache/dev-java/plexus-classworlds-2.7.0-r1 b/metadata/md5-cache/dev-java/plexus-classworlds-2.7.0-r1
index 9352d013d1d2..19d355300a70 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.7.0-r1
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.7.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-2.7.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0d9581530952f02eb429ea49c389ae95
diff --git a/metadata/md5-cache/dev-java/poi-5.2.3 b/metadata/md5-cache/dev-java/poi-5.2.3
index 82bdfc7ee97b..e20e39289bc8 100644
--- a/metadata/md5-cache/dev-java/poi-5.2.3
+++ b/metadata/md5-cache/dev-java/poi-5.2.3
@@ -10,5 +10,5 @@ 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/poi/release/src/poi-src-5.2.3-20220909.tgz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1f34718ed49e41427652b9b5e773b2d1
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.23.0 b/metadata/md5-cache/dev-java/protobuf-java-3.23.0
index 3a88fcf16fff..0bf684230c68 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.23.0
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.23.0
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v23.0.tar.gz -> protobuf-23.0.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ae2b87600366de7588d058fae095060d
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.23.3 b/metadata/md5-cache/dev-java/protobuf-java-3.23.3
index 4707882b4e9b..15c0c79cec2b 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.23.3
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.23.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v23.3.tar.gz -> protobuf-23.3.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=eacaad8178be41c0ff3b019cbeeb8f22
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.25.1 b/metadata/md5-cache/dev-java/protobuf-java-3.25.1
index cbae6d69b3e9..6a30f22f01c8 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.25.1
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.25.1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v25.1.tar.gz -> protobuf-25.1.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e2bd35339356772a51efa0391d24fb64
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.25.2 b/metadata/md5-cache/dev-java/protobuf-java-3.25.2
index 419293f97323..674d4984b702 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.25.2
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.25.2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v25.2.tar.gz -> protobuf-25.2.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=470625560443746a9add9c9cf4eb8c4d
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.25.3 b/metadata/md5-cache/dev-java/protobuf-java-3.25.3
index 42eb2579d9c9..29a73aef3616 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.25.3
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.25.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v25.3.tar.gz -> protobuf-25.3.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9df8454bfa3af6090b41195541c6e418
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.26.0 b/metadata/md5-cache/dev-java/protobuf-java-3.26.0
index e9596db8d63e..de4a4c2612bb 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.26.0
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.26.0
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v26.0.tar.gz -> protobuf-26.0.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5ba2ec013aa3f6dc96d04364e135615f
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r5 b/metadata/md5-cache/dev-java/qdox-1.12.1-r5
index c0fae52cb589..77e435e9a0e0 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r5
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r5
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( ant-task )
 RESTRICT=!test? ( test )
 SLOT=1.12
 SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5a6a049cf8f9e088b4ab31e94b7cbc11
diff --git a/metadata/md5-cache/dev-java/qdox-2.0.1 b/metadata/md5-cache/dev-java/qdox-2.0.1
index 237dfb92acb3..cfca0c13a5d8 100644
--- a/metadata/md5-cache/dev-java/qdox-2.0.1
+++ b/metadata/md5-cache/dev-java/qdox-2.0.1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/paul-hammant/qdox/archive/qdox-2.0.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=13e8dbdb52a315b4ee9b2842be5f9441
diff --git a/metadata/md5-cache/dev-java/randomized-runner-2.8.0 b/metadata/md5-cache/dev-java/randomized-runner-2.8.0
index c9bf1b707225..98d10f4d813c 100644
--- a/metadata/md5-cache/dev-java/randomized-runner-2.8.0
+++ b/metadata/md5-cache/dev-java/randomized-runner-2.8.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/randomizedtesting/randomizedtesting/archive/release/2.8.0.tar.gz -> randomized-runner-2.8.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=ffa4a8dedf4d659af3f555a344b67949
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.12-r6 b/metadata/md5-cache/dev-java/reflections-0.9.12-r6
index 3961c6420b32..3bea7d261b90 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.12-r6
+++ b/metadata/md5-cache/dev-java/reflections-0.9.12-r6
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/dom4j:1 dev-java/gson:0 dev-java/javassist:
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz -> reflections-0.9.12.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=ef60dd1b5962e9581f5fa3d72f351b5c
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-20020414 b/metadata/md5-cache/dev-java/relaxng-datatype-20020414
index 7087e62ae672..b77041f735da 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-20020414
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-20020414
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/relaxngDatatype/relaxngDatatype/20020414/relaxngDatatype-20020414-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=1f8c8bb813e888416897073582c14529
diff --git a/metadata/md5-cache/dev-java/reload4j-1.2.22 b/metadata/md5-cache/dev-java/reload4j-1.2.22
index ef6edf5d19f6..9a29042f70ff 100644
--- a/metadata/md5-cache/dev-java/reload4j-1.2.22
+++ b/metadata/md5-cache/dev-java/reload4j-1.2.22
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/javax-mail:0 dev-java/jboss-jms-api:1.1 >=d
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/reload4j/archive/v_1.2.22.tar.gz -> reload4j-1.2.22.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b3ff7d60da0064d7d74c7fca86bf26ed
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.14-r1 b/metadata/md5-cache/dev-java/rhino-1.7.14-r1
index eed386c287a4..ead38102c1c2 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.14-r1
+++ b/metadata/md5-cache/dev-java/rhino-1.7.14-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=1.6
 SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_14_Release.tar.gz -> rhino-1.7.14.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=6374157fd608e69ee18c7222cd238865
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r4 b/metadata/md5-cache/dev-java/rome-0.9-r4
index 1e58da24a239..0009a34043fc 100644
--- a/metadata/md5-cache/dev-java/rome-0.9-r4
+++ b/metadata/md5-cache/dev-java/rome-0.9-r4
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sour
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/rome-0.9.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=213f0e66eb276ced3a6c501f727e5592
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
index 353a2d08d08b..ed81ff8ac860 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* lfd? ( sys-apps/xinetd ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=4b1b6bb6d744203a2ff99f29dd2f5915
diff --git a/metadata/md5-cache/dev-java/saslprep-1.1-r1 b/metadata/md5-cache/dev-java/saslprep-1.1-r1
index 075df77c04c9..ad746aad0806 100644
--- a/metadata/md5-cache/dev-java/saslprep-1.1-r1
+++ b/metadata/md5-cache/dev-java/saslprep-1.1-r1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/stringprep:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/ongres/stringprep/saslprep/1.1/saslprep-1.1-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8479af41ff6c2a238ee56ac3abafdaa4
diff --git a/metadata/md5-cache/dev-java/sax-2.2.1-r5 b/metadata/md5-cache/dev-java/sax-2.2.1-r5
index 7427a4c80aeb..78f94faf9aa1 100644
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r5
+++ b/metadata/md5-cache/dev-java/sax-2.2.1-r5
@@ -11,5 +11,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/sax/sax2r3.zip -> sax-2.2.1.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=9ea870d78ad0ecfd98e3fe721dd31778
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5-r3 b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
index 301d5a01a74f..885f8911da9c 100644
--- a/metadata/md5-cache/dev-java/saxon-6.5.5-r3
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5-r3
@@ -11,5 +11,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-java/jdom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6.5
 SRC_URI=https://downloads.sourceforge.net/project/saxon/saxon6/6.5.5/saxon6-5-5.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=74dc55f897e0cda9f63ecddbd599f890
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r4 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r4
index bd3e22b98c8f..114cd25c6921 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r4
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r4
@@ -11,5 +11,5 @@ LICENSE=MPL-1.0
 RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=https://downloads.sourceforge.net/project/saxon/Saxon-HE/9.2/saxonhe9-2-0-6source.zip
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=fcfb90b28556dbcd2a46516ea70855df
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r5 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r5
index 63317dc7710a..d04a6cbccb86 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r5
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r5
@@ -11,5 +11,5 @@ LICENSE=MPL-1.0
 RDEPEND=dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jre-1.8:* ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=https://downloads.sourceforge.net/saxon/Saxon-HE/9.2/saxonhe9-2-0-6source.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=aebbee2ec8dadab762448ce2181f13c7
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.18-r1 b/metadata/md5-cache/dev-java/sbt-0.13.18-r1
index b38a9975aa74..bb8a2cb9f2a2 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.18-r1
+++ b/metadata/md5-cache/dev-java/sbt-0.13.18-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( https://github.com/sbt/sbt/archive/v0.13.18.tar.gz -> sbt-0.13.18.tar.gz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.18-sbt-deps.tar.xz https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.18/sbt-launch.jar -> sbt-launch-0.13.18.jar ) binary? ( https://dev.gentoo.org/~gienah/distfiles/sbt-0.13.18-gentoo-binary.tar.xz )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a286ed1f9d2e96d8c695f0fb33a66249
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.8.0 b/metadata/md5-cache/dev-java/sbt-bin-1.8.0
index a2c0a332f96c..f0fb8bff3ba3 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-1.8.0
+++ b/metadata/md5-cache/dev-java/sbt-bin-1.8.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/sbt/sbt/releases/download/v1.8.0/sbt-1.8.0.tgz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=ba3c6b0a62b1990a5598ea3f881105a0
diff --git a/metadata/md5-cache/dev-java/scram-2.1 b/metadata/md5-cache/dev-java/scram-2.1
index 268d4cf33f6a..adf727bdd2c7 100644
--- a/metadata/md5-cache/dev-java/scram-2.1
+++ b/metadata/md5-cache/dev-java/scram-2.1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/saslprep:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/ongresinc/scram/-/archive/2.1/scram-2.1.tar.bz2
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d515c8505c886eddc801c5214d141d47
diff --git a/metadata/md5-cache/dev-java/shrinkwrap-api-1.2.6 b/metadata/md5-cache/dev-java/shrinkwrap-api-1.2.6
index 960c00407f1c..a5a18b7d8681 100644
--- a/metadata/md5-cache/dev-java/shrinkwrap-api-1.2.6
+++ b/metadata/md5-cache/dev-java/shrinkwrap-api-1.2.6
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/shrinkwrap/shrinkwrap/archive/1.2.6.tar.gz -> shrinkwrap-1.2.6.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=05ffedbd63e308cf998e633499747ac0
diff --git a/metadata/md5-cache/dev-java/shrinkwrap-impl-base-1.2.6 b/metadata/md5-cache/dev-java/shrinkwrap-impl-base-1.2.6
index cfb38d788ac4..e6bafa404013 100644
--- a/metadata/md5-cache/dev-java/shrinkwrap-impl-base-1.2.6
+++ b/metadata/md5-cache/dev-java/shrinkwrap-impl-base-1.2.6
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jakarta-activation:1 ~dev-java/shrinkwrap-api-1.2.6:0 ~dev-java
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/shrinkwrap/shrinkwrap/archive/1.2.6.tar.gz -> shrinkwrap-1.2.6.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=127fd45566850a101f9f183f262c108d
diff --git a/metadata/md5-cache/dev-java/shrinkwrap-spi-1.2.6 b/metadata/md5-cache/dev-java/shrinkwrap-spi-1.2.6
index 2055d54a1b53..7458fb83b52d 100644
--- a/metadata/md5-cache/dev-java/shrinkwrap-spi-1.2.6
+++ b/metadata/md5-cache/dev-java/shrinkwrap-spi-1.2.6
@@ -10,5 +10,5 @@ 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=https://github.com/shrinkwrap/shrinkwrap/archive/1.2.6.tar.gz -> shrinkwrap-1.2.6.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e9a1a255be47617bc467ec79fa684e8c
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.2 b/metadata/md5-cache/dev-java/sjsxp-1.0.2
index 76b033f79ad5..e2086f67ffac 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.2
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.2
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/sun/xml/stream/sjsxp/1.0.2/sjsxp-1.0.2-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=308d0100ae4ba811f4261b0944400eaf
diff --git a/metadata/md5-cache/dev-java/slf4j-api-2.0.3 b/metadata/md5-cache/dev-java/slf4j-api-2.0.3
index 366c15f3ed80..e1ea50be3182 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-api-2.0.3
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8d3e2c14d46b04c10587b5e30cd66c85
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-2.0.3 b/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
index 099b680eb07f..3b3e4b321d14 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/cal10n:0 dev-java/javassist:3 ~dev-java/slf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=296eeb74c0907f93c5473a9e8ed14a52
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-2.0.3 b/metadata/md5-cache/dev-java/slf4j-nop-2.0.3
index 5e65db895056..4898045e78f2 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-nop-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=f6498be8910a028b01ef1c4a659fb4e6
diff --git a/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3 b/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
index 18acf5310383..4d9542644f68 100644
--- a/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/reload4j:0 ~dev-java/slf4j-api-2.0.3:0 >=de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c0d8ae144a3cd2102f5ec172801b0cce
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-2.0.3 b/metadata/md5-cache/dev-java/slf4j-simple-2.0.3
index 37e246339574..0897ee7f12fa 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-simple-2.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=778d0b8809400ec08a6ea785cec13279
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.33 b/metadata/md5-cache/dev-java/snakeyaml-1.33
index c616936a3861..bcfab3b6edb0 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.33
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.33
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-1.33.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8f519c2540dfaf4f22e4c33e3b90e8f2
diff --git a/metadata/md5-cache/dev-java/snakeyaml-2.0 b/metadata/md5-cache/dev-java/snakeyaml-2.0
index a6495f3e2d83..f28fb0ecf5c5 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-2.0
+++ b/metadata/md5-cache/dev-java/snakeyaml-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-2.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a72f0b84ed08afa27f7476911c329b29
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.10.5-r1 b/metadata/md5-cache/dev-java/snappy-1.1.10.5-r1
index b3c8989b6d00..592afc46638c 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.10.5-r1
+++ b/metadata/md5-cache/dev-java/snappy-1.1.10.5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-core:0 app-arch/snappy dev-libs/bitshu
 RESTRICT=!test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/xerial/snappy-java/archive/v1.1.10.5.tar.gz -> snappy-1.1.10.5.tar.gz test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/3.3.5/hadoop-common-3.3.5.jar )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=58da44a624c341f0105d249faae8814c
diff --git a/metadata/md5-cache/dev-java/sparsebitset-1.2 b/metadata/md5-cache/dev-java/sparsebitset-1.2
index 994fa2b7275c..fbe2be620a3e 100644
--- a/metadata/md5-cache/dev-java/sparsebitset-1.2
+++ b/metadata/md5-cache/dev-java/sparsebitset-1.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brettwooldridge/SparseBitSet/archive/refs/tags/SparseBitSet-1.2.tar.gz -> sparsebitset-1.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5f69a03feebea29a78b517f77e5b9cf8
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1 b/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
index a533e5b1ce2a..75886295d3f7 100644
--- a/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
+++ b/metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/stax2-api/archive/refs/tags/stax2-api-4.2.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=950511a8e1083c5f4ad34a160222c06e
diff --git a/metadata/md5-cache/dev-java/stringprep-1.1 b/metadata/md5-cache/dev-java/stringprep-1.1
index 65dbfff530b5..1e3472da7446 100644
--- a/metadata/md5-cache/dev-java/stringprep-1.1
+++ b/metadata/md5-cache/dev-java/stringprep-1.1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/ongres/stringprep/stringprep/1.1/stringprep-1.1-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=60be8cc441cc9801b4844c531d85b0ca
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r3 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r3
index 3e3501f03e00..1df4680bc850 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r3
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-java/antlr:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/antlr/stringtemplate3/archive/68f2a42e8038f8e716e9666909ea485ee8aff45a.tar.gz -> stringtemplate-3.2.1.tar.gz https://sources.debian.org/data/main/s/stringtemplate/3.2.1-4/debian/patches/java21-compatibility.patch -> stringtemplate-3.2.1-4-java21-compatibility.patch
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0004d3143a40bf35a0b745b90619b3d6
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.3.4 b/metadata/md5-cache/dev-java/stringtemplate-4.3.4
index e892a6d7e069..c971e90a1b66 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.3.4
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.3.4
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/antlr-runtime:3.5 >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://repo1.maven.org/maven2/org/antlr/ST4/4.3.4/ST4-4.3.4-sources.jar https://github.com/antlr/stringtemplate4/archive/ST4-4.3.4.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=70fe3d237c78969adbd771916ba84dbd
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
index a40b833d184b..d14c04918ac7 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=!amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz ) amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64.tar.gz )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=09fcb42b33c1665c3ad8594de22b165a
diff --git a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2 b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
index 395a2544097f..55bf73cf585f 100644
--- a/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/swing-layout-1.0.4-src.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=2676b345338fb20e84e5cddcba153511
diff --git a/metadata/md5-cache/dev-java/swingx-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
index f76a70d14e17..4b8bc877d50f 100644
--- a/metadata/md5-cache/dev-java/swingx-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-1.6.4-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/jre:1.8 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.6
 SRC_URI=https://maven.java.net/service/local/repositories/releases/content/org/swinglabs/swingx/swingx-all/1.6.4/swingx-all-1.6.4-sources.jar https://java.net/projects/swingx/downloads/download/releases/swingx-mavensupport-1.6.4-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8b75665f7ccbc2320259e96eef6cebf2
diff --git a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1 b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
index d1f870ec19ab..616572c4bc99 100644
--- a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
+++ b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.8:* dev-java/swingx:1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/downloads/swingx/releases/swingx-beaninfo-1.6.4-sources.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=f12e43df4ba1e563f1b2e5f55c8df20c
diff --git a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2 b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
index b67613262b2a..63e670e484aa 100644
--- a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
+++ b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/jakarta-xml-soap-api:1 dev-java/jdom:0 dev-java/json:0 dev-java/rome:0 dev-java/jtidy:0 dev-java/xerces:2 dev-java/swingx:1.6 dev-java/swing-layout:1 dev-java/swingx-beaninfo:0 dev-java/commons-httpclient:3 dev-java/xml-commons-external:1.4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=bt747
 SRC_URI=https://downloads.sourceforge.net/bt747/Development/swingx-ws-2011_05_15-src.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=7e8d2036ca266ce42afdbdde505d3bfe
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r4 b/metadata/md5-cache/dev-java/swt-3.7.2-r4
index 05e1e4094dcc..1e4501643a6e 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r4
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r4
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.7
 SRC_URI=amd64? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip ) x86? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip )
-_eclasses_=java-osgi	b1d0d0f01a98e464d86fd1ed8eddf07b	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-osgi	b1d0d0f01a98e464d86fd1ed8eddf07b	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=642d6491e4ed26e054d616204e3cd9a5
diff --git a/metadata/md5-cache/dev-java/swt-4.10-r4 b/metadata/md5-cache/dev-java/swt-4.10-r4
index 8f67d6abe9a1..4a64717029db 100644
--- a/metadata/md5-cache/dev-java/swt-4.10-r4
+++ b/metadata/md5-cache/dev-java/swt-4.10-r4
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8:* x11-libs/libX11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.10
 SRC_URI=amd64? ( https://archive.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( https://archive.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-osgi	b1d0d0f01a98e464d86fd1ed8eddf07b	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-osgi	b1d0d0f01a98e464d86fd1ed8eddf07b	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=61778c8aef9c2e8af95bdf148ee23973
diff --git a/metadata/md5-cache/dev-java/swt-4.29-r1 b/metadata/md5-cache/dev-java/swt-4.29-r1
index 284ca3ab4b18..6081454d3e70 100644
--- a/metadata/md5-cache/dev-java/swt-4.29-r1
+++ b/metadata/md5-cache/dev-java/swt-4.29-r1
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-1.8:* x11-libs/libX11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.27
 SRC_URI=amd64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/swt-4.29-gtk-linux-x86_64.zip ) arm64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/swt-4.29-gtk-linux-aarch64.zip ) ppc64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/swt-4.29-gtk-linux-ppc64le.zip )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=347677291d56e584526afcf3bba8607b
diff --git a/metadata/md5-cache/dev-java/swt-4.30-r2 b/metadata/md5-cache/dev-java/swt-4.30-r2
index 90c7553e8c74..af28d93bd9e4 100644
--- a/metadata/md5-cache/dev-java/swt-4.30-r2
+++ b/metadata/md5-cache/dev-java/swt-4.30-r2
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-17:* x11-libs/libX11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.30
 SRC_URI=amd64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.30-202312010110/swt-4.30-gtk-linux-x86_64.zip ) arm64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.30-202312010110/swt-4.30-gtk-linux-aarch64.zip ) ppc64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.30-202312010110/swt-4.30-gtk-linux-ppc64le.zip )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=6fb395f4f8948fd9c3ec21d5149bb534
diff --git a/metadata/md5-cache/dev-java/swt-4.31-r1 b/metadata/md5-cache/dev-java/swt-4.31-r1
index 4fe35b06d680..b824a0981d62 100644
--- a/metadata/md5-cache/dev-java/swt-4.31-r1
+++ b/metadata/md5-cache/dev-java/swt-4.31-r1
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-17:* x11-libs/libX11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.31
 SRC_URI=amd64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/swt-4.31-gtk-linux-x86_64.zip ) arm64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/swt-4.31-gtk-linux-aarch64.zip ) ppc64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/swt-4.31-gtk-linux-ppc64le.zip )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=b6f68db483d4ee567855345d4aa5e7ad
diff --git a/metadata/md5-cache/dev-java/swt-4.32 b/metadata/md5-cache/dev-java/swt-4.32
index 727933032c5b..445c39e814f1 100644
--- a/metadata/md5-cache/dev-java/swt-4.32
+++ b/metadata/md5-cache/dev-java/swt-4.32
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/glib x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4.1 ) >=virtual/jre-17:* x11-libs/libX11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.32
 SRC_URI=amd64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.32-202406010610/swt-4.32-gtk-linux-x86_64.zip ) arm64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.32-202406010610/swt-4.32-gtk-linux-aarch64.zip ) ppc64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.32-202406010610/swt-4.32-gtk-linux-ppc64le.zip )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=b30a641c2b0706a444a416cc72999124
diff --git a/metadata/md5-cache/dev-java/system-rules-1.19.0 b/metadata/md5-cache/dev-java/system-rules-1.19.0
index eac5c4482fbf..f19e5e383cc2 100644
--- a/metadata/md5-cache/dev-java/system-rules-1.19.0
+++ b/metadata/md5-cache/dev-java/system-rules-1.19.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefanbirkner/system-rules/archive/system-rules-1.19.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=99c09d7bec18b6cb525588968c5568bf
diff --git a/metadata/md5-cache/dev-java/testng-6.11-r1 b/metadata/md5-cache/dev-java/testng-6.11-r1
index 248edb1e5356..bf8c17ef3930 100644
--- a/metadata/md5-cache/dev-java/testng-6.11-r1
+++ b/metadata/md5-cache/dev-java/testng-6.11-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/bsh:0 dev-java/guice:4 dev-java/jco
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/testng-team/testng/archive/6.11.tar.gz -> testng-6.11.tar.gz https://repo1.maven.org/maven2/org/webjars/jquery/3.5.1/jquery-3.5.1.jar test? ( https://repo1.maven.org/maven2/org/spockframework/spock-core/1.0-groovy-2.4/spock-core-1.0-groovy-2.4.jar https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/2.4.7/groovy-all-2.4.7.jar https://downloads.apache.org/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=99aedbd69843a19a59803d4a298d7d03
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.3.0 b/metadata/md5-cache/dev-java/tomcat-native-1.3.0
index 136a97ef1980..be662e9ce526 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.3.0
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.3.0
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.3.0/source/tomcat-native-1.3.0-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/1.3.0/source/tomcat-native-1.3.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=c707c7f8be30657eed3f5c2e780b46d5
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.7 b/metadata/md5-cache/dev-java/tomcat-native-2.0.7
index a0a2d34a7af3..afebe377fa91 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-2.0.7
+++ b/metadata/md5-cache/dev-java/tomcat-native-2.0.7
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/2.0.7/source/tomcat-native-2.0.7-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.7/source/tomcat-native-2.0.7-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=0a145d0ab67b430be6d3c983f2d0777d
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40-r1
index 57105466ecd0..c77738dbf88f 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-4/v4.1.40/src/apache-tomcat-4.1.40-src.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=6178e5669050cf8aca7e0a20b8066105
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1 b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
index 103749fd055f..f718542e08c0 100644
--- a/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
+++ b/metadata/md5-cache/dev-java/treelayout-1.0.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/abego/treelayout/archive/v1.0.3.tar.gz -> treelayout-1.0.3.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8887a0352989a252aa1bba63953ac9bb
diff --git a/metadata/md5-cache/dev-java/txw2-2.3.8-r1 b/metadata/md5-cache/dev-java/txw2-2.3.8-r1
index 4a01910c62fa..7ea6c9b7eda2 100644
--- a/metadata/md5-cache/dev-java/txw2-2.3.8-r1
+++ b/metadata/md5-cache/dev-java/txw2-2.3.8-r1
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/2.3.8-RI.tar.gz -> jaxb-ri-2.3.8.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=90db21f1763707053b67dce4c3967b14
diff --git a/metadata/md5-cache/dev-java/typesafe-config-1.4.2 b/metadata/md5-cache/dev-java/typesafe-config-1.4.2
index fd5a6c065126..1335bda84925 100644
--- a/metadata/md5-cache/dev-java/typesafe-config-1.4.2
+++ b/metadata/md5-cache/dev-java/typesafe-config-1.4.2
@@ -10,5 +10,5 @@ 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=https://github.com/lightbend/config/archive/v1.4.2.tar.gz -> typesafe-config-1.4.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=908813cab4fcc930cc4aecdd557ee93d
diff --git a/metadata/md5-cache/dev-java/unbescape-1.1.6 b/metadata/md5-cache/dev-java/unbescape-1.1.6
index b132c72edd0b..4e8b6a1e3a0b 100644
--- a/metadata/md5-cache/dev-java/unbescape-1.1.6
+++ b/metadata/md5-cache/dev-java/unbescape-1.1.6
@@ -10,5 +10,5 @@ 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=https://github.com/unbescape/unbescape/archive/unbescape-1.1.6.RELEASE.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=81b796a3517fc9904ea35ac7cbdd8a21
diff --git a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1 b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
index 49c74778bba6..941bb4277a57 100644
--- a/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
+++ b/metadata/md5-cache/dev-java/univocity-parsers-2.9.1
@@ -10,5 +10,5 @@ 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=https://github.com/uniVocity/univocity-parsers/archive/refs/tags/v2.9.1.tar.gz -> univocity-parsers-2.9.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=19253877fdd33c094d6d50c427f7f224
diff --git a/metadata/md5-cache/dev-java/velocity-2.3_p20240314 b/metadata/md5-cache/dev-java/velocity-2.3_p20240314
index b6fef58a76f0..c475f0c65d71 100644
--- a/metadata/md5-cache/dev-java/velocity-2.3_p20240314
+++ b/metadata/md5-cache/dev-java/velocity-2.3_p20240314
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-io-2.8.0:1 >=dev-java/commons-lan
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apache/velocity-engine/archive/86cfcf41105f8a25db11ca6483e33c20fc0804d9.tar.gz -> velocity-2.3_p20240314.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0b1741413dc73271ae42035b38de4169
diff --git a/metadata/md5-cache/dev-java/waffle-jna-3.3.0 b/metadata/md5-cache/dev-java/waffle-jna-3.3.0
index 8c7efa1355f3..42129896c2df 100644
--- a/metadata/md5-cache/dev-java/waffle-jna-3.3.0
+++ b/metadata/md5-cache/dev-java/waffle-jna-3.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Waffle/waffle/archive/waffle-parent-3.3.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=efbaa76b80d90d437d76b339eaf20b22
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.4.0-r1 b/metadata/md5-cache/dev-java/woodstox-core-6.4.0-r1
index c9d481106402..5fd0d42a31f1 100644
--- a/metadata/md5-cache/dev-java/woodstox-core-6.4.0-r1
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/woodstox/archive/woodstox-core-6.4.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a5beeccc3b7f3c654dff45f743865b05
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.3 b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
index 565a3a893e3c..18f0eb528619 100644
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.3
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/wsdl4j/WSDL4J/1.6.3/wsdl4j-src-1.6.3.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b066d6ce4db97a9d47b71778c0bab256
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.3-r1 b/metadata/md5-cache/dev-java/xalan-2.7.3-r1
index 8bec8c2a09a9..26b4a072f967 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.3-r1
+++ b/metadata/md5-cache/dev-java/xalan-2.7.3-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/bcel:0 dev-java/javacup:0 ~dev-java/xalan-serializer-2.7.3:0 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_3-src.tar.gz verify-sig? ( https://downloads.apache.org/xalan/xalan-j/source/xalan-j_2_7_3-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=15da51f38e8812e2cfe16abc527c092e
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.3-r1 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.3-r1
index 2d98b1a6d9b5..984359bf3401 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.3-r1
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.3-r1
@@ -11,5 +11,5 @@ 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/xalan/xalan-j/source/xalan-j_2_7_3-src.tar.gz verify-sig? ( https://downloads.apache.org/xalan/xalan-j/source/xalan-j_2_7_3-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=b2440496c4ee11d22fd7658e497b7993
diff --git a/metadata/md5-cache/dev-java/xerces-2.12.2-r2 b/metadata/md5-cache/dev-java/xerces-2.12.2-r2
index 6f10aea60715..49b8127e010a 100644
--- a/metadata/md5-cache/dev-java/xerces-2.12.2-r2
+++ b/metadata/md5-cache/dev-java/xerces-2.12.2-r2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz verify-sig? ( https://downloads.apache.org/xerces/j/source/Xerces-J-src.2.12.2.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=cfa55e78b228a9353477e8c4f62f492b
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.1 b/metadata/md5-cache/dev-java/xerial-core-2.1
index 0f0e177dd7ee..bd809d831863 100644
--- a/metadata/md5-cache/dev-java/xerial-core-2.1
+++ b/metadata/md5-cache/dev-java/xerial-core-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xerial/xerial-java/archive/2.1.tar.gz -> xerial-core-2.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=79739ea4111dfa331b7d9653f0054d92
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
index 9095e994ab44..fcc22684b29d 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=https://repo1.maven.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar -> xml-commons-external-1.4.01.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=549778ea5769b108007ed65548c688d9
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
index 9d9ad56e59ca..ca5c252ad83b 100644
--- a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
+++ b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xerces/xml-commons/xml-commons-resolver-1.2.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=4d028ad9252d61dcfe4bca85c6a4547c
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.9 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.9
index c41383f1661a..d04ea7e901bc 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.9
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.9
@@ -12,5 +12,5 @@ RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=d
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.9-src.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-2.9-src.tar.gz.asc )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=bbed9ac1564ccd2c50e57fe79cf0d70b
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6-r2 b/metadata/md5-cache/dev-java/xmlunit-1.6-r2
index 8335e87fc9de..83b250666396 100644
--- a/metadata/md5-cache/dev-java/xmlunit-1.6-r2
+++ b/metadata/md5-cache/dev-java/xmlunit-1.6-r2
@@ -12,5 +12,5 @@ RDEPEND=dev-java/junit:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://downloads.sourceforge.net/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%201.6/xmlunit-1.6-src.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=f2917499d2bedfb3b8dba739206ea9e6
diff --git a/metadata/md5-cache/dev-java/xmlunit-assertj-2.9.1 b/metadata/md5-cache/dev-java/xmlunit-assertj-2.9.1
index 53c2026dac98..2c3410528423 100644
--- a/metadata/md5-cache/dev-java/xmlunit-assertj-2.9.1
+++ b/metadata/md5-cache/dev-java/xmlunit-assertj-2.9.1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/xmlunit/xmlunit/releases/download/v2.9.1/xmlunit-2.9.1-src.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=08a31fa79056023e354a660ce048982b
diff --git a/metadata/md5-cache/dev-java/xmlunit-core-2.9.1 b/metadata/md5-cache/dev-java/xmlunit-core-2.9.1
index 32c8506d7dc6..f645c4db8ce1 100644
--- a/metadata/md5-cache/dev-java/xmlunit-core-2.9.1
+++ b/metadata/md5-cache/dev-java/xmlunit-core-2.9.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/jaxb-api:2 >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/xmlunit/xmlunit/releases/download/v2.9.1/xmlunit-2.9.1-src.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=946bc3525df5f27af05740e85fedd1c3
diff --git a/metadata/md5-cache/dev-java/xmlunit-matchers-2.9.1 b/metadata/md5-cache/dev-java/xmlunit-matchers-2.9.1
index 957bb9efee2a..a79d0bd20c83 100644
--- a/metadata/md5-cache/dev-java/xmlunit-matchers-2.9.1
+++ b/metadata/md5-cache/dev-java/xmlunit-matchers-2.9.1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/xmlunit/xmlunit/releases/download/v2.9.1/xmlunit-2.9.1-src.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=62d2e09a0d7e3f5b94fdff29f10bdc97
diff --git a/metadata/md5-cache/dev-java/xmpbox-2.0.27 b/metadata/md5-cache/dev-java/xmpbox-2.0.27
index 5d3301087565..df95363fdf57 100644
--- a/metadata/md5-cache/dev-java/xmpbox-2.0.27
+++ b/metadata/md5-cache/dev-java/xmpbox-2.0.27
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jaxb-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=62031f511db190b6effb65117fcb0f55
diff --git a/metadata/md5-cache/dev-java/xom-1.3.8-r1 b/metadata/md5-cache/dev-java/xom-1.3.8-r1
index 5157cf94a282..6f1e55b86dfd 100644
--- a/metadata/md5-cache/dev-java/xom-1.3.8-r1
+++ b/metadata/md5-cache/dev-java/xom-1.3.8-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jaxen:1.2 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elharo/xom/releases/download/v1.3.8/xom-1.3.8-src.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=62026963ac133a87c1d7b556be1e9f5e
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
index 36f43c1a3122..673bbeff32e4 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 so
 RESTRICT=test
 SLOT=0
 SRC_URI=https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=c997da50407e1c5b051225df8e317c3c
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r4 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r4
index ad85f7d322af..b3d2c71cc14a 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r4
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r4
@@ -11,5 +11,5 @@ RDEPEND=dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 so
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=6ffb10a3460992dd4dd40b3b6a41e561
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
index 276e5a94bdc7..057933e45e2e 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1 IBM JDOM LGPL-2.1+
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar -> xpp3-1.1.4c.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=32574ef45b44b2b4a0fe73eb1ddb4c0f
diff --git a/metadata/md5-cache/dev-java/xsdlib-2022.7 b/metadata/md5-cache/dev-java/xsdlib-2022.7
index 7b398cf448d3..423f6de3b115 100644
--- a/metadata/md5-cache/dev-java/xsdlib-2022.7
+++ b/metadata/md5-cache/dev-java/xsdlib-2022.7
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/relaxng-datatype:0 dev-java/xerces:2 >=dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=6f3294149479b0f7c03175b8919ef856
diff --git a/metadata/md5-cache/dev-java/xz-java-1.9-r2 b/metadata/md5-cache/dev-java/xz-java-1.9-r2
index c83bbbf597b4..1867279aa5f4 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.9-r2
+++ b/metadata/md5-cache/dev-java/xz-java-1.9-r2
@@ -11,5 +11,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://tukaani.org/xz/xz-java-1.9.zip verify-sig? ( https://tukaani.org/xz/xz-java-1.9.zip.sig )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=73a71bd34d18e855bb5e5469bdad225e
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5 b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
index b19120cfaee8..30e01f6bfc26 100644
--- a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/luben/zstd-jni/archive/c1.5.2-5.tar.gz -> zstd-jni-1.5.2.5.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9b364aea5da8cf709ebb9db674de07ce
diff --git a/metadata/md5-cache/dev-java/zxing-core-3.5.1 b/metadata/md5-cache/dev-java/zxing-core-3.5.1
index 76e98f777d4d..bf1d3369cdd2 100644
--- a/metadata/md5-cache/dev-java/zxing-core-3.5.1
+++ b/metadata/md5-cache/dev-java/zxing-core-3.5.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/zxing/zxing/archive/zxing-3.5.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=47c1a5fbc3baffbbff02fb946d2b75bb
diff --git a/metadata/md5-cache/dev-java/zxing-javase-3.5.1 b/metadata/md5-cache/dev-java/zxing-javase-3.5.1
index 45b4c467185f..7296d2705728 100644
--- a/metadata/md5-cache/dev-java/zxing-javase-3.5.1
+++ b/metadata/md5-cache/dev-java/zxing-javase-3.5.1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jcommander:0 dev-java/zxing-core:3 >=virtual/jre-1.8:* >=dev-ja
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/zxing/zxing/archive/zxing-3.5.1.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=3652497e8415bc9eaad890765242d27b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index a1518507beec..9499a7e8db81 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/clipsjni-6.40-r1 b/metadata/md5-cache/dev-lang/clipsjni-6.40-r1
index d2f03b0fc27a..c12f2e3628d1 100644
--- a/metadata/md5-cache/dev-lang/clipsjni-6.40-r1
+++ b/metadata/md5-cache/dev-lang/clipsjni-6.40-r1
@@ -11,5 +11,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/clipsrules/files/CLIPS/6.40/clips_jni_640.tar.gz -> clipsjni-6.40.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=334c9ba18af6229550b4380824426cdc
diff --git a/metadata/md5-cache/dev-lang/clojure-1.11.3 b/metadata/md5-cache/dev-lang/clojure-1.11.3
index 3b5476e3f50b..19c172db6e8c 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.11.3
+++ b/metadata/md5-cache/dev-lang/clojure-1.11.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/1.11
 SRC_URI=https://github.com/clojure/clojure/archive/clojure-1.11.3.tar.gz https://github.com/clojure/spec.alpha/archive/v0.4.233.tar.gz -> spec.alpha-0.4.233.tar.gz https://github.com/clojure/core.specs.alpha/archive/v0.3.70.tar.gz -> core.specs.alpha-0.3.70.tar.gz test? ( https://github.com/clojure/tools.namespace/archive/v1.5.0.tar.gz -> tools.namespace-1.5.0.tar.gz https://github.com/clojure/java.classpath/archive/v1.1.0.tar.gz -> java.classpath-1.1.0.tar.gz https://github.com/clojure/tools.reader/archive/v1.4.2.tar.gz -> tools.reader-1.4.2.tar.gz https://github.com/clojure/test.generative/archive/v1.1.0.tar.gz -> test.generative-1.1.0.tar.gz https://github.com/clojure/data.generators/archive/v1.1.0.tar.gz -> data.generators-1.1.0.tar.gz https://github.com/clojure/test.check/archive/v1.1.1.tar.gz -> test.check-1.1.1.tar.gz )
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=f85cd7a180369efb191a8b01b0ae39fc
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20240317 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20240317
index f8e7a91940ac..659cdac258c6 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20240317
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20240317
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v20240317/closure-compiler-v20240317.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=edb59e520f40a43ac9a28a3eda7715a0
diff --git a/metadata/md5-cache/dev-lang/cxprolog-0.98.2-r1 b/metadata/md5-cache/dev-lang/cxprolog-0.98.2-r1
index 7fd05180329c..250b153032b1 100644
--- a/metadata/md5-cache/dev-lang/cxprolog-0.98.2-r1
+++ b/metadata/md5-cache/dev-lang/cxprolog-0.98.2-r1
@@ -11,5 +11,5 @@ RDEPEND=readline? ( sys-libs/readline:= ) java? ( >=virtual/jdk-1.8:= ) wxwidget
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://ctp.di.fct.unl.pt/~amd/cxprolog/cxunix/cxprolog-0.98.2.src.tgz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
 _md5_=2b6f8059e58aa6cb9c57418ccb3f85d9
diff --git a/metadata/md5-cache/dev-lang/dafny-4.6.0 b/metadata/md5-cache/dev-lang/dafny-4.6.0
index 92f4073c8138..56c5b57391a4 100644
--- a/metadata/md5-cache/dev-lang/dafny-4.6.0
+++ b/metadata/md5-cache/dev-lang/dafny-4.6.0
@@ -12,5 +12,5 @@ RDEPEND=!dev-lang/dafny-bin >=virtual/jre-1.8:* sci-mathematics/z3 virtual/dotne
 RESTRICT=!test? ( test ) strip
 SLOT=0
 SRC_URI=https://github.com/dafny-lang/dafny/archive/v4.6.0.tar.gz -> dafny-4.6.0.tar.gz https://api.nuget.org/v3-flatcontainer/boogie.abstractinterpretation/3.1.3/boogie.abstractinterpretation.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.basetypes/3.1.3/boogie.basetypes.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.codecontractsextender/3.1.3/boogie.codecontractsextender.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.concurrency/3.1.3/boogie.concurrency.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.core/3.1.3/boogie.core.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.executionengine/3.1.3/boogie.executionengine.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.graph/3.1.3/boogie.graph.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.houdini/3.1.3/boogie.houdini.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.model/3.1.3/boogie.model.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.provers.smtlib/3.1.3/boogie.provers.smtlib.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.vcexpr/3.1.3/boogie.vcexpr.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/boogie.vcgeneration/3.1.3/boogie.vcgeneration.3.1.3.nupkg https://api.nuget.org/v3-flatcontainer/castle.core/4.4.0/castle.core.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/commandlineparser/2.8.0/commandlineparser.2.8.0.nupkg https://api.nuget.org/v3-flatcontainer/commandlineparser/2.9.1/commandlineparser.2.9.1.nupkg https://api.nuget.org/v3-flatcontainer/coverlet.collector/3.2.0/coverlet.collector.3.2.0.nupkg https://api.nuget.org/v3-flatcontainer/diffplex/1.7.0/diffplex.1.7.0.nupkg https://api.nuget.org/v3-flatcontainer/humanizer.core/2.2.0/humanizer.core.2.2.0.nupkg https://api.nuget.org/v3-flatcontainer/jetbrains.annotations/2021.1.0/jetbrains.annotations.2021.1.0.nupkg https://api.nuget.org/v3-flatcontainer/mediatr/8.1.0/mediatr.8.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.1/microsoft.bcl.asyncinterfaces.1.1.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/5.0.0/microsoft.bcl.asyncinterfaces.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/6.0.0/microsoft.bcl.asyncinterfaces.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/17.0.0/microsoft.build.framework.17.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.locator/1.4.1/microsoft.build.locator.1.4.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/17.0.0/microsoft.build.tasks.core.17.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/17.0.0/microsoft.build.utilities.core.17.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.build/17.0.0/microsoft.build.17.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.0.0/microsoft.codeanalysis.analyzers.3.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.3.2/microsoft.codeanalysis.analyzers.3.3.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.common/3.7.0/microsoft.codeanalysis.common.3.7.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.common/4.0.1/microsoft.codeanalysis.common.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.csharp.workspaces/4.0.1/microsoft.codeanalysis.csharp.workspaces.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.csharp/3.7.0/microsoft.codeanalysis.csharp.3.7.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.csharp/4.0.1/microsoft.codeanalysis.csharp.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.visualbasic.workspaces/4.0.1/microsoft.codeanalysis.visualbasic.workspaces.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.visualbasic/4.0.1/microsoft.codeanalysis.visualbasic.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.workspaces.common/4.0.1/microsoft.codeanalysis.workspaces.common.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.workspaces.msbuild/4.0.1/microsoft.codeanalysis.workspaces.msbuild.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis/4.0.1/microsoft.codeanalysis.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codecoverage/16.11.0/microsoft.codecoverage.16.11.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codecoverage/16.9.4/microsoft.codecoverage.16.9.4.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.codecoverage/17.1.0/microsoft.codecoverage.17.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.0.1/microsoft.csharp.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.dotnet.platformabstractions/2.0.4/microsoft.dotnet.platformabstractions.2.0.4.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/2.0.0/microsoft.extensions.configuration.abstractions.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/5.0.0/microsoft.extensions.configuration.abstractions.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/2.0.0/microsoft.extensions.configuration.binder.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/5.0.0/microsoft.extensions.configuration.binder.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/5.0.0/microsoft.extensions.configuration.commandline.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/5.0.0/microsoft.extensions.configuration.fileextensions.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/5.0.0/microsoft.extensions.configuration.json.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/2.0.0/microsoft.extensions.configuration.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/5.0.0/microsoft.extensions.configuration.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/2.0.0/microsoft.extensions.dependencyinjection.abstractions.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/5.0.0/microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/2.0.0/microsoft.extensions.dependencyinjection.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/5.0.0/microsoft.extensions.dependencyinjection.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/2.0.4/microsoft.extensions.dependencymodel.2.0.4.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/5.0.0/microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/5.0.0/microsoft.extensions.fileproviders.physical.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/5.0.0/microsoft.extensions.filesystemglobbing.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.0.0/microsoft.extensions.logging.abstractions.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/5.0.0/microsoft.extensions.logging.abstractions.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/5.0.0/microsoft.extensions.logging.configuration.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/5.0.0/microsoft.extensions.logging.console.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/2.0.0/microsoft.extensions.logging.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/5.0.0/microsoft.extensions.logging.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/2.0.0/microsoft.extensions.options.configurationextensions.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/5.0.0/microsoft.extensions.options.configurationextensions.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/2.0.0/microsoft.extensions.options.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/5.0.0/microsoft.extensions.options.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/2.0.0/microsoft.extensions.primitives.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/5.0.0/microsoft.extensions.primitives.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.stringtools/1.0.0/microsoft.net.stringtools.1.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.test.sdk/16.11.0/microsoft.net.test.sdk.16.11.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.test.sdk/16.9.4/microsoft.net.test.sdk.16.9.4.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.net.test.sdk/17.1.0/microsoft.net.test.sdk.17.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.0.0/microsoft.netcore.platforms.3.0.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.1.0/microsoft.netcore.platforms.3.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies.net452/1.0.2/microsoft.netframework.referenceassemblies.net452.1.0.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies/1.0.2/microsoft.netframework.referenceassemblies.1.0.2.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.extensions.trxlogger/17.9.0/microsoft.testplatform.extensions.trxlogger.17.9.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.11.0/microsoft.testplatform.objectmodel.16.11.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.9.4/microsoft.testplatform.objectmodel.16.9.4.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/17.1.0/microsoft.testplatform.objectmodel.17.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/17.9.0/microsoft.testplatform.objectmodel.17.9.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.testhost/16.11.0/microsoft.testplatform.testhost.16.11.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.testhost/16.9.4/microsoft.testplatform.testhost.16.9.4.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.testhost/17.1.0/microsoft.testplatform.testhost.17.1.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.testhost/17.9.0/microsoft.testplatform.testhost.17.9.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading.analyzers/16.7.56/microsoft.visualstudio.threading.analyzers.16.7.56.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading/16.7.56/microsoft.visualstudio.threading.16.7.56.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.validation/15.5.31/microsoft.visualstudio.validation.15.5.31.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.3.0/microsoft.win32.registry.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.6.0/microsoft.win32.registry.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/4.7.0/microsoft.win32.systemevents.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/6.0.0/microsoft.win32.systemevents.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/moq/4.16.1/moq.4.16.1.nupkg https://api.nuget.org/v3-flatcontainer/nerdbank.streams/2.6.81/nerdbank.streams.2.6.81.nupkg https://api.nuget.org/v3-flatcontainer/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/11.0.2/newtonsoft.json.11.0.2.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg https://api.nuget.org/v3-flatcontainer/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.0.0/nuget.frameworks.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.11.0/nuget.frameworks.5.11.0.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc.generators/0.19.5/omnisharp.extensions.jsonrpc.generators.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc.testing/0.19.5/omnisharp.extensions.jsonrpc.testing.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc/0.19.5/omnisharp.extensions.jsonrpc.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageclient/0.19.5/omnisharp.extensions.languageclient.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageprotocol.testing/0.19.5/omnisharp.extensions.languageprotocol.testing.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageprotocol/0.19.5/omnisharp.extensions.languageprotocol.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver.shared/0.19.5/omnisharp.extensions.languageserver.shared.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver/0.19.5/omnisharp.extensions.languageserver.0.19.5.nupkg https://api.nuget.org/v3-flatcontainer/rangetree/3.0.1/rangetree.3.0.1.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tools/4.3.0/runtime.any.system.diagnostics.tools.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.extensions/4.3.0/runtime.any.system.reflection.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.timer/4.3.0/runtime.any.system.threading.timer.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.console/4.3.0/runtime.unix.system.console.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.net.sockets/4.3.0/runtime.unix.system.net.sockets.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/serilog.extensions.logging/3.0.1/serilog.extensions.logging.3.0.1.nupkg https://api.nuget.org/v3-flatcontainer/serilog.settings.configuration/3.1.0/serilog.settings.configuration.3.1.0.nupkg https://api.nuget.org/v3-flatcontainer/serilog.sinks.debug/2.0.0/serilog.sinks.debug.2.0.0.nupkg https://api.nuget.org/v3-flatcontainer/serilog.sinks.file/5.0.0/serilog.sinks.file.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/serilog.sinks.inmemory/0.11.0/serilog.sinks.inmemory.0.11.0.nupkg https://api.nuget.org/v3-flatcontainer/serilog/2.12.0/serilog.2.12.0.nupkg https://api.nuget.org/v3-flatcontainer/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.buffers/4.4.0/system.buffers.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.codedom/4.4.0/system.codedom.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.7.0/system.collections.immutable.1.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.7.1/system.collections.immutable.1.7.1.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.nongeneric/4.3.0/system.collections.nongeneric.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections.specialized/4.3.0/system.collections.specialized.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.collections/4.0.11/system.collections.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.commandline/2.0.0-beta4.22272.1/system.commandline.2.0.0-beta4.22272.1.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel.primitives/4.3.0/system.componentmodel.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel.typeconverter/4.3.0/system.componentmodel.typeconverter.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.componentmodel/4.3.0/system.componentmodel.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.composition.attributedmodel/1.0.31/system.composition.attributedmodel.1.0.31.nupkg https://api.nuget.org/v3-flatcontainer/system.composition.convention/1.0.31/system.composition.convention.1.0.31.nupkg https://api.nuget.org/v3-flatcontainer/system.composition.hosting/1.0.31/system.composition.hosting.1.0.31.nupkg https://api.nuget.org/v3-flatcontainer/system.composition.runtime/1.0.31/system.composition.runtime.1.0.31.nupkg https://api.nuget.org/v3-flatcontainer/system.composition.typedparts/1.0.31/system.composition.typedparts.1.0.31.nupkg https://api.nuget.org/v3-flatcontainer/system.composition/1.0.31/system.composition.1.0.31.nupkg https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/6.0.0/system.configuration.configurationmanager.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.console/4.3.0/system.console.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracesource/4.3.0/system.diagnostics.tracesource.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.drawing.common/4.7.0/system.drawing.common.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.drawing.common/6.0.0/system.drawing.common.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.0.11/system.dynamic.runtime.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization/4.0.11/system.globalization.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io.pipelines/4.7.3/system.io.pipelines.4.7.3.nupkg https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.1/system.io.pipelines.5.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.io/4.1.0/system.io.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.async/6.0.1/system.linq.async.6.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.1.0/system.linq.expressions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq/4.1.0/system.linq.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.linq/4.3.0/system.linq.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.3/system.memory.4.5.3.nupkg https://api.nuget.org/v3-flatcontainer/system.memory/4.5.4/system.memory.4.5.4.nupkg https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.0/system.net.http.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.net.websockets/4.3.0/system.net.websockets.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reactive/4.4.1/system.reactive.4.4.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection/4.1.0/system.reflection.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.caching/6.0.0/system.runtime.caching.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.4.0/system.runtime.compilerservices.unsafe.4.4.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.2/system.runtime.compilerservices.unsafe.4.5.2.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.0/system.runtime.compilerservices.unsafe.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime/4.1.0/system.runtime.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.6.0/system.security.accesscontrol.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.7.0/system.security.accesscontrol.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/6.0.0/system.security.accesscontrol.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.claims/4.3.0/system.security.claims.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.7.0/system.security.cryptography.cng.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/4.7.0/system.security.cryptography.pkcs.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.7.0/system.security.cryptography.protecteddata.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/6.0.0/system.security.cryptography.protecteddata.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.cryptography.xml/4.7.0/system.security.cryptography.xml.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.7.0/system.security.permissions.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.permissions/6.0.0/system.security.permissions.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.3.0/system.security.principal.windows.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.6.0/system.security.principal.windows.4.6.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.0/system.text.json.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.2/system.text.json.5.0.2.nupkg https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.channels/4.7.1/system.threading.channels.4.7.1.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.dataflow/4.9.0/system.threading.tasks.dataflow.4.9.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.3/system.threading.tasks.extensions.4.5.3.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.threading/4.0.11/system.threading.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.windows.extensions/4.7.0/system.windows.extensions.4.7.0.nupkg https://api.nuget.org/v3-flatcontainer/system.windows.extensions/6.0.0/system.windows.extensions.6.0.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/system.xml.xmldocument/4.3.0/system.xml.xmldocument.4.3.0.nupkg https://api.nuget.org/v3-flatcontainer/tomlyn/0.16.2/tomlyn.0.16.2.nupkg https://api.nuget.org/v3-flatcontainer/validation/2.4.18/validation.2.4.18.nupkg https://api.nuget.org/v3-flatcontainer/xunit.abstractions/2.0.2/xunit.abstractions.2.0.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.abstractions/2.0.3/xunit.abstractions.2.0.3.nupkg https://api.nuget.org/v3-flatcontainer/xunit.analyzers/0.10.0/xunit.analyzers.0.10.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.analyzers/1.0.0/xunit.analyzers.1.0.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.assert/2.4.1/xunit.assert.2.4.1.nupkg https://api.nuget.org/v3-flatcontainer/xunit.assert/2.4.2/xunit.assert.2.4.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.assertmessages/2.4.0/xunit.assertmessages.2.4.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.core/2.4.1/xunit.core.2.4.1.nupkg https://api.nuget.org/v3-flatcontainer/xunit.core/2.4.2/xunit.core.2.4.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.core/2.4.0/xunit.extensibility.core.2.4.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.core/2.4.1/xunit.extensibility.core.2.4.1.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.core/2.4.2/xunit.extensibility.core.2.4.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.execution/2.4.0/xunit.extensibility.execution.2.4.0.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.execution/2.4.1/xunit.extensibility.execution.2.4.1.nupkg https://api.nuget.org/v3-flatcontainer/xunit.extensibility.execution/2.4.2/xunit.extensibility.execution.2.4.2.nupkg https://api.nuget.org/v3-flatcontainer/xunit.runner.visualstudio/2.4.3/xunit.runner.visualstudio.2.4.3.nupkg https://api.nuget.org/v3-flatcontainer/xunit.runner.visualstudio/2.5.1/xunit.runner.visualstudio.2.5.1.nupkg https://api.nuget.org/v3-flatcontainer/xunit.skippablefact/1.4.8/xunit.skippablefact.1.4.8.nupkg https://api.nuget.org/v3-flatcontainer/xunit/2.4.1/xunit.2.4.1.nupkg https://api.nuget.org/v3-flatcontainer/xunit/2.4.2/xunit.2.4.2.nupkg test? ( https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	dotnet-pkg	9f041be16373f3b3c2ad1ae7a7559960	dotnet-pkg-base	3e91bc4d3bc423a7b9dc30a94279901c	edo	367e103a74bf77e6a8da7894d999fa3c	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	nuget	e90611a22e7a711a49d37cb365b878e8	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	dotnet-pkg	9f041be16373f3b3c2ad1ae7a7559960	dotnet-pkg-base	3e91bc4d3bc423a7b9dc30a94279901c	edo	367e103a74bf77e6a8da7894d999fa3c	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	nuget	e90611a22e7a711a49d37cb365b878e8	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=e1feb5b16f32378fb51d36eeccae0216
diff --git a/metadata/md5-cache/dev-lang/dzaima-bqn-0.2.1 b/metadata/md5-cache/dev-lang/dzaima-bqn-0.2.1
index b052d17ed43f..766b5d6e129b 100644
--- a/metadata/md5-cache/dev-lang/dzaima-bqn-0.2.1
+++ b/metadata/md5-cache/dev-lang/dzaima-bqn-0.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/dzaima/BQN/archive/v0.2.1.tar.gz -> dzaima-bqn-0.2.1.tar.gz
-_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d8139849e2355fc9ab95b1884474183a
diff --git a/metadata/md5-cache/dev-lang/dzaima-bqn-9999 b/metadata/md5-cache/dev-lang/dzaima-bqn-9999
index ee6da82e6419..7b2d4b88d676 100644
--- a/metadata/md5-cache/dev-lang/dzaima-bqn-9999
+++ b/metadata/md5-cache/dev-lang/dzaima-bqn-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e8deb6dcd8eed29b248c2a2b90d434b1
diff --git a/metadata/md5-cache/dev-lang/erlang-26.2.1 b/metadata/md5-cache/dev-lang/erlang-26.2.1
index 3fffd3215539..e574936132f2 100644
--- a/metadata/md5-cache/dev-lang/erlang-26.2.1
+++ b/metadata/md5-cache/dev-lang/erlang-26.2.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( dev-libs/glib:2 x11-libs/wxGTK:3.2-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/26.2.1
 SRC_URI=https://github.com/erlang/otp/archive/OTP-26.2.1.tar.gz -> erlang-26.2.1.tar.gz https://github.com/erlang/otp/releases/download/OTP-26.2/otp_doc_man_26.2.tar.gz -> erlang_doc_man_26.2.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-26.2/otp_doc_html_26.2.tar.gz -> erlang_doc_html_26.2.tar.gz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
 _md5_=39a96042761e819291d289a01e1bce71
diff --git a/metadata/md5-cache/dev-lang/erlang-26.2.2 b/metadata/md5-cache/dev-lang/erlang-26.2.2
index e08013349aae..d185b5fbeb53 100644
--- a/metadata/md5-cache/dev-lang/erlang-26.2.2
+++ b/metadata/md5-cache/dev-lang/erlang-26.2.2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( dev-libs/glib:2 x11-libs/wxGTK:3.2-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/26.2.2
 SRC_URI=https://github.com/erlang/otp/archive/OTP-26.2.2.tar.gz -> erlang-26.2.2.tar.gz https://github.com/erlang/otp/releases/download/OTP-26.2/otp_doc_man_26.2.tar.gz -> erlang_doc_man_26.2.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-26.2/otp_doc_html_26.2.tar.gz -> erlang_doc_html_26.2.tar.gz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
 _md5_=ee6a0466c4a1615bd24cb27623c06e65
diff --git a/metadata/md5-cache/dev-lang/erlang-26.2.4 b/metadata/md5-cache/dev-lang/erlang-26.2.4
index 1f0f7b2fc201..74aeae4ee810 100644
--- a/metadata/md5-cache/dev-lang/erlang-26.2.4
+++ b/metadata/md5-cache/dev-lang/erlang-26.2.4
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( dev-libs/glib:2 x11-libs/wxGTK:3.2-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/26.2.4
 SRC_URI=https://github.com/erlang/otp/archive/OTP-26.2.4.tar.gz -> erlang-26.2.4.tar.gz https://github.com/erlang/otp/releases/download/OTP-26.2/otp_doc_man_26.2.tar.gz -> erlang_doc_man_26.2.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-26.2/otp_doc_html_26.2.tar.gz -> erlang_doc_html_26.2.tar.gz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
 _md5_=2beaba50557202cf5c9c5199b2e6d93f
diff --git a/metadata/md5-cache/dev-lang/erlang-27.0 b/metadata/md5-cache/dev-lang/erlang-27.0
index 43a0b523f931..f5f217c13d2f 100644
--- a/metadata/md5-cache/dev-lang/erlang-27.0
+++ b/metadata/md5-cache/dev-lang/erlang-27.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( dev-libs/glib:2 x11-libs/wxGTK:3.2-gtk3[X,opengl] virtual/glu ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/27.0
 SRC_URI=https://github.com/erlang/otp/archive/OTP-27.0.tar.gz -> erlang-27.0.tar.gz https://github.com/erlang/otp/releases/download/OTP-27.0/otp_doc_man_27.0.tar.gz -> erlang_doc_man_27.0.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-27.0/otp_doc_html_27.0.tar.gz -> erlang_doc_html_27.0.tar.gz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
 _md5_=46e683da1903f620ee732ff6557fb9cb
diff --git a/metadata/md5-cache/dev-lang/fuzion-0.086 b/metadata/md5-cache/dev-lang/fuzion-0.086
index 34b8575043e5..2043959bcd18 100644
--- a/metadata/md5-cache/dev-lang/fuzion-0.086
+++ b/metadata/md5-cache/dev-lang/fuzion-0.086
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-17:* dev-libs/boehm-gc >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tokiwa-software/fuzion/archive/refs/tags/v0.086.tar.gz -> fuzion-0.086.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0a10c4f1f06883f4cb8ae90fafd501e5
diff --git a/metadata/md5-cache/dev-lang/fuzion-0.088 b/metadata/md5-cache/dev-lang/fuzion-0.088
index 735d0cec7cbc..1dba928399b6 100644
--- a/metadata/md5-cache/dev-lang/fuzion-0.088
+++ b/metadata/md5-cache/dev-lang/fuzion-0.088
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-21:* dev-libs/boehm-gc >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tokiwa-software/fuzion/archive/refs/tags/v0.088.tar.gz -> fuzion-0.088.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5a3ef7b6343958876ed3f72674c51b98
diff --git a/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r2 b/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r2
index dbf137b6acec..6800f3f39cab 100644
--- a/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r2
+++ b/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-3+
 RDEPEND=dev-java/java-getopt:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gnu/gnuprologjava/gnuprologjava-0.2.6-src.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=913a16aa7edfe7c05efc4a147e81a2e5
diff --git a/metadata/md5-cache/dev-lang/interprolog-2.1.2-r2 b/metadata/md5-cache/dev-lang/interprolog-2.1.2-r2
index 5e88efe84757..e3f786efca49 100644
--- a/metadata/md5-cache/dev-lang/interprolog-2.1.2-r2
+++ b/metadata/md5-cache/dev-lang/interprolog-2.1.2-r2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jdk-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://declarativa.com/InterProlog/interprolog212.zip
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=13affbbe03c33681f5f99e33aa55605a
diff --git a/metadata/md5-cache/dev-lang/interprolog-2.1.2-r3 b/metadata/md5-cache/dev-lang/interprolog-2.1.2-r3
index d786de31d711..d57a6b3ac17b 100644
--- a/metadata/md5-cache/dev-lang/interprolog-2.1.2-r3
+++ b/metadata/md5-cache/dev-lang/interprolog-2.1.2-r3
@@ -11,5 +11,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://declarativa.com/InterProlog/interprolog212.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c1acccd881ebb602fb1c156084bb652d
diff --git a/metadata/md5-cache/dev-lang/kotlin-bin-1.9.24 b/metadata/md5-cache/dev-lang/kotlin-bin-1.9.24
index a34d49ff9743..3a66674404d1 100644
--- a/metadata/md5-cache/dev-lang/kotlin-bin-1.9.24
+++ b/metadata/md5-cache/dev-lang/kotlin-bin-1.9.24
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD MIT NPL-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0/1.9.24
 SRC_URI=https://github.com/JetBrains/kotlin/releases/download/v1.9.24/kotlin-compiler-1.9.24.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=db0901065397c32a19a75359fdf2c712
diff --git a/metadata/md5-cache/dev-lang/kotlin-bin-2.0.0 b/metadata/md5-cache/dev-lang/kotlin-bin-2.0.0
index 4b78175ad1d0..2a57f1f6f1d3 100644
--- a/metadata/md5-cache/dev-lang/kotlin-bin-2.0.0
+++ b/metadata/md5-cache/dev-lang/kotlin-bin-2.0.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD MIT NPL-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0/2.0.0
 SRC_URI=https://github.com/JetBrains/kotlin/releases/download/v2.0.0/kotlin-compiler-2.0.0.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=db0901065397c32a19a75359fdf2c712
diff --git a/metadata/md5-cache/dev-lang/mercury-22.01.1 b/metadata/md5-cache/dev-lang/mercury-22.01.1
index ac74ed7a336b..f165f629205c 100644
--- a/metadata/md5-cache/dev-lang/mercury-22.01.1
+++ b/metadata/md5-cache/dev-lang/mercury-22.01.1
@@ -12,5 +12,5 @@ RDEPEND=net-libs/libnsl:0= readline? ( sys-libs/readline:= ) java? ( >=virtual/j
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dl.mercurylang.org/release/mercury-srcdist-22.01.1.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury/mercury-22.01.1-gentoo-patchset-2.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d35d677456ae159661b7d0270ed0c715
diff --git a/metadata/md5-cache/dev-lang/mozart-2.0.1-r1 b/metadata/md5-cache/dev-lang/mozart-2.0.1-r1
index d346da7f5829..b02fdfaaa9e9 100644
--- a/metadata/md5-cache/dev-lang/mozart-2.0.1-r1
+++ b/metadata/md5-cache/dev-lang/mozart-2.0.1-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:= dev-libs/gmp:0 dev-lang/tcl:0 dev-lang/tk:0 emacs? ( >=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mozart/mozart2/archive/v2.0.1.tar.gz -> mozart-2.0.1.tar.gz https://dev.gentoo.org/~keri/distfiles/mozart/mozart-2.0.1-gentoo-patchset-2.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e834a4ab54260ccfaba9574761f00c00
diff --git a/metadata/md5-cache/dev-lang/nqp-2024.02 b/metadata/md5-cache/dev-lang/nqp-2024.02
index 287fa2802309..cb30de33836e 100644
--- a/metadata/md5-cache/dev-lang/nqp-2024.02
+++ b/metadata/md5-cache/dev-lang/nqp-2024.02
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( java moar )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2024.02/nqp-2024.02.tar.gz
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
 _md5_=9873ed7fdfa65c5316e7cf1ce2e31daa
diff --git a/metadata/md5-cache/dev-lang/nqp-2024.04 b/metadata/md5-cache/dev-lang/nqp-2024.04
index 6bba31f1ac30..ef804debb7f2 100644
--- a/metadata/md5-cache/dev-lang/nqp-2024.04
+++ b/metadata/md5-cache/dev-lang/nqp-2024.04
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( java moar )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2024.04/nqp-2024.04.tar.gz
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
 _md5_=9873ed7fdfa65c5316e7cf1ce2e31daa
diff --git a/metadata/md5-cache/dev-lang/nqp-2024.05 b/metadata/md5-cache/dev-lang/nqp-2024.05
index 717d88fd5ced..24c9c3c06360 100644
--- a/metadata/md5-cache/dev-lang/nqp-2024.05
+++ b/metadata/md5-cache/dev-lang/nqp-2024.05
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( java moar )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2024.05/nqp-2024.05.tar.gz
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
 _md5_=9873ed7fdfa65c5316e7cf1ce2e31daa
diff --git a/metadata/md5-cache/dev-lang/nqp-9999 b/metadata/md5-cache/dev-lang/nqp-9999
index ef113ba06cc1..10dba6a662a9 100644
--- a/metadata/md5-cache/dev-lang/nqp-9999
+++ b/metadata/md5-cache/dev-lang/nqp-9999
@@ -12,5 +12,5 @@ RDEPEND=java? ( dev-java/asm:9 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-9999[cl
 REQUIRED_USE=|| ( java moar )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
+_eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
 _md5_=2158aaeaf4b4dce27a0b29047c4d74af
diff --git a/metadata/md5-cache/dev-lang/rakudo-2024.02 b/metadata/md5-cache/dev-lang/rakudo-2024.02
index 4711b1d8d22b..22957a23b56c 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2024.02
+++ b/metadata/md5-cache/dev-lang/rakudo-2024.02
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( java moar )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rakudo.org/dl/rakudo/rakudo-2024.02.tar.gz
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=637524407d4841797804d261ad3b0dc3
diff --git a/metadata/md5-cache/dev-lang/rakudo-2024.04 b/metadata/md5-cache/dev-lang/rakudo-2024.04
index 0b1d582728d4..cb236de4a30e 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2024.04
+++ b/metadata/md5-cache/dev-lang/rakudo-2024.04
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( java moar )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rakudo.org/dl/rakudo/rakudo-2024.04.tar.gz
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=637524407d4841797804d261ad3b0dc3
diff --git a/metadata/md5-cache/dev-lang/rakudo-2024.05 b/metadata/md5-cache/dev-lang/rakudo-2024.05
index ea4754053670..3e892437f0b2 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2024.05
+++ b/metadata/md5-cache/dev-lang/rakudo-2024.05
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( java moar )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rakudo.org/dl/rakudo/rakudo-2024.05.tar.gz
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=637524407d4841797804d261ad3b0dc3
diff --git a/metadata/md5-cache/dev-lang/scala-2.12.10-r2 b/metadata/md5-cache/dev-lang/scala-2.12.10-r2
index 67ce4fcc4243..1bb74e0035dc 100644
--- a/metadata/md5-cache/dev-lang/scala-2.12.10-r2
+++ b/metadata/md5-cache/dev-lang/scala-2.12.10-r2
@@ -11,5 +11,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=>=dev-java/ant-1.10.14-r3:0 dev-java/jline:2 >=virtual/jre-1.8:* app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.12/2.12.10
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.12.10.tar.gz -> scala-2.12.10.tar.gz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.10-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.10-sbt-deps.tar.xz ) binary? ( https://dev.gentoo.org/~gienah/distfiles/scala-2.12.10-gentoo-binary.tar.xz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=d6aa30e17fcf682a5dc58c6695ff6cb5
diff --git a/metadata/md5-cache/dev-lang/scala-2.12.4 b/metadata/md5-cache/dev-lang/scala-2.12.4
index 514b9902defd..20b5a2335188 100644
--- a/metadata/md5-cache/dev-lang/scala-2.12.4
+++ b/metadata/md5-cache/dev-lang/scala-2.12.4
@@ -11,5 +11,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/jline:2 >=virtual/jre-1.8 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.12/2.12.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.12.4.tar.gz -> scala-2.12.4.tar.gz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.4-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.4-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.12.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.12.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.12.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.12.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.12.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.12.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.12.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.12.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.12.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.12.4-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.12.4-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.12.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.12.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.12.4-instrumented.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.12.4-gentoo-binary.tar.xz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=955e13862b47f7c168cb788c5cf07409
diff --git a/metadata/md5-cache/dev-lang/scala-bin-2.13.9 b/metadata/md5-cache/dev-lang/scala-bin-2.13.9
index 3b3ffac3a34f..f0b8b1f2c2fe 100644
--- a/metadata/md5-cache/dev-lang/scala-bin-2.13.9
+++ b/metadata/md5-cache/dev-lang/scala-bin-2.13.9
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 !dev-lang/scala >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://downloads.lightbend.com/scala/2.13.9/scala-2.13.9.tgz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=dfec0917918fa8d60ebef99fd4776585
diff --git a/metadata/md5-cache/dev-lang/souffle-2.4.1 b/metadata/md5-cache/dev-lang/souffle-2.4.1
index 7cdc35c05204..619c78cfe338 100644
--- a/metadata/md5-cache/dev-lang/souffle-2.4.1
+++ b/metadata/md5-cache/dev-lang/souffle-2.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=java? ( swig ) python? ( swig ) test? ( ^^ ( python_single_target_p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/souffle-lang/souffle/archive/2.4.1.tar.gz -> souffle-2.4.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a3c25d00fa3c739faed82305b156bf4f
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-9.1.2-r1 b/metadata/md5-cache/dev-lang/swi-prolog-9.1.2-r1
index a13ad31029b8..8ca4df13b094 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-9.1.2-r1
+++ b/metadata/md5-cache/dev-lang/swi-prolog-9.1.2-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=doc? ( archive ) minimal? ( !archive !doc !ipc !ssl !test )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-9.1.2.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=43b5253a53ad7d6c9a33be82a9855f3c
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.2.0-r2 b/metadata/md5-cache/dev-lang/tuprolog-3.2.0-r2
index 24b3cb30bbe2..57fbee0a243a 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-3.2.0-r2
+++ b/metadata/md5-cache/dev-lang/tuprolog-3.2.0-r2
@@ -11,5 +11,5 @@ RDEPEND=virtual/jdk:1.8 dev-java/javassist:3 dev-java/commons-lang:3.6 dev-java/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~keri/distfiles/tuprolog/tuprolog-3.2.0.tar.gz https://dev.gentoo.org/~keri/distfiles/tuprolog/tuprolog-3.2.0-gentoo-patchset-0.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=47ac2c5372cf98c6136c67138749359c
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.2.0-r3 b/metadata/md5-cache/dev-lang/tuprolog-3.2.0-r3
index 1a4213c33274..fbae76bd782d 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-3.2.0-r3
+++ b/metadata/md5-cache/dev-lang/tuprolog-3.2.0-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-lang:3.6 dev-java/gson:0 dev-java/javassist:3 >=virtual
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~keri/distfiles/tuprolog/tuprolog-3.2.0.tar.gz https://dev.gentoo.org/~keri/distfiles/tuprolog/tuprolog-3.2.0-gentoo-patchset-0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=2f4e32684aa23f0abc17746a8d99db26
diff --git a/metadata/md5-cache/dev-lang/xsb-3.8.0 b/metadata/md5-cache/dev-lang/xsb-3.8.0
index e459d45a308b..b3dfe3e5713b 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.8.0
+++ b/metadata/md5-cache/dev-lang/xsb-3.8.0
@@ -11,5 +11,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.8:* ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB38.tar.gz https://dev.gentoo.org/~keri/distfiles/xsb/xsb-3.8.0-gentoo-patchset-5.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=efc6f991756356193fdf1998e700d5c8
diff --git a/metadata/md5-cache/dev-lang/xsb-4.0.0-r1 b/metadata/md5-cache/dev-lang/xsb-4.0.0-r1
index 8ac6304f9318..361bd8201d62 100644
--- a/metadata/md5-cache/dev-lang/xsb-4.0.0-r1
+++ b/metadata/md5-cache/dev-lang/xsb-4.0.0-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.8:* ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/xsb/XSB-4-0-0.tar.gz https://dev.gentoo.org/~keri/distfiles/xsb/xsb-4.0.0-gentoo-patchset-3.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=dbc2467e0b6c97e5e1a9fee1c485d332
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 36f33b73869d..63001f5f3032 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/OpenNI-1.5.7.10-r3 b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r3
index ea645a88b05c..9360a2a07c9b 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r3
+++ b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-libs/libjpeg-turbo:= virtual/libusb:1 virtual/libudev dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/OpenNI/OpenNI/archive/Stable-1.5.7.10.tar.gz -> OpenNI-1.5.7.10.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=6e1e1a8d8ba99724f49b1b368c877df8
diff --git a/metadata/md5-cache/dev-libs/OpenNI-9999 b/metadata/md5-cache/dev-libs/OpenNI-9999
index 71f0cd88a46d..e4a85f6deb83 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI-9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=media-libs/libjpeg-turbo:= virtual/libusb:1 virtual/libudev dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=676edd610bc59046dbe2c70b8287dd46
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1 b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1
index 6010e0ab7466..7ce4701761ec 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1
+++ b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-libs/libjpeg-turbo:= virtual/libusb:1 virtual/libudev opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/occipital/OpenNI2/archive/2.2-beta2.tar.gz -> OpenNI2-2.2_beta2.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=c181c2887d71add741f2fc9ccb72bbf8
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-9999 b/metadata/md5-cache/dev-libs/OpenNI2-9999
index 93cc726deea8..16775e8bf31e 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI2-9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=media-libs/libjpeg-turbo:= virtual/libusb:1 virtual/libudev opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=bae3673d5cc575bfdb9113f5281569d9
diff --git a/metadata/md5-cache/dev-libs/cxxopts-3.0.0-r1 b/metadata/md5-cache/dev-libs/cxxopts-3.0.0-r1
index 2e92f80b87d4..a1a3d12c41fc 100644
--- a/metadata/md5-cache/dev-libs/cxxopts-3.0.0-r1
+++ b/metadata/md5-cache/dev-libs/cxxopts-3.0.0-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/jarro2783/cxxopts
 INHERIT=cmake
 IUSE=icu test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/jarro2783/cxxopts/archive/v3.0.0.tar.gz -> cxxopts-3.0.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=00ccc179de14c1f993bf406273099be7
+_md5_=97792784c4ae3b258692c8f3dc3c971d
diff --git a/metadata/md5-cache/dev-libs/half-1.12.0 b/metadata/md5-cache/dev-libs/half-1.12.0
deleted file mode 100644
index ffa94ffa91ac..000000000000
--- a/metadata/md5-cache/dev-libs/half-1.12.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Half-precision floating-point library
-EAPI=7
-HOMEPAGE=http://half.sourceforge.net/
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0/1
-SRC_URI=https://github.com/ROCmSoftwarePlatform/half/archive/1.12.0.tar.gz -> half-1.12.0.tar.gz
-_md5_=7e158d8ee408af440f680eaf61a2d1e4
diff --git a/metadata/md5-cache/dev-libs/half-1.12.0-r1 b/metadata/md5-cache/dev-libs/half-1.12.0-r1
new file mode 100644
index 000000000000..b00d2e2acdaf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/half-1.12.0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Half-precision floating-point library
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/half
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0/1
+SRC_URI=https://github.com/ROCm/half/archive/1.12.0.tar.gz -> half-1.12.0.tar.gz
+_md5_=8357f0ef721da4cc09242ba798094c88
diff --git a/metadata/md5-cache/dev-libs/hipother-6.1.1 b/metadata/md5-cache/dev-libs/hipother-6.1.1
new file mode 100644
index 000000000000..9a08972b387a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/hipother-6.1.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=ROCclr runtime implementation for non-AMD HIP platforms, like NVIDIA
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/hipother
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/hipother/archive/refs/tags/rocm-6.1.1.tar.gz -> hipother-6.1.1.tar.gz
+_md5_=d186ebd0f03affb3739cbdf79ce0a4e8
diff --git a/metadata/md5-cache/dev-libs/libclc-18.1.7 b/metadata/md5-cache/dev-libs/libclc-18.1.7
deleted file mode 100644
index 87dff503d740..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-18.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) llvm_slot_17? ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) llvm_slot_18? ( sys-devel/clang:18 spirv? ( dev-util/spirv-llvm-translator:18 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm.org llvm-r1 python-any-r1
-IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig +llvm_slot_17 llvm_slot_18
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-REQUIRED_USE=^^ ( llvm_slot_17 llvm_slot_18 )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=147c7f7ad0a79d0234c9c37cb01ae3b0
diff --git a/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240608 b/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240608
deleted file mode 100644
index b7c295c3d3c2..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240608
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) llvm_slot_17? ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) llvm_slot_18? ( sys-devel/clang:18 spirv? ( dev-util/spirv-llvm-translator:18 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm.org llvm-r1 python-any-r1
-IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi +llvm_slot_17 llvm_slot_18
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-REQUIRED_USE=^^ ( llvm_slot_17 llvm_slot_18 )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fda4a93b6f4f3c3a70e68ff3f1702311
diff --git a/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240615 b/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240615
deleted file mode 100644
index f2b06f323144..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-19.0.0_pre20240615
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) llvm_slot_17? ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) llvm_slot_18? ( sys-devel/clang:18 spirv? ( dev-util/spirv-llvm-translator:18 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm.org llvm-r1 python-any-r1
-IUSE=+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi +llvm_slot_17 llvm_slot_18
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-REQUIRED_USE=^^ ( llvm_slot_17 llvm_slot_18 )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fda4a93b6f4f3c3a70e68ff3f1702311
diff --git a/metadata/md5-cache/dev-libs/rccl-5.7.1 b/metadata/md5-cache/dev-libs/rccl-5.7.1
index 3bb4b1e06928..fb3aed641030 100644
--- a/metadata/md5-cache/dev-libs/rccl-5.7.1
+++ b/metadata/md5-cache/dev-libs/rccl-5.7.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.7
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-5.7.1.tar.gz -> rccl-5.7.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a909b6a36e8d0f4c8e0f16d647f73b84
+_md5_=9859abebc2eb74f0716a608ba1ed16c0
diff --git a/metadata/md5-cache/dev-libs/rccl-6.1.1 b/metadata/md5-cache/dev-libs/rccl-6.1.1
new file mode 100644
index 000000000000..66610df890fa
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rccl-6.1.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-build/cmake-3.22 >=dev-build/rocm-cmake-5.7.1 dev-util/hipify-clang:0/6.1 test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-util/hip-6* dev-util/rocm-smi:0/6.1 sys-libs/binutils-libs
+DESCRIPTION=ROCm Communication Collectives Library (RCCL)
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/rccl
+INHERIT=cmake edo rocm flag-o-matic
+IUSE=test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND==dev-util/hip-6* dev-util/rocm-smi:0/6.1
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/rccl/archive/rocm-6.1.1.tar.gz -> rccl-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d3d0ca0c0d2c9979168b9c6b18f0923d
diff --git a/metadata/md5-cache/dev-libs/rocdbgapi-5.7.1 b/metadata/md5-cache/dev-libs/rocdbgapi-5.7.1
new file mode 100644
index 000000000000..206dc947e38f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocdbgapi-5.7.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-text/doxygen[dot] virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/rocm-comgr:0/5.7 dev-libs/rocr-runtime:0/5.7
+DESCRIPTION=AMD Debugger API
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/ROCdbgapi
+INHERIT=cmake
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/rocm-comgr:0/5.7 dev-libs/rocr-runtime:0/5.7
+SLOT=0/5.7
+SRC_URI=https://github.com/ROCm/ROCdbgapi/archive/rocm-5.7.1.tar.gz -> rocdbgapi-5.7.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b9a9b9473963ab037a8df0806696efbf
diff --git a/metadata/md5-cache/dev-libs/rocdbgapi-6.1.1 b/metadata/md5-cache/dev-libs/rocdbgapi-6.1.1
new file mode 100644
index 000000000000..6a3bf65fbadc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocdbgapi-6.1.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-text/doxygen[dot] virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/rocm-comgr:0/6.1 dev-libs/rocr-runtime:0/6.1
+DESCRIPTION=AMD Debugger API
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/ROCdbgapi
+INHERIT=cmake
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/rocm-comgr:0/6.1 dev-libs/rocr-runtime:0/6.1
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/ROCdbgapi/archive/rocm-6.1.1.tar.gz -> rocdbgapi-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=628ddacc6a5ba64471bca1c63663a446
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-6.0.0 b/metadata/md5-cache/dev-libs/rocm-comgr-6.0.0
deleted file mode 100644
index ac6e300dc7bd..000000000000
--- a/metadata/md5-cache/dev-libs/rocm-comgr-6.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/rocm-device-libs-6.0.0 sys-devel/clang:17= sys-devel/clang-runtime:= sys-devel/lld:17= !!sys-devel/llvm:0
-DESCRIPTION=Radeon Open Compute Code Object Manager
-EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport
-INHERIT=cmake llvm prefix
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-libs/rocm-device-libs-6.0.0 sys-devel/clang:17= sys-devel/clang-runtime:= sys-devel/lld:17=
-RESTRICT=!test? ( test )
-SLOT=0/6.0
-SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-6.0.0.tar.gz -> rocm-comgr-6.0.0.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9e687e6cd24102a35dd71ffd71eb60b6
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-6.1.1 b/metadata/md5-cache/dev-libs/rocm-comgr-6.1.1
new file mode 100644
index 000000000000..fb9e30774bb5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/rocm-device-libs-6.1.1 sys-devel/clang-runtime:= llvm_slot_18? ( sys-devel/clang:18= sys-devel/lld:18= ) dev-util/hipcc:0/6.1
+DESCRIPTION=Radeon Open Compute Code Object Manager
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/ROCm-CompilerSupport
+INHERIT=cmake llvm-r1 prefix
+IUSE=test +llvm_slot_18
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-libs/rocm-device-libs-6.1.1 sys-devel/clang-runtime:= llvm_slot_18? ( sys-devel/clang:18= sys-devel/lld:18= ) dev-util/hipcc:0/6.1
+REQUIRED_USE=^^ ( llvm_slot_18 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/llvm-project/archive/rocm-6.1.1.tar.gz -> llvm-project-rocm-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=36dc6d07f738a8c35d2fd661fcfbf556
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-5.7.1 b/metadata/md5-cache/dev-libs/rocm-device-libs-5.7.1
index eab1d4379b8d..d04da40c3f44 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-5.7.1
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-5.7.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.7.1.tar.gz -> rocm-device-libs-5.7.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0d5baafc043262621edc524e694b1aa8
+_md5_=10bb14073224a85b1822f0851997509f
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-6.0.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-6.0.0
deleted file mode 100644
index 19ab18b8a507..000000000000
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-6.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/clang:17 !!sys-devel/llvm:0
-DESCRIPTION=Radeon Open Compute Device Libraries
-EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-Device-Libs
-INHERIT=cmake llvm
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=sys-devel/clang:17
-RESTRICT=!test? ( test )
-SLOT=0/6.0
-SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-6.0.0.tar.gz -> rocm-device-libs-6.0.0.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ca68e4ab1e83e68a2edbb3fdb6154e26
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-6.1.1 b/metadata/md5-cache/dev-libs/rocm-device-libs-6.1.1
new file mode 100644
index 000000000000..450ab0d6a8b1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-6.1.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-build/rocm-cmake llvm_slot_18? ( sys-devel/clang:18 sys-devel/lld:18 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DESCRIPTION=Radeon Open Compute Device Libraries
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/ROCm-Device-Libs
+INHERIT=cmake llvm-r1
+IUSE=test +llvm_slot_18
+KEYWORDS=~amd64
+LICENSE=MIT
+REQUIRED_USE=^^ ( llvm_slot_18 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/llvm-project/archive/rocm-6.1.1.tar.gz -> llvm-project-rocm-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c9486d974a3284cd4fe7b7b0e96ce000
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-6.0.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-6.1.1
index 508ed808dcdb..52f2115d0d9c 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-6.0.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-6.1.1
@@ -1,5 +1,5 @@
 BDEPEND=>=dev-build/rocm-cmake-5.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test unpack
+DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/rocr-runtime-6.0 >=dev-libs/rocm-comgr-6.0 >=dev-libs/rocm-device-libs-6.0 >=virtual/opencl-3 media-libs/mesa[-opencl]
 DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
 EAPI=8
@@ -10,7 +10,7 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-libs/rocr-runtime-6.0 >=dev-libs/rocm-comgr-6.0 >=dev-libs/rocm-device-libs-6.0 >=virtual/opencl-3 media-libs/mesa[-opencl]
 RESTRICT=!test? ( test )
-SLOT=0/6.0
-SRC_URI=https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-6.0.0.tar.gz -> rocm-clr-6.0.0.tar.gz
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-6.1.1.tar.gz -> rocm-clr-6.1.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=63a9012bc51f4aa8644841040212365b
+_md5_=fbcc4eb1a307cfc01dfc17dd4dddc98e
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-9999 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-9999
deleted file mode 100644
index d34fcd6eb4c7..000000000000
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-build/rocm-cmake-5.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/rocr-runtime-5.3 >=dev-libs/rocm-comgr-5.3 >=dev-libs/rocm-device-libs-5.3 >=virtual/opencl-3 media-libs/mesa[-opencl] dev-util/opencl-headers
-DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
-EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
-INHERIT=cmake edo flag-o-matic git-r3
-IUSE=debug test
-LICENSE=Apache-2.0 MIT
-PROPERTIES=live
-RDEPEND=>=dev-libs/rocr-runtime-5.3 >=dev-libs/rocm-comgr-5.3 >=dev-libs/rocm-device-libs-5.3 >=virtual/opencl-3 media-libs/mesa[-opencl]
-RESTRICT=!test? ( test )
-SLOT=0/9999
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b10fa97f1cb5d6adb35de77e19b8db95
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.1.3-r1 b/metadata/md5-cache/dev-libs/rocr-runtime-5.1.3-r1
index b1cd74745c74..4b94ddf6985d 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.1.3-r1
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.1.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.1.3 >=dev-libs/rocm-device-libs-5.1.3 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
+DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.1.3 >=dev-libs/rocm-device-libs-5.1.3 <=dev-libs/rocm-device-libs-6.0 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=8
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/elfutils
 SLOT=0/5.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.1.3.tar.gz -> rocr-runtime-5.1.3.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7a2f1162f552887abd6e71c26eb4b2e3
+_md5_=7882d49933c3ab5c3b69ef1fe39a2af8
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.3.3-r1 b/metadata/md5-cache/dev-libs/rocr-runtime-5.3.3-r1
index abd84707470a..253860159e6b 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.3.3-r1
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.3.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.3.3 >=dev-libs/rocm-device-libs-5.3.3 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
+DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.3.3 >=dev-libs/rocm-device-libs-5.3.3 <=dev-libs/rocm-device-libs-6.0 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=8
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/elfutils
 SLOT=0/5.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.3.3.tar.gz -> rocr-runtime-5.3.3.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c25fae70af5c506d3e1d812177479994
+_md5_=e73c262c62babfd60e60c618ce1fff68
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.4.3-r1 b/metadata/md5-cache/dev-libs/rocr-runtime-5.4.3-r1
index 378ae0cd0271..5fbb88fb2e1b 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.4.3-r1
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.4.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.4.3 >=dev-libs/rocm-device-libs-5.4.3 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
+DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.4.3 >=dev-libs/rocm-device-libs-5.4.3 <=dev-libs/rocm-device-libs-6.0 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=8
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/elfutils
 SLOT=0/5.4
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.4.3.tar.gz -> rocr-runtime-5.4.3.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=aaa9b18931ec04a3de5e9ed630f7688f
+_md5_=6393fc7eb13681d066ff150530b6dd12
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.5.1 b/metadata/md5-cache/dev-libs/rocr-runtime-5.5.1
index 34734a6eba5b..37167109bbad 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.5.1
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.5.1
@@ -1,6 +1,6 @@
 BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.5.1 >=dev-libs/rocm-device-libs-5.5.1 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
+DEPEND=dev-libs/elfutils >=dev-libs/roct-thunk-interface-5.5.1 >=dev-libs/rocm-device-libs-5.5.1 <=dev-libs/rocm-device-libs-6.0 sys-devel/clang sys-devel/lld !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=8
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/elfutils
 SLOT=0/5.5
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.5.1.tar.gz -> rocr-runtime-5.5.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=75631c138b86e4a7082586b423d8e9e4
+_md5_=137853b9847db4d1828b2cac7aa5a2ab
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-5.7.1-r2 b/metadata/md5-cache/dev-libs/rocr-runtime-5.7.1-r3
index 6218d73a5a49..32147f8f901a 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-5.7.1-r2
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-5.7.1-r3
@@ -1,6 +1,6 @@
 BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/elfutils x11-libs/libdrm >=dev-libs/roct-thunk-interface-5.7.1 >=dev-libs/rocm-device-libs-5.7.1 sys-devel/clang:17= sys-devel/lld:17= !!sys-devel/llvm:0
+DEPEND=dev-libs/elfutils x11-libs/libdrm >=dev-libs/roct-thunk-interface-5.7.1 >=dev-libs/rocm-device-libs-5.7.1 <=dev-libs/rocm-device-libs-6.0 sys-devel/clang:17= sys-devel/lld:17= !!sys-devel/llvm:0
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=8
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
@@ -8,8 +8,8 @@ INHERIT=cmake flag-o-matic llvm
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-libs/elfutils x11-libs/libdrm >=dev-libs/roct-thunk-interface-5.7.1 >=dev-libs/rocm-device-libs-5.7.1 sys-devel/clang:17= sys-devel/lld:17=
+RDEPEND=dev-libs/elfutils x11-libs/libdrm >=dev-libs/roct-thunk-interface-5.7.1 >=dev-libs/rocm-device-libs-5.7.1 <=dev-libs/rocm-device-libs-6.0 sys-devel/clang:17= sys-devel/lld:17=
 SLOT=0/5.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.7.1.tar.gz -> rocr-runtime-5.7.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=530f75506a60bd40abf9a784c03bb0e2
+_md5_=9c036271ed4faa94fe7c7ea0a85ab78f
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-6.0.0-r1 b/metadata/md5-cache/dev-libs/rocr-runtime-6.0.0-r1
deleted file mode 100644
index 27cc7cbdba44..000000000000
--- a/metadata/md5-cache/dev-libs/rocr-runtime-6.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/elfutils x11-libs/libdrm >=dev-libs/roct-thunk-interface-6.0.0 >=dev-libs/rocm-device-libs-6.0.0 sys-devel/clang:17= sys-devel/lld:17= !!sys-devel/llvm:0
-DESCRIPTION=Radeon Open Compute Runtime
-EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
-INHERIT=cmake flag-o-matic llvm
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-libs/elfutils x11-libs/libdrm >=dev-libs/roct-thunk-interface-6.0.0 >=dev-libs/rocm-device-libs-6.0.0 sys-devel/clang:17= sys-devel/lld:17=
-SLOT=0/6.0
-SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-6.0.0.tar.gz -> rocr-runtime-6.0.0.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c2f153293bb44abaa77c4b264a1c3ce6
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-6.1.1 b/metadata/md5-cache/dev-libs/rocr-runtime-6.1.1
new file mode 100644
index 000000000000..db61dce0627a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-6.1.1
@@ -0,0 +1,16 @@
+BDEPEND=app-editors/vim-core app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/elfutils x11-libs/libdrm >=dev-libs/roct-thunk-interface-6.1.1 >=dev-libs/rocm-device-libs-6.1.1 llvm_slot_18? ( sys-devel/clang:18= sys-devel/lld:18= )
+DESCRIPTION=Radeon Open Compute Runtime
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/ROCR-Runtime
+INHERIT=cmake flag-o-matic llvm-r1
+IUSE=debug +llvm_slot_18
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/elfutils x11-libs/libdrm >=dev-libs/roct-thunk-interface-6.1.1 >=dev-libs/rocm-device-libs-6.1.1 llvm_slot_18? ( sys-devel/clang:18= sys-devel/lld:18= )
+REQUIRED_USE=^^ ( llvm_slot_18 )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/ROCR-Runtime/archive/rocm-6.1.1.tar.gz -> rocr-runtime-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1a237297399e17611d319c2d98daeff4
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-6.0.0-r1 b/metadata/md5-cache/dev-libs/roct-thunk-interface-6.0.0-r1
deleted file mode 100644
index d644e67bb29f..000000000000
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-6.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=x11-libs/libdrm[video_cards_amdgpu] app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-process/numactl
-DESCRIPTION=Radeon Open Compute Thunk Interface
-EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface
-INHERIT=cmake linux-info
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=sys-process/numactl
-SLOT=0/6.0
-SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-6.0.0.tar.gz -> roct-thunk-interface-6.0.0.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7860c4addc814f7615d81fed4f919e72
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-6.1.1 b/metadata/md5-cache/dev-libs/roct-thunk-interface-6.1.1
new file mode 100644
index 000000000000..8efc1f7b8f58
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-6.1.1
@@ -0,0 +1,16 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-process/numactl x11-libs/libdrm[video_cards_amdgpu] test? ( sys-devel/llvm dev-cpp/gtest )
+DESCRIPTION=Radeon Open Compute Thunk Interface
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/ROCT-Thunk-Interface
+INHERIT=cmake linux-info rocm
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=sys-process/numactl x11-libs/libdrm[video_cards_amdgpu]
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/ROCT-Thunk-Interface/archive/rocm-6.1.1.tar.gz -> roct-thunk-interface-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2d13f8ca8aec48897923509ab6715ec5
diff --git a/metadata/md5-cache/dev-libs/simdjson-3.9.1 b/metadata/md5-cache/dev-libs/simdjson-3.9.1
index 18e640fd7547..447931297118 100644
--- a/metadata/md5-cache/dev-libs/simdjson-3.9.1
+++ b/metadata/md5-cache/dev-libs/simdjson-3.9.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
 INHERIT=toolchain-funcs cmake
 IUSE=+all-impls test tools
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86
 LICENSE=Apache-2.0 Boost-1.0 BSD MIT
 REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=https://github.com/simdjson/simdjson/archive/v3.9.1.tar.gz -> simdjson-3.9.1.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=18dc0726c3cf11d95463f88c9d8c889d
+_md5_=dfcfc64d51f414952ff0e0f8e642134d
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.22 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.22
index 7e5a3f98dfcb..fbccacb43cb7 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.22
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.22
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/xapian-1.4.21 lua? ( lua_targets_luajit? ( dev-lang/luajit:=
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) ruby? ( || ( ruby_targets_ruby31 ruby_targets_ruby32 ) ) php? ( || ( php_targets_php8-1 php_targets_php8-2 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.22/xapian-bindings-1.4.22.tar.xz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	57493651a3540d6ef7bff5e1c97c8dd3	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	57493651a3540d6ef7bff5e1c97c8dd3	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=99c6ea5d8f005af4cd1ef8d2613f8d4d
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.23 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.23
index 7cb267a918f7..e0f81c9f74f9 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.23
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.23
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/xapian-1.4.23 lua? ( lua_targets_luajit? ( dev-lang/luajit:=
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) ruby? ( || ( ruby_targets_ruby31 ruby_targets_ruby32 ) ) php? ( || ( php_targets_php8-1 php_targets_php8-2 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.23/xapian-bindings-1.4.23.tar.xz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	57493651a3540d6ef7bff5e1c97c8dd3	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	57493651a3540d6ef7bff5e1c97c8dd3	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=20b3cd3453f9e798144a7548a22fb3d5
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.24 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.24
index ed0f0c445291..0f80ea9016f0 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.24
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.24
@@ -12,5 +12,5 @@ RDEPEND=~dev-libs/xapian-1.4.24 lua? ( lua_targets_luajit? ( dev-lang/luajit:= )
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) ruby? ( || ( ruby_targets_ruby31 ruby_targets_ruby32 ) ) php? ( || ( php_targets_php8-1 php_targets_php8-2 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.24/xapian-bindings-1.4.24.tar.xz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	57493651a3540d6ef7bff5e1c97c8dd3	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	57493651a3540d6ef7bff5e1c97c8dd3	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=545c15b580dea27fbacae301234cbd56
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.25 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.25
index dd587084dccb..ca24986e7b81 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.25
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.25
@@ -12,5 +12,5 @@ RDEPEND=~dev-libs/xapian-1.4.25 lua? ( lua_targets_luajit? ( dev-lang/luajit:= )
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) ) ruby? ( || ( ruby_targets_ruby31 ruby_targets_ruby32 ) ) php? ( || ( php_targets_php8-1 php_targets_php8-2 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.25/xapian-bindings-1.4.25.tar.xz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	57493651a3540d6ef7bff5e1c97c8dd3	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	57493651a3540d6ef7bff5e1c97c8dd3	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=99e8bd4e5317774dc7e59c387ecc54b9
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 074198dfe9a4..40cda8a37a46 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/abcl-1.9.2 b/metadata/md5-cache/dev-lisp/abcl-1.9.2
index 63f1774f847b..68b468601ea7 100644
--- a/metadata/md5-cache/dev-lisp/abcl-1.9.2
+++ b/metadata/md5-cache/dev-lisp/abcl-1.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://abcl.org/releases/1.9.2/abcl-src-1.9.2.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=ae81361f307e7e998d1cf4799b204fd1
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 6e15574722da..e6169bdc4f60 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/lablgtk-3.1.5-r1 b/metadata/md5-cache/dev-ml/lablgtk-3.1.5-r1
new file mode 100644
index 000000000000..471c9c3869f2
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/lablgtk-3.1.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=app-text/gtkspell:3= dev-ml/cairo2:=[ocamlopt?] dev-ml/camlp-streams:=[ocamlopt?] x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=OCaml bindings to GTK-3
+EAPI=8
+HOMEPAGE=https://github.com/garrigue/lablgtk
+INHERIT=dune
+IUSE=+ocamlopt sourceview
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+PDEPEND=sourceview? ( dev-ml/lablgtk-sourceview:3/3.1.5 )
+RDEPEND=app-text/gtkspell:3= dev-ml/cairo2:=[ocamlopt?] dev-ml/camlp-streams:=[ocamlopt?] x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=3/3.1.5
+SRC_URI=https://github.com/garrigue/lablgtk/archive/3.1.5.tar.gz -> lablgtk-3.1.5.tar.gz
+_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_md5_=e4c18bd009d6aee705ecf1e0443426b8
diff --git a/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.5 b/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.5
new file mode 100644
index 000000000000..29e10927a346
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/lablgtk-3.1.5:3= dev-ml/cairo2:= x11-libs/gtksourceview:3.0= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=OCaml bindings to GTK-3
+EAPI=8
+HOMEPAGE=https://github.com/garrigue/lablgtk
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-ml/lablgtk-3.1.5:3= dev-ml/cairo2:= x11-libs/gtksourceview:3.0= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=3/3.1.5
+SRC_URI=https://github.com/garrigue/lablgtk/archive/3.1.5.tar.gz -> lablgtk-3.1.5.tar.gz
+_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_md5_=9d9a49d9f318a00378d7175fa3b7c343
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-18.1.7 b/metadata/md5-cache/dev-ml/llvm-ocaml-18.1.7
deleted file mode 100644
index fcc3729863cb..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-18.1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl dev-ml/findlib verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-18.1.7:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.1.7[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.1.7[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.1.7[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.1.7[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.1.7[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.1.7[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.1.7[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.1.7[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.1.7[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.1.7[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.1.7[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.1.7[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.1.7[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.1.7[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.1.7[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.1.7[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.1.7[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.1.7[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.1.7[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.1.7[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.1.7[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.1.7[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.1.7[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.1.7[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.1.7[llvm_targets_Xtensa] )
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org llvm-utils 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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa 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-18.1.7:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-18.1.7[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.1.7[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.1.7[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.1.7[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.1.7[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.1.7[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.1.7[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.1.7[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.1.7[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.1.7[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.1.7[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.1.7[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.1.7[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.1.7[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.1.7[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.1.7[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.1.7[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.1.7[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.1.7[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.1.7[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.1.7[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.1.7[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.1.7[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.1.7[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.1.7[llvm_targets_Xtensa] )
-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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=0/18.1.7
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=645932dddf1639f8d66787b4fbe355da
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240608 b/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240608
deleted file mode 100644
index 30fcbe2f8dd7..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240608
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl dev-ml/findlib app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-19.0.0_pre20240608:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Xtensa] )
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org llvm-utils 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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-19.0.0_pre20240608:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Xtensa] )
-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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=0/19.0.0_pre20240608
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fc84c701640938fd7dc2370c5647ea01
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240615 b/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240615
deleted file mode 100644
index ad31a992712a..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-19.0.0_pre20240615
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl dev-ml/findlib app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-19.0.0_pre20240615:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Xtensa] )
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org llvm-utils 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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-19.0.0_pre20240615:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Xtensa] )
-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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=0/19.0.0_pre20240615
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fc84c701640938fd7dc2370c5647ea01
diff --git a/metadata/md5-cache/dev-perl/BSD-Resource-1.291.100-r3 b/metadata/md5-cache/dev-perl/BSD-Resource-1.291.100-r3
index 808021a615ad..8dea2b20fd0c 100644
--- a/metadata/md5-cache/dev-perl/BSD-Resource-1.291.100-r3
+++ b/metadata/md5-cache/dev-perl/BSD-Resource-1.291.100-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/BSD-Resource
 INHERIT=perl-module
 IUSE=perl_features_debug perl_features_ithreads perl_features_quadmath test
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic-2 LGPL-2 )
 RDEPEND=>=dev-lang/perl-5.38.2-r3[perl_features_debug=,perl_features_ithreads=,perl_features_quadmath=] dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHI/BSD-Resource-1.2911.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	25ca2ff8e7971cb7f817f0bda4be696d	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3cc3b19f1b023c789a07680f61e9a9e1
+_md5_=bede884d7a7e978f780aa3a2b6a761df
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 7eee0fc8369a..b59f2dc6266c 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/Faker-25.9.2 b/metadata/md5-cache/dev-python/Faker-25.9.2
new file mode 100644
index 000000000000..b27e6144277d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-25.9.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pillow[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?,tiff] dev-python/validators[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !dev-ruby/faker >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package that generates fake data for you
+EAPI=8
+HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !dev-ruby/faker python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/Faker-25.9.2.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f4d5659cd428873bea750d50cd37b3a9
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 55576bd214e0..53c4274d9ee9 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-2.3.8 b/metadata/md5-cache/dev-python/Nuitka-2.3.10
index b759d98877a9..814f1bd7e633 100644
--- a/metadata/md5-cache/dev-python/Nuitka-2.3.8
+++ b/metadata/md5-cache/dev-python/Nuitka-2.3.10
@@ -11,6 +11,6 @@ RDEPEND=dev-build/scons[python_targets_python3_10(-)?,python_targets_python3_11(
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/N/Nuitka/Nuitka-2.3.8.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/N/Nuitka/Nuitka-2.3.10.tar.gz
 _eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=807c1775ec6d7ebeb6a352a96328b8dc
diff --git a/metadata/md5-cache/dev-python/Nuitka-2.3.3 b/metadata/md5-cache/dev-python/Nuitka-2.3.3
deleted file mode 100644
index e35077378b08..000000000000
--- a/metadata/md5-cache/dev-python/Nuitka-2.3.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-build/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-util/ccache ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
-INHERIT=distutils-r1 flag-o-matic optfeature pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-build/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/N/Nuitka/Nuitka-2.3.3.tar.gz
-_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=807c1775ec6d7ebeb6a352a96328b8dc
diff --git a/metadata/md5-cache/dev-python/Nuitka-2.3.4 b/metadata/md5-cache/dev-python/Nuitka-2.3.4
deleted file mode 100644
index 85b1804f56c9..000000000000
--- a/metadata/md5-cache/dev-python/Nuitka-2.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-build/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-util/ccache ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
-INHERIT=distutils-r1 flag-o-matic optfeature pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-build/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/N/Nuitka/Nuitka-2.3.4.tar.gz
-_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=807c1775ec6d7ebeb6a352a96328b8dc
diff --git a/metadata/md5-cache/dev-python/Nuitka-2.3.7 b/metadata/md5-cache/dev-python/Nuitka-2.3.7
deleted file mode 100644
index 02869e2e01fb..000000000000
--- a/metadata/md5-cache/dev-python/Nuitka-2.3.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-build/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-util/ccache ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
-INHERIT=distutils-r1 flag-o-matic optfeature pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-build/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/N/Nuitka/Nuitka-2.3.7.tar.gz
-_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=807c1775ec6d7ebeb6a352a96328b8dc
diff --git a/metadata/md5-cache/dev-python/a2wsgi-1.10.6 b/metadata/md5-cache/dev-python/a2wsgi-1.10.6
new file mode 100644
index 000000000000..fc49d7a011ff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/a2wsgi-1.10.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-python/asgiref-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/asgiref-3.2.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/httpx-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/httpx-0.22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pdm-backend-2.1.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Convert WSGI app to ASGI app or ASGI app to WSGI app
+EAPI=8
+HOMEPAGE=https://github.com/abersheeran/a2wsgi/ https://pypi.org/project/a2wsgi/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/a2wsgi/a2wsgi-1.10.6.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c305065ec655392596a70691d9e913e3
diff --git a/metadata/md5-cache/dev-python/alembic-1.13.2 b/metadata/md5-cache/dev-python/alembic-1.13.2
new file mode 100644
index 000000000000..cef7c752760d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/alembic-1.13.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( sys-libs/timezone-data ) test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Database migrations tool, written by the author of SQLAlchemy
+EAPI=8
+HOMEPAGE=https://github.com/sqlalchemy/alembic/ https://pypi.org/project/alembic/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/alembic/alembic-1.13.2.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=e61acf92e37e20bb0b802444fa49729e
diff --git a/metadata/md5-cache/dev-python/beniget-0.4.1-r1 b/metadata/md5-cache/dev-python/beniget-0.4.1-r1
index d7d388c28efc..1f80c1ed2f9d 100644
--- a/metadata/md5-cache/dev-python/beniget-0.4.1-r1
+++ b/metadata/md5-cache/dev-python/beniget-0.4.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( =dev-python/gast-0.5*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=test? ( =dev-python/gast-0.5*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extract semantic information about static Python code
 EAPI=8
 HOMEPAGE=https://pypi.org/project/beniget/ https://github.com/serge-sans-paille/beniget/
 INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
 KEYWORDS=amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos
 LICENSE=BSD
-RDEPEND==dev-python/gast-0.5*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RDEPEND==dev-python/gast-0.5*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge-sans-paille/beniget/archive/0.4.1.tar.gz -> beniget-0.4.1.gh.tar.gz
 _eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b5114b8391021c22ddbffec803f4cd28
+_md5_=0dea0bb50792aedad9c9d58abcb724ef
diff --git a/metadata/md5-cache/dev-python/boto3-1.34.133 b/metadata/md5-cache/dev-python/boto3-1.34.133
new file mode 100644
index 000000000000..21abceaad30d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.34.133
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/botocore-1.34.133[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+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
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.34.133[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.34.133.tar.gz -> boto3-1.34.133.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8c57f4eda873e63141fd7028ea88e83b
diff --git a/metadata/md5-cache/dev-python/boto3-1.34.134 b/metadata/md5-cache/dev-python/boto3-1.34.134
new file mode 100644
index 000000000000..8f724d772002
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.34.134
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/botocore-1.34.134[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+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
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.34.134[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.34.134.tar.gz -> boto3-1.34.134.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8c57f4eda873e63141fd7028ea88e83b
diff --git a/metadata/md5-cache/dev-python/botocore-1.34.133 b/metadata/md5-cache/dev-python/botocore-1.34.133
new file mode 100644
index 000000000000..0e4f460ed81c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.34.133
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+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
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.34.133.tar.gz -> botocore-1.34.133.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f1ca9a8b0e1247ff42152fa304fc8999
diff --git a/metadata/md5-cache/dev-python/botocore-1.34.134 b/metadata/md5-cache/dev-python/botocore-1.34.134
new file mode 100644
index 000000000000..e2f7719c8cdc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.34.134
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+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
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.34.134.tar.gz -> botocore-1.34.134.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f1ca9a8b0e1247ff42152fa304fc8999
diff --git a/metadata/md5-cache/dev-python/cfn-lint-1.3.7 b/metadata/md5-cache/dev-python/cfn-lint-1.3.7
new file mode 100644
index 000000000000..1aa1a7a33424
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-1.3.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aws-sam-translator-1.89.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jschema-to-python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sarif-om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.89.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jschema-to-python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sarif-om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn_lint-1.3.7.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=78ae3b92ff93999c42cdf338056d7a29
diff --git a/metadata/md5-cache/dev-python/clang-python-18.1.7 b/metadata/md5-cache/dev-python/clang-python-18.1.7
deleted file mode 100644
index f72116dc7ce9..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-18.1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) test? ( sys-devel/clang:18 ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-18.1.7:* !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_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-18.1.7:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=5a3187c9b71a0265c5926510e1e4580d
diff --git a/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240608 b/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240608
deleted file mode 100644
index be6d6d603ae5..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240608
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) test? ( sys-devel/clang:19 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-19.0.0_pre20240608:* !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 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-19.0.0_pre20240608:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ed247c9547de121f2706c9d415e5e493
diff --git a/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240615 b/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240615
deleted file mode 100644
index 4f8c687cc84a..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-19.0.0_pre20240615
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) test? ( sys-devel/clang:19 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-19.0.0_pre20240615:* !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 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-19.0.0_pre20240615:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ed247c9547de121f2706c9d415e5e493
diff --git a/metadata/md5-cache/dev-python/doc8-1.1.1-r1 b/metadata/md5-cache/dev-python/doc8-1.1.1-r1
new file mode 100644
index 000000000000..9af162bdf475
--- /dev/null
+++ b/metadata/md5-cache/dev-python/doc8-1.1.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( <dev-python/docutils-0.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/restructuredtext-lint-0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/stevedore[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Style checker for Sphinx (or other) RST documentation
+EAPI=8
+HOMEPAGE=https://pypi.org/project/doc8/ https://github.com/PyCQA/doc8/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/docutils-0.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/restructuredtext-lint-0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/stevedore[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/doc8/doc8-1.1.1.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=964bc3347413b8fc7aa1c5442031a9f6
diff --git a/metadata/md5-cache/dev-python/doit-0.36.0-r2 b/metadata/md5-cache/dev-python/doit-0.36.0-r2
new file mode 100644
index 000000000000..79bc5d400f6c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/doit-0.36.0-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/doit-py-0.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[sqlite] ) dev-python/pyflakes[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyinotify[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( || ( dev-python/tomli[python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automation tool
+EAPI=8
+HOMEPAGE=https://pydoit.org/ https://github.com/pydoit/doit/ https://pypi.org/project/doit/
+INHERIT=bash-completion-r1 distutils-r1 pypi
+IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+PDEPEND=>=dev-python/doit-py-0.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+RDEPEND=dev-python/cloudpickle[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyinotify[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( || ( dev-python/tomli[python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_10(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/doit/doit-0.36.0.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8c63cc86dbb7338d1b0661cfd7a61693
diff --git a/metadata/md5-cache/dev-python/ensurepip-pip-24.1.1 b/metadata/md5-cache/dev-python/ensurepip-pip-24.1.1
new file mode 100644
index 000000000000..569d1a48e21a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ensurepip-pip-24.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Shared pip wheel for ensurepip Python module
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pip/
+INHERIT=pypi
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2
+RDEPEND=!<dev-python/ensurepip-wheels-100
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/py3/p/pip/pip-24.1.1-py3-none-any.whl
+_eclasses_=pypi	2eecb475512bc76e5ea9192a681b9e6b
+_md5_=c6152ef02ebf8dfde46fffb095603aa7
diff --git a/metadata/md5-cache/dev-python/ensurepip-setuptools-70.1.1 b/metadata/md5-cache/dev-python/ensurepip-setuptools-70.1.1
new file mode 100644
index 000000000000..a20707708ae2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ensurepip-setuptools-70.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Shared setuptools wheel for ensurepip Python module
+EAPI=8
+HOMEPAGE=https://pypi.org/project/setuptools/
+INHERIT=pypi
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=!<dev-python/ensurepip-wheels-100
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-70.1.1-py3-none-any.whl
+_eclasses_=pypi	2eecb475512bc76e5ea9192a681b9e6b
+_md5_=18ef0d79011aba0459e70e79f342939c
diff --git a/metadata/md5-cache/dev-python/enzyme-0.5.2 b/metadata/md5-cache/dev-python/enzyme-0.5.2
new file mode 100644
index 000000000000..aeeaac0e00ea
--- /dev/null
+++ b/metadata/md5-cache/dev-python/enzyme-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-arch/unzip dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[xml(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python video metadata parser
+EAPI=8
+HOMEPAGE=https://github.com/Diaoul/enzyme/ https://pypi.org/project/enzyme/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/e/enzyme/enzyme-0.5.2.tar.gz test? ( https://downloads.sourceforge.net/matroska/test_files/matroska_test_w1_1.zip )
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c578e5eb1cf84bb1ef447e0efc0a440e
diff --git a/metadata/md5-cache/dev-python/flit-3.8.0 b/metadata/md5-cache/dev-python/flit-3.8.0
deleted file mode 100644
index ed0a611d0ffb..000000000000
--- a/metadata/md5-cache/dev-python/flit-3.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit-core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/grep test? ( dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit-core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/pygments-github-lexers[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules
-EAPI=8
-HOMEPAGE=https://github.com/pypa/flit https://flit.readthedocs.io/
-INHERIT=distutils-r1 pypi
-IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~mips ~x86
-LICENSE=BSD
-RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit-core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/f/flit/flit-3.8.0.tar.gz
-_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c8c542ad393cedeb11040a9588639645
diff --git a/metadata/md5-cache/dev-python/flit-3.9.0 b/metadata/md5-cache/dev-python/flit-3.9.0
deleted file mode 100644
index 8fe9c169c092..000000000000
--- a/metadata/md5-cache/dev-python/flit-3.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/grep test? ( dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_12(-)] dev-python/pygments-github-lexers[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/pygments-github-lexers[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules
-EAPI=8
-HOMEPAGE=https://github.com/pypa/flit https://flit.readthedocs.io/
-INHERIT=distutils-r1 pypi
-IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~mips ~x86
-LICENSE=BSD
-RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/f/flit/flit-3.9.0.tar.gz
-_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8fa81c29ee190f2f9e8f3a92a10416bf
diff --git a/metadata/md5-cache/dev-python/flit-3.9.0-r1 b/metadata/md5-cache/dev-python/flit-3.9.0-r1
new file mode 100644
index 000000000000..d76127bcaa26
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flit-3.9.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/grep test? ( dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_12(-)] dev-python/pygments-github-lexers[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/pygments-github-lexers[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simplified packaging of Python modules
+EAPI=8
+HOMEPAGE=https://github.com/pypa/flit https://flit.readthedocs.io/
+INHERIT=distutils-r1 pypi
+IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=BSD
+RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/f/flit/flit-3.9.0.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=020a6859cb7b528a3e1cc5457c7ff011
diff --git a/metadata/md5-cache/dev-python/gast-0.5.5 b/metadata/md5-cache/dev-python/gast-0.5.5
new file mode 100644
index 000000000000..8339af8ebf1f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gast-0.5.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)
+EAPI=8
+HOMEPAGE=https://github.com/serge-sans-paille/gast/ https://pypi.org/project/gast/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
+LICENSE=BSD PSF-2
+RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/g/gast/gast-0.5.5.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=cfd953396e767c4b5aca4f9c776eff57
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.104.1 b/metadata/md5-cache/dev-python/hypothesis-6.104.1
new file mode 100644
index 000000000000..efe168d95be3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.104.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_pypy3? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) ) >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+),sqlite] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+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 optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_pypy3? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.104.1.tar.gz -> hypothesis-6.104.1.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=a22754a99ae09e4e8d356d55e8f33963
diff --git a/metadata/md5-cache/dev-python/importlib-metadata-8.0.0 b/metadata/md5-cache/dev-python/importlib-metadata-8.0.0
new file mode 100644
index 000000000000..4b358f34dc78
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib-metadata-8.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/jaraco-test-5.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read metadata from Python packages
+EAPI=8
+HOMEPAGE=https://github.com/python/importlib_metadata/ https://pypi.org/project/importlib-metadata/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+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=Apache-2.0
+RDEPEND=dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/i/importlib-metadata/importlib_metadata-8.0.0.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=d7d0751242db133a68f2f0c8d86dd25b
diff --git a/metadata/md5-cache/dev-python/jsonschema-path-0.3.3 b/metadata/md5-cache/dev-python/jsonschema-path-0.3.3
new file mode 100644
index 000000000000..53ee75c682ca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonschema-path-0.3.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/referencing-0.28.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.31.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/poetry-core-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JSONSchema Spec with object-oriented paths
+EAPI=8
+HOMEPAGE=https://pypi.org/project/jsonschema-path/ https://github.com/p1c2u/jsonschema-path/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/referencing-0.28.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.31.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/p1c2u/jsonschema-path/archive/0.3.3.tar.gz -> jsonschema-path-0.3.3.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=fcfd17fe90356c39d8a822bc3dad1153
diff --git a/metadata/md5-cache/dev-python/jupyterlab-4.2.3 b/metadata/md5-cache/dev-python/jupyterlab-4.2.3
new file mode 100644
index 000000000000..e9520fd75a9e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyterlab-4.2.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/hatch-jupyter-builder[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-console-scripts[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-jupyter-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-tornasync[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests-cache[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/async-lru[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.25.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ipykernel-6.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter-core[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.27.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-40.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/tornado-6.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/traitlets[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-libs/nodejs >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DESCRIPTION=JupyterLab computational environment
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab/ https://pypi.org/project/jupyterlab/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=distutils-r1 pypi xdg
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=BSD MIT GPL-3 Apache-2.0
+RDEPEND=dev-python/async-lru[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.25.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ipykernel-6.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter-core[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.27.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-40.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/tornado-6.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/traitlets[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-libs/nodejs python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab/jupyterlab-4.2.3.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=07fce29b6f2fd2361ea78dc1dbcd603e
diff --git a/metadata/md5-cache/dev-python/lit-18.1.7 b/metadata/md5-cache/dev-python/lit-18.1.7
deleted file mode 100644
index e761bd5587bb..000000000000
--- a/metadata/md5-cache/dev-python/lit-18.1.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-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_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=50ccad7969446ae62b8ff2adb3b20d7e
diff --git a/metadata/md5-cache/dev-python/lit-19.0.0_pre20240608 b/metadata/md5-cache/dev-python/lit-19.0.0_pre20240608
deleted file mode 100644
index 2d9ac68cfbd8..000000000000
--- a/metadata/md5-cache/dev-python/lit-19.0.0_pre20240608
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] sys-devel/llvm ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-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_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0bdec33de4799ed93ceb7be21a337559
diff --git a/metadata/md5-cache/dev-python/lit-19.0.0_pre20240615 b/metadata/md5-cache/dev-python/lit-19.0.0_pre20240615
deleted file mode 100644
index 9ad6c3f969c0..000000000000
--- a/metadata/md5-cache/dev-python/lit-19.0.0_pre20240615
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] sys-devel/llvm ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-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_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0bdec33de4799ed93ceb7be21a337559
diff --git a/metadata/md5-cache/dev-python/parse-1.20.2 b/metadata/md5-cache/dev-python/parse-1.20.2
index 72319aff218a..0c194e3c5a2a 100644
--- a/metadata/md5-cache/dev-python/parse-1.20.2
+++ b/metadata/md5-cache/dev-python/parse-1.20.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/r1chardj0n3s/parse/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/parse/parse-1.20.2.tar.gz
 _eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=08f65a03e826f086eb579a5bd19935cc
+_md5_=c3b90221a994be2ed256a5175c23c74a
diff --git a/metadata/md5-cache/dev-python/pdm-2.16.0 b/metadata/md5-cache/dev-python/pdm-2.16.0
new file mode 100644
index 000000000000..932a0af9930a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pdm-2.16.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/blinker[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dep-logic-0.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/truststore[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/filelock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/hishel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pbs-installer[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyproject-hooks[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/unearth-0.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/findpython-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/findpython-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomlkit[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/shellingham[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dotenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/resolvelib-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/installer[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) test? ( dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-httpserver[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/blinker[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dep-logic-0.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/truststore[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/filelock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/hishel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pbs-installer[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyproject-hooks[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/unearth-0.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/findpython-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/findpython-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomlkit[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/shellingham[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dotenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/resolvelib-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/installer[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pdm-backend-2.1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python package and dependency manager supporting the latest PEP standards
+EAPI=8
+HOMEPAGE=https://pdm-project.org/ https://github.com/pdm-project/pdm/ https://pypi.org/project/pdm/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=dev-python/blinker[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dep-logic-0.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/truststore[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/filelock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/hishel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pbs-installer[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyproject-hooks[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/unearth-0.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/findpython-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/findpython-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomlkit[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/shellingham[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dotenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/resolvelib-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/installer[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pdm/pdm-2.16.0.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=38e7d5540ae998b2903cced3df8b4070
diff --git a/metadata/md5-cache/dev-python/pdm-2.16.1 b/metadata/md5-cache/dev-python/pdm-2.16.1
new file mode 100644
index 000000000000..e4d1f806edb6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pdm-2.16.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/blinker[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dep-logic-0.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/truststore[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/filelock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/hishel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pbs-installer-2024.4.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyproject-hooks[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/unearth-0.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/findpython-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/findpython-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomlkit[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/shellingham[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dotenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/resolvelib-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/installer[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) test? ( dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-httpserver[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/blinker[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dep-logic-0.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/truststore[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/filelock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/hishel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pbs-installer-2024.4.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyproject-hooks[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/unearth-0.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/findpython-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/findpython-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomlkit[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/shellingham[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dotenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/resolvelib-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/installer[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pdm-backend-2.1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python package and dependency manager supporting the latest PEP standards
+EAPI=8
+HOMEPAGE=https://pdm-project.org/ https://github.com/pdm-project/pdm/ https://pypi.org/project/pdm/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=dev-python/blinker[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dep-logic-0.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/truststore[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/filelock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/hishel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pbs-installer-2024.4.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyproject-hooks[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/unearth-0.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/findpython-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/findpython-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomlkit[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/shellingham[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dotenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/resolvelib-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/installer[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pdm/pdm-2.16.1.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=08687a3806cfc0181d772ad41cf26f87
diff --git a/metadata/md5-cache/dev-python/pip-24.1-r1 b/metadata/md5-cache/dev-python/pip-24.1-r1
index d7f6d1c47055..b409db27bb19 100644
--- a/metadata/md5-cache/dev-python/pip-24.1-r1
+++ b/metadata/md5-cache/dev-python/pip-24.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pip.pypa.io/en/stable/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
 INHERIT=bash-completion-r1 distutils-r1
 IUSE=test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc
 LICENSE=MIT Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2
 RDEPEND=>=dev-python/cachecontrol-0.14.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/distlib-0.3.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/distro-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/msgpack-1.0.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/packaging-24.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/platformdirs-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyproject-hooks-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.32.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/rich-13.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/resolvelib-1.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/tenacity-8.2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/truststore-0.9.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:=[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+),threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+),threads(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[ssl(+),threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/24.1.tar.gz -> pip-24.1.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c06e78b5984cc1955e006aceba16ee59
+_md5_=e2ad75bbbc16c7a8f2e3e63be2bdce17
diff --git a/metadata/md5-cache/dev-python/pip-24.1.1 b/metadata/md5-cache/dev-python/pip-24.1.1
new file mode 100644
index 000000000000..1aebf5fa1a47
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pip-24.1.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/cachecontrol-0.14.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/distlib-0.3.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/distro-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/msgpack-1.0.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/packaging-24.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/platformdirs-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyproject-hooks-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.32.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/rich-13.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/resolvelib-1.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/tenacity-8.2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/truststore-0.9.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( python_targets_python3_10? ( dev-python/ensurepip-setuptools dev-python/ensurepip-wheel dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pretend[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/scripttest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/tomli-w[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test-rust? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) dev-vcs/git ) python_targets_python3_11? ( dev-python/ensurepip-setuptools dev-python/ensurepip-wheel dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pretend[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/scripttest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/tomli-w[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test-rust? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) dev-vcs/git ) python_targets_python3_12? ( dev-python/ensurepip-setuptools dev-python/ensurepip-wheel dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pretend[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/scripttest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/tomli-w[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test-rust? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) dev-vcs/git ) python_targets_python3_13? ( dev-python/ensurepip-setuptools dev-python/ensurepip-wheel dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pretend[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/scripttest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/tomli-w[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test-rust? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) dev-vcs/git ) ) test? ( >=dev-python/cachecontrol-0.14.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/distlib-0.3.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/distro-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/msgpack-1.0.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/packaging-24.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/platformdirs-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyproject-hooks-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.32.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/rich-13.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/resolvelib-1.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/tenacity-8.2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/truststore-0.9.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+),threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+),threads(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[ssl(+),threads(+)] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The PyPA recommended tool for installing Python packages
+EAPI=8
+HOMEPAGE=https://pip.pypa.io/en/stable/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
+INHERIT=bash-completion-r1 distutils-r1
+IUSE=test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc
+LICENSE=MIT Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2
+RDEPEND=>=dev-python/cachecontrol-0.14.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/distlib-0.3.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/distro-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/msgpack-1.0.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/packaging-24.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/platformdirs-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyproject-hooks-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.32.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/rich-13.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/resolvelib-1.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/tenacity-8.2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/truststore-0.9.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:=[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+),threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+),threads(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[ssl(+),threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/pip/archive/24.1.1.tar.gz -> pip-24.1.1.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=e2ad75bbbc16c7a8f2e3e63be2bdce17
diff --git a/metadata/md5-cache/dev-python/pybind11-2.13.1 b/metadata/md5-cache/dev-python/pybind11-2.13.1
new file mode 100644
index 000000000000..f88c8315f47c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pybind11-2.13.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-cpp/catch-3:0 >=dev-cpp/catch-2.13.9:0 dev-libs/boost ) test? ( dev-cpp/eigen:3 >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) app-alternatives/ninja >=dev-build/cmake-3.20.5 python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=AST-based Python refactoring library
+EAPI=8
+HOMEPAGE=https://pybind11.readthedocs.io/en/stable/ https://github.com/pybind/pybind11/ https://pypi.org/project/pybind11/
+INHERIT=cmake distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
+LICENSE=BSD
+RDEPEND=dev-cpp/eigen:3 python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pybind/pybind11/archive/v2.13.1.tar.gz -> pybind11-2.13.1.gh.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=161f26a871290a311d12a7e01fdf669c
diff --git a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.15.4 b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.15.4
new file mode 100644
index 000000000000..217e5c5f13cc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.15.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-regressions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/accessible-pygments[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Bootstrap-based Sphinx theme from the PyData community
+EAPI=8
+HOMEPAGE=https://github.com/pydata/pydata-sphinx-theme/ https://pypi.org/project/pydata-sphinx-theme/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD-with-disclosure
+RDEPEND=dev-python/accessible-pygments[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pydata/pydata-sphinx-theme/archive/v0.15.4.tar.gz -> pydata-sphinx-theme-0.15.4.gh.tar.gz https://files.pythonhosted.org/packages/py3/p/pydata-sphinx-theme/pydata_sphinx_theme-0.15.4-py3-none-any.whl
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=e4af1c125e6244b127f8d8ee9106e9a9
diff --git a/metadata/md5-cache/dev-python/pygame-2.6.0 b/metadata/md5-cache/dev-python/pygame-2.6.0
new file mode 100644
index 000000000000..71872a90831b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygame-2.6.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( media-libs/fontconfig sys-apps/util-linux ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-libs/freetype media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/portmidi media-libs/sdl2-image media-libs/sdl2-mixer media-libs/sdl2-ttf X? ( media-libs/libsdl2[opengl?,threads(+),video,X] ) !X? ( media-libs/libsdl2[threads(+)] ) test? ( media-libs/sdl2-image[gif,jpeg,png,tiff,webp] media-libs/sdl2-mixer[mp3,vorbis,wav] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Python bindings for SDL multimedia library
+EAPI=8
+HOMEPAGE=https://www.pygame.org/ https://github.com/pygame/pygame/ https://pypi.org/project/pygame/
+INHERIT=distutils-r1
+IUSE=examples opengl test X python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-libs/freetype media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/portmidi media-libs/sdl2-image media-libs/sdl2-mixer media-libs/sdl2-ttf X? ( media-libs/libsdl2[opengl?,threads(+),video,X] ) !X? ( media-libs/libsdl2[threads(+)] ) media-libs/fontconfig python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pygame/pygame/archive/2.6.0.tar.gz -> pygame-2.6.0.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=922d1cf74eb0ad972017ead26beb7743
diff --git a/metadata/md5-cache/dev-python/python-socks-2.5.0 b/metadata/md5-cache/dev-python/python-socks-2.5.0
new file mode 100644
index 000000000000..e8f6ed9c2bee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-socks-2.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/anyio-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/async-timeout-3.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/flask-1.1.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-asyncio-0.18.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-trio-0.7.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/tiny-proxy-0.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/trio-0.16.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/trustme-0.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/yarl-1.4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( dev-python/async-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=SOCKS4, SOCKS5, HTTP tunneling functionality for Python
+EAPI=8
+HOMEPAGE=https://github.com/romis2012/python-socks/ https://pypi.org/project/python-socks/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/async-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/romis2012/python-socks/archive/v2.5.0.tar.gz -> python-socks-2.5.0.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=d28e639dd52c11b74905aea04b14d3ae
diff --git a/metadata/md5-cache/dev-python/quantities-0.15.0 b/metadata/md5-cache/dev-python/quantities-0.15.0-r1
index d3e0a9876db3..210c6ba3b11b 100644
--- a/metadata/md5-cache/dev-python/quantities-0.15.0
+++ b/metadata/md5-cache/dev-python/quantities-0.15.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/numpy-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Support for physical quantities with units, based on numpy
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+RDEPEND=>=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/numpy-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-quantities/python-quantities/archive/v0.15.0.tar.gz -> python-quantities-0.15.0.gh.tar.gz
 _eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6f11ff8601132aa3cc68b8e3e3dbd974
+_md5_=49983163b9d99a69cc90e2120baef44d
diff --git a/metadata/md5-cache/dev-python/redis-5.0.7 b/metadata/md5-cache/dev-python/redis-5.0.7
new file mode 100644
index 000000000000..74c3ec824ef5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/redis-5.0.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/redis dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( python_targets_pypy3? ( >=dev-python/async-timeout-4.0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-4.0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python client for Redis key-value store
+EAPI=8
+HOMEPAGE=https://github.com/redis/redis-py/ https://pypi.org/project/redis/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/async-timeout-4.0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-4.0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/redis/redis-py/archive/v5.0.7.tar.gz -> redis-py-5.0.7.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=3a9e1d95c5296dded4ed7d07ce92cf21
diff --git a/metadata/md5-cache/dev-python/reportlab-4.2.2 b/metadata/md5-cache/dev-python/reportlab-4.2.2
new file mode 100644
index 000000000000..8a385e429554
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reportlab-4.2.2
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip doc? ( || ( ( dev-lang/python:3.13 >=dev-python/sphinx-7.2.6[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+DESCRIPTION=Tools for generating printable PDF documents from any data source
+EAPI=8
+HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
+INHERIT=distutils-r1 pypi
+IUSE=doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/r/reportlab/reportlab-4.2.2.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=64b9762076ca1b4c369957730c80b533
diff --git a/metadata/md5-cache/dev-python/seedir-0.5.0 b/metadata/md5-cache/dev-python/seedir-0.5.0
new file mode 100644
index 000000000000..a209d725c4d6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/seedir-0.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/natsort[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Package for creating, editing, and reading folder tree diagrams
+EAPI=8
+HOMEPAGE=https://github.com/earnestt1234/seedir/ https://pypi.org/project/seedir/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/natsort[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/earnestt1234/seedir/archive/v0.5.0.tar.gz -> seedir-0.5.0.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=906a6fd5520b8d181a0f51e7eaa29e9e
diff --git a/metadata/md5-cache/dev-python/setuptools-70.1.1 b/metadata/md5-cache/dev-python/setuptools-70.1.1
new file mode 100644
index 000000000000..cbaebd4332f4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-70.1.1
@@ -0,0 +1,17 @@
+BDEPEND=!!<dev-python/setuptools-rust-1.8.0 >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/packaging-24[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_pypy3? ( >=dev-python/build-1.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/ini2toml-0.14[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyproject-hooks[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-home-0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-subprocess[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( >=dev-python/build-1.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/ini2toml-0.14[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyproject-hooks[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-home-0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-subprocess[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( >=dev-python/build-1.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/ini2toml-0.14[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyproject-hooks[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-home-0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-subprocess[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( >=dev-python/build-1.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/ini2toml-0.14[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyproject-hooks[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-home-0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-subprocess[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( >=dev-python/build-1.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/ini2toml-0.14[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyproject-hooks[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-home-0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-subprocess[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:=[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[xml(+)] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of extensions to Distutils
+EAPI=8
+HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+RDEPEND=!!<dev-python/setuptools-rust-1.8.0 >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/packaging-24[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[xml(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-70.1.1.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1fda296212de2b3cb36b0cb92aef7955
diff --git a/metadata/md5-cache/dev-python/sqlglot-25.1.0 b/metadata/md5-cache/dev-python/sqlglot-25.1.0
deleted file mode 100644
index c2f000758c51..000000000000
--- a/metadata/md5-cache/dev-python/sqlglot-25.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=native-extensions? ( >=virtual/rust-1.53 dev-util/maturin[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-DESCRIPTION=An easily customizable SQL parser and transpiler
-EAPI=8
-HOMEPAGE=https://sqlglot.com/ https://github.com/tobymao/sqlglot/ https://pypi.org/project/sqlglot/
-INHERIT=cargo distutils-r1 pypi optfeature
-IUSE=+native-extensions test debug python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT native-extensions? ( Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016 )
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-25.1.0.tar.gz native-extensions? ( 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/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/libc/0.2.150/download -> libc-0.2.150.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.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.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/pyo3-build-config/0.20.0/download -> pyo3-build-config-0.20.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.20.0/download -> pyo3-ffi-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.20.0/download -> pyo3-macros-backend-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.20.0/download -> pyo3-macros-0.20.0.crate https://crates.io/api/v1/crates/pyo3/0.20.0/download -> pyo3-0.20.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/smallvec/1.11.2/download -> smallvec-1.11.2.crate https://crates.io/api/v1/crates/syn/2.0.41/download -> syn-2.0.41.crate https://crates.io/api/v1/crates/target-lexicon/0.12.12/download -> target-lexicon-0.12.12.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate )
-_eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9012414245aaf5034ef963a7744ac54a
diff --git a/metadata/md5-cache/dev-python/sqlglot-25.2.0 b/metadata/md5-cache/dev-python/sqlglot-25.2.0
deleted file mode 100644
index 2456bb72293b..000000000000
--- a/metadata/md5-cache/dev-python/sqlglot-25.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=native-extensions? ( >=virtual/rust-1.53 dev-util/maturin[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-DESCRIPTION=An easily customizable SQL parser and transpiler
-EAPI=8
-HOMEPAGE=https://sqlglot.com/ https://github.com/tobymao/sqlglot/ https://pypi.org/project/sqlglot/
-INHERIT=cargo distutils-r1 pypi optfeature
-IUSE=+native-extensions test debug python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT native-extensions? ( Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016 )
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-25.2.0.tar.gz native-extensions? ( 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/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/libc/0.2.150/download -> libc-0.2.150.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.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.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/pyo3-build-config/0.20.0/download -> pyo3-build-config-0.20.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.20.0/download -> pyo3-ffi-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.20.0/download -> pyo3-macros-backend-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.20.0/download -> pyo3-macros-0.20.0.crate https://crates.io/api/v1/crates/pyo3/0.20.0/download -> pyo3-0.20.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/smallvec/1.11.2/download -> smallvec-1.11.2.crate https://crates.io/api/v1/crates/syn/2.0.41/download -> syn-2.0.41.crate https://crates.io/api/v1/crates/target-lexicon/0.12.12/download -> target-lexicon-0.12.12.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate )
-_eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9012414245aaf5034ef963a7744ac54a
diff --git a/metadata/md5-cache/dev-python/sqlglot-25.0.3 b/metadata/md5-cache/dev-python/sqlglot-25.3.1
index 4b6a2b9c6ccb..f2bba8d37d07 100644
--- a/metadata/md5-cache/dev-python/sqlglot-25.0.3
+++ b/metadata/md5-cache/dev-python/sqlglot-25.3.1
@@ -12,6 +12,6 @@ RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-25.0.3.tar.gz native-extensions? ( 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/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/libc/0.2.150/download -> libc-0.2.150.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.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.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/pyo3-build-config/0.20.0/download -> pyo3-build-config-0.20.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.20.0/download -> pyo3-ffi-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.20.0/download -> pyo3-macros-backend-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.20.0/download -> pyo3-macros-0.20.0.crate https://crates.io/api/v1/crates/pyo3/0.20.0/download -> pyo3-0.20.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/smallvec/1.11.2/download -> smallvec-1.11.2.crate https://crates.io/api/v1/crates/syn/2.0.41/download -> syn-2.0.41.crate https://crates.io/api/v1/crates/target-lexicon/0.12.12/download -> target-lexicon-0.12.12.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate )
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-25.3.1.tar.gz native-extensions? ( 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/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/libc/0.2.150/download -> libc-0.2.150.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.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.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/pyo3-build-config/0.20.0/download -> pyo3-build-config-0.20.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.20.0/download -> pyo3-ffi-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.20.0/download -> pyo3-macros-backend-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.20.0/download -> pyo3-macros-0.20.0.crate https://crates.io/api/v1/crates/pyo3/0.20.0/download -> pyo3-0.20.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/smallvec/1.11.2/download -> smallvec-1.11.2.crate https://crates.io/api/v1/crates/syn/2.0.41/download -> syn-2.0.41.crate https://crates.io/api/v1/crates/target-lexicon/0.12.12/download -> target-lexicon-0.12.12.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate )
 _eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9012414245aaf5034ef963a7744ac54a
diff --git a/metadata/md5-cache/dev-python/sqlglot-25.3.0 b/metadata/md5-cache/dev-python/sqlglot-25.3.3
index 4b8328274e74..18852da5a2a1 100644
--- a/metadata/md5-cache/dev-python/sqlglot-25.3.0
+++ b/metadata/md5-cache/dev-python/sqlglot-25.3.3
@@ -12,6 +12,6 @@ RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-25.3.0.tar.gz native-extensions? ( 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/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/libc/0.2.150/download -> libc-0.2.150.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.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.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/pyo3-build-config/0.20.0/download -> pyo3-build-config-0.20.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.20.0/download -> pyo3-ffi-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.20.0/download -> pyo3-macros-backend-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.20.0/download -> pyo3-macros-0.20.0.crate https://crates.io/api/v1/crates/pyo3/0.20.0/download -> pyo3-0.20.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/smallvec/1.11.2/download -> smallvec-1.11.2.crate https://crates.io/api/v1/crates/syn/2.0.41/download -> syn-2.0.41.crate https://crates.io/api/v1/crates/target-lexicon/0.12.12/download -> target-lexicon-0.12.12.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate )
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-25.3.3.tar.gz native-extensions? ( 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/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/libc/0.2.150/download -> libc-0.2.150.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.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.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/pyo3-build-config/0.20.0/download -> pyo3-build-config-0.20.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.20.0/download -> pyo3-ffi-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.20.0/download -> pyo3-macros-backend-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.20.0/download -> pyo3-macros-0.20.0.crate https://crates.io/api/v1/crates/pyo3/0.20.0/download -> pyo3-0.20.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/smallvec/1.11.2/download -> smallvec-1.11.2.crate https://crates.io/api/v1/crates/syn/2.0.41/download -> syn-2.0.41.crate https://crates.io/api/v1/crates/target-lexicon/0.12.12/download -> target-lexicon-0.12.12.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate )
 _eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9012414245aaf5034ef963a7744ac54a
diff --git a/metadata/md5-cache/dev-python/tenacity-8.4.2 b/metadata/md5-cache/dev-python/tenacity-8.4.2
index f4f618a30a37..7bedc6777a15 100644
--- a/metadata/md5-cache/dev-python/tenacity-8.4.2
+++ b/metadata/md5-cache/dev-python/tenacity-8.4.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jd/tenacity/ https://pypi.org/project/tenacity/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/tenacity/tenacity-8.4.2.tar.gz
 _eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=36541a4a9b570f23e91a9063cff7cfe1
+_md5_=23598741f38d5b01b94920475425e213
diff --git a/metadata/md5-cache/dev-python/truststore-0.9.1 b/metadata/md5-cache/dev-python/truststore-0.9.1
index c17f18179822..54c0ff918d5a 100644
--- a/metadata/md5-cache/dev-python/truststore-0.9.1
+++ b/metadata/md5-cache/dev-python/truststore-0.9.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sethmlarson/truststore/ https://pypi.org/project/truststore/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc
 LICENSE=MIT
 PROPERTIES=test_network
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sethmlarson/truststore/archive/v0.9.1.tar.gz -> truststore-0.9.1.gh.tar.gz
 _eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d912f048462aa0fb84120cc485e47b75
+_md5_=67c9638f2fa96555c8ca8d8995a29792
diff --git a/metadata/md5-cache/dev-python/uv-0.2.17 b/metadata/md5-cache/dev-python/uv-0.2.17
new file mode 100644
index 000000000000..d86fbf863ba8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uv-0.2.17
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.77 test? ( dev-lang/python:3.8 dev-lang/python:3.9 dev-lang/python:3.10 dev-lang/python:3.11 dev-lang/python:3.12 ) >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DESCRIPTION=A Python package installer and resolver, written in Rust
+EAPI=8
+HOMEPAGE=https://github.com/astral-sh/uv/ https://pypi.org/project/uv/
+INHERIT=cargo check-reqs
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=|| ( Apache-2.0 MIT ) 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016 openssl
+PROPERTIES=test_network
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/astral-sh/uv/archive/0.2.17.tar.gz -> uv-0.2.17.gh.tar.gz https://github.com/charliermarsh/rs-async-zip/archive/1dcb40cfe1bf5325a6fd4bfcf9894db40241f585.tar.gz -> rs-async-zip-1dcb40cfe1bf5325a6fd4bfcf9894db40241f585.gh.tar.gz https://github.com/astral-sh/pubgrub/archive/b4435e2f3af10dab2336a0345b35dcd622699d06.tar.gz -> pubgrub-b4435e2f3af10dab2336a0345b35dcd622699d06.gh.tar.gz https://dev.gentoo.org/~mgorny/dist/uv-0.2.15-crates.tar.xz
+_eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=9fdc14d3e1974cd556c948a88cf61d95
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.15.1 b/metadata/md5-cache/dev-python/voluptuous-0.15.1
new file mode 100644
index 000000000000..09c904cca024
--- /dev/null
+++ b/metadata/md5-cache/dev-python/voluptuous-0.15.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python data validation library
+EAPI=8
+HOMEPAGE=https://github.com/alecthomas/voluptuous/ https://pypi.org/project/voluptuous/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/alecthomas/voluptuous/archive/0.15.1.tar.gz -> voluptuous-0.15.1.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f935325ce5fa0397efd6a0d5101d5338
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 29ff45caaa24..10897ff04f15 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/async-pool-0.7.0 b/metadata/md5-cache/dev-ruby/async-pool-0.7.0
new file mode 100644
index 000000000000..ee526a932ff7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/async-pool-0.7.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/async-1.25:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/async-1.25:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/async-1.25:*[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/sus-fixtures-async[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/sus-fixtures-async[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/sus-fixtures-async[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/sus[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/sus[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/sus[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=A singleplex and multiplex resource pool for implementing robust clients
+EAPI=8
+HOMEPAGE=https://github.com/socketry/async-pool
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/async-1.25:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/async-1.25:*[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/async-1.25:*[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/socketry/async-pool/archive/refs/tags/v0.7.0.tar.gz -> async-pool-0.7.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=083e6b33199073640631cfd4af8d2e0c
diff --git a/metadata/md5-cache/dev-ruby/dalli-3.2.8 b/metadata/md5-cache/dev-ruby/dalli-3.2.8
index d50a0bf23e49..d6810beb721f 100644
--- a/metadata/md5-cache/dev-ruby/dalli-3.2.8
+++ b/metadata/md5-cache/dev-ruby/dalli-3.2.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/petergoldstein/dalli
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v3.2.8.tar.gz -> dalli-3.2.8.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3810e72c18b2fda7521a2eb663e1d490
+_md5_=5dbf6b5677f21543fd98b91d8c4c9d71
diff --git a/metadata/md5-cache/dev-ruby/net-ftp-0.3.7 b/metadata/md5-cache/dev-ruby/net-ftp-0.3.7
new file mode 100644
index 000000000000..73e816b03a75
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/net-ftp-0.3.7
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( dev-ruby/net-protocol[ruby_targets_ruby31(-)] dev-ruby/time[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/net-protocol[ruby_targets_ruby32(-)] dev-ruby/time[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/net-protocol[ruby_targets_ruby33(-)] dev-ruby/time[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=Support for the File Transfer Protocol
+EAPI=8
+HOMEPAGE=https://github.com/ruby/net-ftp
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 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 ~x64-solaris
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby31? ( dev-ruby/net-protocol[ruby_targets_ruby31(-)] dev-ruby/time[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/net-protocol[ruby_targets_ruby32(-)] dev-ruby/time[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( dev-ruby/net-protocol[ruby_targets_ruby33(-)] dev-ruby/time[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/net-ftp/archive/v0.3.7.tar.gz -> net-ftp-0.3.7.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=6f83739a4c2edebb695f6015585c9bfd
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.16.6 b/metadata/md5-cache/dev-ruby/nokogiri-1.16.6
new file mode 100644
index 000000000000..ad6067bd2429
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.16.6
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby31(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby31(-)] dev-ruby/rdoc[ruby_targets_ruby31(-)] test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] dev-ruby/rubyzip[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby32(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby32(-)] dev-ruby/rdoc[ruby_targets_ruby32(-)] test? ( dev-ruby/minitest[ruby_targets_ruby32(-)] dev-ruby/rubyzip[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby33(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby33(-)] dev-ruby/rdoc[ruby_targets_ruby33(-)] test? ( dev-ruby/minitest[ruby_targets_ruby33(-)] dev-ruby/rubyzip[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rake[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/libxml2-2.12.8 >=dev-libs/libxslt-1.1.39 >=sys-libs/zlib-1.3.1 virtual/libiconv ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
+EAPI=8
+HOMEPAGE=https://nokogiri.org/
+INHERIT=ruby-fakegem multilib
+IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos
+LICENSE=MIT
+RDEPEND=>=dev-libs/libxml2-2.12.8 >=dev-libs/libxslt-1.1.39 >=sys-libs/zlib-1.3.1 virtual/libiconv ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby33(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.16.6.tar.gz -> nokogiri-1.16.6-git.tgz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5fead73d9fb65480f9572e45db0c11b7
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.6.9 b/metadata/md5-cache/dev-ruby/rjb-1.6.9
index 3bbaa4c7ad2f..d756d71e42eb 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.6.9
+++ b/metadata/md5-cache/dev-ruby/rjb-1.6.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rjb-1.6.9.gem
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=f06c652fa756bde0b6829a611160a079
diff --git a/metadata/md5-cache/dev-ruby/sus-0.21.1 b/metadata/md5-cache/dev-ruby/sus-0.21.1
deleted file mode 100644
index 8dfd4d6e1e3d..000000000000
--- a/metadata/md5-cache/dev-ruby/sus-0.21.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=A fast and scalable test runner
-EAPI=8
-HOMEPAGE=https://github.com/ioquatix/sus
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ioquatix/sus/archive/v0.21.1.tar.gz -> sus-0.21.1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5962e540247f6eef6a404dcca60a11ab
diff --git a/metadata/md5-cache/dev-ruby/sus-0.24.6 b/metadata/md5-cache/dev-ruby/sus-0.27.0
index 45f5bc6b5231..370bcec848e1 100644
--- a/metadata/md5-cache/dev-ruby/sus-0.24.6
+++ b/metadata/md5-cache/dev-ruby/sus-0.27.0
@@ -12,6 +12,6 @@ RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ioquatix/sus/archive/v0.24.6.tar.gz -> sus-0.24.6.tar.gz
+SRC_URI=https://github.com/ioquatix/sus/archive/v0.27.0.tar.gz -> sus-0.27.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=adfb2fc5b7f7882ea3c5b3e3c55ed32a
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 716bbe241d75..ffe3cfba9f2b 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/jscheme-7.2-r2 b/metadata/md5-cache/dev-scheme/jscheme-7.2-r2
index 2c24c7db9ae4..14d5ac031a8c 100644
--- a/metadata/md5-cache/dev-scheme/jscheme-7.2-r2
+++ b/metadata/md5-cache/dev-scheme/jscheme-7.2-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 >=virtual/jdk-1.6:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/jscheme/jscheme-7.2.tgz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=da364f7a967cf00a87a00068eee3ce09
diff --git a/metadata/md5-cache/dev-scheme/kawa-3.1.1-r3 b/metadata/md5-cache/dev-scheme/kawa-3.1.1-r3
index 1568ed4fbb2a..e2860f7b8a61 100644
--- a/metadata/md5-cache/dev-scheme/kawa-3.1.1-r3
+++ b/metadata/md5-cache/dev-scheme/kawa-3.1.1-r3
@@ -12,5 +12,5 @@ RDEPEND=frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) servlets? ( de
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/kashell/Kawa/-/archive/3.1.1/Kawa-3.1.1.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=4313e982102569186ae2415a188f9400
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index c5fe38dbc7fd..f743f8d018a8 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/pdfannotextractor-0.2-r1 b/metadata/md5-cache/dev-tex/pdfannotextractor-0.2-r2
index 718c662fc424..127a77ebdcbd 100644
--- a/metadata/md5-cache/dev-tex/pdfannotextractor-0.2-r1
+++ b/metadata/md5-cache/dev-tex/pdfannotextractor-0.2-r2
@@ -7,8 +7,8 @@ HOMEPAGE=https://www.ctan.org/tex-archive/macros/latex/contrib/pax/
 INHERIT=latex-package java-pkg-2 java-ant-2
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=GPL-2
-RDEPEND=dev-java/commons-logging:0 virtual/perl-Getopt-Long dev-perl/File-Which >=virtual/jre-11 !<dev-texlive/texlive-latexextra-2023_p69752-r4 virtual/latex-base >=dev-java/java-config-2.2.0-r3
+RDEPEND=dev-java/commons-logging:0 virtual/latex-base virtual/perl-Getopt-Long dev-perl/File-Which >=virtual/jre-11 !<dev-texlive/texlive-latexextra-2023_p69752-r4 virtual/latex-base >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/bastien-roucaries/latex-pax/archive/718e18be0c8fd1dc5b7c974eb4fbe6d0774cd05e.tar.gz -> pdfannotextractor-0.2.tar.gz https://downloads.apache.org/pdfbox/1.8.17/pdfbox-1.8.17.jar https://archive.apache.org/dist/pdfbox/1.7.1/fontbox-1.7.1.jar
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	latex-package	c20e442c3953c765f636630631c96194	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=cdba0299a9f99b5d3feffd067f80df4d
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	latex-package	c20e442c3953c765f636630631c96194	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=cd7ae69d78623141579367c52ea19bec
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603-r1 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603-r1
index 54915db303ee..f27b70d1105a 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603-r1
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603-r1
@@ -11,5 +11,5 @@ LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick dev-libs/kpathsea java? ( >=virtual/jre-1.8:* ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz https://dev.gentoo.org/~ulm/distfiles/tex4ht-texlive-20210603.tar.xz doc? ( https://dev.gentoo.org/~ulm/distfiles/tex4ht-texlive-20210603.doc.tar.xz )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	latex-package	c20e442c3953c765f636630631c96194	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	latex-package	c20e442c3953c765f636630631c96194	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=83954aa3345b2c5c759e6a237beda2ea
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20230311_p69739 b/metadata/md5-cache/dev-tex/tex4ht-20230311_p69739
index c68a6617315e..a04e44908ab1 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20230311_p69739
+++ b/metadata/md5-cache/dev-tex/tex4ht-20230311_p69739
@@ -11,5 +11,5 @@ LICENSE=LPPL-1.2
 RDEPEND=dev-libs/kpathsea:= app-text/ghostscript-gpl dev-lang/perl media-gfx/imagemagick java? ( >=virtual/jre-1.8:* ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~flow/distfiles/texlive/tex4ht-sources-1477.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex4ht.r69739.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tex4ht.r69739.tar.xz source? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex4ht.source.r69739.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tex4ht.source.r69739.tar.xz ) doc? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex4ht.doc.r69739.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tex4ht.doc.r69739.tar.xz )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	latex-package	c20e442c3953c765f636630631c96194	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	latex-package	c20e442c3953c765f636630631c96194	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=01ab9bfb068f0baa364eab85603fd56e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 64095eed96fd..df978ff1a548 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/Tensile-5.7.1-r2 b/metadata/md5-cache/dev-util/Tensile-5.7.1-r2
index 7bfd8cc996a0..ca14d090a7c3 100644
--- a/metadata/md5-cache/dev-util/Tensile-5.7.1-r2
+++ b/metadata/md5-cache/dev-util/Tensile-5.7.1-r2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/filelock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) client? ( dev-libs/boost ) >=dev-cpp/msgpack-cxx-6.0.0 dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =dev-util/hip-5* >=dev-util/rocm-smi-4.3.0 sys-devel/clang:17 >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) app-alternatives/ninja >=dev-build/cmake-3.20.5 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/filelock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/joblib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) client? ( dev-libs/boost ) >=dev-cpp/msgpack-cxx-6.0.0 dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =dev-util/hip-5* >=dev-util/rocm-smi-4.3.0 sys-devel/clang:17 >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) app-alternatives/ninja >=dev-build/cmake-3.20.5 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) client? ( dev-libs/boost ) >=dev-cpp/msgpack-cxx-6.0.0 dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =dev-util/hip-5* >=dev-util/rocm-smi-4.3.0 sys-devel/clang:17 !!sys-devel/llvm:0
 DESCRIPTION=Stretching GPU performance for GEMMs and tensor contractions
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/5.7
 SRC_URI=https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.7.1.tar.gz -> rocm-Tensile-5.7.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=75beab10c90076b73220cee16b34f886
+_md5_=464a48f899e3298a72298bf9b65d9c70
diff --git a/metadata/md5-cache/dev-util/Tensile-6.1.1 b/metadata/md5-cache/dev-util/Tensile-6.1.1
new file mode 100644
index 000000000000..85d51c83dcf8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/Tensile-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/filelock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/joblib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) client? ( dev-libs/boost ) >=dev-cpp/msgpack-cxx-6.0.0 dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/joblib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =dev-util/hip-6* >=dev-util/rocm-smi-4.3.0 llvm_slot_18? ( sys-devel/clang:18 ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) app-alternatives/ninja >=dev-build/cmake-3.20.5 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) client? ( dev-libs/boost ) >=dev-cpp/msgpack-cxx-6.0.0 dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/joblib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =dev-util/hip-6* >=dev-util/rocm-smi-4.3.0 llvm_slot_18? ( sys-devel/clang:18 )
+DESCRIPTION=Stretching GPU performance for GEMMs and tensor contractions
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/Tensile
+INHERIT=cmake distutils-r1 llvm-r1 prefix rocm
+IUSE=client test test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 +llvm_slot_18 +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) client? ( dev-libs/boost ) >=dev-cpp/msgpack-cxx-6.0.0 dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/joblib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =dev-util/hip-6* >=dev-util/rocm-smi-4.3.0 llvm_slot_18? ( sys-devel/clang:18 ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=client? ( || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 ) ) || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) ^^ ( llvm_slot_18 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-6.1.1.tar.gz -> rocm-Tensile-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=72b4e6abaf95eeccf52abe089f111df5
diff --git a/metadata/md5-cache/dev-util/argouml-0.34-r1 b/metadata/md5-cache/dev-util/argouml-0.34-r1
index 86ad32b8aaa7..131827d57752 100644
--- a/metadata/md5-cache/dev-util/argouml-0.34-r1
+++ b/metadata/md5-cache/dev-util/argouml-0.34-r1
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://argouml-downloads.tigris.org/nonav/argouml-0.34/ArgoUML-0.34.tar.gz http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip doc? ( http://argouml-downloads.tigris.org/nonav/argouml-0.34/manual-0.34.pdf http://argouml-downloads.tigris.org/nonav/argouml-0.34/quickguide-0.34.pdf )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=801246c9ee7416339c78eebc657a8968
diff --git a/metadata/md5-cache/dev-util/astyle-3.1-r2 b/metadata/md5-cache/dev-util/astyle-3.1-r2
index 915c017851fb..fee3e4d58186 100644
--- a/metadata/md5-cache/dev-util/astyle-3.1-r2
+++ b/metadata/md5-cache/dev-util/astyle-3.1-r2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/3.1
 SRC_URI=https://downloads.sourceforge.net/astyle/astyle_3.1_linux.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=df276896f02fcaea9dab3335714c9367
diff --git a/metadata/md5-cache/dev-util/astyle-3.4.8 b/metadata/md5-cache/dev-util/astyle-3.4.8
index 1c2487cc25a2..505386e987b6 100644
--- a/metadata/md5-cache/dev-util/astyle-3.4.8
+++ b/metadata/md5-cache/dev-util/astyle-3.4.8
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/3.2
 SRC_URI=https://downloads.sourceforge.net/astyle/astyle-3.4.8.tar.bz2 http://www.andre-simon.de/zip/astyle-3.4.8.tar.bz2 verify-sig? ( http://www.andre-simon.de/zip/astyle-3.4.8.tar.bz2.asc )
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=7abb18fbf0fb66b2a912411b1981019a
diff --git a/metadata/md5-cache/dev-util/astyle-3.4.9 b/metadata/md5-cache/dev-util/astyle-3.4.9
index 4779bb8232e9..59e68451aa62 100644
--- a/metadata/md5-cache/dev-util/astyle-3.4.9
+++ b/metadata/md5-cache/dev-util/astyle-3.4.9
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/3.2
 SRC_URI=https://downloads.sourceforge.net/astyle/astyle-3.4.9.tar.bz2 http://www.andre-simon.de/zip/astyle-3.4.9.tar.bz2 verify-sig? ( http://www.andre-simon.de/zip/astyle-3.4.9.tar.bz2.asc )
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=7abb18fbf0fb66b2a912411b1981019a
diff --git a/metadata/md5-cache/dev-util/gcovr-7.2-r1 b/metadata/md5-cache/dev-util/gcovr-7.2-r1
new file mode 100644
index 000000000000..d9305f360a49
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gcovr-7.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/yaxmldiff[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorlog[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python script for summarizing gcov data
+EAPI=8
+HOMEPAGE=https://github.com/gcovr/gcovr
+INHERIT=toolchain-funcs distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=BSD
+RDEPEND=dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorlog[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gcovr/gcovr/archive/7.2.tar.gz -> gcovr-7.2.gh.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=09caa115a9d0969aca154f2fb68a4e62
diff --git a/metadata/md5-cache/dev-util/gitlab-runner-16.10.0 b/metadata/md5-cache/dev-util/gitlab-runner-17.1.0
index e361308b5082..a8a0dc8365f4 100644
--- a/metadata/md5-cache/dev-util/gitlab-runner-16.10.0
+++ b/metadata/md5-cache/dev-util/gitlab-runner-17.1.0
@@ -10,6 +10,6 @@ LICENSE=MIT
 RDEPEND=acct-group/gitlab-runner acct-user/gitlab-runner virtual/tmpfiles
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v16.10.0/gitlab-runner-v16.10.0.tar.bz2 -> gitlab-runner-16.10.0.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-runner-16.10.0-deps.tar.xz
+SRC_URI=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v17.1.0/gitlab-runner-v17.1.0.tar.bz2 -> gitlab-runner-17.1.0.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-runner-17.1.0-deps.tar.xz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a1e07732e0d47512a347f09312bbb01e
+_md5_=4e88cebc8dcf234b6d23038dc1c8a01a
diff --git a/metadata/md5-cache/dev-util/gource-0.55 b/metadata/md5-cache/dev-util/gource-0.55
new file mode 100644
index 000000000000..e3bb76572ce0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gource-0.55
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/boost:= >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre2:= dev-libs/tinyxml media-libs/libglvnd[X] media-libs/freetype:2 virtual/glu:0 >=media-libs/glm-0.9.3
+DESCRIPTION=A software version control visualization tool
+EAPI=8
+HOMEPAGE=https://gource.io/
+INHERIT=autotools flag-o-matic
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/boost:= >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre2:= dev-libs/tinyxml media-libs/libglvnd[X] media-libs/freetype:2 virtual/glu:0 media-fonts/freefont
+SLOT=0
+SRC_URI=https://github.com/acaudwell/Gource/releases/download/gource-0.55/gource-0.55.tar.gz
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=b46965df5415a4a264c57b89a8d82d8e
diff --git a/metadata/md5-cache/dev-util/hip-5.1.3-r4 b/metadata/md5-cache/dev-util/hip-5.1.3-r4
index 75d34f830432..56e0a0f6b34d 100644
--- a/metadata/md5-cache/dev-util/hip-5.1.3-r4
+++ b/metadata/md5-cache/dev-util/hip-5.1.3-r4
@@ -12,4 +12,4 @@ RDEPEND=>=dev-util/rocminfo-5 sys-devel/clang:15 dev-libs/rocm-comgr:0/5.1 virtu
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-5.1.3.tar.gz -> rocm-hipamd-5.1.3.tar.gz https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.1.3.tar.gz -> rocm-hip-5.1.3.tar.gz https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.1.3.tar.gz -> rocclr-5.1.3.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.1.3.tar.gz -> rocm-opencl-runtime-5.1.3.tar.gz profile? ( https://github.com/ROCm-Developer-Tools/roctracer/archive/refs/tags/rocm-5.1.3.tar.gz -> rocm-tracer-5.1.3.tar.gz https://github.com/ROCm-Developer-Tools/hipamd/files/8991181/hip_prof_str_diff.gz -> hip-5.1.3-update-header.patch.gz )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	docs	7f3c0d47338743498c69f1887a139f57	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ed5cde5a4283685e410d6d57fb11635a
+_md5_=d6ca8af5eb0c44538475fa1a924e1ac4
diff --git a/metadata/md5-cache/dev-util/hip-5.3.3-r3 b/metadata/md5-cache/dev-util/hip-5.3.3-r3
index 8df4ee4cad52..e5a0d31cb0b9 100644
--- a/metadata/md5-cache/dev-util/hip-5.3.3-r3
+++ b/metadata/md5-cache/dev-util/hip-5.3.3-r3
@@ -12,4 +12,4 @@ RDEPEND=>=dev-util/rocminfo-5 sys-devel/clang:15 dev-libs/rocm-comgr:0/5.3 virtu
 SLOT=0/5.3
 SRC_URI=https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-5.3.3.tar.gz -> rocm-hipamd-5.3.3.tar.gz https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.3.3.tar.gz -> rocm-hip-5.3.3.tar.gz https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.3.3.tar.gz -> rocclr-5.3.3.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.3.3.tar.gz -> rocm-opencl-runtime-5.3.3.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	docs	7f3c0d47338743498c69f1887a139f57	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=88aad74713a06a1f4e6f125edfb3f3fe
+_md5_=ff53e7fd5b9daa64d4064b772b855ede
diff --git a/metadata/md5-cache/dev-util/hip-5.4.3 b/metadata/md5-cache/dev-util/hip-5.4.3
index 33ad11987fbb..a91b28222864 100644
--- a/metadata/md5-cache/dev-util/hip-5.4.3
+++ b/metadata/md5-cache/dev-util/hip-5.4.3
@@ -12,4 +12,4 @@ RDEPEND=>=dev-util/rocminfo-5 sys-devel/clang:15 dev-libs/rocm-comgr:0/5.4 virtu
 SLOT=0/5.4
 SRC_URI=https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-5.4.3.tar.gz -> rocm-hipamd-5.4.3.tar.gz https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.4.3.tar.gz -> rocm-hip-5.4.3.tar.gz https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.4.3.tar.gz -> rocclr-5.4.3.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.4.3.tar.gz -> rocm-opencl-runtime-5.4.3.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	docs	7f3c0d47338743498c69f1887a139f57	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=02af7e1e192d124851b001adc955d148
+_md5_=332aad92537bc5969d94de9caa51c257
diff --git a/metadata/md5-cache/dev-util/hip-5.5.1 b/metadata/md5-cache/dev-util/hip-5.5.1
index 11466b6cab5f..a333f09bb14d 100644
--- a/metadata/md5-cache/dev-util/hip-5.5.1
+++ b/metadata/md5-cache/dev-util/hip-5.5.1
@@ -12,4 +12,4 @@ RDEPEND=>=dev-util/rocminfo-5 sys-devel/clang:16 dev-libs/rocm-comgr:0/5.5 virtu
 SLOT=0/5.5
 SRC_URI=https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-5.5.1.tar.gz -> rocm-hipamd-5.5.1.tar.gz https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.5.1.tar.gz -> rocm-hip-5.5.1.tar.gz https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.5.1.tar.gz -> rocclr-5.5.1.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.5.1.tar.gz -> rocm-opencl-runtime-5.5.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	docs	7f3c0d47338743498c69f1887a139f57	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=89c3ee81201887eaf6727d5209b22efa
+_md5_=f6443a8bfa3cd288271f7679ca7ade0b
diff --git a/metadata/md5-cache/dev-util/hip-5.7.1-r2 b/metadata/md5-cache/dev-util/hip-5.7.1-r2
index 7bd6bf21a286..88665d70afef 100644
--- a/metadata/md5-cache/dev-util/hip-5.7.1-r2
+++ b/metadata/md5-cache/dev-util/hip-5.7.1-r2
@@ -1,16 +1,16 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( app-text/doxygen media-gfx/graphviz )
+BDEPEND=test? ( =dev-util/hipcc-5* ) app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( app-text/doxygen media-gfx/graphviz )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-util/hipcc >=dev-util/rocminfo-5 sys-devel/clang:17 dev-libs/rocm-comgr:0/5.7 >=dev-libs/rocr-runtime-5.6 x11-base/xorg-proto virtual/opengl !!sys-devel/llvm:0
+DEPEND=>=dev-util/rocminfo-5 sys-devel/clang:17 dev-libs/rocm-comgr:0/5.7 >=dev-libs/rocr-runtime-5.6 x11-base/xorg-proto virtual/opengl !!sys-devel/llvm:0
 DESCRIPTION=C++ Heterogeneous-Compute Interface for Portability
 EAPI=8
-HOMEPAGE=https://github.com/ROCm-Developer-Tools/hipamd
-INHERIT=cmake docs llvm rocm flag-o-matic
+HOMEPAGE=https://github.com/ROCm/hipamd
+INHERIT=cmake docs flag-o-matic llvm rocm
 IUSE=debug test doc
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-util/hipcc >=dev-util/rocminfo-5 sys-devel/clang:17 dev-libs/rocm-comgr:0/5.7 >=dev-libs/rocr-runtime-5.6 x11-base/xorg-proto virtual/opengl dev-perl/URI-Encode sys-devel/clang-runtime:= >=dev-libs/roct-thunk-interface-5
+RDEPEND=>=dev-util/rocminfo-5 sys-devel/clang:17 dev-libs/rocm-comgr:0/5.7 >=dev-libs/rocr-runtime-5.6 x11-base/xorg-proto virtual/opengl =dev-util/hipcc-5* dev-perl/URI-Encode sys-devel/clang-runtime:= >=dev-libs/roct-thunk-interface-5
 RESTRICT=!test? ( test )
 SLOT=0/5.7
-SRC_URI=https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-5.7.1.tar.gz -> rocm-clr-5.7.1.tar.gz https://github.com/ROCm-Developer-Tools/HIP/archive/refs/tags/rocm-5.7.1.tar.gz -> hip-5.7.1.tar.gz test? ( https://github.com/ROCm-Developer-Tools/hip-tests/archive/refs/tags/rocm-5.7.0.tar.gz )
+SRC_URI=https://github.com/ROCm/clr/archive/refs/tags/rocm-5.7.1.tar.gz -> rocm-clr-5.7.1.tar.gz https://github.com/ROCm/HIP/archive/refs/tags/rocm-5.7.1.tar.gz -> hip-5.7.1.tar.gz test? ( https://github.com/ROCm/hip-tests/archive/refs/tags/rocm-5.7.0.tar.gz )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	docs	7f3c0d47338743498c69f1887a139f57	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fb64b93b3e18764de3da48a830bad37a
+_md5_=31d90911242b7af1d6204cbd4c908a45
diff --git a/metadata/md5-cache/dev-util/hip-6.0.0 b/metadata/md5-cache/dev-util/hip-6.0.0
deleted file mode 100644
index a7efa0ec83c0..000000000000
--- a/metadata/md5-cache/dev-util/hip-6.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( app-text/doxygen media-gfx/graphviz )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-util/hipcc >=dev-util/rocminfo-5 sys-devel/clang:17 dev-libs/rocm-comgr:0/6.0 >=dev-libs/rocr-runtime-5.6 x11-base/xorg-proto virtual/opengl !!sys-devel/llvm:0
-DESCRIPTION=C++ Heterogeneous-Compute Interface for Portability
-EAPI=8
-HOMEPAGE=https://github.com/ROCm-Developer-Tools/hipamd
-INHERIT=cmake docs flag-o-matic llvm rocm
-IUSE=debug test doc
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-util/hipcc >=dev-util/rocminfo-5 sys-devel/clang:17 dev-libs/rocm-comgr:0/6.0 >=dev-libs/rocr-runtime-5.6 x11-base/xorg-proto virtual/opengl dev-perl/URI-Encode sys-devel/clang-runtime:= >=dev-libs/roct-thunk-interface-5
-RESTRICT=!test? ( test )
-SLOT=0/6.0
-SRC_URI=https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-6.0.0.tar.gz -> rocm-clr-6.0.0.tar.gz https://github.com/ROCm-Developer-Tools/HIP/archive/refs/tags/rocm-6.0.0.tar.gz -> hip-6.0.0.tar.gz test? ( https://github.com/ROCm-Developer-Tools/hip-tests/archive/refs/tags/rocm-5.7.0.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	docs	7f3c0d47338743498c69f1887a139f57	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ba9f8309db7f48a4795cf1b03d610d17
diff --git a/metadata/md5-cache/dev-util/hip-6.1.1 b/metadata/md5-cache/dev-util/hip-6.1.1
new file mode 100644
index 000000000000..ae0286aa0ae2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/hip-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=video_cards_amdgpu? ( dev-util/hipcc:0/6.1[llvm_slot_18(-)?] ) app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( app-text/doxygen media-gfx/graphviz )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=video_cards_amdgpu? ( >=dev-util/rocminfo-5 llvm_slot_18? ( sys-devel/clang:18 ) dev-libs/rocm-comgr:0/6.1 dev-libs/rocr-runtime:0/6.1 ) video_cards_nvidia? ( dev-libs/hipother:0/6.1 ) x11-base/xorg-proto virtual/opengl
+DESCRIPTION=C++ Heterogeneous-Compute Interface for Portability
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/clr
+INHERIT=cmake docs flag-o-matic llvm-r1 rocm
+IUSE=debug +hip opencl test video_cards_amdgpu video_cards_nvidia doc +llvm_slot_18
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=video_cards_amdgpu? ( >=dev-util/rocminfo-5 llvm_slot_18? ( sys-devel/clang:18 ) dev-libs/rocm-comgr:0/6.1 dev-libs/rocr-runtime:0/6.1 ) video_cards_nvidia? ( dev-libs/hipother:0/6.1 ) x11-base/xorg-proto virtual/opengl sys-devel/clang-runtime:= video_cards_amdgpu? ( dev-util/hipcc:0/6.1[llvm_slot_18(-)?] >=dev-libs/rocm-device-libs-6.1.1 >=dev-libs/roct-thunk-interface-5 )
+REQUIRED_USE=|| ( hip opencl ) ^^ ( video_cards_amdgpu video_cards_nvidia ) ^^ ( llvm_slot_18 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/clr/archive/refs/tags/rocm-6.1.1.tar.gz -> rocm-clr-6.1.1.tar.gz https://github.com/ROCm/HIP/archive/refs/tags/rocm-6.1.1.tar.gz -> hip-6.1.1.tar.gz test? ( https://github.com/ROCm/hip-tests/archive/refs/tags/rocm-6.1.1.tar.gz -> hip-test-6.1.1.tar.gz )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	docs	7f3c0d47338743498c69f1887a139f57	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5507e3372d955ee8eb1c6a13d7140130
diff --git a/metadata/md5-cache/dev-util/hipcc-6.0.0 b/metadata/md5-cache/dev-util/hipcc-6.0.0
deleted file mode 100644
index 64fa8bae7002..000000000000
--- a/metadata/md5-cache/dev-util/hipcc-6.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=<sys-devel/llvm-18:= <sys-devel/clang-18:= !!sys-devel/llvm:0
-DESCRIPTION=Radeon Open Compute hipcc
-EAPI=8
-HOMEPAGE=https://github.com/ROCm-Developer-Tools/hipcc
-INHERIT=cmake llvm
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 MIT
-RDEPEND=<sys-devel/llvm-18:= <sys-devel/clang-18:= !<dev-util/hip-5.7
-RESTRICT=!test? ( test )
-SLOT=0/6.0
-SRC_URI=https://github.com/ROCm-Developer-Tools/hipcc/archive/refs/tags/rocm-6.0.0.tar.gz -> hipcc-6.0.0.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=24f588d9466ad312a730748e9eef8ef4
diff --git a/metadata/md5-cache/dev-util/hipcc-6.1.1 b/metadata/md5-cache/dev-util/hipcc-6.1.1
new file mode 100644
index 000000000000..ecc17cc25eee
--- /dev/null
+++ b/metadata/md5-cache/dev-util/hipcc-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=llvm_slot_18? ( sys-libs/compiler-rt:18= sys-devel/llvm:18= sys-devel/clang:18= )
+DESCRIPTION=Radeon Open Compute hipcc
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/hipcc
+INHERIT=cmake perl-functions llvm-r1
+IUSE=debug test +llvm_slot_18
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT
+RDEPEND=llvm_slot_18? ( sys-libs/compiler-rt:18= sys-devel/llvm:18= sys-devel/clang:18= ) !<dev-util/hip-5.7
+REQUIRED_USE=^^ ( llvm_slot_18 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/llvm-project/archive/rocm-6.1.1.tar.gz -> llvm-project-rocm-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	perl-functions	c3fca037246e877693badea0df3b0ef8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=da74b123a3ff1a29794a304e9e935790
diff --git a/metadata/md5-cache/dev-util/hipify-clang-6.1.1 b/metadata/md5-cache/dev-util/hipify-clang-6.1.1
new file mode 100644
index 000000000000..0f5486d6da1f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/hipify-clang-6.1.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-build/cmake-3.22 app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=llvm_slot_18? ( sys-devel/clang:18= sys-devel/llvm:18= )
+DESCRIPTION=A set of tools to translate CUDA source code into portable HIP C++
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/HIPIFY
+INHERIT=cmake llvm-r1
+IUSE=+llvm_slot_18
+KEYWORDS=~amd64
+LICENSE=MIT
+REQUIRED_USE=^^ ( llvm_slot_18 )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/HIPIFY/archive/rocm-6.1.1.tar.gz -> HIPIFY-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=7b56bd078df850e5093aacf5578f5cc9
diff --git a/metadata/md5-cache/dev-util/makeheaders-0_p20240202 b/metadata/md5-cache/dev-util/makeheaders-0_p20240202
index d07542a9d76e..10dba50c1c03 100644
--- a/metadata/md5-cache/dev-util/makeheaders-0_p20240202
+++ b/metadata/md5-cache/dev-util/makeheaders-0_p20240202
@@ -3,9 +3,9 @@ DESCRIPTION=Tool that automatically generates .h files for a C or C++ programmin
 EAPI=8
 HOMEPAGE=https://www.hwaci.com/sw/mkhdr/
 INHERIT=edo toolchain-funcs
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://fossil-scm.org/home/raw/cae894dc3611ee6e0fba4100c0e377fcd3bbc6d8ddb91c997939ce439c50cee2?at=makeheaders.c -> makeheaders-cae894dc3611ee6e0fba4100c0e377fcd3bbc6d8ddb91c997939ce439c50cee2.c https://fossil-scm.org/home/raw/262696252dc50250c896c90cc240dcd946614b9c7727902aa7606640507e9231?at=makeheaders.html -> makeheaders-262696252dc50250c896c90cc240dcd946614b9c7727902aa7606640507e9231.html
 _eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1c6e58817369665a7efd8940230254cd
+_md5_=39f76fa4b010a7b0a3465202a2655a6f
diff --git a/metadata/md5-cache/dev-util/oprofile-1.4.0 b/metadata/md5-cache/dev-util/oprofile-1.4.0
index 2487a3571455..a1e832515854 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.4.0
+++ b/metadata/md5-cache/dev-util/oprofile-1.4.0
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= elibc_glibc? ( >=sys-libs/glibc-2.3.2-r1 ) ppc64? ( dev-libs/libpfm ) acct-user/oprofile acct-group/oprofile java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/oprofile/oprofile-1.4.0.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=4f1c2d239fb6971919d28b23dbb93f9e
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.2.10-r1 b/metadata/md5-cache/dev-util/pkgdev-0.2.10-r1
new file mode 100644
index 000000000000..6e1f47b03862
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgdev-0.2.10-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/flit-core-3.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/snakeoil-0.10.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( x11-misc/xdg-utils ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] >=dev-python/snakeoil-0.10.5[python_targets_python3_12(-)] dev-python/tomli[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] >=dev-python/snakeoil-0.10.5[python_targets_python3_11(-)] dev-python/tomli[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] >=dev-python/snakeoil-0.10.5[python_targets_python3_10(-)] dev-python/tomli[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/snakeoil-0.10.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sys-apps/pkgcore-0.12.23[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-util/pkgcheck-0.10.25[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Collection of tools for Gentoo development
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/pkgdev
+INHERIT=distutils-r1 optfeature pypi
+IUSE=doc doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.10.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sys-apps/pkgcore-0.12.23[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-util/pkgcheck-0.10.25[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pkgdev/pkgdev-0.2.10.tar.gz
+_eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=729381a242f6c47961a9305a3070bf6e
diff --git a/metadata/md5-cache/dev-util/pkgdev-9999 b/metadata/md5-cache/dev-util/pkgdev-9999
index ae15106bb93b..5a33bbee5da8 100644
--- a/metadata/md5-cache/dev-util/pkgdev-9999
+++ b/metadata/md5-cache/dev-util/pkgdev-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/flit-core-3.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/snakeoil-0.10.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( x11-misc/xdg-utils ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] >=dev-python/snakeoil-0.10.5[python_targets_python3_12(-)] dev-python/tomli[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] >=dev-python/snakeoil-0.10.5[python_targets_python3_11(-)] dev-python/tomli[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] >=dev-python/snakeoil-0.10.5[python_targets_python3_10(-)] dev-python/tomli[python_targets_python3_10(-)] ) ) ) test? ( ~dev-python/snakeoil-9999[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ~dev-util/pkgcheck-9999[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-python/flit-core-3.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/snakeoil-0.10.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( x11-misc/xdg-utils ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] >=dev-python/snakeoil-0.10.5[python_targets_python3_12(-)] dev-python/tomli[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] >=dev-python/snakeoil-0.10.5[python_targets_python3_11(-)] dev-python/tomli[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] >=dev-python/snakeoil-0.10.5[python_targets_python3_10(-)] dev-python/tomli[python_targets_python3_10(-)] ) ) ) test? ( ~dev-python/snakeoil-9999[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ~dev-util/pkgcheck-9999[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DESCRIPTION=Collection of tools for Gentoo development
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=distutils-r1 optfeature git-r3
 IUSE=doc doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 LICENSE=BSD MIT
 PROPERTIES=live
-RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ~dev-util/pkgcheck-9999[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ~dev-util/pkgcheck-9999[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=2f30035be4b0101a64d72848daec606a
+_md5_=39d2229b254cd084c6e4b7171ffeec6f
diff --git a/metadata/md5-cache/dev-util/rbtools-5.0 b/metadata/md5-cache/dev-util/rbtools-5.0-r1
index f10a15d69e31..4b22ad0b05ab 100644
--- a/metadata/md5-cache/dev-util/rbtools-5.0
+++ b/metadata/md5-cache/dev-util/rbtools-5.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Command line tools for use with Review Board
 EAPI=8
 HOMEPAGE=https://www.reviewboard.org/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+IUSE=test test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/certifi-2023.5.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/housekeeping-1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =dev-python/housekeeping-1*[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =dev-python/pydiffx-1.1*[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/texttable[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tqdm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/importlib-metadata-5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/reviewboard/rbtools/archive/refs/tags/release-5.0.tar.gz -> rbtools-5.0.tar.gz
 _eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=22a7411c140c299e9fe03eeb61107faf
+_md5_=4763560a0f6ad39add537b73222f944e
diff --git a/metadata/md5-cache/dev-util/rocm-smi-6.1.1 b/metadata/md5-cache/dev-util/rocm-smi-6.1.1
new file mode 100644
index 000000000000..3256b384fc3a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rocm-smi-6.1.1
@@ -0,0 +1,15 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=ROCm System Management Interface Library
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/rocm_smi_lib
+INHERIT=cmake python-r1
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64
+LICENSE=MIT NCSA-AMD
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/rocm_smi_lib/archive/rocm-6.1.1.tar.gz -> rocm-smi-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=960be07b6c5be891cbf5f582beb0a762
diff --git a/metadata/md5-cache/dev-util/rocminfo-5.1.3 b/metadata/md5-cache/dev-util/rocminfo-5.1.3
deleted file mode 100644
index c7395104f028..000000000000
--- a/metadata/md5-cache/dev-util/rocminfo-5.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-5.1.3
-DESCRIPTION=ROCm Application for Reporting System Info
-EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/rocminfo
-INHERIT=cmake
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-libs/rocr-runtime-5.1.3
-SLOT=0/5.1
-SRC_URI=https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-5.1.3.tar.gz -> rocminfo-5.1.3.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7f1ebb77644aa7c9db86fc1d66c7b459
diff --git a/metadata/md5-cache/dev-util/rocminfo-5.4.3 b/metadata/md5-cache/dev-util/rocminfo-5.4.3
deleted file mode 100644
index d5b3b0981493..000000000000
--- a/metadata/md5-cache/dev-util/rocminfo-5.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-5.4.3
-DESCRIPTION=ROCm Application for Reporting System Info
-EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/rocminfo
-INHERIT=cmake
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-libs/rocr-runtime-5.4.3
-SLOT=0/5.4
-SRC_URI=https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-5.4.3.tar.gz -> rocminfo-5.4.3.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9c58b9117fa8d29801058a6e6b7e97e8
diff --git a/metadata/md5-cache/dev-util/rocminfo-5.5.1 b/metadata/md5-cache/dev-util/rocminfo-5.5.1
deleted file mode 100644
index 9325ea307dfd..000000000000
--- a/metadata/md5-cache/dev-util/rocminfo-5.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-5.5.1
-DESCRIPTION=ROCm Application for Reporting System Info
-EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/rocminfo
-INHERIT=cmake
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-libs/rocr-runtime-5.5.1
-SLOT=0/5.5
-SRC_URI=https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-5.5.1.tar.gz -> rocminfo-5.5.1.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=637ae0d2747390572bd696f384e0dfbc
diff --git a/metadata/md5-cache/dev-util/rocminfo-5.7.1 b/metadata/md5-cache/dev-util/rocminfo-5.7.1
deleted file mode 100644
index 2ecbeecc2c76..000000000000
--- a/metadata/md5-cache/dev-util/rocminfo-5.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-5.7.1
-DESCRIPTION=ROCm Application for Reporting System Info
-EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/rocminfo
-INHERIT=cmake
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-libs/rocr-runtime-5.7.1
-SLOT=0/5.7
-SRC_URI=https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-5.7.1.tar.gz -> rocminfo-5.7.1.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=637ae0d2747390572bd696f384e0dfbc
diff --git a/metadata/md5-cache/dev-util/rocminfo-5.7.1-r1 b/metadata/md5-cache/dev-util/rocminfo-5.7.1-r1
new file mode 100644
index 000000000000..58a9f89ec73b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rocminfo-5.7.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/rocr-runtime-5.7.1 python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=ROCm Application for Reporting System Info
+EAPI=8
+HOMEPAGE=https://github.com/RadeonOpenCompute/rocminfo
+INHERIT=cmake python-r1
+IUSE=python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=UoI-NCSA
+RDEPEND=>=dev-libs/rocr-runtime-5.7.1 python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
+SLOT=0/5.7
+SRC_URI=https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-5.7.1.tar.gz -> rocminfo-5.7.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=34e8bcca485cfc0c5668de22bf74a222
diff --git a/metadata/md5-cache/dev-util/rocminfo-6.0.0 b/metadata/md5-cache/dev-util/rocminfo-6.0.0
deleted file mode 100644
index 3f1772202b12..000000000000
--- a/metadata/md5-cache/dev-util/rocminfo-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-6.0.0
-DESCRIPTION=ROCm Application for Reporting System Info
-EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/rocminfo
-INHERIT=cmake
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-libs/rocr-runtime-6.0.0
-SLOT=0/6.0
-SRC_URI=https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-6.0.0.tar.gz -> rocminfo-6.0.0.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=637ae0d2747390572bd696f384e0dfbc
diff --git a/metadata/md5-cache/dev-util/rocminfo-6.1.1 b/metadata/md5-cache/dev-util/rocminfo-6.1.1
new file mode 100644
index 000000000000..8de8c2d8c2df
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rocminfo-6.1.1
@@ -0,0 +1,16 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/rocr-runtime-6.1.1 python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+DESCRIPTION=ROCm Application for Reporting System Info
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/rocminfo
+INHERIT=cmake python-r1
+IUSE=python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64
+LICENSE=UoI-NCSA
+RDEPEND=>=dev-libs/rocr-runtime-6.1.1 python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/rocminfo/archive/rocm-6.1.1.tar.gz -> rocminfo-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b2f9fd35f7ed1babc4564b8ef8b1b505
diff --git a/metadata/md5-cache/dev-util/roctracer-6.1.1 b/metadata/md5-cache/dev-util/roctracer-6.1.1
new file mode 100644
index 000000000000..7e969e2fa78f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/roctracer-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( ( dev-lang/python:3.13 dev-python/CppHeaderParser[python_targets_python3_13(-)] dev-python/ply[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/CppHeaderParser[python_targets_python3_12(-)] dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/CppHeaderParser[python_targets_python3_11(-)] dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/CppHeaderParser[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-util/hip:0/6.1 dev-libs/rocr-runtime
+DESCRIPTION=Callback/Activity Library for Performance tracing AMD GPU's
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/roctracer
+INHERIT=cmake prefix python-any-r1 rocm llvm-r1
+IUSE=test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 +llvm_slot_18
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip:0/6.1 dev-libs/rocr-runtime
+REQUIRED_USE=^^ ( llvm_slot_18 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/roctracer/archive/rocm-6.1.1.tar.gz -> roctracer-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=eb9f814a79dd2e68e2a2572345d4972c
diff --git a/metadata/md5-cache/dev-util/visualvm-2.1.8 b/metadata/md5-cache/dev-util/visualvm-2.1.8
index 62756e4ad10b..140e6a8568cc 100644
--- a/metadata/md5-cache/dev-util/visualvm-2.1.8
+++ b/metadata/md5-cache/dev-util/visualvm-2.1.8
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=dev-java/jmc:0 dev-java/lz4-java:0 dev-java/owasp-java-encoder:0 dev-java/asm:9 dev-java/hamcrest-core:1.3 dev-java/jcommander:0 dev-java/jna:4 dev-java/junit:4 dev-java/junit:5 dev-java/testng:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=7
 SRC_URI=https://github.com/oracle/visualvm/archive/2.1.8.tar.gz -> visualvm-2.1.8.tar.gz https://github.com/oracle/visualvm/releases/download/2.1.8/nb190_platform_20231030.zip https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.4/nashorn-core-15.4.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=4306b49fec126406df6def0b03a19762
diff --git a/metadata/md5-cache/dev-util/weka-3.8.0-r1 b/metadata/md5-cache/dev-util/weka-3.8.0-r1
index f16a24616bc6..be21f6e6746a 100644
--- a/metadata/md5-cache/dev-util/weka-3.8.0-r1
+++ b/metadata/md5-cache/dev-util/weka-3.8.0-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jre:1.8 dev-java/javacup:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/weka/weka-3-8/3.8.0/weka-3-8-0.zip
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=52e6c53365e8d9a08b387486ff7fc164
diff --git a/metadata/md5-cache/dev-util/weka-3.8.6 b/metadata/md5-cache/dev-util/weka-3.8.6
index 867c2c8c558c..29cdb6133b79 100644
--- a/metadata/md5-cache/dev-util/weka-3.8.6
+++ b/metadata/md5-cache/dev-util/weka-3.8.6
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/javacup:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/weka/weka-3-8/3.8.6/weka-3-8-6.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a04f2a2fed488dc205591cc1cd5062d5
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 6cd752947e09..cae5738b0daf 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/bfg-1.13.0 b/metadata/md5-cache/dev-vcs/bfg-1.13.0
index 551f46b77453..ccebb3f55f79 100644
--- a/metadata/md5-cache/dev-vcs/bfg-1.13.0
+++ b/metadata/md5-cache/dev-vcs/bfg-1.13.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/madgag/bfg/1.13.0/bfg-1.13.0.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a32c4bd36c26137ed6bc70a1437be3c0
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.14.2-r1 b/metadata/md5-cache/dev-vcs/subversion-1.14.2-r1
index 45cad56af91c..7362e61df88d 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.14.2-r1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.14.2-r1
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.14.2.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	depend.apache	1d51223a0def226481583990f380519c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	25ca2ff8e7971cb7f817f0bda4be696d	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	depend.apache	1d51223a0def226481583990f380519c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	25ca2ff8e7971cb7f817f0bda4be696d	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ebd8a16616de1412bc4b6351b044ee47
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.14.3 b/metadata/md5-cache/dev-vcs/subversion-1.14.3
index 3d6c25b5594d..a796245b96f3 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.14.3
+++ b/metadata/md5-cache/dev-vcs/subversion-1.14.3
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.5:1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.14.3.tar.bz2
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	depend.apache	1d51223a0def226481583990f380519c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	25ca2ff8e7971cb7f817f0bda4be696d	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	depend.apache	1d51223a0def226481583990f380519c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	25ca2ff8e7971cb7f817f0bda4be696d	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c9a7b7bf033a8292d96d98066ca81ae4
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 9b3391ec8b05..214089ee2099 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/prismlauncher-8.2-r1 b/metadata/md5-cache/games-action/prismlauncher-8.2-r1
index 5cacb9eeda63..c5a022d0ccde 100644
--- a/metadata/md5-cache/games-action/prismlauncher-8.2-r1
+++ b/metadata/md5-cache/games-action/prismlauncher-8.2-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=lto? ( !debug )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PrismLauncher/PrismLauncher/releases/download/8.2/PrismLauncher-8.2.tar.gz -> prismlauncher-8.2.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7bb1d0591f19130df275808bc7baf7e7
diff --git a/metadata/md5-cache/games-action/prismlauncher-8.3 b/metadata/md5-cache/games-action/prismlauncher-8.3
index 9e0d365dc057..8fb29dd9d6df 100644
--- a/metadata/md5-cache/games-action/prismlauncher-8.3
+++ b/metadata/md5-cache/games-action/prismlauncher-8.3
@@ -14,5 +14,5 @@ REQUIRED_USE=lto? ( !debug )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PrismLauncher/PrismLauncher/releases/download/8.3/PrismLauncher-8.3.tar.gz -> prismlauncher-8.3.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c34554902345ca634b236bc35873752c
diff --git a/metadata/md5-cache/games-action/prismlauncher-9999 b/metadata/md5-cache/games-action/prismlauncher-9999
index ee57c6cfc93b..082b9eed8aba 100644
--- a/metadata/md5-cache/games-action/prismlauncher-9999
+++ b/metadata/md5-cache/games-action/prismlauncher-9999
@@ -13,5 +13,5 @@ RDEPEND=!qt6? ( >=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt
 REQUIRED_USE=lto? ( !debug )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c34554902345ca634b236bc35873752c
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 3f6dfcf5798c..c03c866e4abc 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/domination-1.1.1.6-r3 b/metadata/md5-cache/games-board/domination-1.1.1.6-r3
index 8f30a5f68859..224cb4206666 100644
--- a/metadata/md5-cache/games-board/domination-1.1.1.6-r3
+++ b/metadata/md5-cache/games-board/domination-1.1.1.6-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/domination/Domination/1.1.1.6/Domination_1.1.1.6.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=82e600596165eaaec0d02d8de1fc9a84
diff --git a/metadata/md5-cache/games-board/megamek-0.34.10-r2 b/metadata/md5-cache/games-board/megamek-0.34.10-r2
index 5338219a519e..766bd29cab9e 100644
--- a/metadata/md5-cache/games-board/megamek-0.34.10-r2
+++ b/metadata/md5-cache/games-board/megamek-0.34.10-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/megamek/MegaMek-v0.34.10.zip https://dev.gentoo.org/~ionen/distfiles/megamek.png
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=36e0cf96662cfb2608dd887fa8b9e4da
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 71d136951980..2a7a558e2594 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/pauker-1.8-r4 b/metadata/md5-cache/games-puzzle/pauker-1.8-r4
index 37f9235040e1..45078240d294 100644
--- a/metadata/md5-cache/games-puzzle/pauker-1.8-r4
+++ b/metadata/md5-cache/games-puzzle/pauker-1.8-r4
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/browserlauncher2:1.0 dev-java/javahelp:0 dev-java/lucene:2.4 dev-java/swing-layout:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/pauker/pauker/1.8/pauker-1.8.src.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e070615803e985f06208515c63128d98
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 2767ca8ca15f..3a586e82e0f5 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r103 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r103
index a2db2137924c..2613bfe74e91 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r103
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r103
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
+BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.13 dev-python/pyyaml[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
 DEFINED_PHASES=compile install postinst postrm prepare setup test
 DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 )
 DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.25
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.25.1/stone_soup-0.25.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.25.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.25.svg
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d216d220c42e2af8a7b722aaaa559a1b
+_md5_=53ae82d09ab6169d4d1efee10534431b
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r2 b/metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r2
index 823456a8142c..568903ad492d 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r2
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r2
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
+BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.13 dev-python/pyyaml[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
 DEFINED_PHASES=compile install postinst postrm prepare setup test
 DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 )
 DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.26
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.26.1/stone_soup-0.26.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.26.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.26.svg
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=50203e4f6e8f3ab7dbdc14f8d0d6dda3
+_md5_=8f5dfeff3c500b77c070ac147217f84b
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.27.1-r1 b/metadata/md5-cache/games-roguelike/stone-soup-0.27.1-r1
index 5b3dfb6eed97..f5b9348e31e5 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.27.1-r1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.27.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
+BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.13 dev-python/pyyaml[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
 DEFINED_PHASES=compile install postinst postrm prepare setup test
 DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 )
 DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.27
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.27.1/stone_soup-0.27.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.27.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.27.svg
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fc501e317cbbce95c7d91ce606d8a41d
+_md5_=eacb8ce186021c772104a8d4b265eaa2
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.28.0-r1 b/metadata/md5-cache/games-roguelike/stone-soup-0.28.0-r1
index 99565853033c..420c4c7d33e3 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.28.0-r1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.28.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
+BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.13 dev-python/pyyaml[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
 DEFINED_PHASES=compile install postinst postrm prepare setup test
 DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 )
 DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.28
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.28.0/stone_soup-0.28.0.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.28.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.28.svg
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fa864b9fd51cb94aed2aa7e9131cd57f
+_md5_=5e99cbb2255b806b767cab92103411aa
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.29.1 b/metadata/md5-cache/games-roguelike/stone-soup-0.29.1
index 7a6151343c43..cb9bfdf7f9f0 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.29.1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.29.1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
+BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.13 dev-python/pyyaml[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
 DEFINED_PHASES=compile install postinst postrm prepare setup test
 DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 )
 DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.29
 SRC_URI=https://github.com/crawl/crawl/archive/refs/tags/0.29.1.tar.gz -> stone-soup-0.29.1.tar.gz https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.29.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.29.svg
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cf440a4ceb25503838e7592b2dc6e15d
+_md5_=17cecc900f1e680ce0d90bfe6b297fbe
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.30.1 b/metadata/md5-cache/games-roguelike/stone-soup-0.30.1
index 3c6ab98819e1..94c2aa82b1ae 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.30.1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.30.1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
+BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.13 dev-python/pyyaml[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
 DEFINED_PHASES=compile install postinst postrm prepare setup test
 DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 )
 DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.30
 SRC_URI=https://github.com/crawl/crawl/archive/refs/tags/0.30.1.tar.gz -> stone-soup-0.30.1.tar.gz https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.30.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.30.svg
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5d7f20557b9450fd202bc712266c3679
+_md5_=1ec699a138e403ab71f1e69fe7c7017b
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.31.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.31.0
index 9d8434224dd5..4940a4863132 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.31.0
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.31.0
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
+BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.13 dev-python/pyyaml[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
 DEFINED_PHASES=compile install postinst postrm prepare setup test
 DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 )
 DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.31
 SRC_URI=https://github.com/crawl/crawl/archive/refs/tags/0.31.0.tar.gz -> stone-soup-0.31.0.tar.gz https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.31.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.31.svg
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1e5f0e5159529cadc22e92a4ada30461
+_md5_=ae5127c329aba596d8e3098a90291127
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.32.0_pre20240409 b/metadata/md5-cache/games-roguelike/stone-soup-0.32.0_pre20240409
index 972adf2657bc..fe04e8da1ca7 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.32.0_pre20240409
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.32.0_pre20240409
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
+BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.13 dev-python/pyyaml[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
 DEFINED_PHASES=compile install postinst postrm prepare setup test
 DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 )
 DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.32
 SRC_URI=https://github.com/crawl/crawl/archive/0f22ef8d6127abe4e43dc0a93299003b0dfbec3f.tar.gz -> stone-soup-0.32.0_pre20240409.tar.gz https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.32.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.32.svg
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=25aa1ee85bc23195c0afecca89b865f4
+_md5_=243029bbd74d21c23c60628326b0970c
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.32.0_pre20240626 b/metadata/md5-cache/games-roguelike/stone-soup-0.32.0_pre20240626
new file mode 100644
index 000000000000..d8d03c199fc9
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.32.0_pre20240626
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.13 dev-python/pyyaml[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 )
+DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
+EAPI=8
+HOMEPAGE=https://crawl.develz.org
+INHERIT=desktop python-any-r1 lua-single xdg-utils toolchain-funcs
+IUSE=advpng debug ncurses sound test +tiles +lua_single_target_lua5-1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
+RESTRICT=!test? ( test )
+SLOT=0.32
+SRC_URI=https://github.com/crawl/crawl/archive/3d6ac616a9d452a692b94beb1a9d6b8e66346631.tar.gz -> stone-soup-0.32.0_pre20240626.tar.gz https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.32.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.32.svg
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a09038f9f9a46160e43a84c08ae91469
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 5eb793c091a6..d07954ab9bb5 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.21.0 b/metadata/md5-cache/games-server/minecraft-server-1.21.0
index d3223fffde68..104ab581d697 100644
--- a/metadata/md5-cache/games-server/minecraft-server-1.21.0
+++ b/metadata/md5-cache/games-server/minecraft-server-1.21.0
@@ -11,5 +11,5 @@ RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( dev-java/op
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://piston-data.mojang.com/v1/objects/450698d1863ab5180c25d7c804ef0fe6369dd1ba/server.jar -> minecraft-server-1.21.0.jar
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=b100615a33acf2771e70c8afd7819153
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 1ff01107c33c..d76a71b55ba0 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/freecol-1.0.0 b/metadata/md5-cache/games-strategy/freecol-1.0.0
index fcbb33905897..3e2d2a06a591 100644
--- a/metadata/md5-cache/games-strategy/freecol-1.0.0
+++ b/metadata/md5-cache/games-strategy/freecol-1.0.0
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-11:* dev-java/commons-cli:1 dev-java/cortado:0 dev-java/fi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/freecol/freecol/freecol-1.0.0/freecol-1.0.0-src.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=16a0c6a34d7f1c228ef9e72e38b91dba
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index fb317b26fc5d..abc196deae7b 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.2.9-r1 b/metadata/md5-cache/gnome-extra/libgda-5.2.9-r1
index 3662fe1fc070..b142bda992e9 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.2.9-r1
+++ b/metadata/md5-cache/gnome-extra/libgda-5.2.9-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=canvas? ( gtk ) graphviz? ( gtk ) sourceview? ( gtk ) vala? ( intro
 RESTRICT=test firebird? ( bindist )
 SLOT=5/4
 SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.9.tar.xz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=54ef5f8cd74c22f32dc8d7b56ee44225
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.2.9-r2 b/metadata/md5-cache/gnome-extra/libgda-5.2.9-r2
index 0b76b363f36c..97e6cade7d18 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.2.9-r2
+++ b/metadata/md5-cache/gnome-extra/libgda-5.2.9-r2
@@ -14,5 +14,5 @@ REQUIRED_USE=canvas? ( gtk ) graphviz? ( gtk ) sourceview? ( gtk ) vala? ( intro
 RESTRICT=firebird? ( bindist ) !test? ( test )
 SLOT=5/4
 SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.9.tar.xz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	vala	e477903dbe0105930c51f170a592dc16	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3396d5aef45b3b803e207312fead6f8d
diff --git a/metadata/md5-cache/gnustep-libs/Manifest.gz b/metadata/md5-cache/gnustep-libs/Manifest.gz
index b7a93a2945d9..dff7beed488a 100644
--- a/metadata/md5-cache/gnustep-libs/Manifest.gz
+++ b/metadata/md5-cache/gnustep-libs/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-libs/sqlclient-1.8.1-r2 b/metadata/md5-cache/gnustep-libs/sqlclient-1.8.1-r2
index d9990e822cc1..914b578aee0a 100644
--- a/metadata/md5-cache/gnustep-libs/sqlclient-1.8.1-r2
+++ b/metadata/md5-cache/gnustep-libs/sqlclient-1.8.1-r2
@@ -12,5 +12,5 @@ RDEPEND=>=gnustep-libs/performance-0.3.2 mysql? ( dev-db/mysql-connector-c:= ) p
 REQUIRED_USE=|| ( java mysql postgres sqlite )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/libs/SQLClient-1.8.1.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnustep-2	cfafeebb1111f944995a3bb7ae64ce8b	gnustep-base	2b9571bc4b56a107f4efee592fa2f2a8	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnustep-2	cfafeebb1111f944995a3bb7ae64ce8b	gnustep-base	2b9571bc4b56a107f4efee592fa2f2a8	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=c7783cf31ebfdff32bd1b5038e520cad
diff --git a/metadata/md5-cache/gnustep-libs/sqlclient-1.9.0 b/metadata/md5-cache/gnustep-libs/sqlclient-1.9.0
index 593a43539b24..8e8933efb3ce 100644
--- a/metadata/md5-cache/gnustep-libs/sqlclient-1.9.0
+++ b/metadata/md5-cache/gnustep-libs/sqlclient-1.9.0
@@ -12,5 +12,5 @@ RDEPEND=>=gnustep-libs/performance-0.3.2 mysql? ( dev-db/mysql-connector-c:= ) p
 REQUIRED_USE=|| ( java mysql postgres sqlite )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/libs/SQLClient-1.9.0.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnustep-2	cfafeebb1111f944995a3bb7ae64ce8b	gnustep-base	2b9571bc4b56a107f4efee592fa2f2a8	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnustep-2	cfafeebb1111f944995a3bb7ae64ce8b	gnustep-base	2b9571bc4b56a107f4efee592fa2f2a8	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=c7783cf31ebfdff32bd1b5038e520cad
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index d6265d703a15..50eeca1b77bc 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-115.11.1 b/metadata/md5-cache/mail-client/thunderbird-bin-115.11.1
deleted file mode 100644
index 41c37f2e80cc..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-115.11.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
-DESCRIPTION=Thunderbird Mail Client
-EAPI=8
-HOMEPAGE=https://www.thunderbird.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop optfeature pax-utils xdg
-IUSE=+alsa +ffmpeg +pulseaudio selinux wayland l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-thunderbird )
-RESTRICT=strip
-SLOT=0/115
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/en-US/thunderbird-115.11.1.tar.bz2 -> thunderbird-bin_x86_64-115.11.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-i686/en-US/thunderbird-115.11.1.tar.bz2 -> thunderbird-bin_i686-115.11.1.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/af.xpi -> thunderbird-115.11.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/ar.xpi -> thunderbird-115.11.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/ast.xpi -> thunderbird-115.11.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/be.xpi -> thunderbird-115.11.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/bg.xpi -> thunderbird-115.11.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/br.xpi -> thunderbird-115.11.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/ca.xpi -> thunderbird-115.11.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/cak.xpi -> thunderbird-115.11.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/cs.xpi -> thunderbird-115.11.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/cy.xpi -> thunderbird-115.11.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/da.xpi -> thunderbird-115.11.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/de.xpi -> thunderbird-115.11.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/dsb.xpi -> thunderbird-115.11.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/el.xpi -> thunderbird-115.11.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/en-CA.xpi -> thunderbird-115.11.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/en-GB.xpi -> thunderbird-115.11.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/es-AR.xpi -> thunderbird-115.11.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/es-ES.xpi -> thunderbird-115.11.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/es-MX.xpi -> thunderbird-115.11.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/et.xpi -> thunderbird-115.11.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/eu.xpi -> thunderbird-115.11.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/fi.xpi -> thunderbird-115.11.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/fr.xpi -> thunderbird-115.11.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-115.11.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-115.11.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/gd.xpi -> thunderbird-115.11.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/gl.xpi -> thunderbird-115.11.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/he.xpi -> thunderbird-115.11.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/hr.xpi -> thunderbird-115.11.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/hsb.xpi -> thunderbird-115.11.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/hu.xpi -> thunderbird-115.11.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/id.xpi -> thunderbird-115.11.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/is.xpi -> thunderbird-115.11.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/it.xpi -> thunderbird-115.11.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/ja.xpi -> thunderbird-115.11.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/ka.xpi -> thunderbird-115.11.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/kab.xpi -> thunderbird-115.11.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/kk.xpi -> thunderbird-115.11.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/ko.xpi -> thunderbird-115.11.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/lt.xpi -> thunderbird-115.11.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/lv.xpi -> thunderbird-115.11.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/ms.xpi -> thunderbird-115.11.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-115.11.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/nl.xpi -> thunderbird-115.11.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-115.11.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-115.11.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/pl.xpi -> thunderbird-115.11.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-115.11.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-115.11.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/rm.xpi -> thunderbird-115.11.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/ro.xpi -> thunderbird-115.11.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/ru.xpi -> thunderbird-115.11.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/sk.xpi -> thunderbird-115.11.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/sl.xpi -> thunderbird-115.11.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/sq.xpi -> thunderbird-115.11.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/sr.xpi -> thunderbird-115.11.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-115.11.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/th.xpi -> thunderbird-115.11.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/tr.xpi -> thunderbird-115.11.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/uk.xpi -> thunderbird-115.11.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/uz.xpi -> thunderbird-115.11.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/vi.xpi -> thunderbird-115.11.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-115.11.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/115.11.1/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-115.11.1-zh-TW.xpi )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e10fca9721d24f120f30a1bcc1c62bdc
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-115.12.1 b/metadata/md5-cache/mail-client/thunderbird-bin-115.12.1
deleted file mode 100644
index 9ddd0a2f9076..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-115.12.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
-DESCRIPTION=Thunderbird Mail Client
-EAPI=8
-HOMEPAGE=https://www.thunderbird.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop optfeature pax-utils xdg
-IUSE=+alsa +ffmpeg +pulseaudio selinux wayland l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-thunderbird )
-RESTRICT=strip
-SLOT=0/115
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/en-US/thunderbird-115.12.1.tar.bz2 -> thunderbird-bin_x86_64-115.12.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-i686/en-US/thunderbird-115.12.1.tar.bz2 -> thunderbird-bin_i686-115.12.1.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/af.xpi -> thunderbird-115.12.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/ar.xpi -> thunderbird-115.12.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/ast.xpi -> thunderbird-115.12.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/be.xpi -> thunderbird-115.12.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/bg.xpi -> thunderbird-115.12.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/br.xpi -> thunderbird-115.12.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/ca.xpi -> thunderbird-115.12.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/cak.xpi -> thunderbird-115.12.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/cs.xpi -> thunderbird-115.12.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/cy.xpi -> thunderbird-115.12.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/da.xpi -> thunderbird-115.12.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/de.xpi -> thunderbird-115.12.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/dsb.xpi -> thunderbird-115.12.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/el.xpi -> thunderbird-115.12.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/en-CA.xpi -> thunderbird-115.12.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/en-GB.xpi -> thunderbird-115.12.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/es-AR.xpi -> thunderbird-115.12.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/es-ES.xpi -> thunderbird-115.12.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/es-MX.xpi -> thunderbird-115.12.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/et.xpi -> thunderbird-115.12.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/eu.xpi -> thunderbird-115.12.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/fi.xpi -> thunderbird-115.12.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/fr.xpi -> thunderbird-115.12.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-115.12.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-115.12.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/gd.xpi -> thunderbird-115.12.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/gl.xpi -> thunderbird-115.12.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/he.xpi -> thunderbird-115.12.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/hr.xpi -> thunderbird-115.12.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/hsb.xpi -> thunderbird-115.12.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/hu.xpi -> thunderbird-115.12.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/id.xpi -> thunderbird-115.12.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/is.xpi -> thunderbird-115.12.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/it.xpi -> thunderbird-115.12.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/ja.xpi -> thunderbird-115.12.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/ka.xpi -> thunderbird-115.12.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/kab.xpi -> thunderbird-115.12.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/kk.xpi -> thunderbird-115.12.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/ko.xpi -> thunderbird-115.12.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/lt.xpi -> thunderbird-115.12.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/lv.xpi -> thunderbird-115.12.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/ms.xpi -> thunderbird-115.12.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-115.12.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/nl.xpi -> thunderbird-115.12.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-115.12.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-115.12.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/pl.xpi -> thunderbird-115.12.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-115.12.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-115.12.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/rm.xpi -> thunderbird-115.12.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/ro.xpi -> thunderbird-115.12.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/ru.xpi -> thunderbird-115.12.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/sk.xpi -> thunderbird-115.12.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/sl.xpi -> thunderbird-115.12.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/sq.xpi -> thunderbird-115.12.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/sr.xpi -> thunderbird-115.12.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-115.12.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/th.xpi -> thunderbird-115.12.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/tr.xpi -> thunderbird-115.12.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/uk.xpi -> thunderbird-115.12.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/uz.xpi -> thunderbird-115.12.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/vi.xpi -> thunderbird-115.12.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-115.12.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.1/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-115.12.1-zh-TW.xpi )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e10fca9721d24f120f30a1bcc1c62bdc
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-115.12.2 b/metadata/md5-cache/mail-client/thunderbird-bin-115.12.2
new file mode 100644
index 000000000000..d12d185c16b3
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-115.12.2
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
+DESCRIPTION=Thunderbird Mail Client
+EAPI=8
+HOMEPAGE=https://www.thunderbird.net/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop optfeature pax-utils xdg
+IUSE=+alsa +ffmpeg +pulseaudio selinux wayland l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-thunderbird )
+RESTRICT=strip
+SLOT=0/115
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/en-US/thunderbird-115.12.2.tar.bz2 -> thunderbird-bin_x86_64-115.12.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-i686/en-US/thunderbird-115.12.2.tar.bz2 -> thunderbird-bin_i686-115.12.2.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/af.xpi -> thunderbird-115.12.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/ar.xpi -> thunderbird-115.12.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/ast.xpi -> thunderbird-115.12.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/be.xpi -> thunderbird-115.12.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/bg.xpi -> thunderbird-115.12.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/br.xpi -> thunderbird-115.12.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/ca.xpi -> thunderbird-115.12.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/cak.xpi -> thunderbird-115.12.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/cs.xpi -> thunderbird-115.12.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/cy.xpi -> thunderbird-115.12.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/da.xpi -> thunderbird-115.12.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/de.xpi -> thunderbird-115.12.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/dsb.xpi -> thunderbird-115.12.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/el.xpi -> thunderbird-115.12.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/en-CA.xpi -> thunderbird-115.12.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/en-GB.xpi -> thunderbird-115.12.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/es-AR.xpi -> thunderbird-115.12.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/es-ES.xpi -> thunderbird-115.12.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/es-MX.xpi -> thunderbird-115.12.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/et.xpi -> thunderbird-115.12.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/eu.xpi -> thunderbird-115.12.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/fi.xpi -> thunderbird-115.12.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/fr.xpi -> thunderbird-115.12.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-115.12.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-115.12.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/gd.xpi -> thunderbird-115.12.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/gl.xpi -> thunderbird-115.12.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/he.xpi -> thunderbird-115.12.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/hr.xpi -> thunderbird-115.12.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/hsb.xpi -> thunderbird-115.12.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/hu.xpi -> thunderbird-115.12.2-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/id.xpi -> thunderbird-115.12.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/is.xpi -> thunderbird-115.12.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/it.xpi -> thunderbird-115.12.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/ja.xpi -> thunderbird-115.12.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/ka.xpi -> thunderbird-115.12.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/kab.xpi -> thunderbird-115.12.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/kk.xpi -> thunderbird-115.12.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/ko.xpi -> thunderbird-115.12.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/lt.xpi -> thunderbird-115.12.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/lv.xpi -> thunderbird-115.12.2-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/ms.xpi -> thunderbird-115.12.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-115.12.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/nl.xpi -> thunderbird-115.12.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-115.12.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-115.12.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/pl.xpi -> thunderbird-115.12.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-115.12.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-115.12.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/rm.xpi -> thunderbird-115.12.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/ro.xpi -> thunderbird-115.12.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/ru.xpi -> thunderbird-115.12.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/sk.xpi -> thunderbird-115.12.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/sl.xpi -> thunderbird-115.12.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/sq.xpi -> thunderbird-115.12.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/sr.xpi -> thunderbird-115.12.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-115.12.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/th.xpi -> thunderbird-115.12.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/tr.xpi -> thunderbird-115.12.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/uk.xpi -> thunderbird-115.12.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/uz.xpi -> thunderbird-115.12.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/vi.xpi -> thunderbird-115.12.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-115.12.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/115.12.2/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-115.12.2-zh-TW.xpi )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e10fca9721d24f120f30a1bcc1c62bdc
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 44492170c27c..fcec31adc619 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/ditaa-0.11.0-r1 b/metadata/md5-cache/media-gfx/ditaa-0.11.0-r1
index e5b23029973a..f2719d2ecfda 100644
--- a/metadata/md5-cache/media-gfx/ditaa-0.11.0-r1
+++ b/metadata/md5-cache/media-gfx/ditaa-0.11.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3+
 RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/stathissideris/ditaa/archive/v0.11.0.tar.gz -> ditaa-0.11.0.tar.gz https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4.pom https://repo.maven.apache.org/maven2/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar https://repo.maven.apache.org/maven2/commons-io/commons-io/1.3.1/commons-io-1.3.1.pom https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom https://repo.maven.apache.org/maven2/net/htmlparser/jericho/jericho-html/3.4/jericho-html-3.4.jar https://repo.maven.apache.org/maven2/net/htmlparser/jericho/jericho-html/3.4/jericho-html-3.4.pom https://repo.maven.apache.org/maven2/org/apache/apache/3/apache-3.pom https://repo.maven.apache.org/maven2/org/apache/apache/4/apache-4.pom https://repo.maven.apache.org/maven2/org/apache/apache/7/apache-7.pom https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-anim/1.14/batik-anim-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-anim/1.14/batik-anim-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-awt-util/1.14/batik-awt-util-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-awt-util/1.14/batik-awt-util-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-bridge/1.14/batik-bridge-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-bridge/1.14/batik-bridge-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-codec/1.14/batik-codec-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-codec/1.14/batik-codec-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-dom/1.14/batik-dom-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-dom/1.14/batik-dom-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-ext/1.14/batik-ext-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-ext/1.14/batik-ext-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-gvt/1.14/batik-gvt-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-gvt/1.14/batik-gvt-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-parser/1.14/batik-parser-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-parser/1.14/batik-parser-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-script/1.14/batik-script-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-script/1.14/batik-script-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-svggen/1.14/batik-svggen-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-svggen/1.14/batik-svggen-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-svg-dom/1.14/batik-svg-dom-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-svg-dom/1.14/batik-svg-dom-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-transcoder/1.14/batik-transcoder-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-transcoder/1.14/batik-transcoder-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-xml/1.14/batik-xml-1.14.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-xml/1.14/batik-xml-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik/1.14/batik-1.14.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6.pom https://repo.maven.apache.org/maven2/org/clojure/clojure/1.9.0/clojure-1.9.0.jar https://repo.maven.apache.org/maven2/org/clojure/clojure/1.9.0/clojure-1.9.0.pom https://repo.maven.apache.org/maven2/org/clojure/core.specs.alpha/0.1.24/core.specs.alpha-0.1.24.jar https://repo.maven.apache.org/maven2/org/clojure/core.specs.alpha/0.1.24/core.specs.alpha-0.1.24.pom https://repo.maven.apache.org/maven2/org/clojure/pom.contrib/0.2.2/pom.contrib-0.2.2.pom https://repo.maven.apache.org/maven2/org/clojure/spec.alpha/0.1.143/spec.alpha-0.1.143.jar https://repo.maven.apache.org/maven2/org/clojure/spec.alpha/0.1.143/spec.alpha-0.1.143.pom https://repo.maven.apache.org/maven2/xalan/serializer/2.7.2/serializer-2.7.2.jar https://repo.maven.apache.org/maven2/xalan/serializer/2.7.2/serializer-2.7.2.pom https://repo.maven.apache.org/maven2/xalan/xalan/2.7.2/xalan-2.7.2.jar https://repo.maven.apache.org/maven2/xalan/xalan/2.7.2/xalan-2.7.2.pom https://repo.maven.apache.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar https://repo.maven.apache.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.pom
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e1f14379f539bdce576df2eea46edff2
diff --git a/metadata/md5-cache/media-gfx/geeqie-2.4 b/metadata/md5-cache/media-gfx/geeqie-2.4
index 4db82ad3d17b..df44316fc52b 100644
--- a/metadata/md5-cache/media-gfx/geeqie-2.4
+++ b/metadata/md5-cache/media-gfx/geeqie-2.4
@@ -7,11 +7,11 @@ HOMEPAGE=http://www.geeqie.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=flag-o-matic lua-single meson optfeature xdg
 IUSE=debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7:= ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) map? ( media-libs/clutter-gtk media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20:= ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:= ) webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) zip? ( >=app-arch/libarchive-3.4.0 )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=0
 SRC_URI=https://github.com/BestImageViewer/geeqie/releases/download/v2.4/geeqie-2.4.tar.xz https://dev.gentoo.org/~voyageur/distfiles/geeqie-2.4-docs.tar.xz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=41d43787dd3749f77d4e0e07913035d0
+_md5_=95f35a05027f311e766783c4389b2847
diff --git a/metadata/md5-cache/media-gfx/plantuml-1.2024.4-r2 b/metadata/md5-cache/media-gfx/plantuml-1.2024.4-r2
index d48417c59fb6..dc0adf51c4b6 100644
--- a/metadata/md5-cache/media-gfx/plantuml-1.2024.4-r2
+++ b/metadata/md5-cache/media-gfx/plantuml-1.2024.4-r2
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.8:* media-gfx/graphviz >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/plantuml/plantuml/archive/v1.2024.4.tar.gz -> plantuml-1.2024.4.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1eccef37d49bded54beb4756e24a9405
diff --git a/metadata/md5-cache/media-gfx/plantuml-1.2024.5-r1 b/metadata/md5-cache/media-gfx/plantuml-1.2024.5-r1
index 15dddb4efcf1..f54e74c63c07 100644
--- a/metadata/md5-cache/media-gfx/plantuml-1.2024.5-r1
+++ b/metadata/md5-cache/media-gfx/plantuml-1.2024.5-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.8:* media-gfx/graphviz ant-task? ( >=dev-java/ant-1.10.14-r3:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/plantuml/plantuml/archive/v1.2024.5.tar.gz -> plantuml-1.2024.5.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0acc8b6259622fa584b9a5a514100ee9
diff --git a/metadata/md5-cache/media-gfx/zbar-0.23.92 b/metadata/md5-cache/media-gfx/zbar-0.23.92
index 0664b01f524f..67f8c4d90283 100644
--- a/metadata/md5-cache/media-gfx/zbar-0.23.92
+++ b/metadata/md5-cache/media-gfx/zbar-0.23.92
@@ -13,5 +13,5 @@ REQUIRED_USE=introspection? ( gtk ) python? ( ^^ ( python_single_target_python3_
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mchehab/zbar/archive/0.23.92.tar.gz -> zbar-0.23.92.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5
 _md5_=6d86d4d6929a5659e777d61adc45f4d7
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 49220875b773..af28601b1234 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/libbluray-1.3.4-r1 b/metadata/md5-cache/media-libs/libbluray-1.3.4-r1
index 3eb5ac720fa1..ef9425cd4b89 100644
--- a/metadata/md5-cache/media-libs/libbluray-1.3.4-r1
+++ b/metadata/md5-cache/media-libs/libbluray-1.3.4-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libudfread-1.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(-)?] aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bdplus? ( media-libs/libbdplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1: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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/2
 SRC_URI=https://downloads.videolan.org/pub/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=8776df34bd989c86811a7140490111ee
diff --git a/metadata/md5-cache/media-libs/libbluray-9999 b/metadata/md5-cache/media-libs/libbluray-9999
index 6f0315476c7b..f82f96655bef 100644
--- a/metadata/md5-cache/media-libs/libbluray-9999
+++ b/metadata/md5-cache/media-libs/libbluray-9999
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=>=dev-libs/libudfread-1.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(-)?] aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bdplus? ( media-libs/libbdplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1: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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/2
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=6543e082813a060013a5ab35d6433255
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.5.1 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.5.1
index 2210f1c0bd0b..800a3e71d128 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.5.1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.5.1
@@ -11,5 +11,5 @@ LICENSE=BSD IJG ZLIB
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/0.2
 SRC_URI=https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-2.1.5.1.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ad68845404f8c0b3a8699abb88c952f1
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.0 b/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.0
index 687ac26f8512..42da3c01d44e 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.0
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.0
@@ -11,5 +11,5 @@ LICENSE=BSD IJG ZLIB
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/0.2
 SRC_URI=https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-3.0.0.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=92f835fddb012df18e7ded31d3655b24
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.1 b/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.1
index 478ae428d9b9..bdf4e57df3ca 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.1
@@ -11,5 +11,5 @@ LICENSE=BSD IJG ZLIB
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/0.2
 SRC_URI=https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-3.0.1.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cfffcea229dcd78e0953608ca132bdee
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.2 b/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.2
index d260a18eea9f..c4352beeea7c 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.2
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.2
@@ -11,5 +11,5 @@ LICENSE=BSD IJG ZLIB java? ( GPL-2-with-classpath-exception )
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/0.2
 SRC_URI=https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.2/libjpeg-turbo-3.0.2.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=24a6df00e0ba5a90a55175ea75ec9e2a
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.3 b/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.3
index 7b3e87cc52a5..7683cd98edd3 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.3
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-3.0.3
@@ -11,5 +11,5 @@ LICENSE=BSD IJG ZLIB java? ( GPL-2-with-classpath-exception )
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/0.2
 SRC_URI=https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/libjpeg-turbo-3.0.3.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=24a6df00e0ba5a90a55175ea75ec9e2a
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.22 b/metadata/md5-cache/media-libs/libpano13-2.9.22
index 99565093c281..1eb3efab8b27 100644
--- a/metadata/md5-cache/media-libs/libpano13-2.9.22
+++ b/metadata/md5-cache/media-libs/libpano13-2.9.22
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:= media-libs/tiff:= media-libs/libjpeg-turbo:= sys-libs/zlib java? ( >=virtual/jdk-1.8:* ) suitesparse? ( sci-libs/suitesparse ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/3
 SRC_URI=https://downloads.sourceforge.net/panotools/libpano13-2.9.22.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ac7cd9e26ea3515ddf18436e751e3d5d
diff --git a/metadata/md5-cache/media-libs/opencv-4.8.1-r2 b/metadata/md5-cache/media-libs/opencv-4.8.1-r2
index eb189b2645a6..73a7195189b3 100644
--- a/metadata/md5-cache/media-libs/opencv-4.8.1-r2
+++ b/metadata/md5-cache/media-libs/opencv-4.8.1-r2
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 REQUIRED_USE=cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) cuda? ( contrib tesseract? ( opencl ) ) cudnn? ( cuda ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib || ( qt5 qt6 ) ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib ) java? ( python ) opengl? ( || ( qt5 qt6 ) ) python? ( || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) ) tesseract? ( contrib ) ?? ( gtk3 || ( qt5 qt6 ) ) ?? ( cuda gdal ) ?? ( cuda openexr ) ?? ( cuda tbb )
 SLOT=0/4.8.1
 SRC_URI=https://github.com/opencv/opencv/archive/4.8.1.tar.gz -> opencv-4.8.1.tar.gz https://github.com/opencv/ade/archive/v0.1.2a.tar.gz -> ade-0.1.2a.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/4.8.1.tar.gz -> opencv-4.8.1_contrib.tar.gz dnnsamples? ( https://github.com/opencv/opencv_3rdparty/archive/a8b69ccc738421293254aec5ddb38bd523503252.tar.gz -> opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252.tar.gz https://github.com/opencv/opencv_3rdparty/archive/b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz -> opencv_3rdparty-b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz ) contribxfeatures2d? ( https://github.com/opencv/opencv_3rdparty/archive/34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz -> opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz https://github.com/opencv/opencv_3rdparty/archive/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz -> opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz ) contribdnn? ( https://github.com/opencv/opencv_3rdparty/archive/8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz -> opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz ) cuda? ( https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz -> NVIDIAOpticalFlowSDK-edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz ) )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ec956389713cbc474d3f6127dd2bf428
diff --git a/metadata/md5-cache/media-libs/opencv-4.9.0-r1 b/metadata/md5-cache/media-libs/opencv-4.9.0-r1
index cf0e84dbf8b8..61d1ea238629 100644
--- a/metadata/md5-cache/media-libs/opencv-4.9.0-r1
+++ b/metadata/md5-cache/media-libs/opencv-4.9.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=amd64? ( cpu_flags_x86_sse cpu_flags_x86_sse2 ) cpu_flags_x86_avx2?
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/4.9.0
 SRC_URI=https://github.com/opencv/opencv/archive/4.9.0.tar.gz -> opencv-4.9.0.tar.gz https://github.com/opencv/ade/archive/v0.1.2d.tar.gz -> ade-0.1.2d.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/4.9.0.tar.gz -> opencv_contrib-4.9.0.tar.gz dnnsamples? ( https://github.com/opencv/opencv_3rdparty/archive/a8b69ccc738421293254aec5ddb38bd523503252.tar.gz -> opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252.tar.gz https://github.com/opencv/opencv_3rdparty/archive/b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz -> opencv_3rdparty-b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz ) contribxfeatures2d? ( https://github.com/opencv/opencv_3rdparty/archive/34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz -> opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz https://github.com/opencv/opencv_3rdparty/archive/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz -> opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz ) contribdnn? ( https://github.com/opencv/opencv_3rdparty/archive/8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz -> opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz ) cuda? ( https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz -> NVIDIAOpticalFlowSDK-edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz ) ) test? ( https://github.com/opencv/opencv_extra/archive/refs/tags/4.9.0.tar.gz -> opencv_extra-4.9.0.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1faf8dd7f0cd91b78a4508d2676bb3d1
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index b296dc9af75f..36e8e0399050 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r4 b/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r4
index f1166059b273..af67326ad3d7 100644
--- a/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r4
+++ b/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r4
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/channeleditor/channeleditor/1.9.2/channeleditor_1.9.2.1_src.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c9cf31608998650d208c4cab88025932
diff --git a/metadata/md5-cache/media-tv/kodi-20.5-r1 b/metadata/md5-cache/media-tv/kodi-20.5-r1
index 1109165792d1..b2a82a198f50 100644
--- a/metadata/md5-cache/media-tv/kodi-20.5-r1
+++ b/metadata/md5-cache/media-tv/kodi-20.5-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2-2.tar.gz -> libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz css? ( https://github.com/xbmc/libdvdcss/archive/1.4.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz ) !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.4.1-Nexus-Alpha1.tar.gz -> ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz ) https://github.com/xbmc/xbmc/archive/20.5-Nexus.tar.gz -> kodi-20.5-Nexus.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=82243488cdbded62144c20bebf6f96d5
diff --git a/metadata/md5-cache/media-tv/kodi-21.0-r1 b/metadata/md5-cache/media-tv/kodi-21.0-r1
index 55524d538f11..77d4db127a1c 100644
--- a/metadata/md5-cache/media-tv/kodi-21.0-r1
+++ b/metadata/md5-cache/media-tv/kodi-21.0-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2-2.tar.gz -> libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip https://mirrors.kodi.tv/build-deps/sources/commons-lang3-3.14.0-bin.tar.gz https://mirrors.kodi.tv/build-deps/sources/commons-text-1.11.0-bin.tar.gz css? ( https://github.com/xbmc/libdvdcss/archive/1.4.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz ) !system-ffmpeg? ( https://ffmpeg.org/releases/ffmpeg-6.0.1.tar.gz ) https://github.com/xbmc/xbmc/archive/21.0-Omega.tar.gz -> kodi-21.0-Omega.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=510be4c87962de41401bb410da231dde
diff --git a/metadata/md5-cache/media-tv/kodi-21.0-r2 b/metadata/md5-cache/media-tv/kodi-21.0-r2
index c29ce4175ea2..6cec91048d95 100644
--- a/metadata/md5-cache/media-tv/kodi-21.0-r2
+++ b/metadata/md5-cache/media-tv/kodi-21.0-r2
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2-2.tar.gz -> libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip https://mirrors.kodi.tv/build-deps/sources/commons-lang3-3.14.0-bin.tar.gz https://mirrors.kodi.tv/build-deps/sources/commons-text-1.11.0-bin.tar.gz css? ( https://github.com/xbmc/libdvdcss/archive/1.4.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz ) !system-ffmpeg? ( https://ffmpeg.org/releases/ffmpeg-6.0.1.tar.gz ) https://github.com/xbmc/xbmc/archive/21.0-Omega.tar.gz -> kodi-21.0-Omega.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=92b21d45fd0e372afd5747692553d751
diff --git a/metadata/md5-cache/media-tv/kodi-21.9999 b/metadata/md5-cache/media-tv/kodi-21.9999
index 4cc17a9903ec..2b8e24708d0f 100644
--- a/metadata/md5-cache/media-tv/kodi-21.9999
+++ b/metadata/md5-cache/media-tv/kodi-21.9999
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2-2.tar.gz -> libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip https://mirrors.kodi.tv/build-deps/sources/commons-lang3-3.14.0-bin.tar.gz https://mirrors.kodi.tv/build-deps/sources/commons-text-1.11.0-bin.tar.gz css? ( https://github.com/xbmc/libdvdcss/archive/1.4.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz ) !system-ffmpeg? ( https://ffmpeg.org/releases/ffmpeg-6.0.1.tar.gz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=df84c100bceaa93e7f331dc0bd058042
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index be19e0a9936a..fd5b8a2b60db 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2-2.tar.gz -> libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip https://mirrors.kodi.tv/build-deps/sources/commons-lang3-3.14.0-bin.tar.gz https://mirrors.kodi.tv/build-deps/sources/commons-text-1.11.0-bin.tar.gz css? ( https://github.com/xbmc/libdvdcss/archive/1.4.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz ) !system-ffmpeg? ( https://ffmpeg.org/releases/ffmpeg-6.0.1.tar.gz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=47888ea4f535fe8123a26051b31488c7
diff --git a/metadata/md5-cache/media-tv/mythtv-33.1-r1 b/metadata/md5-cache/media-tv/mythtv-33.1-r1
index eda123cc1814..083ec45f78ea 100644
--- a/metadata/md5-cache/media-tv/mythtv-33.1-r1
+++ b/metadata/md5-cache/media-tv/mythtv-33.1-r1
@@ -12,5 +12,5 @@ RDEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-libs/libzip:= dev-qt/q
 REQUIRED_USE=cdr? ( cdda )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v33.1.tar.gz -> mythtv-33.1.tar.gz
-_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=6d784010939a2700c869a548c2aa9f2d
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 90883e4984ba..db0d6b3f0ecb 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r3 b/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r3
index bf8155dd0bfe..3621af50991b 100644
--- a/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r3
+++ b/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r3
@@ -10,5 +10,5 @@ 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=http://sbriesen.de/gentoo/distfiles/bdsup2sub-4.0.0.tar.xz http://sbriesen.de/gentoo/distfiles/xdg-20100731.java.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=5cb9022cc8d5d5de339b800f73b2861e
diff --git a/metadata/md5-cache/media-video/projectx-0.91.0.10-r5 b/metadata/md5-cache/media-video/projectx-0.91.0.10-r5
index 5e018d1efbd9..33af9a994bd5 100644
--- a/metadata/md5-cache/media-video/projectx-0.91.0.10-r5
+++ b/metadata/md5-cache/media-video/projectx-0.91.0.10-r5
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/commons-net:0 X? ( dev-java/browserlauncher2:1.0 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~billie/distfiles/projectx-0.91.0.10-r4.tar.xz https://dev.gentoo.org/~billie/distfiles/projectx-idctfast.tar.xz https://dev.gentoo.org/~billie/distfiles/xdg-20100731.java.xz https://dev.gentoo.org/~billie/distfiles/projectx-icon.png
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=eae00d775866d831eb5c665e7d150904
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 7752fbe2ed63..06da9bd216b2 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/monitoring-plugins-2.3.3-r2 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.3-r2
deleted file mode 100644
index c05916070fe1..000000000000
--- a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure postinst
-DEPEND=dev-lang/perl curl? ( dev-libs/uriparser net-misc/curl ) ldap? ( net-nds/openldap:= ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( virtual/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] )
-DESCRIPTION=50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu
-EAPI=8
-HOMEPAGE=https://www.monitoring-plugins.org/
-INHERIT=flag-o-matic
-IUSE=curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl
-KEYWORDS=amd64 ~arm ~arm64 sparc x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl curl? ( dev-libs/uriparser net-misc/curl ) ldap? ( net-nds/openldap:= ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( virtual/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) acct-group/nagios acct-user/nagios !net-analyzer/nagios-plugins
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.3.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=07a174797417121025ad8e4558c5455c
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.73-r4 b/metadata/md5-cache/net-analyzer/munin-2.0.73-r4
index c3de19ce9eba..6c0cb5afa0f7 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.73-r4
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.73-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.73.tar.gz -> munin-2.0.73.tar.gz
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=0b9d34a996e81d1fd990a834312c78ab
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.75 b/metadata/md5-cache/net-analyzer/munin-2.0.75
index be88394bf7d2..637469d3ff03 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.75
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.75
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.75.tar.gz -> munin-2.0.75.tar.gz
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=d819cef20d73a81cbc5c701eefe65b92
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.76 b/metadata/md5-cache/net-analyzer/munin-2.0.76
index 0dabb86de253..0f4da0d5e7f3 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.76
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.76
@@ -13,5 +13,5 @@ REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.76.tar.gz -> munin-2.0.76.tar.gz
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=206f302ec91909a0bf9d30b482c493bb
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.42-r1 b/metadata/md5-cache/net-analyzer/zabbix-5.0.42-r1
index fcf7bca26023..a523868be789 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.42-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.42-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) age
 RESTRICT=test strip
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.42.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.42-go-deps.tar.xz )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
 _md5_=f46a0e1dc5859c9218ddd2fc7c31a16b
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.29 b/metadata/md5-cache/net-analyzer/zabbix-6.0.29
index 28ef46a6e41c..f9a8f9817e94 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.29
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.29
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) age
 RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.29.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.29-go-deps.tar.xz )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
 _md5_=0a2c74e59bd2c647e3bb4a1d09b36648
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.30 b/metadata/md5-cache/net-analyzer/zabbix-6.0.30
index a7d5fb438091..3dbbf3654679 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.30
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.30
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) age
 RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.30.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.30-go-deps.tar.xz )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
 _md5_=0a2c74e59bd2c647e3bb4a1d09b36648
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.31 b/metadata/md5-cache/net-analyzer/zabbix-6.0.31
index 35a1de78e35a..8870bb7932d6 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.31
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.31
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) age
 RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.31.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.31-go-deps.tar.xz )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
 _md5_=f277eb4eefbbe02afd410bc87175a211
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.14 b/metadata/md5-cache/net-analyzer/zabbix-6.4.14
index 5db4d4139a4f..fe1574100a7a 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.14
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.14
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) age
 RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.14.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.14-go-deps.tar.xz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
 _md5_=632a815db37f6bd49a8b6f1f2829a614
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.15 b/metadata/md5-cache/net-analyzer/zabbix-6.4.15
index 770a4ee922c4..e7ad513f153c 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.15
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.15
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) age
 RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.15.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.15-go-deps.tar.xz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
 _md5_=632a815db37f6bd49a8b6f1f2829a614
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.16 b/metadata/md5-cache/net-analyzer/zabbix-6.4.16
index 6182bc5a680d..5295b6808c91 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.16
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.16
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) age
 RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.16.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.16-go-deps.tar.xz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
 _md5_=1a4c5a2676d20777adb47542fcd86417
diff --git a/metadata/md5-cache/net-analyzer/zabbix-7.0.0 b/metadata/md5-cache/net-analyzer/zabbix-7.0.0
index 0b4dc5b40e36..b3c592edafd0 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-7.0.0
+++ b/metadata/md5-cache/net-analyzer/zabbix-7.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) age
 RESTRICT=test strip
 SLOT=0/7.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/7.0/zabbix-7.0.0.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-7.0.0-go-deps.tar.xz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
 _md5_=ed92992efdc832a9c806810b5df43f4b
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 02e7b58bd746..079073178c74 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/djbdns-1.05-r40 b/metadata/md5-cache/net-dns/djbdns-1.05-r40
index 1d096fd2e7cf..091a7df6a867 100644
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r40
+++ b/metadata/md5-cache/net-dns/djbdns-1.05-r40
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://cr.yp.to/djbdns.html
 INHERIT=flag-o-matic readme.gentoo-r1 toolchain-funcs
 IUSE=ipv6 selinux
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86
 LICENSE=public-domain
 RDEPEND=acct-user/dnscache acct-user/dnslog acct-user/tinydns sys-apps/ucspi-tcp virtual/daemontools selinux? ( sec-policy/selinux-djbdns )
 SLOT=0
 SRC_URI=https://cr.yp.to/djbdns/djbdns-1.05.tar.gz https://smarden.org/pape/djb/manpages/djbdns-1.05-man.tar.gz ipv6? ( https://www.fefe.de/dns/djbdns-1.05-test32.diff.xz )
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=88fddd0c81c8aa1c91318cc2c54bdf81
+_md5_=2288715a559ad96240596f0f701f4f9f
diff --git a/metadata/md5-cache/net-dns/smartdns-45 b/metadata/md5-cache/net-dns/smartdns-45
deleted file mode 100644
index eb53373028c0..000000000000
--- a/metadata/md5-cache/net-dns/smartdns-45
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/openssl:0=
-DESCRIPTION=A local DNS server returns the fastest access results
-EAPI=8
-HOMEPAGE=https://github.com/pymumu/smartdns
-INHERIT=systemd
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-libs/openssl:0=
-SLOT=0
-SRC_URI=https://github.com/pymumu/smartdns/archive/refs/tags/Release45.tar.gz -> smartdns-45.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=53e5eac55c3a2df47aca28a427d38bf6
diff --git a/metadata/md5-cache/net-dns/smartdns-43 b/metadata/md5-cache/net-dns/smartdns-46
index b87402874976..cd0275df41da 100644
--- a/metadata/md5-cache/net-dns/smartdns-43
+++ b/metadata/md5-cache/net-dns/smartdns-46
@@ -9,6 +9,6 @@ KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=dev-libs/openssl:0=
 SLOT=0
-SRC_URI=https://github.com/pymumu/smartdns/archive/refs/tags/Release43.tar.gz -> smartdns-43.tar.gz
+SRC_URI=https://github.com/pymumu/smartdns/archive/refs/tags/Release46.tar.gz -> smartdns-46.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ce9697c2e6346f59612b172a4db66a16
+_md5_=b1fcbd195485970778207327e07e0a46
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 76261e8e0b54..bf138c4a766d 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/discord-0.0.57-r1 b/metadata/md5-cache/net-im/discord-0.0.58
index 265e1f7e386e..870990d16f4d 100644
--- a/metadata/md5-cache/net-im/discord-0.0.57-r1
+++ b/metadata/md5-cache/net-im/discord-0.0.58
@@ -10,6 +10,6 @@ LICENSE=all-rights-reserved
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango appindicator? ( dev-libs/libayatana-appindicator )
 RESTRICT=bindist mirror strip test
 SLOT=0
-SRC_URI=https://dl.discordapp.net/apps/linux/0.0.57/discord-0.0.57.tar.gz
+SRC_URI=https://dl.discordapp.net/apps/linux/0.0.58/discord-0.0.58.tar.gz
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d52db52583b16a4b95dec5fca20130e5
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 57f723af6339..7dd185a93716 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/weechat-4.3.3 b/metadata/md5-cache/net-irc/weechat-4.3.3
new file mode 100644
index 000000000000..a75511abc522
--- /dev/null
+++ b/metadata/md5-cache/net-irc/weechat-4.3.3
@@ -0,0 +1,18 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-weechat ) virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0:12= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= virtual/libcrypt:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) relay-api? ( dev-libs/cJSON ) ruby? ( || ( dev-lang/ruby:3.3 dev-lang/ruby:3.2 dev-lang/ruby:3.1 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( enchant? ( app-text/enchant:* ) !enchant? ( app-text/aspell ) ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) zstd? ( app-arch/zstd:= ) test? ( dev-util/cpputest )
+DESCRIPTION=Portable and multi-interface IRC client
+EAPI=8
+HOMEPAGE=https://weechat.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake lua-single python-single-r1 xdg verify-sig
+IUSE=doc enchant man nls relay-api selinux test +zstd guile lua +perl +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0:12= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= virtual/libcrypt:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) relay-api? ( dev-libs/cJSON ) ruby? ( || ( dev-lang/ruby:3.3 dev-lang/ruby:3.2 dev-lang/ruby:3.1 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( enchant? ( app-text/enchant:* ) !enchant? ( app-text/aspell ) ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=enchant? ( spell ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) ) test? ( nls ) relay-api? ( relay )
+RESTRICT=!test? ( test )
+SLOT=0/4.3.3
+SRC_URI=https://weechat.org/files/src/weechat-4.3.3.tar.xz verify-sig? ( https://weechat.org/files/src/weechat-4.3.3.tar.xz.asc )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8b907380b90e9e5a4c5ce1c389cd9026
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 2db86b2b76d3..df772687f768 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/NativeThread-0_pre20190914-r1 b/metadata/md5-cache/net-libs/NativeThread-0_pre20190914-r1
index d2579c905b32..b712cc1dd11d 100644
--- a/metadata/md5-cache/net-libs/NativeThread-0_pre20190914-r1
+++ b/metadata/md5-cache/net-libs/NativeThread-0_pre20190914-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/NativeThread-0_pre20190914.tar.bz2
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=2ffcdbcf6f1cfa8bfe6e98a5edbc346f
diff --git a/metadata/md5-cache/net-libs/ngtcp2-1.5.0 b/metadata/md5-cache/net-libs/ngtcp2-1.5.0
index 867c36d80b19..d27a6432abc3 100644
--- a/metadata/md5-cache/net-libs/ngtcp2-1.5.0
+++ b/metadata/md5-cache/net-libs/ngtcp2-1.5.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ngtcp2/ngtcp2/
 INHERIT=cmake-multilib
 IUSE=+gnutls openssl +ssl 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
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~hppa ~loong ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.7.2:0= ) openssl? ( >=dev-libs/openssl-1.1.1:0= ) )
 REQUIRED_USE=ssl? ( || ( gnutls openssl ) ) test? ( static-libs )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/ngtcp2/ngtcp2/releases/download/v1.5.0/ngtcp2-1.5.0.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=14fe5c4d06916e19e64d52130f92add3
+_md5_=9fead8aa6faf9886bfaf77ae50a407c3
diff --git a/metadata/md5-cache/net-libs/nodejs-18.20.3 b/metadata/md5-cache/net-libs/nodejs-18.20.3
index d823f5396ff9..c9805eeef1da 100644
--- a/metadata/md5-cache/net-libs/nodejs-18.20.3
+++ b/metadata/md5-cache/net-libs/nodejs-18.20.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
 IUSE=corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.44.0:= >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib corepack? ( !sys-apps/yarn ) system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=https://nodejs.org/dist/v18.20.3/node-v18.20.3.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ba8b4e2414e7dd0655d57070dae1d2c1
+_md5_=6c93cf6302ee1a89eb93bfc87e1682f9
diff --git a/metadata/md5-cache/net-libs/nodejs-20.14.0 b/metadata/md5-cache/net-libs/nodejs-20.14.0
index f679a09313d1..cf659060504c 100644
--- a/metadata/md5-cache/net-libs/nodejs-20.14.0
+++ b/metadata/md5-cache/net-libs/nodejs-20.14.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
 IUSE=corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.46.0:= >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.41.0:= >=net-libs/ngtcp2-1.1.0:= sys-libs/zlib corepack? ( !sys-apps/yarn ) system-icu? ( >=dev-libs/icu-71:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl ) x86? ( cpu_flags_x86_sse2 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://nodejs.org/dist/v20.14.0/node-v20.14.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2da05c0a71c147d0d69bbf8daa70fb03
+_md5_=2341065643f45f669683e559463e90c9
diff --git a/metadata/md5-cache/net-libs/nodejs-22.3.0 b/metadata/md5-cache/net-libs/nodejs-22.3.0
index 0f14098af89f..111471c2e1a7 100644
--- a/metadata/md5-cache/net-libs/nodejs-22.3.0
+++ b/metadata/md5-cache/net-libs/nodejs-22.3.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
 IUSE=corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.46.0:= >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.61.0:= >=net-libs/ngtcp2-1.3.0:= >=dev-libs/simdjson-3.9.1:= sys-libs/zlib corepack? ( !sys-apps/yarn ) system-icu? ( >=dev-libs/icu-71:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl ) x86? ( cpu_flags_x86_sse2 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=https://nodejs.org/dist/v22.3.0/node-v22.3.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d2dad7788f5b5e9a78c8c8bf628e550d
+_md5_=7e1d7fc8ce0eaf23cc3c28391786df6a
diff --git a/metadata/md5-cache/net-libs/quiche-0.21.0 b/metadata/md5-cache/net-libs/quiche-0.21.0
deleted file mode 100644
index 293eb6cb9349..000000000000
--- a/metadata/md5-cache/net-libs/quiche-0.21.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.66.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-build/cmake >=virtual/rust-1.53 app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Implementation of the QUIC transport protocol and HTTP/3
-EAPI=8
-HOMEPAGE=https://github.com/cloudflare/quiche
-INHERIT=cargo cmake flag-o-matic rust-toolchain multilib-minimal
-IUSE=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
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
-SLOT=0/0
-SRC_URI=https://crates.io/api/v1/crates/quiche/0.21.0/download -> quiche-0.21.0.crate https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/aho-corasick/1.1.3/download -> aho-corasick-1.1.3.crate https://crates.io/api/v1/crates/android-tzdata/0.1.1/download -> android-tzdata-0.1.1.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/arrayvec/0.7.4/download -> arrayvec-0.7.4.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.2.0/download -> autocfg-1.2.0.crate https://crates.io/api/v1/crates/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace/sys-0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/base64/0.21.7/download -> base64-0.21.7.crate https://crates.io/api/v1/crates/bindgen/0.68.1/download -> bindgen-0.68.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags/2.5.0/download -> bitflags-2.5.0.crate https://crates.io/api/v1/crates/boring/4.6.0/download -> boring-4.6.0.crate https://crates.io/api/v1/crates/boring-sys/4.6.0/download -> boring-sys-4.6.0.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bumpalo/3.15.4/download -> bumpalo-3.15.4.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.94/download -> cc-1.0.94.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfg/if-0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg/if-1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.35/download -> chrono-0.4.35.crate https://crates.io/api/v1/crates/clang-sys/1.7.0/download -> clang-sys-1.7.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cmake/0.1.50/download -> cmake-0.1.50.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.6/download -> core-foundation-sys-0.8.6.crate https://crates.io/api/v1/crates/criterion/0.3.1/download -> criterion-0.3.1.crate https://crates.io/api/v1/crates/criterion/plot-0.4.1/download -> criterion-plot-0.4.1.crate https://crates.io/api/v1/crates/crossbeam/deque-0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam/epoch-0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam/queue-0.2.1/download -> crossbeam-queue-0.2.1.crate https://crates.io/api/v1/crates/crossbeam/utils-0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv/core-0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/data-encoding/2.5.0/download -> data-encoding-2.5.0.crate https://crates.io/api/v1/crates/darling/0.20.8/download -> darling-0.20.8.crate https://crates.io/api/v1/crates/darling_core/0.20.8/download -> darling_core-0.20.8.crate https://crates.io/api/v1/crates/darling_macro/0.20.8/download -> darling_macro-0.20.8.crate https://crates.io/api/v1/crates/data/encoding-2.3.3/download -> data-encoding-2.3.3.crate https://crates.io/api/v1/crates/deranged/0.3.11/download -> deranged-0.3.11.crate https://crates.io/api/v1/crates/either/1.11.0/download -> either-1.11.0.crate https://crates.io/api/v1/crates/env_logger/0.8.4/download -> env_logger-0.8.4.crate https://crates.io/api/v1/crates/equivalent/1.0.1/download -> equivalent-1.0.1.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.3/download -> foreign-types-macros-0.2.3.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.1/download -> foreign-types-shared-0.3.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.2.1/download -> form_urlencoded-1.2.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/fs_extra/1.3.0/download -> fs_extra-1.3.0.crate https://crates.io/api/v1/crates/fslock/0.2.1/download -> fslock-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.2.14/download -> getrandom-0.2.14.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hashbrown/0.14.3/download -> hashbrown-0.14.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/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.2/download -> iana-time-zone-haiku-0.1.2.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.60/download -> iana-time-zone-0.1.60.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.5.0/download -> idna-0.5.0.crate https://crates.io/api/v1/crates/intrusive-collections/0.9.6/download -> intrusive-collections-0.9.6.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/1.0.11/download -> itoa-1.0.11.crate https://crates.io/api/v1/crates/js-sys/0.3.69/download -> js-sys-0.3.69.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.153/download -> libc-0.2.153.crate https://crates.io/api/v1/crates/libloading/0.8.3/download -> libloading-0.8.3.crate https://crates.io/api/v1/crates/libm/0.2.8/download -> libm-0.2.8.crate https://crates.io/api/v1/crates/log/0.4.21/download -> log-0.4.21.crate https://crates.io/api/v1/crates/matches/0.1.10/download -> matches-0.1.10.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.7.2/download -> memchr-2.7.2.crate https://crates.io/api/v1/crates/memoffset/0.9.1/download -> memoffset-0.9.1.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/mio/0.8.11/download -> mio-0.8.11.crate https://crates.io/api/v1/crates/miow/0.4.0/download -> miow-0.4.0.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/num-conv/0.1.0/download -> num-conv-0.1.0.crate https://crates.io/api/v1/crates/num-traits/0.2.18/download -> num-traits-0.2.18.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/octets/0.3.0/download -> octets-0.3.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/indexmap/1.9.3/download -> indexmap-1.9.3.crate https://crates.io/api/v1/crates/indexmap/2.2.6/download -> indexmap-2.2.6.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/oorandom/11.1.0/download -> oorandom-11.1.0.crate https://crates.io/api/v1/crates/percent-encoding/2.3.1/download -> percent-encoding-2.3.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.30/download -> pkg-config-0.3.30.crate https://crates.io/api/v1/crates/plotters/0.2.12/download -> plotters-0.2.12.crate https://crates.io/api/v1/crates/powerfmt/0.2.0/download -> powerfmt-0.2.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.80/download -> proc-macro2-1.0.80.crate https://crates.io/api/v1/crates/qlog/0.13.0/download -> qlog-0.13.0.crate https://crates.io/api/v1/crates/quote/1.0.36/download -> quote-1.0.36.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon/core-1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.10.4/download -> regex-1.10.4.crate https://crates.io/api/v1/crates/regex-automata/0.4.6/download -> regex-automata-0.4.6.crate https://crates.io/api/v1/crates/regex-syntax/0.8.3/download -> regex-syntax-0.8.3.crate https://crates.io/api/v1/crates/ring/0.17.8/download -> ring-0.17.8.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.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/rustversion/1.0.6/download -> rustversion-1.0.6.crate https://crates.io/api/v1/crates/rust_decimal/1.35.0/download -> rust_decimal-1.35.0.crate https://crates.io/api/v1/crates/ryu/1.0.17/download -> ryu-1.0.17.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sfv/0.9.4/download -> sfv-0.9.4.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.197/download -> serde-1.0.197.crate https://crates.io/api/v1/crates/serde_derive/1.0.197/download -> serde_derive-1.0.197.crate https://crates.io/api/v1/crates/serde_json/1.0.115/download -> serde_json-1.0.115.crate https://crates.io/api/v1/crates/serde_with/3.7.0/download -> serde_with-3.7.0.crate https://crates.io/api/v1/crates/serde_with_macros/3.7.0/download -> serde_with_macros-3.7.0.crate https://crates.io/api/v1/crates/shlex/1.3.0/download -> shlex-1.3.0.crate https://crates.io/api/v1/crates/slab/0.4.9/download -> slab-0.4.9.crate https://crates.io/api/v1/crates/smallvec/1.13.2/download -> smallvec-1.13.2.crate https://crates.io/api/v1/crates/spin/0.9.8/download -> spin-0.9.8.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.59/download -> syn-2.0.59.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.3.34/download -> time-0.3.34.crate https://crates.io/api/v1/crates/time-core/0.1.2/download -> time-core-0.1.2.crate https://crates.io/api/v1/crates/time-macros/0.2.17/download -> time-macros-0.2.17.crate https://crates.io/api/v1/crates/tinytemplate/1.0.3/download -> tinytemplate-1.0.3.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.15/download -> unicode-bidi-0.3.15.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.23/download -> unicode-normalization-0.1.23.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unicode-xid/0.2.4/download -> unicode-xid-0.2.4.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/untrusted/0.9.0/download -> untrusted-0.9.0.crate https://crates.io/api/v1/crates/url/2.5.0/download -> url-2.5.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.92/download -> wasm-bindgen-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.92/download -> wasm-bindgen-backend-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.92/download -> wasm-bindgen-macro-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.92/download -> wasm-bindgen-macro-support-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.92/download -> wasm-bindgen-shared-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.75/download -> wasm-bindgen-webidl-0.2.75.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/web-sys/0.3.65/download -> web-sys-0.3.65.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-core/0.52.0/download -> windows-core-0.52.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.52.5/download -> windows_aarch64_gnullvm-0.52.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.52.5/download -> windows_aarch64_msvc-0.52.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.52.5/download -> windows_i686_gnu-0.52.5.crate https://crates.io/api/v1/crates/windows_i686_gnullvm/0.52.5/download -> windows_i686_gnullvm-0.52.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.52.5/download -> windows_i686_msvc-0.52.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.52.5/download -> windows_x86_64_gnu-0.52.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.52.5/download -> windows_x86_64_gnullvm-0.52.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.52.5/download -> windows_x86_64_msvc-0.52.5.crate https://crates.io/api/v1/crates/windows-sys/0.48.0/download -> windows-sys-0.48.0.crate https://crates.io/api/v1/crates/windows-sys/0.52.0/download -> windows-sys-0.52.0.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows-targets/0.52.5/download -> windows-targets-0.52.5.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
-_eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2c78342914282086f39807a07e20147f
diff --git a/metadata/md5-cache/net-libs/quiche-0.22.0 b/metadata/md5-cache/net-libs/quiche-0.22.0
new file mode 100644
index 000000000000..da42b9a64311
--- /dev/null
+++ b/metadata/md5-cache/net-libs/quiche-0.22.0
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.66.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-build/cmake >=virtual/rust-1.53 app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Implementation of the QUIC transport protocol and HTTP/3
+EAPI=8
+HOMEPAGE=https://github.com/cloudflare/quiche
+INHERIT=cargo cmake flag-o-matic rust-toolchain multilib-minimal
+IUSE=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
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
+SLOT=0/0
+SRC_URI=https://crates.io/api/v1/crates/quiche/0.22.0/download -> quiche-0.22.0.crate https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/aho-corasick/1.1.3/download -> aho-corasick-1.1.3.crate https://crates.io/api/v1/crates/android-tzdata/0.1.1/download -> android-tzdata-0.1.1.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/arrayvec/0.7.4/download -> arrayvec-0.7.4.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.3.0/download -> autocfg-1.3.0.crate https://crates.io/api/v1/crates/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace/sys-0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/base64/0.21.7/download -> base64-0.21.7.crate https://crates.io/api/v1/crates/bindgen/0.68.1/download -> bindgen-0.68.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags/2.6.0/download -> bitflags-2.6.0.crate https://crates.io/api/v1/crates/boring/4.7.0/download -> boring-4.7.0.crate https://crates.io/api/v1/crates/boring-sys/4.7.0/download -> boring-sys-4.7.0.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bumpalo/3.15.4/download -> bumpalo-3.15.4.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.101/download -> cc-1.0.101.crate https://crates.io/api/v1/crates/cdylib-link-lines/0.1.5/download -> cdylib-link-lines-0.1.5.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfg/if-0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg/if-1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.35/download -> chrono-0.4.35.crate https://crates.io/api/v1/crates/clang-sys/1.8.1/download -> clang-sys-1.8.1.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cmake/0.1.50/download -> cmake-0.1.50.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.6/download -> core-foundation-sys-0.8.6.crate https://crates.io/api/v1/crates/criterion/0.3.1/download -> criterion-0.3.1.crate https://crates.io/api/v1/crates/criterion/plot-0.4.1/download -> criterion-plot-0.4.1.crate https://crates.io/api/v1/crates/crossbeam/deque-0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam/epoch-0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam/queue-0.2.1/download -> crossbeam-queue-0.2.1.crate https://crates.io/api/v1/crates/crossbeam/utils-0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv/core-0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/data-encoding/2.6.0/download -> data-encoding-2.6.0.crate https://crates.io/api/v1/crates/darling/0.20.9/download -> darling-0.20.9.crate https://crates.io/api/v1/crates/darling_core/0.20.9/download -> darling_core-0.20.9.crate https://crates.io/api/v1/crates/darling_macro/0.20.9/download -> darling_macro-0.20.9.crate https://crates.io/api/v1/crates/data/encoding-2.3.3/download -> data-encoding-2.3.3.crate https://crates.io/api/v1/crates/deranged/0.3.11/download -> deranged-0.3.11.crate https://crates.io/api/v1/crates/either/1.13.0/download -> either-1.13.0.crate https://crates.io/api/v1/crates/env_logger/0.8.4/download -> env_logger-0.8.4.crate https://crates.io/api/v1/crates/equivalent/1.0.1/download -> equivalent-1.0.1.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.3/download -> foreign-types-macros-0.2.3.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.1/download -> foreign-types-shared-0.3.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.2.1/download -> form_urlencoded-1.2.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/fs_extra/1.3.0/download -> fs_extra-1.3.0.crate https://crates.io/api/v1/crates/fslock/0.2.1/download -> fslock-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.2.15/download -> getrandom-0.2.15.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hashbrown/0.14.5/download -> hashbrown-0.14.5.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/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.2/download -> iana-time-zone-haiku-0.1.2.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.60/download -> iana-time-zone-0.1.60.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.5.0/download -> idna-0.5.0.crate https://crates.io/api/v1/crates/intrusive-collections/0.9.6/download -> intrusive-collections-0.9.6.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/1.0.11/download -> itoa-1.0.11.crate https://crates.io/api/v1/crates/js-sys/0.3.69/download -> js-sys-0.3.69.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.5.0/download -> lazy_static-1.5.0.crate https://crates.io/api/v1/crates/libc/0.2.155/download -> libc-0.2.155.crate https://crates.io/api/v1/crates/libloading/0.8.4/download -> libloading-0.8.4.crate https://crates.io/api/v1/crates/libm/0.2.8/download -> libm-0.2.8.crate https://crates.io/api/v1/crates/log/0.4.21/download -> log-0.4.21.crate https://crates.io/api/v1/crates/matches/0.1.10/download -> matches-0.1.10.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.7.4/download -> memchr-2.7.4.crate https://crates.io/api/v1/crates/memoffset/0.9.1/download -> memoffset-0.9.1.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/mio/0.8.11/download -> mio-0.8.11.crate https://crates.io/api/v1/crates/miow/0.4.0/download -> miow-0.4.0.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/num-conv/0.1.0/download -> num-conv-0.1.0.crate https://crates.io/api/v1/crates/num-traits/0.2.19/download -> num-traits-0.2.19.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/octets/0.3.0/download -> octets-0.3.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/indexmap/1.9.3/download -> indexmap-1.9.3.crate https://crates.io/api/v1/crates/indexmap/2.2.6/download -> indexmap-2.2.6.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/oorandom/11.1.0/download -> oorandom-11.1.0.crate https://crates.io/api/v1/crates/percent-encoding/2.3.1/download -> percent-encoding-2.3.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.30/download -> pkg-config-0.3.30.crate https://crates.io/api/v1/crates/plotters/0.2.12/download -> plotters-0.2.12.crate https://crates.io/api/v1/crates/powerfmt/0.2.0/download -> powerfmt-0.2.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.86/download -> proc-macro2-1.0.86.crate https://crates.io/api/v1/crates/qlog/0.13.0/download -> qlog-0.13.0.crate https://crates.io/api/v1/crates/quote/1.0.36/download -> quote-1.0.36.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon/core-1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.10.5/download -> regex-1.10.5.crate https://crates.io/api/v1/crates/regex-automata/0.4.7/download -> regex-automata-0.4.7.crate https://crates.io/api/v1/crates/regex-syntax/0.8.4/download -> regex-syntax-0.8.4.crate https://crates.io/api/v1/crates/ring/0.17.8/download -> ring-0.17.8.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.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/rustversion/1.0.6/download -> rustversion-1.0.6.crate https://crates.io/api/v1/crates/rust_decimal/1.35.0/download -> rust_decimal-1.35.0.crate https://crates.io/api/v1/crates/ryu/1.0.18/download -> ryu-1.0.18.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sfv/0.9.4/download -> sfv-0.9.4.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.203/download -> serde-1.0.203.crate https://crates.io/api/v1/crates/serde_derive/1.0.203/download -> serde_derive-1.0.203.crate https://crates.io/api/v1/crates/serde_json/1.0.118/download -> serde_json-1.0.118.crate https://crates.io/api/v1/crates/serde_with/3.8.1/download -> serde_with-3.8.1.crate https://crates.io/api/v1/crates/serde_with_macros/3.8.1/download -> serde_with_macros-3.8.1.crate https://crates.io/api/v1/crates/shlex/1.3.0/download -> shlex-1.3.0.crate https://crates.io/api/v1/crates/slab/0.4.9/download -> slab-0.4.9.crate https://crates.io/api/v1/crates/smallvec/1.13.2/download -> smallvec-1.13.2.crate https://crates.io/api/v1/crates/spin/0.9.8/download -> spin-0.9.8.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.11.1/download -> strsim-0.11.1.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.68/download -> syn-2.0.68.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.3.34/download -> time-0.3.34.crate https://crates.io/api/v1/crates/time-core/0.1.2/download -> time-core-0.1.2.crate https://crates.io/api/v1/crates/time-macros/0.2.17/download -> time-macros-0.2.17.crate https://crates.io/api/v1/crates/tinytemplate/1.0.3/download -> tinytemplate-1.0.3.crate https://crates.io/api/v1/crates/tinyvec/1.6.1/download -> tinyvec-1.6.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.15/download -> unicode-bidi-0.3.15.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.23/download -> unicode-normalization-0.1.23.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unicode-xid/0.2.4/download -> unicode-xid-0.2.4.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/untrusted/0.9.0/download -> untrusted-0.9.0.crate https://crates.io/api/v1/crates/url/2.5.2/download -> url-2.5.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.92/download -> wasm-bindgen-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.92/download -> wasm-bindgen-backend-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.92/download -> wasm-bindgen-macro-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.92/download -> wasm-bindgen-macro-support-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.92/download -> wasm-bindgen-shared-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.75/download -> wasm-bindgen-webidl-0.2.75.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/web-sys/0.3.65/download -> web-sys-0.3.65.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-core/0.52.0/download -> windows-core-0.52.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.52.5/download -> windows_aarch64_gnullvm-0.52.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.52.5/download -> windows_aarch64_msvc-0.52.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.52.5/download -> windows_i686_gnu-0.52.5.crate https://crates.io/api/v1/crates/windows_i686_gnullvm/0.52.5/download -> windows_i686_gnullvm-0.52.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.52.5/download -> windows_i686_msvc-0.52.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.52.5/download -> windows_x86_64_gnu-0.52.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.52.5/download -> windows_x86_64_gnullvm-0.52.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.52.5/download -> windows_x86_64_msvc-0.52.5.crate https://crates.io/api/v1/crates/windows-sys/0.48.0/download -> windows-sys-0.48.0.crate https://crates.io/api/v1/crates/windows-sys/0.52.0/download -> windows-sys-0.52.0.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows-targets/0.52.5/download -> windows-targets-0.52.5.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
+_eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ded8344e091d031aa1c531be86e0cf20
diff --git a/metadata/md5-cache/net-libs/quiche-9999 b/metadata/md5-cache/net-libs/quiche-9999
index 7db7aeaeb120..009483f5c117 100644
--- a/metadata/md5-cache/net-libs/quiche-9999
+++ b/metadata/md5-cache/net-libs/quiche-9999
@@ -9,4 +9,4 @@ LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-L
 PROPERTIES=live
 SLOT=0/0
 _eclasses_=cargo	67ea64209e3442a3a0e095f048d43a62	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	rust-toolchain	68a6453cb41148db1da01fa2267527f0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2c78342914282086f39807a07e20147f
+_md5_=ded8344e091d031aa1c531be86e0cf20
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 9bbc9e1b510f..d131847a7fb1 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/asterisk-g729-16.0.3.1.10 b/metadata/md5-cache/net-misc/asterisk-g729-16.0.3.1.10
index 4415d2aed6e6..a48d282475f3 100644
--- a/metadata/md5-cache/net-misc/asterisk-g729-16.0.3.1.10
+++ b/metadata/md5-cache/net-misc/asterisk-g729-16.0.3.1.10
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst setup unpack
 DESCRIPTION=G.729 codec and supporting files for asterisk
 EAPI=7
 HOMEPAGE=https://www.sangoma.com/asterisk/software/g729-codec/
-KEYWORDS=-* ~amd64 x86
+KEYWORDS=-* amd64 x86
 LICENSE=Digium
 RDEPEND==net-misc/asterisk-16*
 RESTRICT=mirror strip
 SLOT=0/16.0
 SRC_URI=x86? ( https://downloads.digium.com/pub/telephony/codec_g729/asterisk-16.0/x86-32/codec_g729a-16.0_3.1.10-x86_32.tar.gz https://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32 https://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32 ) amd64? ( https://downloads.digium.com/pub/telephony/codec_g729/asterisk-16.0/x86-64/codec_g729a-16.0_3.1.10-x86_64.tar.gz https://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64 https://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64 )
-_md5_=9f2c92971dbb5e1ef63c6f65dbe95b5e
+_md5_=ae9645a5d7d9e290a2221b98344653fd
diff --git a/metadata/md5-cache/net-misc/asterisk-g729-18.0.3.1.10 b/metadata/md5-cache/net-misc/asterisk-g729-18.0.3.1.10
index 49bc453ddc0b..9ba8bd90eec0 100644
--- a/metadata/md5-cache/net-misc/asterisk-g729-18.0.3.1.10
+++ b/metadata/md5-cache/net-misc/asterisk-g729-18.0.3.1.10
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst setup unpack
 DESCRIPTION=G.729 codec and supporting files for asterisk
 EAPI=7
 HOMEPAGE=https://www.sangoma.com/asterisk/software/g729-codec/
-KEYWORDS=-* ~amd64 x86
+KEYWORDS=-* amd64 x86
 LICENSE=Digium
 RDEPEND==net-misc/asterisk-18*
 RESTRICT=mirror strip
 SLOT=0/18.0
 SRC_URI=x86? ( https://downloads.digium.com/pub/telephony/codec_g729/asterisk-18.0/x86-32/codec_g729a-18.0_3.1.10-x86_32.tar.gz https://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32 https://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32 ) amd64? ( https://downloads.digium.com/pub/telephony/codec_g729/asterisk-18.0/x86-64/codec_g729a-18.0_3.1.10-x86_64.tar.gz https://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64 https://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64 )
-_md5_=9f2c92971dbb5e1ef63c6f65dbe95b5e
+_md5_=ae9645a5d7d9e290a2221b98344653fd
diff --git a/metadata/md5-cache/net-misc/ipmiview-2.21.1.230720 b/metadata/md5-cache/net-misc/ipmiview-2.21.1.230720
index 4d871a6bdfc9..f6edfdce9bd8 100644
--- a/metadata/md5-cache/net-misc/ipmiview-2.21.1.230720
+++ b/metadata/md5-cache/net-misc/ipmiview-2.21.1.230720
@@ -11,5 +11,5 @@ RDEPEND=net-misc/stunnel sys-libs/ncurses-compat:5 virtual/jre:1.8 >=dev-java/ja
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://www.supermicro.com/Bios/sw_download/588/IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=0d1bb8ab9f22ca158c34cadb25ab3fc3
diff --git a/metadata/md5-cache/net-misc/r8152-2.16.3-r1 b/metadata/md5-cache/net-misc/r8152-2.16.3-r1
deleted file mode 100644
index 643d530a5e9e..000000000000
--- a/metadata/md5-cache/net-misc/r8152-2.16.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=virtual/udev virtual/linux-sources
-DESCRIPTION=r8152 driver for Realtek USB FE / GBE / 2.5G Gaming Ethernet Family Controller
-EAPI=8
-HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software
-IDEPEND=sys-apps/kmod[tools]
-INHERIT=linux-mod-r1 udev
-IUSE=+center-tap-short dist-kernel modules-compress modules-sign +strip
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
-SLOT=0
-SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8152-2.16.3.tar.bz2
-_eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	367e103a74bf77e6a8da7894d999fa3c	linux-info	e967b81f54be6f49f4219a57ce7db437	linux-mod-r1	9ccd2b29cd75bd48092f8f46b07fc935	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=9e5b8ecf8b89407925fcb21553082d47
diff --git a/metadata/md5-cache/net-misc/r8152-2.17.1 b/metadata/md5-cache/net-misc/r8152-2.17.1
index 8c870d89ca62..64a0a2429f61 100644
--- a/metadata/md5-cache/net-misc/r8152-2.17.1
+++ b/metadata/md5-cache/net-misc/r8152-2.17.1
@@ -13,4 +13,4 @@ RDEPEND=virtual/udev sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 SLOT=0
 SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8152-2.17.1.tar.bz2
 _eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	367e103a74bf77e6a8da7894d999fa3c	linux-info	e967b81f54be6f49f4219a57ce7db437	linux-mod-r1	9ccd2b29cd75bd48092f8f46b07fc935	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=bbe33eada72ca2c10f43f8ddd5405b30
+_md5_=bc56338b9f085b69ce1b895ccf8cec3b
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.13.1-r3 b/metadata/md5-cache/net-misc/tigervnc-1.13.1-r3
index 48f38b5dabf3..a7120418d4b1 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.13.1-r3
+++ b/metadata/md5-cache/net-misc/tigervnc-1.13.1-r3
@@ -13,5 +13,5 @@ RDEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zli
 REQUIRED_USE=dri3? ( drm ) java? ( viewer ) opengl? ( server ) || ( server viewer )
 SLOT=0
 SRC_URI=server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.8.tar.xz ) https://github.com/TigerVNC/tigervnc/archive/v1.13.1.tar.gz -> tigervnc-1.13.1.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bbdc4838cb5a7845830f59b157b847a0
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.13.90-r1 b/metadata/md5-cache/net-misc/tigervnc-1.13.90-r1
index eb6c32fef506..77ae349ca572 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.13.90-r1
+++ b/metadata/md5-cache/net-misc/tigervnc-1.13.90-r1
@@ -13,5 +13,5 @@ RDEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zli
 REQUIRED_USE=dri3? ( drm ) java? ( viewer ) opengl? ( server ) || ( server viewer )
 SLOT=0
 SRC_URI=server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.13.tar.xz ) https://github.com/TigerVNC/tigervnc/archive/v1.13.90.tar.gz -> tigervnc-1.13.90.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=500f4a308dbad0aef86b531b577e92e2
diff --git a/metadata/md5-cache/net-misc/tigervnc-9999 b/metadata/md5-cache/net-misc/tigervnc-9999
index 4299f685e960..906dc37d498c 100644
--- a/metadata/md5-cache/net-misc/tigervnc-9999
+++ b/metadata/md5-cache/net-misc/tigervnc-9999
@@ -13,5 +13,5 @@ RDEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zli
 REQUIRED_USE=dri3? ( drm ) java? ( viewer ) opengl? ( server ) || ( server viewer )
 SLOT=0
 SRC_URI=server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.13.tar.xz )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=500f4a308dbad0aef86b531b577e92e2
diff --git a/metadata/md5-cache/net-misc/turbovnc-3.0.3 b/metadata/md5-cache/net-misc/turbovnc-3.0.3
index ec7c4b9eb919..b3a0de670192 100644
--- a/metadata/md5-cache/net-misc/turbovnc-3.0.3
+++ b/metadata/md5-cache/net-misc/turbovnc-3.0.3
@@ -12,5 +12,5 @@ RDEPEND=x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-confi
 REQUIRED_USE=|| ( server viewer )
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/turbovnc/files/3.0.3/turbovnc-3.0.3.tar.gz/download -> turbovnc-3.0.3.tar.gz verify-sig? ( https://sourceforge.net/projects/turbovnc/files/3.0.3/turbovnc-3.0.3.tar.gz.sig/download -> turbovnc-3.0.3.tar.gz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=32963417bf401c701c46a63a88fa3a9a
diff --git a/metadata/md5-cache/net-misc/turbovnc-3.1 b/metadata/md5-cache/net-misc/turbovnc-3.1
index 268064a51e2c..b536a140b9e9 100644
--- a/metadata/md5-cache/net-misc/turbovnc-3.1
+++ b/metadata/md5-cache/net-misc/turbovnc-3.1
@@ -12,5 +12,5 @@ RDEPEND=x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-confi
 REQUIRED_USE=|| ( server viewer )
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/turbovnc/files/3.1/turbovnc-3.1.tar.gz/download -> turbovnc-3.1.tar.gz verify-sig? ( https://sourceforge.net/projects/turbovnc/files/3.1/turbovnc-3.1.tar.gz.sig/download -> turbovnc-3.1.tar.gz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0e8cf12576c534de538350f55ef81e8e
diff --git a/metadata/md5-cache/net-misc/turbovnc-3.1.1 b/metadata/md5-cache/net-misc/turbovnc-3.1.1
index 560a5926ba73..fc75c21640b2 100644
--- a/metadata/md5-cache/net-misc/turbovnc-3.1.1
+++ b/metadata/md5-cache/net-misc/turbovnc-3.1.1
@@ -12,5 +12,5 @@ RDEPEND=x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-confi
 REQUIRED_USE=|| ( server viewer )
 SLOT=0
 SRC_URI=https://github.com/TurboVNC/turbovnc/releases/download/3.1.1/turbovnc-3.1.1.tar.gz verify-sig? ( https://github.com/TurboVNC/turbovnc/releases/download/3.1.1/turbovnc-3.1.1.tar.gz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e448b87d3cf7d8588625786e14aa8476
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index fcb38f03a471..98ddc76103e7 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.3.1.2-r2 b/metadata/md5-cache/net-nds/jxplorer-3.3.1.2-r2
index 388bcfce2e9a..1377b99e89ed 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.3.1.2-r2
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1.2-r2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-java/javahelp-2.0.02_p46:0 virtual/jre:1.8 >=dev-java/java-config-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/jxplorer/jxplorer/version%203.3.1.2/jxplorer-3.3.1.2-project%20.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=5023e3ffc4cbaadf929da3d19b589baa
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index e8a945f57ea7..37be8d94c955 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/biglybt-3.5.0.0 b/metadata/md5-cache/net-p2p/biglybt-3.5.0.0
index 4b9c03f5d7b3..2ca4d6613a9d 100644
--- a/metadata/md5-cache/net-p2p/biglybt-3.5.0.0
+++ b/metadata/md5-cache/net-p2p/biglybt-3.5.0.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/commons-cli:1 dev-java/swt:4.27 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/BiglySoftware/BiglyBT/archive/v3.5.0.0.tar.gz -> biglybt-3.5.0.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=61f1879536c6255a1561317e10d9e660
diff --git a/metadata/md5-cache/net-p2p/biglybt-3.6.0.0 b/metadata/md5-cache/net-p2p/biglybt-3.6.0.0
index aaf05845df0f..40960085ef80 100644
--- a/metadata/md5-cache/net-p2p/biglybt-3.6.0.0
+++ b/metadata/md5-cache/net-p2p/biglybt-3.6.0.0
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/commons-cli:1 dev-java/swt:4.27 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/BiglySoftware/BiglyBT/archive/v3.6.0.0.tar.gz -> biglybt-3.6.0.0.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0fa67370ee6c5aaeae20102894f5707b
diff --git a/metadata/md5-cache/net-p2p/bitcoin-core-25.1-r2 b/metadata/md5-cache/net-p2p/bitcoin-core-25.1-r2
index 9cd0dffb41bc..621edefe959f 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-core-25.1-r2
+++ b/metadata/md5-cache/net-p2p/bitcoin-core-25.1-r2
@@ -13,6 +13,6 @@ RDEPEND=!<dev-util/bitcoin-tx-25.0 >=dev-libs/boost-1.81.0:= >=dev-libs/libevent
 REQUIRED_USE=dbus? ( gui ) kde? ( gui ) qrcode? ( gui ) system-leveldb? ( || ( daemon gui ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://bitcoincore.org/bin/bitcoin-core-25.1/bitcoin-25.1.tar.gz
+SRC_URI=https://bitcoincore.org/bin/bitcoin-core-25.1/bitcoin-25.1.tar.gz https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> bitcoin-core-miniupnpc-2.2.8-compat.patch
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=078a0aca5267a91fee29b478ce16b4a0
+_md5_=c0b30e6bc3e0f366da14e668750097b3
diff --git a/metadata/md5-cache/net-p2p/bitcoin-core-25.2 b/metadata/md5-cache/net-p2p/bitcoin-core-25.2
index 72989eb643e2..04dac12c90d6 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-core-25.2
+++ b/metadata/md5-cache/net-p2p/bitcoin-core-25.2
@@ -13,6 +13,6 @@ RDEPEND=!dev-util/bitcoin-tx >=dev-libs/boost-1.81.0:= >=dev-libs/libevent-2.1.1
 REQUIRED_USE=dbus? ( gui ) kde? ( gui ) qrcode? ( gui ) system-leveldb? ( || ( daemon gui ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/bitcoin/bitcoin/archive/v25.2.tar.gz -> bitcoin-core-25.2.tar.gz
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/v25.2.tar.gz -> bitcoin-core-25.2.tar.gz https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> bitcoin-core-miniupnpc-2.2.8-compat.patch
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d8864302f0ad295a0928300193bdd8ac
+_md5_=af83c1a9443438d98f50a5c7820d5e38
diff --git a/metadata/md5-cache/net-p2p/bitcoin-core-26.0-r1 b/metadata/md5-cache/net-p2p/bitcoin-core-26.0-r1
index f337ff1c9fca..4fd0e991b5c4 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-core-26.0-r1
+++ b/metadata/md5-cache/net-p2p/bitcoin-core-26.0-r1
@@ -13,6 +13,6 @@ RDEPEND=!dev-util/bitcoin-tx >=dev-libs/boost-1.81.0:= >=dev-libs/libevent-2.1.1
 REQUIRED_USE=dbus? ( gui ) kde? ( gui ) qrcode? ( gui ) system-leveldb? ( || ( daemon gui ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/bitcoin/bitcoin/archive/v26.0.tar.gz -> bitcoin-26.0.tar.gz
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/v26.0.tar.gz -> bitcoin-26.0.tar.gz https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> bitcoin-core-miniupnpc-2.2.8-compat.patch
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=aa39d2a707d7f52dfdd52f885f385f98
+_md5_=e729ea6bf542f27636a4952d4738b4f4
diff --git a/metadata/md5-cache/net-p2p/bitcoin-core-26.1 b/metadata/md5-cache/net-p2p/bitcoin-core-26.1
index 9d8ee6e8ad7e..40085034778f 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-core-26.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-core-26.1
@@ -13,6 +13,6 @@ RDEPEND=!dev-util/bitcoin-tx >=dev-libs/boost-1.81.0:= >=dev-libs/libevent-2.1.1
 REQUIRED_USE=dbus? ( gui ) kde? ( gui ) qrcode? ( gui ) system-leveldb? ( || ( daemon gui ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/bitcoin/bitcoin/archive/v26.1.tar.gz -> bitcoin-core-26.1.tar.gz
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/v26.1.tar.gz -> bitcoin-core-26.1.tar.gz https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> bitcoin-core-miniupnpc-2.2.8-compat.patch
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9f4f819ce901d7976b0ddb9363756313
+_md5_=83a25a7045394cf7568f2161c2216fd6
diff --git a/metadata/md5-cache/net-p2p/bitcoin-core-26.2_rc1 b/metadata/md5-cache/net-p2p/bitcoin-core-26.2_rc1
index 6e6eb443d356..1fc77f6a4733 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-core-26.2_rc1
+++ b/metadata/md5-cache/net-p2p/bitcoin-core-26.2_rc1
@@ -12,6 +12,6 @@ RDEPEND=!dev-util/bitcoin-tx >=dev-libs/boost-1.81.0:= >=dev-libs/libevent-2.1.1
 REQUIRED_USE=dbus? ( gui ) kde? ( gui ) qrcode? ( gui ) system-leveldb? ( || ( daemon gui ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/bitcoin/bitcoin/archive/v26.2rc1.tar.gz -> bitcoin-core-26.2_rc1.tar.gz
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/v26.2rc1.tar.gz -> bitcoin-core-26.2_rc1.tar.gz https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> bitcoin-core-miniupnpc-2.2.8-compat.patch
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=195a86a312f0ee1bd299f633709d228d
+_md5_=addf99e00233c9cae8d99c5514612cca
diff --git a/metadata/md5-cache/net-p2p/bitcoin-core-27.0 b/metadata/md5-cache/net-p2p/bitcoin-core-27.0
index 00d3f22ccd2c..2a02ec00d1d7 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-core-27.0
+++ b/metadata/md5-cache/net-p2p/bitcoin-core-27.0
@@ -13,6 +13,6 @@ RDEPEND=!dev-util/bitcoin-tx >=dev-libs/boost-1.81.0:= >=dev-libs/libevent-2.1.1
 REQUIRED_USE=dbus? ( gui ) kde? ( gui ) qrcode? ( gui ) system-leveldb? ( || ( daemon gui ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/bitcoin/bitcoin/archive/v27.0.tar.gz -> bitcoin-core-27.0.tar.gz
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/v27.0.tar.gz -> bitcoin-core-27.0.tar.gz https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> bitcoin-core-miniupnpc-2.2.8-compat.patch
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=28a5f19cdce577b0858e18e2387d69e6
+_md5_=9eda508907fa396f43ffbe072ec3fc52
diff --git a/metadata/md5-cache/net-p2p/bitcoin-core-27.1 b/metadata/md5-cache/net-p2p/bitcoin-core-27.1
index 817e2f2fd412..c3f5a47abc54 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-core-27.1
+++ b/metadata/md5-cache/net-p2p/bitcoin-core-27.1
@@ -13,6 +13,6 @@ RDEPEND=!dev-util/bitcoin-tx >=dev-libs/boost-1.81.0:= >=dev-libs/libevent-2.1.1
 REQUIRED_USE=dbus? ( gui ) kde? ( gui ) qrcode? ( gui ) system-leveldb? ( || ( daemon gui ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/bitcoin/bitcoin/archive/v27.1.tar.gz -> bitcoin-core-27.1.tar.gz
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/v27.1.tar.gz -> bitcoin-core-27.1.tar.gz https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> bitcoin-core-miniupnpc-2.2.8-compat.patch
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=be9b0de00536ce41c1828a3a80297c03
+_md5_=52dc2a8a1567bfe7bea9b5aefd412d76
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1497-r1 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1497-r1
index 316a08389aee..6118811c78cf 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1497-r1
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1497-r1
@@ -13,5 +13,5 @@ RDEPEND=acct-user/freenet acct-group/freenet >=virtual/jre-1.8:* dev-java/bcprov
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hyphanet/fred/releases/download/build01497/freenet-build01497-source.tar.bz2 https://github.com/hyphanet/seedrefs/archive/build01480.tar.gz -> seednodes-0.7.5_p1480.tar.gz https://repo1.maven.org/maven2/io/pebbletemplates/pebble/3.1.6/pebble-3.1.6.jar mirror://gentoo/freenet-ant-1.7.1.jar verify-sig? ( https://github.com/hyphanet/fred/releases/download/build01497/freenet-build01497-source.tar.bz2.sig )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=195a86dfd11dd83f1a6321710f8cc714
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 77b245de2fb1..a14d5977e5d5 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/i2p-2.3.0-r4 b/metadata/md5-cache/net-vpn/i2p-2.3.0-r4
index cde75b649f36..7074ad1f681e 100644
--- a/metadata/md5-cache/net-vpn/i2p-2.3.0-r4
+++ b/metadata/md5-cache/net-vpn/i2p-2.3.0-r4
@@ -12,5 +12,5 @@ RDEPEND=dev-java/bcprov:0 dev-java/hashcash:1 dev-java/httpcomponents-client:4 d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.i2p-projekt.de/2.3.0/i2psource_2.3.0.tar.bz2
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=7e1f3b895fa854cb0228708ebcdd5284
diff --git a/metadata/md5-cache/net-vpn/i2p-2.5.2-r1 b/metadata/md5-cache/net-vpn/i2p-2.5.2-r1
index 2c3755ac7961..8ac690144647 100644
--- a/metadata/md5-cache/net-vpn/i2p-2.5.2-r1
+++ b/metadata/md5-cache/net-vpn/i2p-2.5.2-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/bcprov:0 dev-java/hashcash:1 dev-java/httpcomponents-client:4 d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.i2p-projekt.de/2.5.2/i2psource_2.5.2.tar.bz2
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=b9849bb4216fcfb37e81294e4ab5776e
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 6c88416bc8b6..2443a935083f 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/tempestsdr-0.0_p20200221-r1 b/metadata/md5-cache/net-wireless/tempestsdr-0.0_p20200221-r1
index 330ad953d646..df2097b3096c 100644
--- a/metadata/md5-cache/net-wireless/tempestsdr-0.0_p20200221-r1
+++ b/metadata/md5-cache/net-wireless/tempestsdr-0.0_p20200221-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jdk-1.8:* dev-libs/boost:= net-wireless/airspy net-wireless/uhd:= net-wireless/rtl-sdr net-wireless/bladerf:= net-wireless/hackrf-tools >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/deltj/TempestSDR/archive/93c238725bdcf2f50c8a1d3789cf56e90f7bab7f.tar.gz -> tempestsdr-0.0_p20200221.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=32edec977367e908a7d93e10684382a3
diff --git a/metadata/md5-cache/net-wireless/tempestsdr-9999 b/metadata/md5-cache/net-wireless/tempestsdr-9999
index ee1bd3118e87..b0f7ad2de33a 100644
--- a/metadata/md5-cache/net-wireless/tempestsdr-9999
+++ b/metadata/md5-cache/net-wireless/tempestsdr-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=virtual/jdk-1.8:* dev-libs/boost:= net-wireless/airspy net-wireless/uhd:= net-wireless/rtl-sdr net-wireless/bladerf:= net-wireless/hackrf-tools >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=git-r3	fbb2889c81f3a05910c1524db69425c1	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=32edec977367e908a7d93e10684382a3
diff --git a/metadata/md5-cache/net-wireless/unifi-6.5.55-r2 b/metadata/md5-cache/net-wireless/unifi-6.5.55-r2
index ca3972157223..1c35efc10418 100644
--- a/metadata/md5-cache/net-wireless/unifi-6.5.55-r2
+++ b/metadata/md5-cache/net-wireless/unifi-6.5.55-r2
@@ -12,5 +12,5 @@ RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8 >=dev-ja
 RESTRICT=bindist mirror
 SLOT=0/6.5
 SRC_URI=https://dl.ui.com/unifi/6.5.55-1d0581c00d/UniFi.unix.zip -> unifi-6.5.55.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=beb46b553ecf105d16fb530d2933bf74
diff --git a/metadata/md5-cache/net-wireless/unifi-7.5.187 b/metadata/md5-cache/net-wireless/unifi-7.5.187
index 50b20e050c7f..f233f2c1d92f 100644
--- a/metadata/md5-cache/net-wireless/unifi-7.5.187
+++ b/metadata/md5-cache/net-wireless/unifi-7.5.187
@@ -12,5 +12,5 @@ RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:17 >=dev-jav
 RESTRICT=bindist mirror
 SLOT=0/7.5
 SRC_URI=https://dl.ui.com/unifi/7.5.187-f57f5bf7ab/UniFi.unix.zip -> unifi-7.5.187.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=d5bbfca2fa4ec04c6f066aa9a6581592
diff --git a/metadata/md5-cache/net-wireless/unifi-8.1.127 b/metadata/md5-cache/net-wireless/unifi-8.1.127
index a5833144e4ca..37831d519fcb 100644
--- a/metadata/md5-cache/net-wireless/unifi-8.1.127
+++ b/metadata/md5-cache/net-wireless/unifi-8.1.127
@@ -12,5 +12,5 @@ RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:17 >=dev-jav
 RESTRICT=bindist mirror
 SLOT=0/8.1
 SRC_URI=https://dl.ui.com/unifi/8.1.127/UniFi.unix.zip -> unifi-8.1.127.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=31ea4d3217135116f30e8f4861e2c867
diff --git a/metadata/md5-cache/net-wireless/unifi-8.2.93 b/metadata/md5-cache/net-wireless/unifi-8.2.93
index d3684f7c46ad..0d1dd4fc3791 100644
--- a/metadata/md5-cache/net-wireless/unifi-8.2.93
+++ b/metadata/md5-cache/net-wireless/unifi-8.2.93
@@ -12,5 +12,5 @@ RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:17 >=dev-jav
 RESTRICT=bindist mirror
 SLOT=0/8.2
 SRC_URI=https://dl.ui.com/unifi/8.2.93/UniFi.unix.zip -> unifi-8.2.93.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=1c21bc23d733ddcdda104b7061ececb2
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 9e04d973e47a..42ee5e27b50c 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/cpl-7.3.2 b/metadata/md5-cache/sci-astronomy/cpl-7.3.2
index 669591c18b9b..e55cdb461c23 100644
--- a/metadata/md5-cache/sci-astronomy/cpl-7.3.2
+++ b/metadata/md5-cache/sci-astronomy/cpl-7.3.2
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libltdl sci-astronomy/wcslib:0= sci-libs/cfitsio:0= sci-libs/fftw:3.0= gasgano? ( sci-astronomy/gasgano ) gasgano? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/26
 SRC_URI=https://ftp.eso.org/pub/dfs/pipelines/libraries/cpl/cpl-7.3.2.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=822b5c9d0265bd810f63c1d0bd816e16
diff --git a/metadata/md5-cache/sci-astronomy/gasgano-2.4.8-r1 b/metadata/md5-cache/sci-astronomy/gasgano-2.4.8-r1
index 28439e85a027..d3ba0df6c800 100644
--- a/metadata/md5-cache/sci-astronomy/gasgano-2.4.8-r1
+++ b/metadata/md5-cache/sci-astronomy/gasgano-2.4.8-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.8:* dev-java/gnu-regexp:1 dev-java/junit:0 dev-java/jal:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=ftp://ftp.eso.org/pub/dfs/gasgano/gasgano-2.4.8.tar.gz doc? ( https://www.eso.org/sci/software/gasgano/VLT-PRO-ESO-19000-1932-V4.pdf )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=e6037254ae27c7e2834c48eb66a07401
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 84bf93a262e2..e37799fc5722 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/amap-2.2-r5 b/metadata/md5-cache/sci-biology/amap-2.2-r5
index 277dedb1c4db..fbae535d9857 100644
--- a/metadata/md5-cache/sci-biology/amap-2.2-r5
+++ b/metadata/md5-cache/sci-biology/amap-2.2-r5
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://baboon.math.berkeley.edu/amap/download/amap.2.2.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=b4e132581d5e91612a875f7f94387a1b
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 6ddae24d7d76..a3ec0796c28e 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/chemex-2024.05.2 b/metadata/md5-cache/sci-chemistry/chemex-2024.05.2-r1
index 621ce7ed137a..9df9abb5f88a 100644
--- a/metadata/md5-cache/sci-chemistry/chemex-2024.05.2
+++ b/metadata/md5-cache/sci-chemistry/chemex-2024.05.2-r1
@@ -1,6 +1,6 @@
-BDEPEND=test? ( python_single_target_python3_11? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_11(-)] >=dev-python/emcee-3.1.4[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_11(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_11(-)] >=dev-python/numpy-1.26.4[python_targets_python3_11(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_11(-)] >=dev-python/rich-13.7.1[python_targets_python3_11(-)] >=dev-python/scipy-1.13.0[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_12(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_12(-)] >=dev-python/emcee-3.1.4[python_targets_python3_12(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_12(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_12(-)] >=dev-python/numpy-1.26.4[python_targets_python3_12(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_12(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_12(-)] >=dev-python/rich-13.7.1[python_targets_python3_12(-)] >=dev-python/scipy-1.13.0[python_targets_python3_12(-)] >=dev-python/tomli-2.0.1[python_targets_python3_12(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.4.4[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/pytest-7.4.4[python_targets_python3_12(-)] ) ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_11? ( >=dev-python/gpep517-15[python_targets_python3_11(-)] >=dev-python/pdm-backend-2.1.8[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/gpep517-15[python_targets_python3_12(-)] >=dev-python/pdm-backend-2.1.8[python_targets_python3_12(-)] )
+BDEPEND=test? ( python_single_target_python3_11? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_11(-)] >=dev-python/emcee-3.1.4[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_11(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_11(-)] >=dev-python/numpy-1.26.4[python_targets_python3_11(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_11(-)] >=dev-python/rich-13.7.1[python_targets_python3_11(-)] >=dev-python/scipy-1.13.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_12(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_12(-)] >=dev-python/emcee-3.1.4[python_targets_python3_12(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_12(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_12(-)] >=dev-python/numpy-1.26.4[python_targets_python3_12(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_12(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_12(-)] >=dev-python/rich-13.7.1[python_targets_python3_12(-)] >=dev-python/scipy-1.13.0[python_targets_python3_12(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.4.4[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/pytest-7.4.4[python_targets_python3_12(-)] ) ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_11? ( >=dev-python/gpep517-15[python_targets_python3_11(-)] >=dev-python/pdm-backend-2.1.8[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/gpep517-15[python_targets_python3_12(-)] >=dev-python/pdm-backend-2.1.8[python_targets_python3_12(-)] )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_11? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_11(-)] >=dev-python/emcee-3.1.4[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_11(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_11(-)] >=dev-python/numpy-1.26.4[python_targets_python3_11(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_11(-)] >=dev-python/rich-13.7.1[python_targets_python3_11(-)] >=dev-python/scipy-1.13.0[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_12(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_12(-)] >=dev-python/emcee-3.1.4[python_targets_python3_12(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_12(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_12(-)] >=dev-python/numpy-1.26.4[python_targets_python3_12(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_12(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_12(-)] >=dev-python/rich-13.7.1[python_targets_python3_12(-)] >=dev-python/scipy-1.13.0[python_targets_python3_12(-)] >=dev-python/tomli-2.0.1[python_targets_python3_12(-)] )
+DEPEND=python_single_target_python3_11? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_11(-)] >=dev-python/emcee-3.1.4[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_11(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_11(-)] >=dev-python/numpy-1.26.4[python_targets_python3_11(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_11(-)] >=dev-python/rich-13.7.1[python_targets_python3_11(-)] >=dev-python/scipy-1.13.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_12(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_12(-)] >=dev-python/emcee-3.1.4[python_targets_python3_12(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_12(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_12(-)] >=dev-python/numpy-1.26.4[python_targets_python3_12(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_12(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_12(-)] >=dev-python/rich-13.7.1[python_targets_python3_12(-)] >=dev-python/scipy-1.13.0[python_targets_python3_12(-)] )
 DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
 EAPI=8
 HOMEPAGE=https://github.com/gbouvignies/chemex
@@ -8,10 +8,10 @@ INHERIT=distutils-r1
 IUSE=test test python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_11? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_11(-)] >=dev-python/emcee-3.1.4[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_11(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_11(-)] >=dev-python/numpy-1.26.4[python_targets_python3_11(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_11(-)] >=dev-python/rich-13.7.1[python_targets_python3_11(-)] >=dev-python/scipy-1.13.0[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_12(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_12(-)] >=dev-python/emcee-3.1.4[python_targets_python3_12(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_12(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_12(-)] >=dev-python/numpy-1.26.4[python_targets_python3_12(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_12(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_12(-)] >=dev-python/rich-13.7.1[python_targets_python3_12(-)] >=dev-python/scipy-1.13.0[python_targets_python3_12(-)] >=dev-python/tomli-2.0.1[python_targets_python3_12(-)] ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 )
+RDEPEND=python_single_target_python3_11? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_11(-)] >=dev-python/emcee-3.1.4[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_11(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_11(-)] >=dev-python/numpy-1.26.4[python_targets_python3_11(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_11(-)] >=dev-python/rich-13.7.1[python_targets_python3_11(-)] >=dev-python/scipy-1.13.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_12(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_12(-)] >=dev-python/emcee-3.1.4[python_targets_python3_12(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_12(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_12(-)] >=dev-python/numpy-1.26.4[python_targets_python3_12(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_12(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_12(-)] >=dev-python/rich-13.7.1[python_targets_python3_12(-)] >=dev-python/scipy-1.13.0[python_targets_python3_12(-)] ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=^^ ( python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gbouvignies/ChemEx/archive/refs/tags/v2024.05.2.tar.gz -> chemex-2024.05.2.tar.gz
 _eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=eebfc6a9cc0912654e3ce2995946b01f
+_md5_=ab972cea82eedf80c5ebc16d5228124f
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2024.05.3 b/metadata/md5-cache/sci-chemistry/chemex-2024.05.3-r1
index 093ce9b50b9d..050ae21418db 100644
--- a/metadata/md5-cache/sci-chemistry/chemex-2024.05.3
+++ b/metadata/md5-cache/sci-chemistry/chemex-2024.05.3-r1
@@ -1,6 +1,6 @@
-BDEPEND=test? ( python_single_target_python3_11? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_11(-)] >=dev-python/emcee-3.1.4[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_11(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_11(-)] >=dev-python/numpy-1.26.4[python_targets_python3_11(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_11(-)] >=dev-python/rich-13.7.1[python_targets_python3_11(-)] >=dev-python/scipy-1.13.0[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_12(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_12(-)] >=dev-python/emcee-3.1.4[python_targets_python3_12(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_12(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_12(-)] >=dev-python/numpy-1.26.4[python_targets_python3_12(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_12(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_12(-)] >=dev-python/rich-13.7.1[python_targets_python3_12(-)] >=dev-python/scipy-1.13.0[python_targets_python3_12(-)] >=dev-python/tomli-2.0.1[python_targets_python3_12(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.4.4[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/pytest-7.4.4[python_targets_python3_12(-)] ) ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_11? ( >=dev-python/gpep517-15[python_targets_python3_11(-)] >=dev-python/pdm-backend-2.1.8[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/gpep517-15[python_targets_python3_12(-)] >=dev-python/pdm-backend-2.1.8[python_targets_python3_12(-)] )
+BDEPEND=test? ( python_single_target_python3_11? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_11(-)] >=dev-python/emcee-3.1.4[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_11(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_11(-)] >=dev-python/numpy-1.26.4[python_targets_python3_11(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_11(-)] >=dev-python/rich-13.7.1[python_targets_python3_11(-)] >=dev-python/scipy-1.13.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_12(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_12(-)] >=dev-python/emcee-3.1.4[python_targets_python3_12(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_12(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_12(-)] >=dev-python/numpy-1.26.4[python_targets_python3_12(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_12(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_12(-)] >=dev-python/rich-13.7.1[python_targets_python3_12(-)] >=dev-python/scipy-1.13.0[python_targets_python3_12(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.4.4[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/pytest-7.4.4[python_targets_python3_12(-)] ) ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_11? ( >=dev-python/gpep517-15[python_targets_python3_11(-)] >=dev-python/pdm-backend-2.1.8[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/gpep517-15[python_targets_python3_12(-)] >=dev-python/pdm-backend-2.1.8[python_targets_python3_12(-)] )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_11? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_11(-)] >=dev-python/emcee-3.1.4[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_11(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_11(-)] >=dev-python/numpy-1.26.4[python_targets_python3_11(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_11(-)] >=dev-python/rich-13.7.1[python_targets_python3_11(-)] >=dev-python/scipy-1.13.0[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_12(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_12(-)] >=dev-python/emcee-3.1.4[python_targets_python3_12(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_12(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_12(-)] >=dev-python/numpy-1.26.4[python_targets_python3_12(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_12(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_12(-)] >=dev-python/rich-13.7.1[python_targets_python3_12(-)] >=dev-python/scipy-1.13.0[python_targets_python3_12(-)] >=dev-python/tomli-2.0.1[python_targets_python3_12(-)] )
+DEPEND=python_single_target_python3_11? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_11(-)] >=dev-python/emcee-3.1.4[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_11(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_11(-)] >=dev-python/numpy-1.26.4[python_targets_python3_11(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_11(-)] >=dev-python/rich-13.7.1[python_targets_python3_11(-)] >=dev-python/scipy-1.13.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_12(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_12(-)] >=dev-python/emcee-3.1.4[python_targets_python3_12(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_12(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_12(-)] >=dev-python/numpy-1.26.4[python_targets_python3_12(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_12(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_12(-)] >=dev-python/rich-13.7.1[python_targets_python3_12(-)] >=dev-python/scipy-1.13.0[python_targets_python3_12(-)] )
 DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
 EAPI=8
 HOMEPAGE=https://github.com/gbouvignies/chemex
@@ -8,10 +8,10 @@ INHERIT=distutils-r1
 IUSE=test test python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_11? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_11(-)] >=dev-python/emcee-3.1.4[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_11(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_11(-)] >=dev-python/numpy-1.26.4[python_targets_python3_11(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_11(-)] >=dev-python/rich-13.7.1[python_targets_python3_11(-)] >=dev-python/scipy-1.13.0[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_12(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_12(-)] >=dev-python/emcee-3.1.4[python_targets_python3_12(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_12(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_12(-)] >=dev-python/numpy-1.26.4[python_targets_python3_12(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_12(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_12(-)] >=dev-python/rich-13.7.1[python_targets_python3_12(-)] >=dev-python/scipy-1.13.0[python_targets_python3_12(-)] >=dev-python/tomli-2.0.1[python_targets_python3_12(-)] ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 )
+RDEPEND=python_single_target_python3_11? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_11(-)] >=dev-python/emcee-3.1.4[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_11(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_11(-)] >=dev-python/numpy-1.26.4[python_targets_python3_11(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_11(-)] >=dev-python/rich-13.7.1[python_targets_python3_11(-)] >=dev-python/scipy-1.13.0[python_targets_python3_11(-)] ) python_single_target_python3_12? ( >=dev-python/annotated-types-0.6.0[python_targets_python3_12(-)] >=dev-python/cachetools-5.3.3[python_targets_python3_12(-)] >=dev-python/emcee-3.1.4[python_targets_python3_12(-)] >=dev-python/lmfit-1.2.2[python_targets_python3_12(-)] >=dev-python/matplotlib-3.8.4[python_targets_python3_12(-)] >=dev-python/numpy-1.26.4[python_targets_python3_12(-)] >=dev-python/pydantic-2.6.4[python_targets_python3_12(-)] >=dev-python/rapidfuzz-3.7.0[python_targets_python3_12(-)] >=dev-python/rich-13.7.1[python_targets_python3_12(-)] >=dev-python/scipy-1.13.0[python_targets_python3_12(-)] ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=^^ ( python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gbouvignies/ChemEx/archive/refs/tags/v2024.05.3.tar.gz -> chemex-2024.05.3.tar.gz
 _eclasses_=distutils-r1	f11e1bc907da246e941fbae648327823	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=eebfc6a9cc0912654e3ce2995946b01f
+_md5_=ab972cea82eedf80c5ebc16d5228124f
diff --git a/metadata/md5-cache/sci-chemistry/tinker-8.2.1-r1 b/metadata/md5-cache/sci-chemistry/tinker-8.2.1-r1
index 82a353899d09..98dde1fa98b7 100644
--- a/metadata/md5-cache/sci-chemistry/tinker-8.2.1-r1
+++ b/metadata/md5-cache/sci-chemistry/tinker-8.2.1-r1
@@ -12,5 +12,5 @@ RDEPEND=>=sci-libs/fftw-3.2.2-r1[fortran,threads] dev-libs/maloc !sys-apps/bar !
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dasher.wustl.edu/tinker/downloads/tinker-8.2.1.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=6d70b9199ffe5bef7b7377329ae8781e
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 3f7222c26e9b..f1d9ce8e805e 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/electric-9.07 b/metadata/md5-cache/sci-electronics/electric-9.07
index 3e61a0ad1902..8b5c2566a246 100644
--- a/metadata/md5-cache/sci-electronics/electric-9.07
+++ b/metadata/md5-cache/sci-electronics/electric-9.07
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.07.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=0b146561e5485cf4110561a12b73600d
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index ddfc1a9047d4..9674054d8fed 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r3 b/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r3
index 2f8406481442..14c307fa81f9 100644
--- a/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r3
+++ b/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/commons-imaging:0 dev-java/jcalendar:1.2 dev-java/jchart2d:0 dev-java/jopt-simple:0 >=dev-java/rxtx-2.2_pre2:2 dev-java/swing-layout:1 dev-java/swingx:1.6 dev-java/swingx-ws:bt747 dev-libs/glib:2[dbus] >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=1
 SRC_URI=https://downloads.sourceforge.net/project/bt747/Development/BT747_2.1.7_full.zip https://www.bt747.org/icon/bt747_128x128.gif -> bt747.gif
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=16d0fa43bc281e575e0dd3243c5602ea
diff --git a/metadata/md5-cache/sci-geosciences/gpsprune-bin-23.2 b/metadata/md5-cache/sci-geosciences/gpsprune-bin-23.2
index 5b891c821536..d882b615ca8c 100644
--- a/metadata/md5-cache/sci-geosciences/gpsprune-bin-23.2
+++ b/metadata/md5-cache/sci-geosciences/gpsprune-bin-23.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://activityworkshop.net/software/gpsprune/gpsprune_23.2.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=edb789d8776e055aeb55d7cf25920629
diff --git a/metadata/md5-cache/sci-geosciences/josm-bin-19067 b/metadata/md5-cache/sci-geosciences/josm-bin-19067
index 063aa1752712..bd8a7c179adf 100644
--- a/metadata/md5-cache/sci-geosciences/josm-bin-19067
+++ b/metadata/md5-cache/sci-geosciences/josm-bin-19067
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 GPL-2+ GPL-3
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://josm.openstreetmap.de/download/josm-snapshot-19067.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	09d793abe112f655cd781e4467a6fc10	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ddc798f41358f6e3ac61c1c278dc1cdb
diff --git a/metadata/md5-cache/sci-geosciences/josm-bin-19096 b/metadata/md5-cache/sci-geosciences/josm-bin-19096
index 1ca87fc9d4ff..b9eaeb7bb700 100644
--- a/metadata/md5-cache/sci-geosciences/josm-bin-19096
+++ b/metadata/md5-cache/sci-geosciences/josm-bin-19096
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 GPL-2+ GPL-3
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://josm.openstreetmap.de/download/josm-snapshot-19096.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	09d793abe112f655cd781e4467a6fc10	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a0cc76b429d9e64c40fe6426e6f9c6ba
diff --git a/metadata/md5-cache/sci-geosciences/viking-1.10 b/metadata/md5-cache/sci-geosciences/viking-1.10
index 87641e51b14c..37952614f8f4 100644
--- a/metadata/md5-cache/sci-geosciences/viking-1.10
+++ b/metadata/md5-cache/sci-geosciences/viking-1.10
@@ -12,4 +12,4 @@ RDEPEND=app-arch/bzip2 >=dev-tcltk/expect-5.45.4 dev-db/sqlite:3 dev-libs/expat
 SLOT=0
 SRC_URI=https://github.com/viking-gps/viking/archive/viking-1.10.tar.gz doc? ( https://github.com/viking-gps/viking/releases/download/viking-1.10/viking.pdf )
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c31a3ef8e62bff03a7aecb4e1bf7777c
+_md5_=2cf5fb21429b7b71e8c582c3a1c2d290
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 54e908c1a3d9..7223c0efc423 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/caffe2-2.2.2-r1 b/metadata/md5-cache/sci-libs/caffe2-2.2.2-r1
index eb0d3654550e..f5e0a2c21692 100644
--- a/metadata/md5-cache/sci-libs/caffe2-2.2.2-r1
+++ b/metadata/md5-cache/sci-libs/caffe2-2.2.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef virtual/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* >=dev-libs/cudnn-frontend-0.9.2:0/8 <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] ) fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) mpi? ( virtual/mpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] ) ) onednn? ( dev-libs/oneDNN ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) rocm? ( >=dev-util/hip-5.7 >=dev-libs/rccl-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/rocThrust-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/rocPRIM-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipBLAS-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipFFT-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipSPARSE-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipRAND-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipCUB-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipSOLVER-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/miopen-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=dev-util/roctracer-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] ) distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas ) cuda? ( >=dev-libs/cutlass-3.1.0 ) onednn? ( sci-libs/ideep ) dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers >=sci-libs/kineto-0.4.0_p20231031 python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyyaml[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef virtual/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* >=dev-libs/cudnn-frontend-0.9.2:0/8 <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] ) fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) mpi? ( virtual/mpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] ) ) onednn? ( dev-libs/oneDNN ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) rocm? ( =dev-util/hip-5.7* =dev-libs/rccl-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/rocThrust-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/rocPRIM-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipBLAS-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipFFT-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipSPARSE-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipRAND-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipCUB-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipSOLVER-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/miopen-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =dev-util/roctracer-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] ) distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas ) cuda? ( >=dev-libs/cutlass-3.1.0 ) onednn? ( sci-libs/ideep ) dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers >=sci-libs/kineto-0.4.0_p20231031 python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyyaml[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] )
 DESCRIPTION=A deep learning framework
 EAPI=8
 HOMEPAGE=https://pytorch.org/
@@ -8,10 +8,10 @@ INHERIT=python-single-r1 cmake cuda flag-o-matic prefix rocm
 IUSE=cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm xnnpack python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1100 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef virtual/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* >=dev-libs/cudnn-frontend-0.9.2:0/8 <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] ) fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) mpi? ( virtual/mpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] ) ) onednn? ( dev-libs/oneDNN ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) rocm? ( >=dev-util/hip-5.7 >=dev-libs/rccl-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/rocThrust-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/rocPRIM-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipBLAS-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipFFT-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipSPARSE-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipRAND-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipCUB-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipSOLVER-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/miopen-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=dev-util/roctracer-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] ) distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef virtual/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* >=dev-libs/cudnn-frontend-0.9.2:0/8 <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] ) fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) mpi? ( virtual/mpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] ) ) onednn? ( dev-libs/oneDNN ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) rocm? ( =dev-util/hip-5.7* =dev-libs/rccl-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/rocThrust-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/rocPRIM-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipBLAS-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipFFT-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipSPARSE-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipRAND-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipCUB-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipSOLVER-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/miopen-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =dev-util/roctracer-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] ) distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ffmpeg? ( opencv ) mpi? ( distributed ) gloo? ( distributed ) ?? ( cuda rocm ) rocm? ( || ( || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1100 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 ) ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pytorch/pytorch/archive/refs/tags/v2.2.2.tar.gz -> pytorch-2.2.2.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=adfb04793ac9ee1358a8ef1b79f13d00
+_md5_=8847ce91b14b57b2ae3d6beaded0fbbc
diff --git a/metadata/md5-cache/sci-libs/caffe2-2.3.1 b/metadata/md5-cache/sci-libs/caffe2-2.3.1
index c70c5885aa28..d50ff395a3de 100644
--- a/metadata/md5-cache/sci-libs/caffe2-2.3.1
+++ b/metadata/md5-cache/sci-libs/caffe2-2.3.1
@@ -1,6 +1,6 @@
 BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef virtual/lapack sci-libs/onnx sci-libs/foxi cuda? ( dev-libs/cudnn >=dev-libs/cudnn-frontend-1.0.3:0/8 <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] ) fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) mpi? ( virtual/mpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] ) ) onednn? ( dev-libs/oneDNN ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) rocm? ( >=dev-util/hip-5.7 >=dev-libs/rccl-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/rocThrust-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/rocPRIM-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipBLAS-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipFFT-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipSPARSE-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipRAND-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipCUB-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipSOLVER-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/miopen-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=dev-util/roctracer-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] ) distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas ) cuda? ( >=dev-libs/cutlass-3.4.1 ) onednn? ( sci-libs/ideep ) dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers >=sci-libs/kineto-0.4.0_p20231031 python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] dev-python/typing-extensions[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] dev-python/typing-extensions[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyyaml[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] dev-python/typing-extensions[python_targets_python3_12(-)] )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef virtual/lapack sci-libs/onnx sci-libs/foxi cuda? ( dev-libs/cudnn >=dev-libs/cudnn-frontend-1.0.3:0/8 <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] ) fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) mpi? ( virtual/mpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] ) ) onednn? ( dev-libs/oneDNN ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) rocm? ( =dev-util/hip-5.7* =dev-libs/rccl-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/rocThrust-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/rocPRIM-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipBLAS-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipFFT-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipSPARSE-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipRAND-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipCUB-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipSOLVER-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/miopen-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =dev-util/roctracer-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] ) distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas ) cuda? ( >=dev-libs/cutlass-3.4.1 ) onednn? ( sci-libs/ideep ) dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers >=sci-libs/kineto-0.4.0_p20231031 python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] dev-python/typing-extensions[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] dev-python/typing-extensions[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyyaml[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] dev-python/typing-extensions[python_targets_python3_12(-)] )
 DESCRIPTION=A deep learning framework
 EAPI=8
 HOMEPAGE=https://pytorch.org/
@@ -8,10 +8,10 @@ INHERIT=python-single-r1 cmake cuda flag-o-matic prefix rocm
 IUSE=cuda distributed fbgemm ffmpeg flash gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm xnnpack python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1100 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef virtual/lapack sci-libs/onnx sci-libs/foxi cuda? ( dev-libs/cudnn >=dev-libs/cudnn-frontend-1.0.3:0/8 <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] ) fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) mpi? ( virtual/mpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] ) ) onednn? ( dev-libs/oneDNN ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) rocm? ( >=dev-util/hip-5.7 >=dev-libs/rccl-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/rocThrust-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/rocPRIM-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipBLAS-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipFFT-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipSPARSE-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipRAND-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipCUB-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/hipSOLVER-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=sci-libs/miopen-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=dev-util/roctracer-5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] ) distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef virtual/lapack sci-libs/onnx sci-libs/foxi cuda? ( dev-libs/cudnn >=dev-libs/cudnn-frontend-1.0.3:0/8 <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] ) fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) ffmpeg? ( media-video/ffmpeg:= ) gloo? ( sci-libs/gloo[cuda?] ) mpi? ( virtual/mpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] ) ) onednn? ( dev-libs/oneDNN ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) rocm? ( =dev-util/hip-5.7* =dev-libs/rccl-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/rocThrust-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/rocPRIM-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipBLAS-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipFFT-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipSPARSE-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipRAND-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipCUB-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/hipSOLVER-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =sci-libs/miopen-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] =dev-util/roctracer-5.7*[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] ) distributed? ( sci-libs/tensorpipe[cuda?] ) xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ffmpeg? ( opencv ) mpi? ( distributed ) gloo? ( distributed ) ?? ( cuda rocm ) rocm? ( || ( || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1100 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 ) ) !flash )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pytorch/pytorch/archive/refs/tags/v2.3.1.tar.gz -> pytorch-2.3.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=13fd3cbab64d9da9ddcf5b277dfeb758
+_md5_=20aa12f8f8052d0c69ba724382e138f3
diff --git a/metadata/md5-cache/sci-libs/cdf-3.8.0-r1 b/metadata/md5-cache/sci-libs/cdf-3.8.0-r1
index 6d2c6ee201fb..21fdd97f1b60 100644
--- a/metadata/md5-cache/sci-libs/cdf-3.8.0-r1
+++ b/metadata/md5-cache/sci-libs/cdf-3.8.0-r1
@@ -11,5 +11,5 @@ RDEPEND=java? ( >=virtual/jre-1.8:= ) ncurses? ( sys-libs/ncurses:0= ) java? ( >
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_0-dist-cdf.tar.gz java? ( https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_0-dist-java.tar.gz ) doc? ( https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf38ifd.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380crm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380csrm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380frm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380prm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380ug.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380vbrm.pdf )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=e14ce6f38d33f1ad4cbc490b16195a93
diff --git a/metadata/md5-cache/sci-libs/cdf-3.9.0 b/metadata/md5-cache/sci-libs/cdf-3.9.0
index 6ce94d84620c..1055ce9b1990 100644
--- a/metadata/md5-cache/sci-libs/cdf-3.9.0
+++ b/metadata/md5-cache/sci-libs/cdf-3.9.0
@@ -12,5 +12,5 @@ RDEPEND=java? ( >=virtual/jre-1.8:= ) ncurses? ( sys-libs/ncurses:= ) java? ( >=
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf39_0/unix//cdf39_0-dist-cdf.tar.gz java? ( https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf39_0/unix//cdf39_0-dist-java.tar.gz ) doc? ( https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf39_0/unix//cdf39_documentation/cdf39ifd.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf39_0/unix//cdf39_documentation/cdf390crm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf39_0/unix//cdf39_documentation/cdf390csrm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf39_0/unix//cdf39_documentation/cdf390frm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf39_0/unix//cdf39_documentation/cdf390prm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf39_0/unix//cdf39_documentation/cdf390ug.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf39_0/unix//cdf39_documentation/cdf390vbrm.pdf )
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=e1c1a853050fdb70b107e177a499f9a3
diff --git a/metadata/md5-cache/sci-libs/composable-kernel-5.7.1-r1 b/metadata/md5-cache/sci-libs/composable-kernel-5.7.1-r1
index a9f1b0c044ed..24a9341fafe4 100644
--- a/metadata/md5-cache/sci-libs/composable-kernel-5.7.1-r1
+++ b/metadata/md5-cache/sci-libs/composable-kernel-5.7.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-libs/half:0/1 dev-build/rocm-cmake app-alternatives/ninja >=dev-build/cmake-3.20.5
+BDEPEND=dev-build/rocm-cmake app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-util/hip >=dev-db/sqlite-3.17 sci-libs/rocBLAS:0/5.7[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=dev-libs/boost-1.72 dev-cpp/nlohmann_json dev-cpp/frugally-deep !!sys-devel/llvm:0
 DESCRIPTION=High Performance Composable Kernel for AMD GPUs
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.7
 SRC_URI=https://github.com/ROCmSoftwarePlatform/composable_kernel/archive/rocm-5.7.1.tar.gz -> composable-kernel-5.7.1.tar.gz test? ( https://github.com/google/googletest/archive/b85864c64758dec007208e56af933fc3f52044ee.tar.gz -> gtest-1.14.0_p20220421.tar.gz )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=26830a456aa491722edcc540c3e0a0b5
+_md5_=ead87867ac9e02a920f0611a4b77922f
diff --git a/metadata/md5-cache/sci-libs/composable-kernel-6.1.1 b/metadata/md5-cache/sci-libs/composable-kernel-6.1.1
new file mode 100644
index 000000000000..a4fdc8df2bbb
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/composable-kernel-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-build/rocm-cmake app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip >=dev-db/sqlite-3.17 sci-libs/rocBLAS:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=dev-libs/boost-1.72 dev-cpp/nlohmann_json dev-cpp/frugally-deep
+DESCRIPTION=High Performance Composable Kernel for AMD GPUs
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/composable_kernel
+INHERIT=cmake flag-o-matic rocm
+IUSE=debug test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip >=dev-db/sqlite-3.17 sci-libs/rocBLAS:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=dev-libs/boost-1.72 dev-cpp/nlohmann_json dev-cpp/frugally-deep
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/composable_kernel/archive/rocm-6.1.1.tar.gz -> composable-kernel-6.1.1.tar.gz test? ( https://github.com/google/googletest/archive/b85864c64758dec007208e56af933fc3f52044ee.tar.gz -> gtest-1.14.0_p20220421.tar.gz )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4058ba5335788516eae0717f4e952b74
diff --git a/metadata/md5-cache/sci-libs/gdal-3.8.0-r1 b/metadata/md5-cache/sci-libs/gdal-3.8.0-r1
index 155c91a1ecf0..6ff284b178c9 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.8.0-r1
+++ b/metadata/md5-cache/sci-libs/gdal-3.8.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target
 RESTRICT=!test? ( test )
 SLOT=0/34
 SRC_URI=https://download.osgeo.org/gdal/3.8.0/gdal-3.8.0.tar.xz test? ( https://download.osgeo.org/gdal/3.8.0/gdalautotest-3.8.0.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7c650ad47471a363c884cf5afc0d8e4a
diff --git a/metadata/md5-cache/sci-libs/gdal-3.8.5 b/metadata/md5-cache/sci-libs/gdal-3.8.5
index 5a1cc0d32873..c1d58cd9eeb8 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.8.5
+++ b/metadata/md5-cache/sci-libs/gdal-3.8.5
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target
 RESTRICT=!test? ( test )
 SLOT=0/34
 SRC_URI=https://download.osgeo.org/gdal/3.8.5/gdal-3.8.5.tar.xz test? ( https://download.osgeo.org/gdal/3.8.5/gdalautotest-3.8.5.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1df7174638637f76b7b7bd957d157dd4
diff --git a/metadata/md5-cache/sci-libs/gdal-3.9.0 b/metadata/md5-cache/sci-libs/gdal-3.9.0
index 88271ada4055..b8f10f44f8e4 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.9.0
+++ b/metadata/md5-cache/sci-libs/gdal-3.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target
 RESTRICT=!test? ( test )
 SLOT=0/34
 SRC_URI=https://download.osgeo.org/gdal/3.9.0/gdal-3.9.0.tar.xz test? ( https://download.osgeo.org/gdal/3.9.0/gdalautotest-3.9.0.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fa8e4f90ae1cd4f9b3cb0260b5510583
diff --git a/metadata/md5-cache/sci-libs/hipBLAS-5.7.1 b/metadata/md5-cache/sci-libs/hipBLAS-5.7.1
index 051fb7e75490..13bc7d73cc42 100644
--- a/metadata/md5-cache/sci-libs/hipBLAS-5.7.1
+++ b/metadata/md5-cache/sci-libs/hipBLAS-5.7.1
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx
 SLOT=0/5.7
 SRC_URI=https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-5.7.1.tar.gz -> hipBLAS-5.7.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8684902f9a5326f8395e8c0279c898f9
+_md5_=6efc97402875993cf9aea320101cbf47
diff --git a/metadata/md5-cache/sci-libs/hipBLAS-6.1.1 b/metadata/md5-cache/sci-libs/hipBLAS-6.1.1
new file mode 100644
index 000000000000..dd5b239899d1
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hipBLAS-6.1.1
@@ -0,0 +1,16 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip sci-libs/rocBLAS:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] sci-libs/rocSOLVER:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?]
+DESCRIPTION=ROCm BLAS marshalling library
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/hipBLAS
+INHERIT=cmake rocm
+IUSE=+amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip sci-libs/rocBLAS:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] sci-libs/rocSOLVER:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?]
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/hipBLAS/archive/rocm-6.1.1.tar.gz -> hipBLAS-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2a7f534e06edd45060abce464e1e1e6c
diff --git a/metadata/md5-cache/sci-libs/hipBLASLt-6.1.1 b/metadata/md5-cache/sci-libs/hipBLASLt-6.1.1
new file mode 100644
index 000000000000..5ed5ba511bdf
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hipBLASLt-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-build/rocm-cmake || ( ( dev-lang/python:3.13 dev-python/msgpack[python_targets_python3_13(-)] dev-python/pyyaml[python_targets_python3_13(-)] dev-python/joblib[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/msgpack[python_targets_python3_12(-)] dev-python/pyyaml[python_targets_python3_12(-)] dev-python/joblib[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/msgpack[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/joblib[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/msgpack[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/joblib[python_targets_python3_10(-)] ) ) llvm_slot_18? ( sys-devel/clang:18 ) test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-util/hip dev-cpp/msgpack-cxx sci-libs/hipBLAS:0/6.1
+DESCRIPTION=General matrix-matrix operations library for AMD Instinct accelerators
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/hipBLASLt
+INHERIT=cmake python-any-r1 llvm-r1 prefix rocm
+IUSE=+amdgpu_targets_gfx90a +amdgpu_targets_gfx940 +amdgpu_targets_gfx941 +amdgpu_targets_gfx942 test +llvm_slot_18
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip dev-cpp/msgpack-cxx sci-libs/hipBLAS:0/6.1
+REQUIRED_USE=^^ ( llvm_slot_18 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/hipBLASLt/archive/rocm-6.1.1.tar.gz -> hipBLASLt-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=37d8aef2da4ad36dbcab4507618890f3
diff --git a/metadata/md5-cache/sci-libs/hipCUB-6.1.1 b/metadata/md5-cache/sci-libs/hipCUB-6.1.1
new file mode 100644
index 000000000000..849c413093f4
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hipCUB-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip sci-libs/rocPRIM:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] benchmark? ( dev-cpp/benchmark ) test? ( dev-cpp/gtest )
+DESCRIPTION=Wrapper of rocPRIM or CUB for GPU parallel primitives
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/hipCUB
+INHERIT=cmake rocm
+IUSE=benchmark test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-util/hip sci-libs/rocPRIM:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] benchmark? ( dev-cpp/benchmark ) test? ( dev-cpp/gtest )
+REQUIRED_USE=benchmark? ( || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 ) ) test? ( || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 ) )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/hipCUB/archive/rocm-6.1.1.tar.gz -> hipCUB-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=de3d6c6f90d7e1a900c708a8e4dc8adb
diff --git a/metadata/md5-cache/sci-libs/hipFFT-6.1.1 b/metadata/md5-cache/sci-libs/hipFFT-6.1.1
new file mode 100644
index 000000000000..d38135b37ec3
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hipFFT-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip sci-libs/rocFFT:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?]
+DESCRIPTION=CU / ROCM agnostic hip FFT implementation
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/hipFFT
+INHERIT=cmake rocm
+IUSE=+amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip sci-libs/rocFFT:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?]
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=test
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/hipFFT/archive/refs/tags/rocm-6.1.1.tar.gz -> hipFFT-rocm-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=cc6010039f4d16919be224f31e4d6b41
diff --git a/metadata/md5-cache/sci-libs/hipRAND-5.6.0-r1 b/metadata/md5-cache/sci-libs/hipRAND-5.6.0-r1
index 014d9d5534ab..3d4cc884bb3e 100644
--- a/metadata/md5-cache/sci-libs/hipRAND-5.6.0-r1
+++ b/metadata/md5-cache/sci-libs/hipRAND-5.6.0-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/5.6
 SRC_URI=https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-5.6.0.tar.gz -> hipRAND-rocm-5.6.0.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8d12151c1031b55cb1974f567947a0d9
+_md5_=61653e3b1c84922df419344461dce780
diff --git a/metadata/md5-cache/sci-libs/hipRAND-5.7.1 b/metadata/md5-cache/sci-libs/hipRAND-5.7.1
index ebf26b636c0d..671b1294d507 100644
--- a/metadata/md5-cache/sci-libs/hipRAND-5.7.1
+++ b/metadata/md5-cache/sci-libs/hipRAND-5.7.1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/5.7
 SRC_URI=https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-5.7.1.tar.gz -> hipRAND-rocm-5.7.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8d12151c1031b55cb1974f567947a0d9
+_md5_=61653e3b1c84922df419344461dce780
diff --git a/metadata/md5-cache/sci-libs/hipRAND-6.1.1 b/metadata/md5-cache/sci-libs/hipRAND-6.1.1
new file mode 100644
index 000000000000..47e46f3cebae
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hipRAND-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip sci-libs/rocRAND:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?]
+DESCRIPTION=CU / ROCM agnostic hip RAND implementation
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/hipRAND
+INHERIT=cmake rocm
+IUSE=+amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip sci-libs/rocRAND:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?]
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=test
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/hipRAND/archive/refs/tags/rocm-6.1.1.tar.gz -> hipRAND-rocm-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=3d304efa3a08868427a7c7db0a8c5ce9
diff --git a/metadata/md5-cache/sci-libs/hipSOLVER-6.1.1 b/metadata/md5-cache/sci-libs/hipSOLVER-6.1.1
new file mode 100644
index 000000000000..d07bc8133aef
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hipSOLVER-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip sci-libs/rocSOLVER:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] sparse? ( sci-libs/suitesparseconfig sci-libs/cholmod )
+DESCRIPTION=CU / ROCM agnostic marshalling library for LAPACK routines on the GPU
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/hipSOLVER
+INHERIT=cmake rocm
+IUSE=sparse +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip sci-libs/rocSOLVER:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] sparse? ( sci-libs/suitesparseconfig sci-libs/cholmod )
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=test
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/hipSOLVER/archive/refs/tags/rocm-6.1.1.tar.gz -> hipSOLVER-rocm-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ef616b7db20d3290a1b75662b9d29224
diff --git a/metadata/md5-cache/sci-libs/hipSPARSE-6.1.1 b/metadata/md5-cache/sci-libs/hipSPARSE-6.1.1
new file mode 100644
index 000000000000..6970818c3c92
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hipSPARSE-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-build/rocm-cmake >=dev-build/cmake-3.22 test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/rocminfo dev-util/hip sci-libs/rocSPARSE:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?]
+DESCRIPTION=ROCm SPARSE marshalling library
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/hipSPARSE
+INHERIT=cmake edo rocm toolchain-funcs
+IUSE=test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/rocminfo dev-util/hip sci-libs/rocSPARSE:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?]
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-6.1.1.tar.gz -> hipSPARSE-6.1.tar.gz test? ( https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=75ccba0a049dcb6bf673178b804bdbc1
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3 b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
index b7ab8e761e70..4886ee129074 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_10 python_t
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.2.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b95774cc727bac4db32413f29b0be746
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r4 b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r4
index bc60a6481247..261fc147847a 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r4
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_10 python_t
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.2.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2907b89f39d41fb0f055e131ed15dd7b
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r5 b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r5
index 869bcda8ad99..123cb980e10c 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r5
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r5
@@ -13,5 +13,5 @@ REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_10 python_t
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.2.tar.gz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5431b48708e45248830025f6e5200f8b
diff --git a/metadata/md5-cache/sci-libs/libsigrok-9999 b/metadata/md5-cache/sci-libs/libsigrok-9999
index 034b08855cf2..982118285562 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-9999
+++ b/metadata/md5-cache/sci-libs/libsigrok-9999
@@ -12,5 +12,5 @@ RDEPEND=java? ( >=virtual/jre-1.8:* ) !static-libs? ( >=dev-libs/glib-2.32.0 >=d
 REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 ) )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2cff2d301401ffb7ddc5d1fc967a0549
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.25-r1 b/metadata/md5-cache/sci-libs/libsvm-3.25-r1
index 11b0cd14fc71..13b36eae6443 100644
--- a/metadata/md5-cache/sci-libs/libsvm-3.25-r1
+++ b/metadata/md5-cache/sci-libs/libsvm-3.25-r1
@@ -11,5 +11,5 @@ RDEPEND=java? ( >=virtual/jre-1.8:* ) python? ( python_targets_python3_10? ( dev
 REQUIRED_USE=python? ( || ( python_targets_python3_10 ) )
 SLOT=0/2
 SRC_URI=https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.25.tar.gz
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=9eb6a7f984460e6f5773d330b3981b81
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.30 b/metadata/md5-cache/sci-libs/libsvm-3.30
index aa621d9eb36f..7c2380e33199 100644
--- a/metadata/md5-cache/sci-libs/libsvm-3.30
+++ b/metadata/md5-cache/sci-libs/libsvm-3.30
@@ -11,5 +11,5 @@ RDEPEND=java? ( >=virtual/jre-1.8:* ) python? ( python_targets_python3_10? ( dev
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0/2
 SRC_URI=https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.3.tar.gz
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=d2692abd5227cb76d6492429532da10d
diff --git a/metadata/md5-cache/sci-libs/miopen-5.1.3-r1 b/metadata/md5-cache/sci-libs/miopen-5.1.3-r1
index 1ed71d943635..160737d6df30 100644
--- a/metadata/md5-cache/sci-libs/miopen-5.1.3-r1
+++ b/metadata/md5-cache/sci-libs/miopen-5.1.3-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-5.1.3.tar.gz -> MIOpen-5.1.3.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3d43336a145b0fccc1438fda6923d629
+_md5_=ae884fb66a5d476503ee4fe43390e9fe
diff --git a/metadata/md5-cache/sci-libs/miopen-5.7.1-r1 b/metadata/md5-cache/sci-libs/miopen-5.7.1-r1
index 0beec3e1c1c1..34a933d8e3ce 100644
--- a/metadata/md5-cache/sci-libs/miopen-5.7.1-r1
+++ b/metadata/md5-cache/sci-libs/miopen-5.7.1-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.7
 SRC_URI=https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-5.7.1.tar.gz -> MIOpen-5.7.1.tar.gz test? ( https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.tar.gz -> gtest-1.11.0_p20210611.tar.gz )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c849a8cff8839efd752de3dba411c5ee
+_md5_=71d5af170c516041459920cb924cc876
diff --git a/metadata/md5-cache/sci-libs/miopen-6.1.1 b/metadata/md5-cache/sci-libs/miopen-6.1.1
new file mode 100644
index 000000000000..56277c24dfdd
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/miopen-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-libs/half-1.12.0-r1 dev-build/rocm-cmake test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-util/hip >=dev-db/sqlite-3.17 sci-libs/rocBLAS:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] sci-libs/composable-kernel:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] dev-util/roctracer:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=dev-libs/boost-1.72 dev-cpp/nlohmann_json dev-cpp/frugally-deep
+DESCRIPTION=AMD's Machine Intelligence Library
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/MIOpen
+INHERIT=cmake flag-o-matic llvm-r1 rocm
+IUSE=debug test +llvm_slot_18 +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip >=dev-db/sqlite-3.17 sci-libs/rocBLAS:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] sci-libs/composable-kernel:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] dev-util/roctracer:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] >=dev-libs/boost-1.72 dev-cpp/nlohmann_json dev-cpp/frugally-deep
+REQUIRED_USE=^^ ( llvm_slot_18 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/MIOpen/archive/rocm-6.1.1.tar.gz -> MIOpen-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a0c0891fef9a7ee39a7aa632032d0239
diff --git a/metadata/md5-cache/sci-libs/plplot-5.15.0_p6-r1 b/metadata/md5-cache/sci-libs/plplot-5.15.0_p6-r1
index 58892608e8bc..36a5dbdb5002 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.15.0_p6-r1
+++ b/metadata/md5-cache/sci-libs/plplot-5.15.0_p6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test ) octave? ( test ) !test? ( test )
 SLOT=0/14
 SRC_URI=https://downloads.sourceforge.net/plplot/plplot-5.15.0.tar.gz mirror://debian/pool/main/p/plplot/plplot_5.15.0+dfsg2-6.debian.tar.xz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c4275c11267c9f50571761ff6966ce93
diff --git a/metadata/md5-cache/sci-libs/rocBLAS-6.1.1 b/metadata/md5-cache/sci-libs/rocBLAS-6.1.1
new file mode 100644
index 000000000000..a5dec0f08430
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocBLAS-6.1.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-build/rocm-cmake-5.3 video_cards_amdgpu? ( dev-util/Tensile:0/6.1 ) test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5 doc? ( app-text/doxygen media-gfx/graphviz )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-cpp/msgpack-cxx-6.0.0 =dev-util/hip-6* test? ( virtual/blas dev-cpp/gtest sys-libs/libomp ) benchmark? ( virtual/blas sys-libs/libomp )
+DESCRIPTION=AMD's library for BLAS on ROCm
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocBLAS
+INHERIT=cmake docs edo multiprocessing rocm
+IUSE=benchmark test video_cards_amdgpu doc +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=BSD
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-6.1.1.tar.gz -> rocm-rocBLAS-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	docs	7f3c0d47338743498c69f1887a139f57	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c718756397b35cba3ec2da5ae501e19e
diff --git a/metadata/md5-cache/sci-libs/rocFFT-6.1.1 b/metadata/md5-cache/sci-libs/rocFFT-6.1.1
new file mode 100644
index 000000000000..9a174e5c3499
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocFFT-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-build/cmake-3.22 dev-build/rocm-cmake dev-db/sqlite app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND==dev-util/hip-6* python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) benchmark? ( dev-libs/boost sci-libs/hipRAND:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] ) test? ( dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 sys-libs/libomp sci-libs/hipRAND:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] )
+DESCRIPTION=Next generation FFT implementation for ROCm
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/rocFFT
+INHERIT=cmake check-reqs edo multiprocessing python-r1 rocm
+IUSE=benchmark perfscripts test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=perfscripts? ( >=media-gfx/asymptote-2.61 dev-texlive/texlive-latex dev-tex/latexmk sys-apps/texinfo dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=perfscripts? ( benchmark ) || ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/rocFFT/archive/rocm-6.1.1.tar.gz -> rocFFT-6.1.1.tar.gz
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	428f5c53276c2adc06a89108fc2f9f46	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6ab92c8bf82834ddf2ef7a80dc65f936
diff --git a/metadata/md5-cache/sci-libs/rocPRIM-6.1.1 b/metadata/md5-cache/sci-libs/rocPRIM-6.1.1
new file mode 100644
index 000000000000..85017168dc29
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocPRIM-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-build/rocm-cmake >=dev-build/cmake-3.22 app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip benchmark? ( dev-cpp/benchmark ) test? ( dev-cpp/gtest )
+DESCRIPTION=HIP parallel primitives for developing performant GPU-accelerated code on ROCm
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/rocPRIM
+INHERIT=cmake rocm
+IUSE=benchmark test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip benchmark? ( dev-cpp/benchmark ) test? ( dev-cpp/gtest )
+REQUIRED_USE=benchmark? ( || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 ) ) test? ( || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 ) )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/rocPRIM/archive/rocm-6.1.1.tar.gz -> rocPRIM-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=249ffc90f9c4163ef1c0085c85a0a547
diff --git a/metadata/md5-cache/sci-libs/rocRAND-6.1.1 b/metadata/md5-cache/sci-libs/rocRAND-6.1.1
new file mode 100644
index 000000000000..053a3104cec1
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocRAND-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-build/rocm-cmake >=dev-build/cmake-3.22 app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip dev-build/rocm-cmake benchmark? ( dev-cpp/benchmark ) test? ( dev-cpp/gtest )
+DESCRIPTION=Generate pseudo-random and quasi-random numbers
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/rocRAND
+INHERIT=cmake rocm
+IUSE=benchmark test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/rocRAND/archive/rocm-6.1.1.tar.gz -> rocRAND-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a5366f21937948aad26bb7db7e24f2e2
diff --git a/metadata/md5-cache/sci-libs/rocSOLVER-6.1.1 b/metadata/md5-cache/sci-libs/rocSOLVER-6.1.1
new file mode 100644
index 000000000000..f5dd1c054d91
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocSOLVER-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-cpp/gtest >=dev-build/cmake-3.22 virtual/blas ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip sci-libs/rocBLAS:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] sci-libs/rocSPARSE:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] dev-libs/libfmt benchmark? ( virtual/blas )
+DESCRIPTION=Implementation of a subset of LAPACK functionality on the ROCm platform
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/rocSOLVER
+INHERIT=cmake edo rocm
+IUSE=test benchmark +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-util/hip sci-libs/rocBLAS:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] sci-libs/rocSPARSE:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] dev-libs/libfmt benchmark? ( virtual/blas )
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/rocSOLVER/archive/rocm-6.1.1.tar.gz -> rocSOLVER-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=54263e6f669e851db46cffd2061647a8
diff --git a/metadata/md5-cache/sci-libs/rocSPARSE-6.1.1 b/metadata/md5-cache/sci-libs/rocSPARSE-6.1.1
new file mode 100644
index 000000000000..1b79cb31e3fe
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocSPARSE-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-cpp/gtest >=dev-build/cmake-3.22 || ( ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND==dev-util/hip-6* sci-libs/rocPRIM:0/6.1
+DESCRIPTION=Basic Linear Algebra Subroutines for sparse computation
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/rocSPARSE
+INHERIT=cmake edo python-any-r1 toolchain-funcs rocm
+IUSE=benchmark test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND==dev-util/hip-6* sci-libs/rocPRIM:0/6.1
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/rocSPARSE/archive/rocm-6.1.1.tar.gz -> rocSPARSE-6.1.1.tar.gz test? ( https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> rocSPARSE_mplate.tar.gz https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> rocSPARSE_qc2534.tar.gz https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> rocSPARSE_Chevron2.tar.gz https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> rocSPARSE_Chevron3.tar.gz https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> rocSPARSE_Chevron4.tar.gz )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=7d1e9e43b6615697ec68f540b12f2b7a
diff --git a/metadata/md5-cache/sci-libs/rocThrust-6.1.1 b/metadata/md5-cache/sci-libs/rocThrust-6.1.1
new file mode 100644
index 000000000000..ade842bf69e9
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocThrust-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-build/cmake-3.22 app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip sci-libs/rocPRIM:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] test? ( dev-cpp/gtest )
+DESCRIPTION=HIP back-end for the parallel algorithm library Thrust
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/rocThrust
+INHERIT=cmake rocm
+IUSE=benchmark test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-util/hip sci-libs/rocPRIM:0/6.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] test? ( dev-cpp/gtest )
+REQUIRED_USE=benchmark? ( || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 ) ) test? ( || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 ) )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/rocThrust/archive/rocm-6.1.1.tar.gz -> rocThrust-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=29c938002caae73fe7925bdf9d48b876
diff --git a/metadata/md5-cache/sci-libs/rocWMMA-6.1.1 b/metadata/md5-cache/sci-libs/rocWMMA-6.1.1
new file mode 100644
index 000000000000..1475d6021a2e
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocWMMA-6.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-cpp/gtest sci-libs/rocBLAS:0/6.1[amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx940(-)?,amdgpu_targets_gfx941(-)?,amdgpu_targets_gfx942(-)?,amdgpu_targets_gfx1100(-)?,amdgpu_targets_gfx1101(-)?,amdgpu_targets_gfx1102(-)?] ) dev-build/rocm-cmake app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-util/hip-6*
+DESCRIPTION=library for accelerating mixed precision matrix multiply-accumulate operations
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/rocWMMA
+INHERIT=cmake rocm flag-o-matic
+IUSE=+amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx940 +amdgpu_targets_gfx941 +amdgpu_targets_gfx942 +amdgpu_targets_gfx1100 +amdgpu_targets_gfx1101 +amdgpu_targets_gfx1102 test
+KEYWORDS=~amd64
+LICENSE=MIT
+REQUIRED_USE=|| ( amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx942 amdgpu_targets_gfx1100 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/rocWMMA/archive/rocm-6.1.1.tar.gz -> rocWMMA-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c50e08436cd3661b660a740d24ea3622
diff --git a/metadata/md5-cache/sci-libs/rpp-6.1.1 b/metadata/md5-cache/sci-libs/rpp-6.1.1
new file mode 100644
index 000000000000..06b2b87c4e60
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rpp-6.1.1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-build/cmake-3.22 >=dev-libs/half-1.12.0-r1 test? ( dev-cpp/gtest ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip:0/6.1
+DESCRIPTION=AMD ROCm Performance Primitives (RPP) high-performance computer vision library
+EAPI=8
+HOMEPAGE=https://github.com/ROCm/rpp
+INHERIT=cmake flag-o-matic rocm
+IUSE=cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_f16c test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx942 +amdgpu_targets_gfx1030 +amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-util/hip:0/6.1
+REQUIRED_USE=cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_f16c || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx942 amdgpu_targets_gfx1030 amdgpu_targets_gfx1100 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx940 amdgpu_targets_gfx941 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 )
+RESTRICT=!test? ( test )
+SLOT=0/6.1
+SRC_URI=https://github.com/ROCm/rpp/archive/refs/tags/rocm-6.1.1.tar.gz -> rpp-6.1.1.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	rocm	c4a9a8e37c0ead379f7ddb4ddee80485	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8bf386ddb5008daad894e1005612a8d8
diff --git a/metadata/md5-cache/sci-libs/vtk-9.2.5 b/metadata/md5-cache/sci-libs/vtk-9.2.5
index 0900cdd71ad4..1de01c187db0 100644
--- a/metadata/md5-cache/sci-libs/vtk-9.2.5
+++ b/metadata/md5-cache/sci-libs/vtk-9.2.5
@@ -13,5 +13,5 @@ REQUIRED_USE=all-modules? ( boost ffmpeg freetype gdal imaging las mysql odbc op
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/9.2
 SRC_URI=https://www.vtk.org/files/release/9.2/VTK-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKData-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKDataFiles-9.2.5.tar.gz doc? ( https://www.vtk.org/files/release/9.2/vtkDocHtml-9.2.5.tar.gz ) examples? ( https://www.vtk.org/files/release/9.2/VTKLargeData-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKLargeDataFiles-9.2.5.tar.gz ) test? ( https://www.vtk.org/files/release/9.2/VTKLargeData-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKLargeDataFiles-9.2.5.tar.gz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	webapp	de2d3d345b44597c10d7104a7bcdf7b2	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	webapp	de2d3d345b44597c10d7104a7bcdf7b2	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=736670ac8dd493adbc4b0bf75b5e59fd
diff --git a/metadata/md5-cache/sci-libs/vtk-9.2.6-r1 b/metadata/md5-cache/sci-libs/vtk-9.2.6-r1
index f10d67e4d2df..2275e5ca112b 100644
--- a/metadata/md5-cache/sci-libs/vtk-9.2.6-r1
+++ b/metadata/md5-cache/sci-libs/vtk-9.2.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=all-modules? ( boost ffmpeg freetype gdal imaging las mysql odbc op
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/9.2
 SRC_URI=https://www.vtk.org/files/release/9.2/VTK-9.2.6.tar.gz https://www.vtk.org/files/release/9.2/VTKData-9.2.6.tar.gz https://www.vtk.org/files/release/9.2/VTKDataFiles-9.2.6.tar.gz doc? ( https://www.vtk.org/files/release/9.2/vtkDocHtml-9.2.6.tar.gz ) examples? ( https://www.vtk.org/files/release/9.2/VTKLargeData-9.2.6.tar.gz https://www.vtk.org/files/release/9.2/VTKLargeDataFiles-9.2.6.tar.gz ) test? ( https://www.vtk.org/files/release/9.2/VTKLargeData-9.2.6.tar.gz https://www.vtk.org/files/release/9.2/VTKLargeDataFiles-9.2.6.tar.gz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	webapp	de2d3d345b44597c10d7104a7bcdf7b2	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	webapp	de2d3d345b44597c10d7104a7bcdf7b2	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=90f3790507b11ae956fbef466cc77cca
diff --git a/metadata/md5-cache/sci-libs/vtk-9.3.0 b/metadata/md5-cache/sci-libs/vtk-9.3.0
index 307e414714a5..8f59752caaf2 100644
--- a/metadata/md5-cache/sci-libs/vtk-9.3.0
+++ b/metadata/md5-cache/sci-libs/vtk-9.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=all-modules? ( boost ffmpeg freetype gdal imaging las mysql odbc op
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/9.3
 SRC_URI=https://www.vtk.org/files/release/9.3/VTK-9.3.0.tar.gz https://www.vtk.org/files/release/9.3/VTKData-9.3.0.tar.gz https://www.vtk.org/files/release/9.3/VTKDataFiles-9.3.0.tar.gz doc? ( https://www.vtk.org/files/release/9.3/vtkDocHtml-9.3.0.tar.gz ) examples? ( https://www.vtk.org/files/release/9.3/VTKLargeData-9.3.0.tar.gz https://www.vtk.org/files/release/9.3/VTKLargeDataFiles-9.3.0.tar.gz ) test? ( https://www.vtk.org/files/release/9.3/VTKLargeData-9.3.0.tar.gz https://www.vtk.org/files/release/9.3/VTKLargeDataFiles-9.3.0.tar.gz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	webapp	de2d3d345b44597c10d7104a7bcdf7b2	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	webapp	de2d3d345b44597c10d7104a7bcdf7b2	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=aca0e52fb3110e067f440d31e680c00a
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index beb1f600a5fe..400260782caa 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.9.0 b/metadata/md5-cache/sci-mathematics/flint-3.1.3_p1
index c4fff0df72d6..7a9c1f94d8ed 100644
--- a/metadata/md5-cache/sci-mathematics/flint-2.9.0
+++ b/metadata/md5-cache/sci-mathematics/flint-3.1.3_p1
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( dev-python/sphinx app-text/texlive-core dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-tex/latexmk ) || ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-build/make >=dev-build/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) doc? ( app-text/texlive-core dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas
 DESCRIPTION=Fast Library for Number Theory
 EAPI=8
-HOMEPAGE=http://www.flintlib.org/
-INHERIT=cmake python-any-r1
+HOMEPAGE=https://www.flintlib.org/
+INHERIT=cmake flag-o-matic python-any-r1
 IUSE=doc ntl test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas
+RDEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas !sci-mathematics/arb
 RESTRICT=!test? ( test )
-SLOT=0/17
-SRC_URI=https://github.com/wbhart/flint2/archive/refs/tags/v2.9.0.tar.gz -> flint-2.9.0.tar.gz
+SLOT=0/19
+SRC_URI=https://github.com/flintlib/flint/archive/refs/tags/v3.1.3-p1.tar.gz -> flint-3.1.3_p1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7527637a59c85939e1869e7ded2ef597
+_md5_=dcbb193ab8a12e4705822039c7c2be5c
diff --git a/metadata/md5-cache/sci-mathematics/octave-8.3.0-r2 b/metadata/md5-cache/sci-mathematics/octave-8.3.0-r2
index b9599ca6e6a6..e29d8d42e6c1 100644
--- a/metadata/md5-cache/sci-mathematics/octave-8.3.0-r2
+++ b/metadata/md5-cache/sci-mathematics/octave-8.3.0-r2
@@ -13,5 +13,5 @@ RDEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip app-text/ghostscript-gpl sys-
 REQUIRED_USE=fltk? ( opengl X ) gui? ( X ) opengl? ( || ( fltk gui ) )
 SLOT=0/8.3.0
 SRC_URI=mirror://gnu/octave/octave-8.3.0.tar.xz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=79c787649f4b46121482f8c48ea22287
diff --git a/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018 b/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
index 8fe8e14a2454..68f0852d2b4b 100644
--- a/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
+++ b/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/ultimate-pa/smtinterpol/archive/32d7fa8751f668f9e9a18e4e96df3337b53d2150.tar.gz -> smtinterpol-2.5_p20211018.tar.gz
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=3ecc5cfa262ba9fd5ffbd0f2587dbb92
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.13.0 b/metadata/md5-cache/sci-mathematics/z3-4.13.0
index 0a2ec2e14809..d28ac25613e2 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.13.0
+++ b/metadata/md5-cache/sci-mathematics/z3-4.13.0
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0/4.13
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.13.0.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8defa18bb809097d427afa104a7e8d0c
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index ed5d1878e271..f93005b80c7b 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/netlogo-bin-6.2.0 b/metadata/md5-cache/sci-misc/netlogo-bin-6.2.0
index 613c598149af..c6ea56b4964a 100644
--- a/metadata/md5-cache/sci-misc/netlogo-bin-6.2.0
+++ b/metadata/md5-cache/sci-misc/netlogo-bin-6.2.0
@@ -9,5 +9,5 @@ LICENSE=netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* media-libs/mesa sys-libs/glibc x11-libs/libdrm x11-libs/libX11 x11-libs/libXrender x11-libs/libXxf86vm >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://netlogoweb.org/assets/images/desktopicon.png -> netlogo.png amd64? ( https://ccl.northwestern.edu/netlogo/6.2.0/NetLogo-6.2.0-64.tgz ) x86? ( https://ccl.northwestern.edu/netlogo/6.2.0/NetLogo-6.2.0-32.tgz )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c7a95f8a6bbaf88e4354dab7ace9a496
diff --git a/metadata/md5-cache/sci-misc/netlogo-bin-6.2.2 b/metadata/md5-cache/sci-misc/netlogo-bin-6.2.2
index 6555dd1e3cfb..4c55b39b7608 100644
--- a/metadata/md5-cache/sci-misc/netlogo-bin-6.2.2
+++ b/metadata/md5-cache/sci-misc/netlogo-bin-6.2.2
@@ -10,5 +10,5 @@ LICENSE=netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* media-libs/mesa sys-libs/glibc x11-libs/libdrm x11-libs/libX11 x11-libs/libXrender x11-libs/libXxf86vm >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://netlogoweb.org/assets/images/desktopicon.png -> netlogo.png amd64? ( https://ccl.northwestern.edu/netlogo/6.2.2/NetLogo-6.2.2-64.tgz ) x86? ( https://ccl.northwestern.edu/netlogo/6.2.2/NetLogo-6.2.2-32.tgz )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d6cc0fa290f62fee322f0fad43a81175
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index c587d3abbcf6..0533933e8173 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/thepeg-2.2.2-r1 b/metadata/md5-cache/sci-physics/thepeg-2.2.2-r1
index fc22e9860244..619f4960a7b3 100644
--- a/metadata/md5-cache/sci-physics/thepeg-2.2.2-r1
+++ b/metadata/md5-cache/sci-physics/thepeg-2.2.2-r1
@@ -12,5 +12,5 @@ RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-phy
 RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://www.hepforge.org/archive/thepeg/ThePEG-2.2.2.tar.bz2 test? ( hepmc? ( https://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf https://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid https://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid https://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=5d0c4c65411d47b09cd234a79dacebf7
diff --git a/metadata/md5-cache/sci-physics/thepeg-2.2.3-r1 b/metadata/md5-cache/sci-physics/thepeg-2.2.3-r1
index 37ebc3cd38bb..32d2bf9e59b4 100644
--- a/metadata/md5-cache/sci-physics/thepeg-2.2.3-r1
+++ b/metadata/md5-cache/sci-physics/thepeg-2.2.3-r1
@@ -12,5 +12,5 @@ RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-phy
 RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=https://www.hepforge.org/archive/thepeg/ThePEG-2.2.3.tar.bz2 test? ( hepmc3? ( https://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf https://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid https://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid https://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=adb4334df629c9ef4363cb66143438aa
diff --git a/metadata/md5-cache/sci-physics/thepeg-2.3.0 b/metadata/md5-cache/sci-physics/thepeg-2.3.0
index fa51f7e88080..8eca7b552067 100644
--- a/metadata/md5-cache/sci-physics/thepeg-2.3.0
+++ b/metadata/md5-cache/sci-physics/thepeg-2.3.0
@@ -12,5 +12,5 @@ RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-phy
 RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=https://www.hepforge.org/archive/thepeg/ThePEG-2.3.0.tar.bz2 test? ( hepmc3? ( https://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf https://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid https://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid https://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	elisp-common	abb2dda42f680fce87602c8273f832c7	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=d890194081a118a14b9010114ddb9050
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 54ef6fdacd0f..262ab739d2bf 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1-r2 b/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1-r2
index 1dca293b94f3..f39bbf5f6806 100644
--- a/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1-r2
+++ b/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://gcalc.net/files/GCalc-3.1-rc1.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	742531b28b0ce82ba9425bd2c28654f9	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=c7e5cc39217c49f76afad5deb4f69733
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 64e2e9d1202d..496b5d0b2425 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/openrc-0.54 b/metadata/md5-cache/sys-apps/openrc-0.54.1
index a7f5a74b98c4..bc34c75b8aa2 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.54
+++ b/metadata/md5-cache/sys-apps/openrc-0.54.1
@@ -11,6 +11,6 @@ LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=pam? ( sys-libs/pam ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) sys-process/psmisc selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) bash? ( app-shells/bash ) sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sysvinit? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) s6? ( sys-apps/s6-linux-init[sysv-utils(-)] ) ) virtual/tmpfiles selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
 SLOT=0
-SRC_URI=https://github.com/OpenRC/openrc/archive/0.54.tar.gz -> openrc-0.54.tar.gz
+SRC_URI=https://github.com/OpenRC/openrc/archive/0.54.1.tar.gz -> openrc-0.54.1.tar.gz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=4e90532dd761d261aa2c825ecbe2c8b3
+_md5_=225c985e960c52905884b7427f4b3f28
diff --git a/metadata/md5-cache/sys-apps/openrc-9999 b/metadata/md5-cache/sys-apps/openrc-9999
index 00177fc60f91..610bf68e27b5 100644
--- a/metadata/md5-cache/sys-apps/openrc-9999
+++ b/metadata/md5-cache/sys-apps/openrc-9999
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=pam? ( sys-libs/pam ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) sys-process/psmisc selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) bash? ( app-shells/bash ) sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sysvinit? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) s6? ( sys-apps/s6-linux-init[sysv-utils(-)] ) ) virtual/tmpfiles selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
 SLOT=0
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=540993a7f07f7e2c62fdee7e3cf2d489
+_md5_=70ce342a9304f87f2256c58751777ecf
diff --git a/metadata/md5-cache/sys-apps/smcipmitool-2.27.2.230221 b/metadata/md5-cache/sys-apps/smcipmitool-2.27.2.230221
index d1e75f2ba5db..23de07a37fb8 100644
--- a/metadata/md5-cache/sys-apps/smcipmitool-2.27.2.230221
+++ b/metadata/md5-cache/sys-apps/smcipmitool-2.27.2.230221
@@ -10,5 +10,5 @@ RDEPEND=net-misc/stunnel sys-libs/ncurses-compat:5 virtual/jre:1.8 >=dev-java/ja
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://www.supermicro.com/Bios/sw_download/549/SMCIPMITool_2.27.2_build.230221_bundleJRE_Linux_x64.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=71e4c89c2df74ec302ba110a2a7af5e1
diff --git a/metadata/md5-cache/sys-apps/systemd-254.10 b/metadata/md5-cache/sys-apps/systemd-254.10
index b3f360871c8f..5738a370a4d1 100644
--- a/metadata/md5-cache/sys-apps/systemd-254.10
+++ b/metadata/md5-cache/sys-apps/systemd-254.10
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://systemd.io/
 INHERIT=bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1 secureboot systemd toolchain-funcs udev usr-ldscript
 IUSE=acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +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 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 secureboot split-usr
-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=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.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(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 ukify? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/pefile[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pefile[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pefile[python_targets_python3_12(-)] ) ) selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v254.10/systemd-stable-254.10.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	meson	99466844dd8d4fcfb07578a76f5a9922	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	secureboot	4911adb593665638c76fbd4e70d451ac	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
-_md5_=7af1334ef21069f6d07f7e99d756076f
+_md5_=3e271da12be6e5e0fe306e1ec38f6bfe
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 93e2c734ed0f..5b9dba6cb047 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/microsoft-identity-broker-2.0.0 b/metadata/md5-cache/sys-auth/microsoft-identity-broker-2.0.0
index 5829f5d1fd7a..7a7ade11e1df 100644
--- a/metadata/md5-cache/sys-auth/microsoft-identity-broker-2.0.0
+++ b/metadata/md5-cache/sys-auth/microsoft-identity-broker-2.0.0
@@ -11,5 +11,5 @@ RDEPEND=acct-user/microsoft-identity-broker acct-group/microsoft-identity-broker
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/microsoft-identity-broker/microsoft-identity-broker_2.0.0_amd64.deb
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
 _md5_=ec27804bb10cdc73589dd45f353adc29
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 7eaa3337038b..38fa85c14c47 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1 b/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
index 9a944cd31b4f..089831dfa282 100644
--- a/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
+++ b/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=charm
 RDEPEND=>=virtual/jre-1.6 sys-cluster/charm[charmdebug,-smp] >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://charm.cs.illinois.edu/distrib/binaries/charmdebug/charmdebug_6.2.0.tar.gz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=cf00bdd6e49647ab81a30dbbc58904e4
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.28.6 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.28.6
deleted file mode 100644
index 8393cbbec95f..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.28.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.6.tar.gz -> kubernetes-1.28.6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=af0773aefba11d4e1ea26ab233175398
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.29.1 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.29.1
deleted file mode 100644
index f069e61df694..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.29.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module systemd
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.29.1.tar.gz -> kubernetes-1.29.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=af0773aefba11d4e1ea26ab233175398
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.28.6 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.28.6
deleted file mode 100644
index 9e123c609941..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.28.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.6.tar.gz -> kubernetes-1.28.6.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a2c37259fa3925d096e628da3ecd9b40
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.29.1 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.29.1
deleted file mode 100644
index 93362a474b96..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.29.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.29.1.tar.gz -> kubernetes-1.29.1.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a2c37259fa3925d096e628da3ecd9b40
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.28.6 b/metadata/md5-cache/sys-cluster/kube-proxy-1.28.6
deleted file mode 100644
index 837389a4b13c..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.28.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=8
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.6.tar.gz -> kubernetes-1.28.6.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fd07922233c025c233a95d91c0686952
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.29.1 b/metadata/md5-cache/sys-cluster/kube-proxy-1.29.1
deleted file mode 100644
index 0c1267f71d9e..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.29.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Proxy service
-EAPI=8
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.29.1.tar.gz -> kubernetes-1.29.1.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fd07922233c025c233a95d91c0686952
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.28.6 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.28.6
deleted file mode 100644
index e5ba20a691bd..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.28.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.6.tar.gz -> kubernetes-1.28.6.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b31aa8f79a102e08fb92074046be0007
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.29.1 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.29.1
deleted file mode 100644
index cf4023668d7c..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.29.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-DESCRIPTION=Kubernetes Scheduler
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.29.1.tar.gz -> kubernetes-1.29.1.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b31aa8f79a102e08fb92074046be0007
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.28.6 b/metadata/md5-cache/sys-cluster/kubeadm-1.28.6
deleted file mode 100644
index 69017f6020c3..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.28.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened selinux
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=app-containers/cri-tools selinux? ( sec-policy/selinux-kubernetes )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.6.tar.gz -> kubernetes-1.28.6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=924d1f7c5303aa14788cb1c38e416f33
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.29.1 b/metadata/md5-cache/sys-cluster/kubeadm-1.29.1
deleted file mode 100644
index 6f30567cb827..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.29.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened selinux
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=app-containers/cri-tools selinux? ( sec-policy/selinux-kubernetes )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.29.1.tar.gz -> kubernetes-1.29.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=924d1f7c5303aa14788cb1c38e416f33
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.28.6 b/metadata/md5-cache/sys-cluster/kubectl-1.28.6
deleted file mode 100644
index 40b5fb3f0137..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.28.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.6.tar.gz -> kubernetes-1.28.6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1ca87b7b99bf121ef9af1b285230afc2
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.29.1 b/metadata/md5-cache/sys-cluster/kubectl-1.29.1
deleted file mode 100644
index 0fca2ef33c08..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.29.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=bash-completion-r1 go-module
-IUSE=hardened
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.29.1.tar.gz -> kubernetes-1.29.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1ca87b7b99bf121ef9af1b285230afc2
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.28.6 b/metadata/md5-cache/sys-cluster/kubelet-1.28.6
deleted file mode 100644
index f04c990e69ad..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.28.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened selinux
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=selinux? ( sec-policy/selinux-kubernetes )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.6.tar.gz -> kubernetes-1.28.6.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9118112b036cebc01a82c7cc38deff06
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.29.1 b/metadata/md5-cache/sys-cluster/kubelet-1.29.1
deleted file mode 100644
index ca18d1339127..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.29.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20 >=dev-lang/go-1.20:= app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Kubernetes Node Agent
-EAPI=8
-HOMEPAGE=https://kubernetes.io
-INHERIT=go-module systemd
-IUSE=hardened selinux
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=selinux? ( sec-policy/selinux-kubernetes )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.29.1.tar.gz -> kubernetes-1.29.1.tar.gz
-_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9118112b036cebc01a82c7cc38deff06
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.1.4-r1 b/metadata/md5-cache/sys-cluster/openmpi-4.1.4-r1
index 290cfcbeb57a..bea881749cbb 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.1.4-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.1.4-r1
@@ -12,5 +12,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/l
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v4.1/downloads/openmpi-4.1.4.tar.bz2
-_eclasses_=cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=844b56bf90f760c42cb4d91d9c1cef05
diff --git a/metadata/md5-cache/sys-cluster/spark-bin-2.4.3 b/metadata/md5-cache/sys-cluster/spark-bin-2.4.3
index c3b5c50b35bd..7424074f6fdf 100644
--- a/metadata/md5-cache/sys-cluster/spark-bin-2.4.3
+++ b/metadata/md5-cache/sys-cluster/spark-bin-2.4.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 REQUIRED_USE=^^ ( scala211 scala212 )
 SLOT=2
 SRC_URI=!scala212? ( scala211? ( mirror://apache/spark/spark-2.4.3/spark-2.4.3-bin-without-hadoop.tgz -> spark-bin-2.4.3-nohadoop-scala211.tgz ) ) !scala211? ( scala212? ( mirror://apache/spark/spark-2.4.3/spark-2.4.3-bin-without-hadoop-scala-2.12.tgz -> spark-bin-2.4.3-nohadoop-scala212.tgz ) )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b6e050cf89e8d95c179f368b1faa007b
diff --git a/metadata/md5-cache/sys-cluster/spark-bin-2.4.7-r1 b/metadata/md5-cache/sys-cluster/spark-bin-2.4.7-r1
index 25d91e7b089a..63132f520ee2 100644
--- a/metadata/md5-cache/sys-cluster/spark-bin-2.4.7-r1
+++ b/metadata/md5-cache/sys-cluster/spark-bin-2.4.7-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 REQUIRED_USE=^^ ( scala211 scala212 )
 SLOT=2
 SRC_URI=!scala212? ( scala211? ( mirror://apache/spark/spark-2.4.7/spark-2.4.7-bin-without-hadoop.tgz -> spark-bin-2.4.7-nohadoop-scala211.tgz ) ) !scala211? ( scala212? ( mirror://apache/spark/spark-2.4.7/spark-2.4.7-bin-without-hadoop-scala-2.12.tgz -> spark-bin-2.4.7-nohadoop-scala212.tgz ) )
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b6e050cf89e8d95c179f368b1faa007b
diff --git a/metadata/md5-cache/sys-cluster/spark-bin-3.0.1-r2 b/metadata/md5-cache/sys-cluster/spark-bin-3.0.1-r2
index 141eeb5a8493..6c552cf410d9 100644
--- a/metadata/md5-cache/sys-cluster/spark-bin-3.0.1-r2
+++ b/metadata/md5-cache/sys-cluster/spark-bin-3.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=3
 SRC_URI=mirror://apache/spark/spark-3.0.1/spark-3.0.1-bin-without-hadoop.tgz -> spark-bin-3.0.1-nohadoop.tgz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=a1d3dd68036ac811f1cb63f0753048a7
diff --git a/metadata/md5-cache/sys-cluster/spark-bin-3.1.2 b/metadata/md5-cache/sys-cluster/spark-bin-3.1.2
index 7cb65413abd3..524298d7c51c 100644
--- a/metadata/md5-cache/sys-cluster/spark-bin-3.1.2
+++ b/metadata/md5-cache/sys-cluster/spark-bin-3.1.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=3
 SRC_URI=mirror://apache/spark/spark-3.1.2/spark-3.1.2-bin-hadoop3.2.tgz -> spark-bin-3.1.2-hadoop.tgz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=b033a1b1b3fee29fb76a5a87f4447a2a
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.4 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.4
index 6ed9b0b9ab13..04483dc8cf43 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.4
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.4
@@ -10,5 +10,5 @@ RDEPEND=acct-group/zookeeper acct-user/zookeeper >=virtual/jre-1.8
 RESTRICT=mirror binchecks
 SLOT=0
 SRC_URI=https://downloads.apache.org/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz -> zookeeper-bin-3.8.4.tar.gz
-_eclasses_=java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=5f156940302a9a0065e89e7ba01ba9e3
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.9.2 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.9.2
index 6f0d50754380..875b7bbf7a12 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.9.2
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.9.2
@@ -10,5 +10,5 @@ RDEPEND=acct-group/zookeeper acct-user/zookeeper >=virtual/jre-1.8
 RESTRICT=mirror binchecks
 SLOT=0
 SRC_URI=https://downloads.apache.org/zookeeper/zookeeper-3.9.2/apache-zookeeper-3.9.2-bin.tar.gz -> zookeeper-bin-3.9.2.tar.gz
-_eclasses_=java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=8d4c5a792fbdfe943e84dc47a6a225fc
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 1b0b1376132d..89a144feb043 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-18.1.7 b/metadata/md5-cache/sys-devel/clang-18.1.7
deleted file mode 100644
index 6960b2288808..000000000000
--- a/metadata/md5-cache/sys-devel/clang-18.1.7
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) test? ( ~sys-devel/lld-18.1.7 ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) doc? ( python_single_target_python3_10? ( dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/myst-parser[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/myst-parser[python_targets_python3_13(-)] dev-python/sphinx[python_targets_python3_13(-)] ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-18.1.7:18=[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-18.1.7[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.1.7[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.1.7[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.1.7[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.1.7[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.1.7[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.1.7[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.1.7[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.1.7[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.1.7[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.1.7[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.1.7[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.1.7[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.1.7[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.1.7[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.1.7[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.1.7[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.1.7[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.1.7[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.1.7[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.1.7[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.1.7[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.1.7[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.1.7[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.1.7[llvm_targets_Xtensa] )
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org llvm-utils 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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa 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_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-18.1.7 sys-devel/clang-toolchain-symlinks:18
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ~sys-devel/llvm-18.1.7:18=[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-18.1.7 llvm_targets_AArch64? ( ~sys-devel/llvm-18.1.7[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-18.1.7[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-18.1.7[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-18.1.7[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-18.1.7[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-18.1.7[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-18.1.7[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-18.1.7[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-18.1.7[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-18.1.7[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-18.1.7[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-18.1.7[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-18.1.7[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-18.1.7[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-18.1.7[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-18.1.7[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-18.1.7[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-18.1.7[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-18.1.7[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-18.1.7[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-18.1.7[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-18.1.7[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-18.1.7[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-18.1.7[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-18.1.7[llvm_targets_Xtensa] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=18/18.1
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-18.1.0-manpages.tar.bz2 )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=272662e4ba693731f4771d7c9c4ae585
diff --git a/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240608 b/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240608
deleted file mode 100644
index bf17fb46f068..000000000000
--- a/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240608
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) test? ( ~sys-devel/lld-19.0.0_pre20240608 ) xml? ( virtual/pkgconfig ) python_single_target_python3_10? ( dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/myst-parser[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/myst-parser[python_targets_python3_13(-)] dev-python/sphinx[python_targets_python3_13(-)] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-19.0.0_pre20240608:19=[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-19.0.0_pre20240608[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Xtensa] )
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org llvm-utils 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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa 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_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-19.0.0_pre20240608 sys-devel/clang-toolchain-symlinks:19
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ~sys-devel/llvm-19.0.0_pre20240608:19=[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-19.0.0_pre20240608 llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240608[llvm_targets_Xtensa] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=19/19.0.0_pre20240608
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a9624904e5005c416e261471f2fa4f4b
diff --git a/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240615 b/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240615
deleted file mode 100644
index 9499c248dfb7..000000000000
--- a/metadata/md5-cache/sys-devel/clang-19.0.0_pre20240615
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) test? ( ~sys-devel/lld-19.0.0_pre20240615 ) xml? ( virtual/pkgconfig ) python_single_target_python3_10? ( dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/myst-parser[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/myst-parser[python_targets_python3_13(-)] dev-python/sphinx[python_targets_python3_13(-)] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-19.0.0_pre20240615:19=[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-19.0.0_pre20240615[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Xtensa] )
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org llvm-utils 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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa 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_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-19.0.0_pre20240615 sys-devel/clang-toolchain-symlinks:19
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ~sys-devel/llvm-19.0.0_pre20240615:19=[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-19.0.0_pre20240615 llvm_targets_AArch64? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-19.0.0_pre20240615[llvm_targets_Xtensa] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=19/19.0.0_pre20240615
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a9624904e5005c416e261471f2fa4f4b
diff --git a/metadata/md5-cache/sys-devel/clang-common-18.1.7 b/metadata/md5-cache/sys-devel/clang-common-18.1.7
deleted file mode 100644
index 4206ab7f3f9a..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-18.1.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-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 multilib
-IUSE=default-compiler-rt default-libcxx default-lld bootstrap-prefix cet hardened llvm-libunwind verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~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[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-18.1.7[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( >=sys-devel/lld-18.1.7 ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=2a1f4c03a1b443e639dc0858163fe0d2
diff --git a/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240608 b/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240608
deleted file mode 100644
index 4d595091f2af..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240608
+++ /dev/null
@@ -1,13 +0,0 @@
-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 multilib
-IUSE=default-compiler-rt default-libcxx default-lld bootstrap-prefix cet hardened llvm-libunwind
-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[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-19.0.0_pre20240608[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( >=sys-devel/lld-19.0.0_pre20240608 ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=15ce04c18a335ffc8488f8640efaf2a3
diff --git a/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240615 b/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240615
deleted file mode 100644
index 5a941d0aeb63..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-19.0.0_pre20240615
+++ /dev/null
@@ -1,13 +0,0 @@
-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 multilib
-IUSE=default-compiler-rt default-libcxx default-lld bootstrap-prefix cet hardened llvm-libunwind
-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[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-19.0.0_pre20240615[static-libs] ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( >=sys-devel/lld-19.0.0_pre20240615 ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=15ce04c18a335ffc8488f8640efaf2a3
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-18.1.7 b/metadata/md5-cache/sys-devel/clang-runtime-18.1.7
deleted file mode 100644
index d933d5cafdc4..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-18.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build toolchain-funcs
-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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-18.1.7:18[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-18.1.7:18[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-18.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-18.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=18
-_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=160fc06fc8f87413c2a65cf179524b62
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-19.0.0_pre20240608 b/metadata/md5-cache/sys-devel/clang-runtime-19.0.0_pre20240608
deleted file mode 100644
index 81dad5720bbf..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-19.0.0_pre20240608
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build toolchain-funcs
-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
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-19.0.0_pre20240608:19[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-19.0.0_pre20240608:19[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-19.0.0_pre20240608[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-19.0.0_pre20240608[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=19
-_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f4e85250deef580e6b36d286de5a556e
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-19.0.0_pre20240615 b/metadata/md5-cache/sys-devel/clang-runtime-19.0.0_pre20240615
deleted file mode 100644
index 2ef5a1334511..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-19.0.0_pre20240615
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build toolchain-funcs
-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
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-19.0.0_pre20240615:19[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-19.0.0_pre20240615:19[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-19.0.0_pre20240615[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-19.0.0_pre20240615[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=19
-_eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f4e85250deef580e6b36d286de5a556e
diff --git a/metadata/md5-cache/sys-devel/gettext-0.21.1 b/metadata/md5-cache/sys-devel/gettext-0.21.1
index 7734130f4dbd..a16afe3cd60f 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.21.1
+++ b/metadata/md5-cache/sys-devel/gettext-0.21.1
@@ -12,5 +12,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( virtual/jdk:1.8 ) git? ( dev-vcs/git ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.21.1.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.21.1.tar.xz.sig )
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=6e40d25a227e87ffe4ac7b613a83d731
diff --git a/metadata/md5-cache/sys-devel/gettext-0.22.4 b/metadata/md5-cache/sys-devel/gettext-0.22.4
index b85c9d06f7b8..4d60d2b398bb 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.22.4
+++ b/metadata/md5-cache/sys-devel/gettext-0.22.4
@@ -12,5 +12,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:= ) java? ( virtual/jdk:1.8 ) xattr? ( sys-apps/attr ) git? ( dev-vcs/git ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.22.4.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.22.4.tar.xz.sig )
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=1d8e59e58018d5a05608f1a1d7530df3
diff --git a/metadata/md5-cache/sys-devel/gettext-0.22.5 b/metadata/md5-cache/sys-devel/gettext-0.22.5
index 8fa9b74aea99..7ee7bff02c25 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.22.5
+++ b/metadata/md5-cache/sys-devel/gettext-0.22.5
@@ -12,5 +12,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:= ) java? ( virtual/jdk:1.8 ) xattr? ( sys-apps/attr ) git? ( dev-vcs/git ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.22.5.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.22.5.tar.xz.sig )
-_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	09d793abe112f655cd781e4467a6fc10	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=022413970210b534ac6b22d0ecfea34e
diff --git a/metadata/md5-cache/sys-devel/lld-18.1.7 b/metadata/md5-cache/sys-devel/lld-18.1.7
deleted file mode 100644
index a4265cd1b5fc..000000000000
--- a/metadata/md5-cache/sys-devel/lld-18.1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/llvm:18 test? ( || ( ( dev-lang/python:3.13 >=dev-python/lit-18.1.7[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/lit-18.1.7[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-18.1.7[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-18.1.7[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-18.1.7[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= )
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=debug test zstd verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:18
-RDEPEND=~sys-devel/llvm-18.1.7[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=18/18.1
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e5c3566b6607d4c9d6c81015bc2dfce7
diff --git a/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240608 b/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240608
deleted file mode 100644
index 40e6b487960a..000000000000
--- a/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240608
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:19 test? ( || ( ( dev-lang/python:3.13 >=dev-python/lit-19.0.0_pre20240608[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/lit-19.0.0_pre20240608[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-19.0.0_pre20240608[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-19.0.0_pre20240608[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-19.0.0_pre20240608[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= )
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+debug test zstd
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:19
-RDEPEND=~sys-devel/llvm-19.0.0_pre20240608[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=19/19.0.0_pre20240608
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e1df1c5402ae6e2ced6564b14707000f
diff --git a/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240615 b/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240615
deleted file mode 100644
index 8c3442ce0a21..000000000000
--- a/metadata/md5-cache/sys-devel/lld-19.0.0_pre20240615
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:19 test? ( || ( ( dev-lang/python:3.13 >=dev-python/lit-19.0.0_pre20240615[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/lit-19.0.0_pre20240615[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-19.0.0_pre20240615[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-19.0.0_pre20240615[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-19.0.0_pre20240615[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= )
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+debug test zstd
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:19
-RDEPEND=~sys-devel/llvm-19.0.0_pre20240615[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test )
-SLOT=19/19.0.0_pre20240615
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e1df1c5402ae6e2ced6564b14707000f
diff --git a/metadata/md5-cache/sys-devel/llvm-18.1.7 b/metadata/md5-cache/sys-devel/llvm-18.1.7
deleted file mode 100644
index fbe1dd2a79af..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-18.1.7
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-18.1.7.9999 ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) doc? ( || ( ( dev-lang/python:3.13 dev-python/myst-parser[python_targets_python3_13(-)] dev-python/sphinx[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/myst-parser[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-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(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) 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(-)?] ) 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 flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
-IUSE=+binutils-plugin debug debuginfod doc exegesis libedit +libffi ncurses test 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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~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:18 binutils-plugin? ( >=sys-devel/llvmgold-18 )
-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(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) 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(-)?] ) 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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=18/18.1
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-18.1.0-manpages.tar.bz2 )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2ac30d8c7d2e9a74d349ba82b7fb90b0
diff --git a/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240608 b/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240608
deleted file mode 100644
index 9eb1f78d110b..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240608
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-19.0.0.9999 ) libffi? ( virtual/pkgconfig ) || ( ( dev-lang/python:3.13 dev-python/myst-parser[python_targets_python3_13(-)] dev-python/sphinx[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/myst-parser[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-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(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) 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(-)?] ) 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 flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
-IUSE=+binutils-plugin +debug debuginfod doc exegesis libedit +libffi test 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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa 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=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
-PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:19 binutils-plugin? ( >=sys-devel/llvmgold-19 )
-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(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) 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(-)?] ) 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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=19/19.0.0_pre20240608
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b2846b61c5961d4ad8182756693e5c52
diff --git a/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240615 b/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240615
deleted file mode 100644
index 431d2decd9c5..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-19.0.0_pre20240615
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-19.0.0.9999 ) libffi? ( virtual/pkgconfig ) || ( ( dev-lang/python:3.13 dev-python/myst-parser[python_targets_python3_13(-)] dev-python/sphinx[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/myst-parser[python_targets_python3_12(-)] dev-python/sphinx[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-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(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) 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(-)?] ) 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 flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
-IUSE=+binutils-plugin +debug debuginfod doc exegesis libedit +libffi test 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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa 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=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
-PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:19 binutils-plugin? ( >=sys-devel/llvmgold-19 )
-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(-)?] debuginfod? ( net-misc/curl:= dev-cpp/cpp-httplib:= ) 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(-)?] ) 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_LoongArch 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_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=19/19.0.0_pre20240615
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b2846b61c5961d4ad8182756693e5c52
diff --git a/metadata/md5-cache/sys-devel/llvm-common-18.1.7 b/metadata/md5-cache/sys-devel/llvm-common-18.1.7
deleted file mode 100644
index e5095bd47239..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-18.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=elisp-common llvm.org
-IUSE=emacs verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~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-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=elisp-common	abb2dda42f680fce87602c8273f832c7	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=9ac9e6f9618852d5474f1772a96c433c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240608 b/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240608
deleted file mode 100644
index 5ce8100ead54..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240608
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=elisp-common llvm.org
-IUSE=emacs
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=elisp-common	abb2dda42f680fce87602c8273f832c7	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=6a52c60b6240c535a7ab1e5cbbc4817b
diff --git a/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240615 b/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240615
deleted file mode 100644
index 9f1999377b73..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-19.0.0_pre20240615
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=elisp-common llvm.org
-IUSE=emacs
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=elisp-common	abb2dda42f680fce87602c8273f832c7	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=6a52c60b6240c535a7ab1e5cbbc4817b
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 4ec1303bf766..4a7f141b150f 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20240514_p20240514 b/metadata/md5-cache/sys-firmware/intel-microcode-20240514_p20240514
index fdd195ed3208..825c48ab880b 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20240514_p20240514
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20240514_p20240514
@@ -6,7 +6,7 @@ HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files htt
 IDEPEND=dist-kernel? ( initramfs? ( sys-kernel/installkernel ) )
 INHERIT=dist-kernel-utils linux-info mount-boot
 IUSE=dist-kernel hostonly +initramfs +split-ucode vanilla
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=intel-ucode
 RDEPEND=dist-kernel? ( virtual/dist-kernel ) hostonly? ( sys-apps/iucode_tool )
 REQUIRED_USE=!dist-kernel? ( || ( initramfs split-ucode ) )
@@ -14,4 +14,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20240514.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~mpagano/dist/intel-microcode/intel-microcode-collection-20240514.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-firmware/intel-microcode/intel-microcode-collection-20240514.tar.xz
 _eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	linux-info	e967b81f54be6f49f4219a57ce7db437	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=eaaa066b07732064c580ae9892217346
+_md5_=e19a315a79b3d20af88da3505f1b1427
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index c2b55a3961d0..97129537ba8f 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1 b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
index 993024762b55..ed088195d613 100644
--- a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
+++ b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
@@ -10,5 +10,5 @@ LICENSE=freedist
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=63e25571aa60fbe2291074f07f668d2c
diff --git a/metadata/md5-cache/sys-fs/lxcfs-6.0.1 b/metadata/md5-cache/sys-fs/lxcfs-6.0.1
new file mode 100644
index 000000000000..c17772e1bc88
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lxcfs-6.0.1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) virtual/pkgconfig || ( ( dev-lang/python:3.12 dev-python/jinja[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ) doc? ( sys-apps/help2man ) verify-sig? ( sec-keys/openpgp-keys-linuxcontainers ) app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-fs/fuse:3
+DESCRIPTION=FUSE filesystem for LXC
+EAPI=8
+HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
+INHERIT=cmake meson python-any-r1 systemd verify-sig
+IUSE=doc test verify-sig
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0 LGPL-2+
+RDEPEND=sys-fs/fuse:3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxcfs/lxcfs-6.0.1.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/lxcfs-6.0.1.tar.gz.asc )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d5c6f9fd730a2b6f4c3d251a4051d1c1
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 0347a11ec385..66747149dc5f 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-18.1.7 b/metadata/md5-cache/sys-libs/compiler-rt-18.1.7
deleted file mode 100644
index 566b1aba950d..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-18.1.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.13 >=dev-python/lit-15[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-18.1.7*:18 ) !test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:18
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=18
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=17f75d79e76c5f3c43e37aa8ef9d7c93
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240608 b/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240608
deleted file mode 100644
index bed135e04284..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240608
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.13 >=dev-python/lit-15[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-19.0.0*:19 ) !test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:19
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+abi_x86_32 abi_x86_64 +clang +debug test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=19
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a7db51057537afaa6b6ed5cb182962ac
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240615 b/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240615
deleted file mode 100644
index 5aaa6c4e499a..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-19.0.0_pre20240615
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.13 >=dev-python/lit-15[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-19.0.0*:19 ) !test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:19
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-IUSE=+abi_x86_32 abi_x86_64 +clang +debug test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=19
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	crossdev	f04338ff78f213a4a55c5c37b3c6563e	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a7db51057537afaa6b6ed5cb182962ac
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.1.7 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.1.7
deleted file mode 100644
index 83b8427d829e..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-18.1.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( dev-lang/python:3.13 >=dev-python/lit-15[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-18.1.7*:18 sys-libs/compiler-rt:18 ) !test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:18 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm.org llvm-utils 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 ~loong ~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=18
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=12d7c8d73e0e0e8f15886f9794c1290f
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240608 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240608
deleted file mode 100644
index cd2a73a6799d..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240608
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( dev-lang/python:3.13 >=dev-python/lit-15[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-19.0.0*:19 sys-libs/compiler-rt:19 ) !test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:19 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-IUSE=+abi_x86_32 abi_x86_64 +clang +debug test +ctx-profile +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
-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=19
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e20250e8a7d9bf28935b81ab4f5bf111
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240615 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240615
deleted file mode 100644
index d1def2b87553..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-19.0.0_pre20240615
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( dev-lang/python:3.13 >=dev-python/lit-15[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/lit-15[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ) =sys-devel/clang-19.0.0*:19 sys-libs/compiler-rt:19 ) !test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:19 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm.org llvm-utils python-any-r1
-IUSE=+abi_x86_32 abi_x86_64 +clang +debug test +ctx-profile +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
-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=19
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e20250e8a7d9bf28935b81ab4f5bf111
diff --git a/metadata/md5-cache/sys-libs/glibc-2.19-r3 b/metadata/md5-cache/sys-libs/glibc-2.19-r3
index d9ce41b21d5e..a35739c58bf5 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.19-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.19-r3
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.19.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.19-patches-9.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ca3eadd1474bd8ad26bccca0b45133e9
+_md5_=2de390fb28f3928650934f8656b2352f
diff --git a/metadata/md5-cache/sys-libs/glibc-2.31-r7 b/metadata/md5-cache/sys-libs/glibc-2.31-r7
index a04cb9bd58e9..227ba63262a7 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.31-r7
+++ b/metadata/md5-cache/sys-libs/glibc-2.31-r7
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.31.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.31-patches-9.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.00.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3a2ab1db5c6448cb5acde73d0db1cccb
+_md5_=4c65f143ca66796381b272e8c1ac34da
diff --git a/metadata/md5-cache/sys-libs/glibc-2.32-r8 b/metadata/md5-cache/sys-libs/glibc-2.32-r8
index 719a91fca972..4f45d76be246 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.32-r8
+++ b/metadata/md5-cache/sys-libs/glibc-2.32-r8
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.32-patches-8.tar.xz riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6de4ee3e8382dbe47095d01a0080f0df
+_md5_=c2a5b0175e36af7e2554e420f743f7d2
diff --git a/metadata/md5-cache/sys-libs/glibc-2.33-r14 b/metadata/md5-cache/sys-libs/glibc-2.33-r14
index 318786c3ff5f..9d9fbcdc3174 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.33-r14
+++ b/metadata/md5-cache/sys-libs/glibc-2.33-r14
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.33.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.33-patches-11.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210814.tar.gz )
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e8208ffb84d62b12bb4e9cea9c33e978
+_md5_=f0de70a03c888f9ed616bed5f57254c9
diff --git a/metadata/md5-cache/sys-libs/glibc-2.34-r14 b/metadata/md5-cache/sys-libs/glibc-2.34-r14
index 3ab1c5e525b7..88adb34f0bf2 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.34-r14
+++ b/metadata/md5-cache/sys-libs/glibc-2.34-r14
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.34-patches-17.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=16ed03bcb71f3e4927dca367437b55c5
+_md5_=245696769969e05c711d35f47f2b4528
diff --git a/metadata/md5-cache/sys-libs/glibc-2.35-r11 b/metadata/md5-cache/sys-libs/glibc-2.35-r11
index 262646d778b2..737751d52eac 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.35-r11
+++ b/metadata/md5-cache/sys-libs/glibc-2.35-r11
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.35-patches-12.tar.xz experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/glibc-2.35-loongarch-patches-20220522.tar.xz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=332281c6e93e1650fea40b0bc5e7e6b3
+_md5_=e9618dd914a58bf954d8d1cb3ba018be
diff --git a/metadata/md5-cache/sys-libs/glibc-2.36-r8 b/metadata/md5-cache/sys-libs/glibc-2.36-r8
index aeb704a890a1..a34903710d68 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.36-r8
+++ b/metadata/md5-cache/sys-libs/glibc-2.36-r8
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.36.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.36-patches-10.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.23.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ff065e7738f4ae0cc315df728970a105
+_md5_=0225515566bbbdd6fed57844bb2ce113
diff --git a/metadata/md5-cache/sys-libs/glibc-2.37-r10 b/metadata/md5-cache/sys-libs/glibc-2.37-r10
index 78d0126e00d6..cba047c9288d 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.37-r10
+++ b/metadata/md5-cache/sys-libs/glibc-2.37-r10
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.37.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.37-patches-12.tar.xz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=2f23835043ec0e4f5ceba36257361380
+_md5_=1ca94ac657f0539e626b44a35969ca1c
diff --git a/metadata/md5-cache/sys-libs/glibc-2.38-r13 b/metadata/md5-cache/sys-libs/glibc-2.38-r13
index 2e0d6106eaa1..77f263b23302 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.38-r13
+++ b/metadata/md5-cache/sys-libs/glibc-2.38-r13
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.38-patches-13.tar.xz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c9d49568589d0372e30b40df53a5ea21
+_md5_=b4268d0f455e15baddf6c514cc1b150d
diff --git a/metadata/md5-cache/sys-libs/glibc-2.39-r6 b/metadata/md5-cache/sys-libs/glibc-2.39-r6
index b8f6e3249ec2..1eb670e31327 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.39-r6
+++ b/metadata/md5-cache/sys-libs/glibc-2.39-r6
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.39-patches-6.tar.xz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c927caa17aa558652a79aef8c7c8d9e1
+_md5_=c69627b26b68863811435312ba6b2ef9
diff --git a/metadata/md5-cache/sys-libs/glibc-2.39-r7 b/metadata/md5-cache/sys-libs/glibc-2.39-r7
index 19b3f2dc860f..0af8d083099b 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.39-r7
+++ b/metadata/md5-cache/sys-libs/glibc-2.39-r7
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.39-patches-7.tar.xz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=39992a845ffc190f2a8ddfb69adf81f6
+_md5_=73d902eccff8388abeae2a43b8f57c9b
diff --git a/metadata/md5-cache/sys-libs/glibc-2.39-r9 b/metadata/md5-cache/sys-libs/glibc-2.39-r9
index 3f5a7b18c09a..06dc2d4e6d2d 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.39-r9
+++ b/metadata/md5-cache/sys-libs/glibc-2.39-r9
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.39-patches-9.tar.xz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5c9d31164c5bd91450868e5cccf0414d
+_md5_=898b352eed10827dcc9ba4e33594e93a
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 040bc1f5ea7e..8e7491cd3c69 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f3377776d415251341a199da48f141b1
+_md5_=4b56d4b5366a143c4168e6599ed145b1
diff --git a/metadata/md5-cache/sys-libs/libcxx-18.1.7 b/metadata/md5-cache/sys-libs/libcxx-18.1.7
deleted file mode 100644
index 44226f763dab..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-18.1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:18 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( dev-debug/gdb[python] || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-18.1.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] ) sys-devel/llvm:18
-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.org llvm-utils 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 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-18.1.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=745bc558cf73e1543da6e2e14bff129f
diff --git a/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240608 b/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240608
deleted file mode 100644
index 1597eb18ee45..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240608
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:19 ) !test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( dev-debug/gdb[python] || ( ( dev-lang/python:3.13 dev-python/lit[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-19.0.0_pre20240608[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:19
-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.org llvm-utils 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
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-19.0.0_pre20240608[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/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=766fe8445c3ff4bf35da3d5c9d711b68
diff --git a/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240615 b/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240615
deleted file mode 100644
index 6c5b23d4c3b8..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-19.0.0_pre20240615
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:19 ) !test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( dev-debug/gdb[python] || ( ( dev-lang/python:3.13 dev-python/lit[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-19.0.0_pre20240615[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:19
-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.org llvm-utils 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
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-19.0.0_pre20240615[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/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d13096d9fc84814ebe5fa1af2f7f5ea9
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-18.1.7 b/metadata/md5-cache/sys-libs/libcxxabi-18.1.7
deleted file mode 100644
index 13ac319a7c4d..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-18.1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:18 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:18
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils 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 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~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-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=406c06e2acccee230942ffa11c7c151e
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240608 b/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240608
deleted file mode 100644
index 6013d83ae602..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240608
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:19 ) !test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.13 dev-python/lit[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:19
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils 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
-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/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7f2e448e92b7ab5b357298c1ced0c0f0
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240615 b/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240615
deleted file mode 100644
index 125362469e0c..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-19.0.0_pre20240615
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:19 ) !test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.13 dev-python/lit[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:19
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils 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
-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/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7f2e448e92b7ab5b357298c1ced0c0f0
diff --git a/metadata/md5-cache/sys-libs/libomp-18.1.7 b/metadata/md5-cache/sys-libs/libomp-18.1.7
deleted file mode 100644
index 14594986aed0..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-18.1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lit[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/lit[python_targets_python3_13(-)] ) sys-devel/clang ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) 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? ( 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-18.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm.org llvm-utils python-single-r1 toolchain-funcs
-IUSE=debug gdb-plugin 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 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) 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? ( 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-18.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
-REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) )
-RESTRICT=!test? ( test )
-SLOT=0/18.1
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c93d00a9622f6545844f194fc1f558f8
diff --git a/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240608 b/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240608
deleted file mode 100644
index 0fc811a99cc4..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240608
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lit[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/lit[python_targets_python3_13(-)] ) sys-devel/clang ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) 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(-)?] )
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm.org python-single-r1
-IUSE=+debug gdb-plugin hwloc ompt 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 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) 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(-)?] )
-REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) )
-RESTRICT=!test? ( test )
-SLOT=0/19.0.0_pre20240608
-SRC_URI=https://github.com/llvm/llvm-project/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a5619cd21eb158ecdd1e78f8a900a3b9
diff --git a/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240615 b/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240615
deleted file mode 100644
index bdcbed99e4bc..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-19.0.0_pre20240615
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/lit[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/lit[python_targets_python3_13(-)] ) sys-devel/clang ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) 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(-)?] )
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm.org python-single-r1
-IUSE=+debug gdb-plugin hwloc ompt 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 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) 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(-)?] )
-REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) )
-RESTRICT=!test? ( test )
-SLOT=0/19.0.0_pre20240615
-SRC_URI=https://github.com/llvm/llvm-project/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a5619cd21eb158ecdd1e78f8a900a3b9
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-18.1.7 b/metadata/md5-cache/sys-libs/llvm-libunwind-18.1.7
deleted file mode 100644
index 5010879adec3..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-18.1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:18 ) !test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-18.1.6 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:18
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~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-18.1.7/llvm-project-18.1.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-project-18.1.7.src.tar.xz.sig )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4824c894f7d102dcf37c203e3ad999a7
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240608 b/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240608
deleted file mode 100644
index daf8bb4d86d1..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240608
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:19 ) !test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.13 dev-python/lit[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:19
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils 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
-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/archive/5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz -> llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cef3026431ff3aecaed6b75e0dbc9fba
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240615 b/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240615
deleted file mode 100644
index f0202d963a10..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-19.0.0_pre20240615
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:19 ) !test? ( || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) test? ( || ( ( dev-lang/python:3.13 dev-python/lit[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/lit[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:19
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm.org llvm-utils 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
-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/archive/cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz -> llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-utils	e59dc622da7e7e7f16879105bed34858	llvm.org	5feca158a7ab6a6a4f30a30e6b464a06	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cef3026431ff3aecaed6b75e0dbc9fba
diff --git a/metadata/md5-cache/sys-libs/talloc-2.4.1 b/metadata/md5-cache/sys-libs/talloc-2.4.1
index e2f51264911e..0e485bb4be94 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.4.1
+++ b/metadata/md5-cache/sys-libs/talloc-2.4.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://talloc.samba.org/
 INHERIT=waf-utils python-single-r1 multilib-minimal
 IUSE=compat +python test valgrind python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_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
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=GPL-3 LGPL-3+ LGPL-2
 RDEPEND=!elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[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? ( python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[threads(+)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.4.1.tar.gz
 _eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	waf-utils	be1df8dc616c09387b18633b4155fcb5
-_md5_=80c18537516084c1f66b5983826e1461
+_md5_=6c1a399e380575437d0d29c50718cb53
diff --git a/metadata/md5-cache/sys-libs/tevent-0.15.0 b/metadata/md5-cache/sys-libs/tevent-0.15.0
index f9e73f4c430a..4cf728a9cd92 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.15.0
+++ b/metadata/md5-cache/sys-libs/tevent-0.15.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://tevent.samba.org/
 INHERIT=waf-utils multilib-minimal python-single-r1
 IUSE=python 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 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/libbsd[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/talloc-2.4.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(-)?] python? ( python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[threads(+)] ) >=sys-libs/talloc-2.4.1[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://samba.org/ftp/tevent/tevent-0.15.0.tar.gz
 _eclasses_=multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	waf-utils	be1df8dc616c09387b18633b4155fcb5
-_md5_=c5bf518af87a7469bf63df4252b749ea
+_md5_=06bcfe49216037ebab85a8497f72b349
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 84e445b7b886..40163bf27c3a 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/sandmann-bin-1.0 b/metadata/md5-cache/sys-power/sandmann-bin-1.0
index 00d2360842b0..0e14a9f64ff0 100644
--- a/metadata/md5-cache/sys-power/sandmann-bin-1.0
+++ b/metadata/md5-cache/sys-power/sandmann-bin-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ LGPL-3
 RDEPEND=acct-user/sandmann >=dev-java/java-config-2.3.2 sys-apps/systemd sys-auth/polkit || ( virtual/jre:17 virtual/jre:21 ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://geekplace.eu/projects/sandmann/archive/sandmann-1.0.tar.xz
-_eclasses_=java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=b3bea7f5b3db79d56c860e2d3f40a4e8
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 919ec68dbe35..d891f8c11e44 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-126.0.6478.114 b/metadata/md5-cache/www-apps/chromedriver-bin-126.0.6478.126
index c28504eb345a..937f33b2cc83 100644
--- a/metadata/md5-cache/www-apps/chromedriver-bin-126.0.6478.114
+++ b/metadata/md5-cache/www-apps/chromedriver-bin-126.0.6478.126
@@ -8,5 +8,5 @@ LICENSE=google-chrome
 RDEPEND=sys-libs/glibc www-client/google-chrome !www-client/chromium
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=amd64? ( https://storage.googleapis.com/chrome-for-testing-public/126.0.6478.114/linux64/chromedriver-linux64.zip -> chromedriver-bin-126.0.6478.114.linux64.zip )
+SRC_URI=amd64? ( https://storage.googleapis.com/chrome-for-testing-public/126.0.6478.126/linux64/chromedriver-linux64.zip -> chromedriver-bin-126.0.6478.126.linux64.zip )
 _md5_=5e5984a0f6dd175b47af13c2c4ef519e
diff --git a/metadata/md5-cache/www-apps/sonarr-bin-4.0.5.1760 b/metadata/md5-cache/www-apps/sonarr-bin-4.0.5.1782
index cee5e6e76fc6..dcf22e98fe73 100644
--- a/metadata/md5-cache/www-apps/sonarr-bin-4.0.5.1760
+++ b/metadata/md5-cache/www-apps/sonarr-bin-4.0.5.1782
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=acct-group/sonarr acct-user/sonarr media-video/mediainfo dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite
 RESTRICT=bindist strip test
 SLOT=0
-SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.5.1760/Sonarr.develop.4.0.5.1760.linux-x64.tar.gz ) elibc_musl? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.5.1760/Sonarr.develop.4.0.5.1760.linux-musl-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.5.1760/Sonarr.develop.4.0.5.1760.linux-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.5.1760/Sonarr.develop.4.0.5.1760.linux-arm64.tar.gz ) elibc_musl? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.5.1760/Sonarr.develop.4.0.5.1760.linux-musl-arm64.tar.gz ) )
+SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.5.1782/Sonarr.develop.4.0.5.1782.linux-x64.tar.gz ) elibc_musl? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.5.1782/Sonarr.develop.4.0.5.1782.linux-musl-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.5.1782/Sonarr.develop.4.0.5.1782.linux-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.5.1782/Sonarr.develop.4.0.5.1782.linux-arm64.tar.gz ) elibc_musl? ( https://github.com/Sonarr/Sonarr/releases/download/v4.0.5.1782/Sonarr.develop.4.0.5.1782.linux-musl-arm64.tar.gz ) )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=d2434edc294d6dfc5195155c8c3d1bd8
diff --git a/metadata/md5-cache/www-apps/zeppelin-bin-0.10.1 b/metadata/md5-cache/www-apps/zeppelin-bin-0.10.1
index 1fa032ad3329..7b7b8b30bd4b 100644
--- a/metadata/md5-cache/www-apps/zeppelin-bin-0.10.1
+++ b/metadata/md5-cache/www-apps/zeppelin-bin-0.10.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/zeppelin/zeppelin-0.10.1/zeppelin-0.10.1-bin-all.tgz -> zeppelin-bin-0.10.1.tgz
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10
+_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e
 _md5_=302dbedf95d2a743d3b905243d71f040
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index aaa9e15d6e77..c03d1c8a2ad4 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-126.0.6478.126 b/metadata/md5-cache/www-client/chromium-126.0.6478.126
new file mode 100644
index 000000000000..561540582f57
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-126.0.6478.126
@@ -0,0 +1,17 @@
+BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.12.4:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) system-zstd? ( >=app-arch/zstd-1.5.5:= ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-libs/libpulse:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( dev-lang/python:3.13[xml(+)] dev-lang/python:3.12[xml(+)] dev-lang/python:3.11[xml(+)] ) || ( ( dev-lang/python:3.13[xml(+)] dev-python/setuptools[python_targets_python3_13(-)] ) ( dev-lang/python:3.12[xml(+)] dev-python/setuptools[python_targets_python3_12(-)] ) ( dev-lang/python:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ) >=app-arch/gzip-1.7 !headless? ( qt5? ( dev-qt/qtcore:5 ) qt6? ( dev-qt/qtbase:6 ) ) system-toolchain? ( libcxx? ( >=sys-devel/clang-17 ) lto? ( || ( ( sys-devel/clang:17 sys-devel/llvm:17 =sys-devel/lld-17* ) ( sys-devel/clang:18 sys-devel/llvm:18 =sys-devel/lld-18* ) ( sys-devel/clang:19 sys-devel/llvm:19 =sys-devel/lld-19* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:17 sys-devel/llvm:17 =sys-devel/lld-17* ) ( sys-devel/clang:18 sys-devel/llvm:18 =sys-devel/lld-18* ) ( sys-devel/clang:19 sys-devel/llvm:19 =sys-devel/lld-19* ) ) ) >=virtual/rust-1.72.0[profiler(-)] ) >=dev-build/gn-0.2165 dev-build/ninja dev-lang/perl >=dev-util/gperf-3.0.3 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig system-toolchain? ( >=sys-devel/clang-17 ) system-toolchain? ( >=sys-devel/lld-17 ) virtual/pkgconfig pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.12.4:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) system-zstd? ( >=app-arch/zstd-1.5.5:= ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-libs/libpulse:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=8
+HOMEPAGE=https://www.chromium.org/
+INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
+IUSE=+X +system-harfbuzz +system-icu +system-png +system-zstd bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos libcxx +lto +official pax-kernel pgo +proprietary-codecs pulseaudio qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=BSD
+RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.12.4:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) system-zstd? ( >=app-arch/zstd-1.5.5:= ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-libs/libpulse:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) qt6? ( dev-qt/qtbase:6[X?,wayland?] ) ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) bindist? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:126 ) )
+REQUIRED_USE=!headless? ( || ( X wayland ) ) pgo? ( X !wayland ) qt6? ( qt5 ) screencast? ( wayland ) !system-toolchain? ( libcxx ) ffmpeg-chromium? ( bindist proprietary-codecs )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/stable
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-126.0.6478.126.tar.xz system-toolchain? ( https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/126/chromium-patches-126.tar.bz2 ) !system-toolchain? ( https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-llvmorg-19-init-9433-g76ea5feb-1.tar.xz -> chromium-126-clang.tar.xz https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-31e6e8c6c5b6ce62656c922c7384d3376018c980-2-llvmorg-19-init-9433-g76ea5feb.tar.xz -> chromium-126-rust.tar.xz ) ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_126.0.6478.114-1raptor0~deb12u1.debian.tar.xz https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	llvm	1eea65d11f743b8e256ef279b652a2e6	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4f240c826094316c49fc241bc1e24593
diff --git a/metadata/md5-cache/www-client/firefox-127.0.2 b/metadata/md5-cache/www-client/firefox-127.0.2
new file mode 100644
index 000000000000..84782ea9e9ad
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-127.0.2
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/python:3.12[ncurses,sqlite,ssl] dev-lang/python:3.11[ncurses,sqlite,ssl] dev-lang/python:3.10[ncurses,sqlite,ssl] ) llvm_slot_17? ( sys-devel/clang:17 sys-devel/llvm:17 clang? ( sys-devel/lld:17 virtual/rust:0/llvm-17 ) pgo? ( sys-libs/compiler-rt-sanitizers:17[profile] ) ) llvm_slot_18? ( sys-devel/clang:18 sys-devel/llvm:18 clang? ( sys-devel/lld:18 virtual/rust:0/llvm-18 ) pgo? ( sys-libs/compiler-rt-sanitizers:18[profile] ) ) app-alternatives/awk app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.26.0 net-libs/nodejs virtual/pkgconfig !clang? ( >=virtual/rust-1.76 ) !elibc_glibc? ( dev-lang/rust ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) pgo? ( X? ( sys-devel/gettext x11-base/xorg-server[xvfb] x11-apps/xhost ) !X? ( || ( gui-wm/tinywl <gui-libs/wlroots-0.17.3[tinywl(-)] ) x11-misc/xkeyboard-config ) ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) >=dev-build/autoconf-2.13-r7:2.1 >=dev-build/libtool-2.4.7-r3
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=!www-client/firefox:0 !www-client/firefox:esr selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.100 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-73.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) valgrind? ( dev-debug/valgrind ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) X? ( x11-base/xorg-proto x11-libs/libICE x11-libs/libSM )
+DESCRIPTION=Firefox Web Browser
+EAPI=8
+HOMEPAGE=https://www.mozilla.com/firefox
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing optfeature pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack +jumbo-build libproxy lto openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp +telemetry valgrind wayland wifi +X geckodriver +gmp-autoupdate l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_fur l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh +llvm_slot_17 llvm_slot_18
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=!www-client/firefox:0 !www-client/firefox:esr selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.100 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-73.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) valgrind? ( dev-debug/valgrind ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) hwaccel? ( media-video/libva-utils sys-apps/pciutils ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
+REQUIRED_USE=|| ( X wayland ) debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) ^^ ( llvm_slot_17 llvm_slot_18 )
+SLOT=rapid
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/127.0.2/source/firefox-127.0.2.source.tar.xz -> firefox-127.0.2.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-127-patches-02.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/af.xpi -> firefox-127.0.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ar.xpi -> firefox-127.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ast.xpi -> firefox-127.0.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/be.xpi -> firefox-127.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/bg.xpi -> firefox-127.0.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/br.xpi -> firefox-127.0.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ca.xpi -> firefox-127.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/cak.xpi -> firefox-127.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/cs.xpi -> firefox-127.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/cy.xpi -> firefox-127.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/da.xpi -> firefox-127.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/de.xpi -> firefox-127.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-127.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/el.xpi -> firefox-127.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-127.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-127.0.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-127.0.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-127.0.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/et.xpi -> firefox-127.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/eu.xpi -> firefox-127.0.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/fi.xpi -> firefox-127.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/fr.xpi -> firefox-127.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-127.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-127.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/gd.xpi -> firefox-127.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/gl.xpi -> firefox-127.0.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/he.xpi -> firefox-127.0.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/hr.xpi -> firefox-127.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-127.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/hu.xpi -> firefox-127.0.2-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/id.xpi -> firefox-127.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/is.xpi -> firefox-127.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/it.xpi -> firefox-127.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ja.xpi -> firefox-127.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ka.xpi -> firefox-127.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/kab.xpi -> firefox-127.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/kk.xpi -> firefox-127.0.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ko.xpi -> firefox-127.0.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/lt.xpi -> firefox-127.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/lv.xpi -> firefox-127.0.2-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ms.xpi -> firefox-127.0.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-127.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/nl.xpi -> firefox-127.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-127.0.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-127.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/pl.xpi -> firefox-127.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-127.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-127.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/rm.xpi -> firefox-127.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ro.xpi -> firefox-127.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ru.xpi -> firefox-127.0.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sk.xpi -> firefox-127.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sl.xpi -> firefox-127.0.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sq.xpi -> firefox-127.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sr.xpi -> firefox-127.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-127.0.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/th.xpi -> firefox-127.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/tr.xpi -> firefox-127.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/uk.xpi -> firefox-127.0.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/uz.xpi -> firefox-127.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/vi.xpi -> firefox-127.0.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-127.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-127.0.2-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ach.xpi -> firefox-127.0.2-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/an.xpi -> firefox-127.0.2-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/az.xpi -> firefox-127.0.2-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/bn.xpi -> firefox-127.0.2-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/bs.xpi -> firefox-127.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-127.0.2-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/eo.xpi -> firefox-127.0.2-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-127.0.2-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-127.0.2-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/fa.xpi -> firefox-127.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ff.xpi -> firefox-127.0.2-ff.xpi ) l10n_fur? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/fur.xpi -> firefox-127.0.2-fur.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/gn.xpi -> firefox-127.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-127.0.2-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-127.0.2-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-127.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ia.xpi -> firefox-127.0.2-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/km.xpi -> firefox-127.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/kn.xpi -> firefox-127.0.2-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/lij.xpi -> firefox-127.0.2-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/mk.xpi -> firefox-127.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/mr.xpi -> firefox-127.0.2-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/my.xpi -> firefox-127.0.2-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-127.0.2-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/oc.xpi -> firefox-127.0.2-oc.xpi ) l10n_sc? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sc.xpi -> firefox-127.0.2-sc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sco.xpi -> firefox-127.0.2-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/si.xpi -> firefox-127.0.2-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/son.xpi -> firefox-127.0.2-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/szl.xpi -> firefox-127.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ta.xpi -> firefox-127.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/te.xpi -> firefox-127.0.2-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/tl.xpi -> firefox-127.0.2-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/trs.xpi -> firefox-127.0.2-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ur.xpi -> firefox-127.0.2-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/xh.xpi -> firefox-127.0.2-xh.xpi )
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ccc1c322bf6c41db12857f9c9ce5d686
diff --git a/metadata/md5-cache/www-client/firefox-bin-127.0.2 b/metadata/md5-cache/www-client/firefox-bin-127.0.2
new file mode 100644
index 000000000000..5fae3afea928
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-127.0.2
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst postrm preinst setup unpack
+DESCRIPTION=Firefox Web Browser
+EAPI=8
+HOMEPAGE=https://www.mozilla.com/firefox
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop linux-info optfeature pax-utils xdg
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=!www-client/firefox-bin:0 !www-client/firefox-bin:esr >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[X,wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libxcb >=x11-libs/pango-1.22.0 alsa? ( !pulseaudio? ( media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=rapid
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/en-US/firefox-127.0.2.tar.bz2 -> firefox-bin_x86_64-127.0.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/en-US/firefox-127.0.2.tar.bz2 -> firefox-bin_i686-127.0.2.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ach.xpi -> firefox-127.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/af.xpi -> firefox-127.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/an.xpi -> firefox-127.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ar.xpi -> firefox-127.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ast.xpi -> firefox-127.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/az.xpi -> firefox-127.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/be.xpi -> firefox-127.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/bg.xpi -> firefox-127.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/bn.xpi -> firefox-127.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/br.xpi -> firefox-127.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/bs.xpi -> firefox-127.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-127.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ca.xpi -> firefox-127.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/cak.xpi -> firefox-127.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/cs.xpi -> firefox-127.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/cy.xpi -> firefox-127.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/da.xpi -> firefox-127.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/de.xpi -> firefox-127.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-127.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/el.xpi -> firefox-127.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-127.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-127.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/eo.xpi -> firefox-127.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-127.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-127.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-127.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-127.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/et.xpi -> firefox-127.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/eu.xpi -> firefox-127.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/fa.xpi -> firefox-127.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ff.xpi -> firefox-127.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/fi.xpi -> firefox-127.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/fr.xpi -> firefox-127.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-127.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-127.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/gd.xpi -> firefox-127.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/gl.xpi -> firefox-127.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/gn.xpi -> firefox-127.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-127.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/he.xpi -> firefox-127.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-127.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/hr.xpi -> firefox-127.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-127.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/hu.xpi -> firefox-127.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-127.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ia.xpi -> firefox-127.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/id.xpi -> firefox-127.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/is.xpi -> firefox-127.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/it.xpi -> firefox-127.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ja.xpi -> firefox-127.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ka.xpi -> firefox-127.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/kab.xpi -> firefox-127.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/kk.xpi -> firefox-127.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/km.xpi -> firefox-127.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/kn.xpi -> firefox-127.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ko.xpi -> firefox-127.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/lij.xpi -> firefox-127.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/lt.xpi -> firefox-127.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/lv.xpi -> firefox-127.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/mk.xpi -> firefox-127.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/mr.xpi -> firefox-127.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ms.xpi -> firefox-127.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/my.xpi -> firefox-127.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-127.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-127.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/nl.xpi -> firefox-127.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-127.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/oc.xpi -> firefox-127.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-127.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/pl.xpi -> firefox-127.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-127.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-127.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/rm.xpi -> firefox-127.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ro.xpi -> firefox-127.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ru.xpi -> firefox-127.0.2-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sco.xpi -> firefox-127.0.2-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/si.xpi -> firefox-127.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sk.xpi -> firefox-127.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sl.xpi -> firefox-127.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/son.xpi -> firefox-127.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sq.xpi -> firefox-127.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sr.xpi -> firefox-127.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-127.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ta.xpi -> firefox-127.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/te.xpi -> firefox-127.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/th.xpi -> firefox-127.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/tl.xpi -> firefox-127.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/tr.xpi -> firefox-127.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/trs.xpi -> firefox-127.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/uk.xpi -> firefox-127.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/ur.xpi -> firefox-127.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/uz.xpi -> firefox-127.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/vi.xpi -> firefox-127.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/xh.xpi -> firefox-127.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-127.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-127.0.2-zh-TW.xpi )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=356a4ab298833cf6bc944e3b6401df90
diff --git a/metadata/md5-cache/www-client/google-chrome-126.0.6478.114 b/metadata/md5-cache/www-client/google-chrome-126.0.6478.126
index dd3c06591280..1d7219f9cf8d 100644
--- a/metadata/md5-cache/www-client/google-chrome-126.0.6478.114
+++ b/metadata/md5-cache/www-client/google-chrome-126.0.6478.126
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_126.0.6478.114-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_126.0.6478.126-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bfd7fbed5da8b0a45c8a72b4a253e8dd
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-128.0.6535.2 b/metadata/md5-cache/www-client/google-chrome-unstable-128.0.6555.2
index 559d970161d0..4c3b473dcd67 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-128.0.6535.2
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-128.0.6555.2
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_128.0.6535.2-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_128.0.6555.2-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=830a7134f8131d55b1df4f5860ec558f
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-126.0.2592.56 b/metadata/md5-cache/www-client/microsoft-edge-beta-127.0.2651.15
index c88efb39ffba..2c3d2c87d23c 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-126.0.2592.56
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-127.0.2651.15
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_126.0.2592.56-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_127.0.2651.15-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5763d77203fbca8cef77df6c97b9381d
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-126.0.2592.61 b/metadata/md5-cache/www-client/microsoft-edge-beta-127.0.2651.8
index ed6931f5e256..34cbb8964047 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-126.0.2592.61
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-127.0.2651.8
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_126.0.2592.61-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_127.0.2651.8-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5763d77203fbca8cef77df6c97b9381d
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-127.0.2620.3 b/metadata/md5-cache/www-client/microsoft-edge-dev-127.0.2651.8
index 7ca97b79522f..f84d46e8634b 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-127.0.2620.3
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-127.0.2651.8
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_127.0.2620.3-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_127.0.2651.8-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5763d77203fbca8cef77df6c97b9381d
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-127.0.2638.2 b/metadata/md5-cache/www-client/microsoft-edge-dev-128.0.2661.0
index 8d230934b6b1..4ae2f67878d4 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-127.0.2638.2
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-128.0.2661.0
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_127.0.2638.2-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_128.0.2661.0-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5763d77203fbca8cef77df6c97b9381d
diff --git a/metadata/md5-cache/www-client/opera-111.0.5168.25 b/metadata/md5-cache/www-client/opera-111.0.5168.43
index 00ebc8eeca90..92d55a3ef020 100644
--- a/metadata/md5-cache/www-client/opera-111.0.5168.25
+++ b/metadata/md5-cache/www-client/opera-111.0.5168.43
@@ -10,6 +10,6 @@ LICENSE=OPERA-2018
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:125 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/111.0.5168.25/linux/opera-stable_111.0.5168.25_amd64.deb https://download2.operacdn.com/pub/opera/desktop/111.0.5168.25/linux/opera-stable_111.0.5168.25_amd64.deb https://download3.operacdn.com/pub/opera/desktop/111.0.5168.25/linux/opera-stable_111.0.5168.25_amd64.deb https://download4.operacdn.com/pub/opera/desktop/111.0.5168.25/linux/opera-stable_111.0.5168.25_amd64.deb
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/111.0.5168.43/linux/opera-stable_111.0.5168.43_amd64.deb https://download2.operacdn.com/pub/opera/desktop/111.0.5168.43/linux/opera-stable_111.0.5168.43_amd64.deb https://download3.operacdn.com/pub/opera/desktop/111.0.5168.43/linux/opera-stable_111.0.5168.43_amd64.deb https://download4.operacdn.com/pub/opera/desktop/111.0.5168.43/linux/opera-stable_111.0.5168.43_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b703ec022eb735cbccd5f1fff9759668
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index b4cd4e43e74f..11e7906df660 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-126.0.6478.114 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-126.0.6478.126
index d22ac9ce6c7d..184082e34db1 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-126.0.6478.114
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-126.0.6478.126
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_126.0.6478.114-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_126.0.6478.126-1_amd64.deb
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
 _md5_=fa2f06833cd9f9f645a48582e0cfafc8
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-128.0.6535.2_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-128.0.6555.2_alpha
index a59e51d7a786..ccb1ec65aa2f 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-128.0.6535.2_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-128.0.6555.2_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_128.0.6535.2-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_128.0.6555.2-1_amd64.deb
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
 _md5_=5b19787a2bf752fe71a01f6e6da560aa
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 7b6cf196d5e7..cb45ebb75bbc 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.24-r1 b/metadata/md5-cache/www-servers/tomcat-10.1.24-r1
index c2c32886ca6b..ba184ca3f270 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.1.24-r1
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.24-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api
 RESTRICT=test !test? ( test )
 SLOT=10.1
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.24/src/apache-tomcat-10.1.24-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.24/src/apache-tomcat-10.1.24-src.tar.gz.asc )
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=c70db9a9583cd70ca70ff5a9ff211d35
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.25 b/metadata/md5-cache/www-servers/tomcat-10.1.25
index 1a339e0051cf..7a35b3c05eec 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.1.25
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.25
@@ -12,5 +12,5 @@ RDEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api
 RESTRICT=test !test? ( test )
 SLOT=10.1
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.25/src/apache-tomcat-10.1.25-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.25/src/apache-tomcat-10.1.25-src.tar.gz.asc )
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=2c366114f46b9d7fd6e2caaedd1a8260
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.89 b/metadata/md5-cache/www-servers/tomcat-9.0.89
index 5de1d22b5716..b440bd4533c3 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.89
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.89
@@ -12,5 +12,5 @@ RDEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.20 dev-java/jax-rpc-api
 RESTRICT=test !test? ( test )
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.89/src/apache-tomcat-9.0.89-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.89/src/apache-tomcat-9.0.89-src.tar.gz.asc )
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=35783acf9d9f85ccdfb9f0886dcb3a79
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.90 b/metadata/md5-cache/www-servers/tomcat-9.0.90
index 8a7211587dee..821acfe5bfe1 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.90
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.90
@@ -12,5 +12,5 @@ RDEPEND=dev-java/bnd-annotation:0 dev-java/eclipse-ecj:4.20 dev-java/jax-rpc-api
 RESTRICT=test !test? ( test )
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.90/src/apache-tomcat-9.0.90-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.90/src/apache-tomcat-9.0.90-src.tar.gz.asc )
-_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	09d793abe112f655cd781e4467a6fc10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
+_eclasses_=java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	bd5d4f6069e1a68c0b528e9c07ae680e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
 _md5_=70f5aeb933d82f714497dbc1ef7b989a
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 5354f83c90ee..a812a3d0e7a1 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-555.52.04 b/metadata/md5-cache/x11-drivers/nvidia-drivers-555.52.04
index 8cc15add0696..b960a06f3f53 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-555.52.04
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-555.52.04
@@ -13,4 +13,4 @@ REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/555
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/555.52.04/NVIDIA-Linux-x86_64-555.52.04.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/555.52.04/NVIDIA-Linux-aarch64-555.52.04.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-555.52.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-555.52.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-555.52.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-555.52.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-555.52.04.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-555.52.04.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	linux-mod-r1	9ccd2b29cd75bd48092f8f46b07fc935	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	b8c7a61664027641d79dcfc04bd366f4	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6895cfbcb81200fa1ad1a876e07cda54
+_md5_=ad41666be4ad59bd4d9cd462fb2eda89
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index b5ee68309b33..fc3d312e69af 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.6 b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.6
index f8f9cc641ed4..1cd4cdc170f5 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.6
+++ b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.6
@@ -9,7 +9,8 @@ IUSE=X qrcode wayland
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.60.0 >=x11-libs/gtk+-3.22.29:3[wayland?,X?] >=xfce-base/libxfce4ui-4.14.0:= >=xfce-base/libxfce4util-4.14.0:= >=xfce-base/xfce4-panel-4.14.0:= >=xfce-base/xfconf-4.14.0:= X? ( >=x11-libs/libX11-1.6.7 >=x11-libs/libXtst-1.0.0 ) qrcode? ( >=media-gfx/qrencode-3.3.0:= ) wayland? ( >=dev-libs/wayland-1.15.0 )
+REQUIRED_USE=|| ( X wayland )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.6/xfce4-clipman-plugin-1.6.6.tar.bz2
 _eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ceb4798010d9e61a0b55b50d091ebae6
+_md5_=8f790912eed4a091bb23abb9acd188f5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 99a0d53d2aef..d4d1d9b99293 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 18196 BLAKE2B 1b43af09e61e2865c024c72285ed218159c7ec13fb8eed308744d07d77ca67bd464e4e1e0953b84b2feefea8c3c0df17f2e9ca49f7df8516e5e9d8f85c1e97d2 SHA512 1cfd10f587a7c1b83e57769d372f8b0b4748d237837b5136194fd0cb51e57e068480b7753d62a86072d8760a29fb1eea4fda11ead23ce37ef285381acb9e8ce9
-TIMESTAMP 2024-06-25T22:40:15Z
+TIMESTAMP 2024-06-27T06:11:16Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZ7R09fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZ9AoVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCpTA//beFXnZkKxBlkoy3Mlv3trts8f0t7DSnag0y/rRSL+QzGKRHP7IodX7qH
-gl/uDObVLqCqjXN2scz40HgJZvb3WnOX36f2kFPB50NryvE+UL5wikIURqk7h8Mz
-tpukdadvDmzf3JnsZZSFpF5OIjPZZRN28P/Oo5Ot9ShQ5PRBwYJzarml919WA/ue
-3/dVIc3u6rq3eyg4A+YRyp6wYxoAgRxMOLLwAFu3AsgcZeY8yMylrrMWzWOyv0j5
-01ZeksIFG6EhVnqUCUvBI6vZtcplG9mbPoq4aEcuBothYQ6AJ2WyMzTH7+GJUwhJ
-8odGQHkwK7FzRvxtEGtvQy5nYu8u2OY+gYcSwbMqVe6/QaUbEnADPSnFD8vJ9u0Y
-6HN6VUpt+UQ0D3OT1hr3X9irM15PkpreuNl3CexI0xqOWm5fj+CC1Y6rl1ChU1cR
-IpNGmytF5u7/0ojHRXCKoksoMF1AAOYJzMESN6Wyo7MFrZrdwPBm/bvU5rjdSTvy
-mxxScI5wqRdSnv+g0l53n/Sn5PPgIaTzuTtX3jNN8OphDJEdESPajaO7O9q/13kc
-yR6B/4xue+EahpPAxDdE4A0psULTEzFLLp7+igwbFvgYllGZ/LXn02DKKrrQD2Y6
-5zqimqQrbKIv9UwrAllmY1J1MUYv1CgJlQpF0AxEfLOaaalzw9A=
-=It1y
+klDLBg/8CCYnfCfCnEx5PMxmcS+pOdwKO/3mXlm/LL02cKYTdSvcj7k21kgIFFBx
+U/P2Yjl3NIHFzVONa8fBIAM5sqbNHPYhRXA9KY0e8c3RHHxc3NAaAmwiA9uuqTkP
+/9OaPEpi7NUlyaDx88O6g/uv64x3WXIWfjluwd0zkT+RoDpQmOYhYa5Tz1XRnnnA
+Uz/yRa8sqm5Y0gJ81x4GOaw6jiKt+v+d7Hj786EPF94pCg6/fDVLoZ+4ltESz/Ru
+X79UgDUJtjz2SKVtwndS8JqdYXFHwWa6VQf4hD3BtIpYhGzl9OttWRSxVTOj02i9
+DW+18MZswOBBpvLZohl4Nqcc/d6+lvBHqmDDFCTRocmdTOX3rdqJUXREcQZXbNHA
+oZ4asmsV7aP/2JeC8RqlqeoeNwh04Cs9bzUsZdevnf8KkKfqOriw0l0liGbHHUEn
+LpgCvyM0lEiHhPAmPmu3mH3R+iLa2aTfzZxdt9DlkfrQQphW41ciARsD2Ale/Zii
+pLn8jfNQ6P4WSu6bCxklSUi2r0rNXRRsTCDPMECEB1Dw1r/Wk+Nm5DBBYtHUxDsc
+nP8DEt5usqQkU8wZOdAC/hT0EOCOP8YkoF7406jDKLqPdJ+boYx3GqwV25rkBvaV
+CEzrA7avPr8oJiC+cfSnfSBq7xvz+ZWDCJ24bEDZ763etahWI+M=
+=Trn/
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b481c2c3a420..6c926fe0dfde 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Jun 2024 22:40:09 +0000
+Thu, 27 Jun 2024 06:11:14 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index edb01867fc1d..10ddf4b742a2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jun 25 10:40:09 PM UTC 2024
+Thu Jun 27 06:11:10 AM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 118011eee127..101cdbc26e68 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Jun 2024 22:45:00 +0000
+Thu, 27 Jun 2024 06:15:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 69fa50b55327..63880a8f122f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-1c83a085d4c37c247d844dfc0b0f9a76e642763b 1719354726 2024-06-25T22:32:06Z
+39d278750438e9c277956eeed5cd3d158dd0772b 1719466315 2024-06-27T05:31:55Z
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 165e6c8b87ff..1b830b9a5c52 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1719355200 Tue 25 Jun 2024 10:40:00 PM UTC
+1719468600 Thu 27 Jun 2024 06:10:00 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b481c2c3a420..abb0ff7587b4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Jun 2024 22:40:09 +0000
+Thu, 27 Jun 2024 06:11:13 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 79a725ef0b4a..064c42f65c70 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index c8680e47d39a..2606a7bb7e35 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,7 +1,3 @@
-AUX monitoring-plugins-fix-check-http-segfault.patch 870 BLAKE2B 23e0d356fbb2ac071b488c49d846827292ad9fc6a2f7d5b1c1390d84db777e787d2f4d09f40ff297bab7da72c6b6b287ebfb01ca313923cca6d2bd44cad77f50 SHA512 c13325116a125f0af6299ec2d8f2ba109cc14fe5d315d944b3a3a7e8a5af731d40d84d57c9e1e29c9c9bb07212e67e943bcefb4706cd0b9c6bc0e9ec6760c2d2
-AUX monitoring-plugins-gnutls.patch 782 BLAKE2B 52f3ad417fbbf9b6fd021a42dfa2b547fcdf5f6709701732029c4bcca00793d83be9bc56f95100ded0cfe6ddaa026972b7ebd1451a7ce9a756d1cf27f595a1a7 SHA512 bc52716ad032215ce8dcd2b59b18b84eddede536280fdfd263ea7c0bb7be93f57a8efd5fcaedf6b803b435325fba8f3197ba2b17f0dd037c3beecbcaeb5cce75
-DIST monitoring-plugins-2.3.3.tar.gz 2620192 BLAKE2B 47bd7e71cf470781bb3bd8c8437ebfccdc977e48a3eba1d83ba85c2c1a8c154c7db832e3bb7189bf669083a10069c7fe09c7235a00b35fd9a6d80afcdbb44246 SHA512 502274b47da2ad04d0e2e4e29baa7e5ad8b9a9ece36794dcdf7dfcc087de30e514ff6937eaaa26b93daad329fcd11b72c3c87cad826e6bf6bafffa450077706f
 DIST monitoring-plugins-2.3.5.tar.gz 2876130 BLAKE2B 7029f6485ef73d29329bcb36e16cbbaa99c57ae20505f554af154b45cc1af6f623dabb35ee5b7f777d728bcae8eafd795f12aabc199cf1f45c9f2335f74b6d41 SHA512 bb04d547584a4aed82bfd605d129b652b45c7356c0610fb1da53a57b2ab889b67afccdd53998e2612ec06571bdc5fc238ef0d378b96e29ec072f657e74eabd55
-EBUILD monitoring-plugins-2.3.3-r2.ebuild 3169 BLAKE2B 7e6ddc621b94b560b18cdd33c4acabf234b534aa07ad6d239f38b95daa4c4f0f3582630cbda51fd2887492357eb8233dbcc34136e7b9a8fd1640f894c99876c8 SHA512 e17f1cf4619cc3cda54d7024dabc6cd6cb01028504489908110806fc449548297846441a0444b74d12693db182d125dd4e6016522ec9d858a005d0e194623373
 EBUILD monitoring-plugins-2.3.5.ebuild 3053 BLAKE2B fb5abb2f871578946e90eda375c9821c6dab7f87f650bfe8ee11f104c8715babe3ab04520feaa23819598fc227cb68497d027fdca12dbce333db32d87b3ffd65 SHA512 8626668a6504427a7958f3c3775660e1a5f4d7cb0ee7102a3287211ecf9c40132c999682c2b106fb192133a6fead16af19722857b703eda4cec71f1140541084
-MISC metadata.xml 1541 BLAKE2B 979f2ab54aa6fd684023c25a2725f45ce1c3edfcc98f7b79e0bee72937f0c385c71c8f8a2caaa60231bdf26c4649ded397eeafb046a46fdcda5247ca030724be SHA512 a8d68c666fa3e9e181ab3d7f469395b19e26b47145fdf96f1135c3eb5001404f66a8c046a236d25238e4e31adb6269c1da7020b5b92262d3a7cb4f6f8a0f49d9
+MISC metadata.xml 1679 BLAKE2B e99ba6614df951268458260a1b8f02f40408dd2e41b65e77555fe1d1698bf4d5fbb8a35b5d640198c1feb74bdeb78c3efb9c2670c3d87bbadef16be66602d172 SHA512 1b24d36802f5efa30d4c289bbc231761d9a3a1149831ae913eea998d49782c9424e37d270ff2853a91a9d75d65e2991910aab986f7dc78e3a8132ca17be56d8a
diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch
deleted file mode 100644
index 34e539f51e2d..000000000000
--- a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/893252
-https://github.com/monitoring-plugins/monitoring-plugins/issues/1836
-https://github.com/monitoring-plugins/monitoring-plugins/commit/6d3e44d2d8395076060e9c741e9b173dc5d57b76
-
-diff --git a/plugins/check_http.c b/plugins/check_http.c
-index 5fa310f5d..8dda046ff 100644
---- a/plugins/check_http.c
-+++ b/plugins/check_http.c
-@@ -1462,7 +1462,13 @@ char *unchunk_content(const char *content) {
-     memcpy(result + (overall_size - size_of_chunk), start_of_chunk, size_of_chunk);
-   }
- 
--  result[overall_size] = '\0';
-+  if (overall_size == 0 && result == NULL) {
-+    // We might just have received the end chunk without previous content, so result is never allocated
-+    result = calloc(1, sizeof(char));
-+    // No error handling here, we can only return NULL anyway
-+  } else {
-+    result[overall_size] = '\0';
-+  }
-   return result;
- }
- 
diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch
deleted file mode 100644
index 00415f0b7111..000000000000
--- a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/880211
-https://github.com/monitoring-plugins/monitoring-plugins/issues/1834
-https://github.com/monitoring-plugins/monitoring-plugins/commit/31bdbfce92de2dc7717fe13a8d1ca8e7dbf850d4
-
-diff --git a/plugins/sslutils.c b/plugins/sslutils.c
-index 286273f6..c26c4fb3 100644
---- a/plugins/sslutils.c
-+++ b/plugins/sslutils.c
-@@ -134,7 +134,12 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
- 		return STATE_CRITICAL;
- 	}
- 	if (cert && privkey) {
-+#ifdef USE_GNUTLS
-+		SSL_CTX_use_certificate_file(c, cert, SSL_FILETYPE_PEM);
-+#endif
-+#ifdef USE_OPENSSL
- 		SSL_CTX_use_certificate_chain_file(c, cert);
-+#endif
- 		SSL_CTX_use_PrivateKey_file(c, privkey, SSL_FILETYPE_PEM);
- #ifdef USE_OPENSSL
- 		if (!SSL_CTX_check_private_key(c)) {
diff --git a/net-analyzer/monitoring-plugins/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml
index 37237fb7544c..b8ca2be8aea7 100644
--- a/net-analyzer/monitoring-plugins/metadata.xml
+++ b/net-analyzer/monitoring-plugins/metadata.xml
@@ -26,6 +26,10 @@
       Install <pkg>net-analyzer/fping</pkg> required for fancy ping
       monitoring. Disabling the flag does not remove any plugins.
     </flag>
+    <!-- leave this global flag defined here to avoid a pkgcheck warning -->
+    <flag name="ipv6">
+      Enable ipv6 checks.
+    </flag>
     <flag name="ssh">
       Install <pkg>net-misc/openssh</pkg> required for monitoring SSH
       servers. Disabling the flag does not remove any plugins.
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild
deleted file mode 100644
index e364f28aa4cc..000000000000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit flag-o-matic
-
-DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
-HOMEPAGE="https://www.monitoring-plugins.org/"
-SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 sparc x86"
-IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-#
-# REAL_DEPEND contains the dependencies that are actually needed to
-# build. DEPEND contains those plus the automagic dependencies.
-#
-REAL_DEPEND="dev-lang/perl
-	curl? (
-		dev-libs/uriparser
-		net-misc/curl
-	)
-	ldap? ( net-nds/openldap:= )
-	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-		gnutls? ( net-libs/gnutls )
-	)
-	radius? ( net-dialup/freeradius-client )"
-
-DEPEND="${REAL_DEPEND}
-	dns? ( net-dns/bind-tools )
-	game? ( games-util/qstat )
-	fping? ( net-analyzer/fping )
-	samba? ( net-fs/samba )
-	ssh? ( virtual/openssh )
-	snmp? ( dev-perl/Net-SNMP
-			net-analyzer/net-snmp[-minimal] )"
-
-# Basically everything collides with nagios-plugins.
-RDEPEND="${DEPEND}
-	acct-group/nagios
-	acct-user/nagios
-	!net-analyzer/nagios-plugins"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-gnutls.patch" #880211
-	"${FILESDIR}/${PN}-fix-check-http-segfault.patch" #893252
-)
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# Use an array to prevent econf from mangling the ping args.
-	local myconf=()
-
-	if use ssl; then
-		myconf+=( $(use_with !gnutls openssl /usr)
-				  $(use_with gnutls gnutls /usr) )
-	else
-		myconf+=( --without-openssl )
-		myconf+=( --without-gnutls )
-	fi
-
-	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered (bug #468296). But also the path
-	# likes to move around on us (bug #883729).
-	myconf+=( --with-ping-command="$(command -v ping) -4 -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" )
-	fi
-
-	econf \
-		$(use_with curl libcurl) \
-		$(use_with curl uriparser) \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with postgres pgsql /usr) \
-		$(use_with radius) \
-		"${myconf[@]}" \
-		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-		--sysconfdir="/etc/nagios"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-		NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags that determine what you"
-	elog "are able to monitor. Depending on what you want to monitor, some"
-	elog "or all of these USE flags need to be set."
-	elog
-	elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index d00a7456f635..38d2b1443f00 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index eb00901eaf84..efd3eba24298 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -23,5 +23,5 @@ DIST djbdns-1.05-test32.diff.xz 31096 BLAKE2B 0bd6948ba3930f7d6e657f91ff76b1101f
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9
 EBUILD djbdns-1.05-r38.ebuild 3865 BLAKE2B 48ad84b7063fe3bad4f85a31cabf347cf190184d8ba53a1f58e41a687dcdf4ab4073a2e81745f475eeeb5eb2e9b4d90db2525e9db76fbd43e3669be435722f03 SHA512 cde9e09279e6934bd862d3e8962b2aa40348eeff2bb1ba03c7d4b8788ffc9a895a484bd7fee63b0ead42dadfb34c8cc26f700056f3417f2c26565fb443a5e2a2
 EBUILD djbdns-1.05-r39.ebuild 4289 BLAKE2B 9945ba00fa1d8ba613245a7dc86cedc0470bd43de7541419c4bbd999f469a31d8f408bc3f0cfc08d0ff9893428597907f5e8762096e6ec1b4c188aceafb40b10 SHA512 3392601d470e4e1830f23d7a7daac0dcd9149cbfcf827db762c0f6e3369ef53c8a65bdf9707591ad6c1237af62f375d8e2f9e3b5d7a7ee4b0d7107e6bd072f4c
-EBUILD djbdns-1.05-r40.ebuild 4434 BLAKE2B c2cec8e3016d5b0711791f63e042f8bf263f7d58bdbb91fc1ecd112ec1d27b7f91f0956daf60a6cbab4f2d826307acc6e2c582b25504111830a8204043bd5c71 SHA512 6d0b9a11bcac2d0c1cbc2e67f990c708fb499b8b072e9e03575086968f4ea1ac978f1ae960fc24fc46492b5fbf471dfd709cea2110c95f1d43eda5ccd843e46b
+EBUILD djbdns-1.05-r40.ebuild 4429 BLAKE2B 974b95fdc81a512479737296cb53e7c4e9340f568a9b8fd4e05e9eec492439aaf71506bbe67695de6a3b811a8f5c6752291df61e6053ffca6bd015f6a3b7980d SHA512 68276853101bfb890a971f84e4422a905e6394ee5381395ccf5dac18bb32143a814a115e11f393b69bee79537418916b1cf6c5e092cde270659dc81e91cd98f3
 MISC metadata.xml 576 BLAKE2B ade984b384316960d3ea8de1f6ef83c8a578901cf644af5e42543038d52cdac99a834a3881e244fe6f3999f1aac030f4e39cd3cd83d4eed39dbf24b4a55ea9be SHA512 7d85669a1c841d3ea2a97ab5efcd4c18e03062526827f8ae9a97e7becddcf9e3222fee03a67933d01675b605c51dbf0ed6b1e17b9130829545c7c5bad651b5fd
diff --git a/net-dns/djbdns/djbdns-1.05-r40.ebuild b/net-dns/djbdns/djbdns-1.05-r40.ebuild
index f5a5afde9b70..3ceac85f940c 100644
--- a/net-dns/djbdns/djbdns-1.05-r40.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r40.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://cr.yp.to/djbdns/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 RDEPEND="
diff --git a/net-dns/smartdns/Manifest b/net-dns/smartdns/Manifest
index 112d119c07e0..0539d49f9cd5 100644
--- a/net-dns/smartdns/Manifest
+++ b/net-dns/smartdns/Manifest
@@ -1,7 +1,5 @@
 AUX smartdns.confd 148 BLAKE2B 4ea7db4def275650a2321b42ad22ab95f316fb6371cb814792ba5b47091e472a69d9a13c6a77202dc005116c3e723dbf07d4515a43d69239e71e2ea0cffd85fb SHA512 57a69fe8cb1b1f96a9c1e9c06d1908e4764c0bf4010fcfdd8515dfbbc358ff38b85d28416c7b11a8715623528ff22b3982d287dbf266f6c7ae104e745c5cb068
 AUX smartdns.initd 480 BLAKE2B f27c77b95ea13d65eb45d75de831fc2622d7e37cbf517b466e56d38506ad10e283c9a75d74446d3d1329600f3b3b1178ca6169fd7c611e3f8d9aa8bc5b2e8a79 SHA512 66d8b43b01419029162817685c569731eb45dc44128224644e628191bb57cc830d3fdbb9df80d61a52333bba5a763dbefdef7b3be5c164e0bc66cd425ba89e94
-DIST smartdns-43.tar.gz 572029 BLAKE2B 8f4ec3b1b1a804a6624107ed3d97e8015690db9c405fc52d1e34ac9bda280ef0785b7d9648dfd41809a1f729679b6241f36b3c7a4dc88a60e77b2d0ca463ca69 SHA512 ab4ce7ac5fe05173a660f8dce61e7cc0ec8375ff7d64d08e854f73e5cfd78fec702220f076b75efe9518334a384b9689898d5c2856cc506d294b5325733bb9c6
-DIST smartdns-45.tar.gz 631756 BLAKE2B 3bc187b5513b4d02f546b285c5196cdcb3a6851ba679645a4e8bb24d3b338502a2cedc8d21c8397a5370a0330c3e083b7fc880dd972f5c5bc6c72501545d76d4 SHA512 351b2d9591a6c17349ffcd199cb7b387c8b7ec692a0ee16d163d6118dabfdbc4bf67cedc1695c73b2d20b2ee6b4b99fc81a9e26e1eda5e02c477208b140d7cb6
-EBUILD smartdns-43.ebuild 781 BLAKE2B 4bbdae59b3e8644a75adcadb541d4c807786ab4c1d16949ef71d42b792dd4a6da178c4b155d49ab967ba6555798231b70dea57900aca2cc98ce6dfef3c428977 SHA512 ea099a502725e4962300815a695769e7b9b651a32fea3312d866088a323d44d6b4579d6087747c7645f4e20125c0fff686d4d99ffa1989aeb216b001b588aa59
-EBUILD smartdns-45.ebuild 781 BLAKE2B 9f0083423cca9c15839e8593c714cc446666465bb725443363a0cc7ab75c6558701b5300980b952e4303d37094cb14c33a274ac06f231def94f728b1b0ddb417 SHA512 e700789c17481f76d72a5108522f4213ac717dbad51db47c8057da4cbd188d11287d288a20c242ed5960388cd532e46757800b1f48c0a8749e12ab2a0ec44ef3
+DIST smartdns-46.tar.gz 633211 BLAKE2B 2cf550fb88da183a9899995a6b9e030d887c13d16b7cdc479678ac6f8bd411894413f00a4bba02a4ac2dbf6781b7f1c66b18b8fd20c4a522472b514f6777dbaf SHA512 4798b5d75412864f707a2de5bc72c38fdfdc278156dc00c7f5d0ab3af95d605544a86368b56cc41bc7465fa6c063bc742a0c0e797c266aa472bf9d21398313f7
+EBUILD smartdns-46.ebuild 780 BLAKE2B 173e7d2c0309880532b310341a246faaa0a3f35495ebabb7f27af48c985a509ae42668d807e161f1e997e08dd54e639ff05a99a7f34f65aa6e652dbe5260cc83 SHA512 f218944e4b1a5456626c2380a760d3b83ce09fe7aff02fc3318c9ef8de866fcef7a0950bb7cef6642f7afb08741e43b5f0b72973fa273def395b1d275b023dbb
 MISC metadata.xml 384 BLAKE2B 19b47f366fc3f3fe2bcb6df3a06f76452e5ee4d9249a88b02fe3cd08dccd692a8b0130879edbb4070537050746fa60fb3d06f269aba41657e57f359ba0084408 SHA512 924bb86fe0837f58ed9c2da49b28d8531a56e3c97a4331c06fd6697152290c130a55463fea275a7e3d9d8c131bc4ed62d4fe659a935aa9c1a670f3b16805f253
diff --git a/net-dns/smartdns/smartdns-43.ebuild b/net-dns/smartdns/smartdns-43.ebuild
deleted file mode 100644
index 1cb256b86f6b..000000000000
--- a/net-dns/smartdns/smartdns-43.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-DESCRIPTION="A local DNS server returns the fastest access results"
-HOMEPAGE="https://github.com/pymumu/smartdns"
-SRC_URI="https://github.com/pymumu/smartdns/archive/refs/tags/Release${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-libs/openssl:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-Release${PV}"
-
-src_prepare() {
-	default
-	sed -i -e "/install .*default /d" \
-		-e "/install .*init.d /d" Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" install
-
-	newconfd "${FILESDIR}"/smartdns.confd smartdns
-	newinitd "${FILESDIR}"/smartdns.initd smartdns
-}
diff --git a/net-dns/smartdns/smartdns-45.ebuild b/net-dns/smartdns/smartdns-46.ebuild
index 9d01b7f6763a..27d07ff42dc1 100644
--- a/net-dns/smartdns/smartdns-45.ebuild
+++ b/net-dns/smartdns/smartdns-46.ebuild
@@ -8,6 +8,7 @@ DESCRIPTION="A local DNS server returns the fastest access results"
 HOMEPAGE="https://github.com/pymumu/smartdns"
 SRC_URI="https://github.com/pymumu/smartdns/archive/refs/tags/Release${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${PN}-Release${PV}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -15,8 +16,6 @@ KEYWORDS="~amd64"
 DEPEND="dev-libs/openssl:0="
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-Release${PV}"
-
 src_prepare() {
 	default
 	sed -i -e "/install .*default /d" \
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 8829c3336f2a..d31645235499 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest
index 40e966579424..8f4a112f928a 100644
--- a/net-im/discord/Manifest
+++ b/net-im/discord/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.57.tar.gz 101436594 BLAKE2B 689d7b8dc6ad266a2e6d1ce7212761279a320c5e517ec6ba396f1ad043f3bd07f674f1bbafdbe3536f6f0a2001483d6f824bc02edd640462e2609190c727cabd SHA512 5db4a92ca32fd697f7319f81fd4dc29ac6df0296e8a2c55acae25df7225e546880760f3e0b72a09734a01251444aa37320a3db671cf052592daaef78856e7fee
-EBUILD discord-0.0.57-r1.ebuild 3721 BLAKE2B eb82434169d7778ddba7a810dd18938a0b59c78c96bc40f94d2cdb2e650c88cce36b522e5ee6b1305b4d84d39b33d4124b3957c8803f87365e5d6ce12ae7d448 SHA512 dd2bb48a78953299459f3f8e48ff6cc9eb55b975623d1662b00d1b07a66b3bae1291d4be5f8aa09dea3b7a132643c9c58c977b0c6f0b331b7869eaaf4cbf2432
+DIST discord-0.0.58.tar.gz 103212154 BLAKE2B 62b9d598c101c885cd87277020d1d1182fd288b4c3883f1f8b16f12fe62df81725dcc70167c644eb4195a0e6019004033f4775e37ae24382ff4eadddf0f0d465 SHA512 8efab6f4a476c05b620f3e95c082ae3f5423a2aaab310687f8b67711b0b34e7c82105e8c9ea5d4e0b92fc368443bc6a0e8970143d28ef7cb2d5f9e05f85b038d
+EBUILD discord-0.0.58.ebuild 3721 BLAKE2B eb82434169d7778ddba7a810dd18938a0b59c78c96bc40f94d2cdb2e650c88cce36b522e5ee6b1305b4d84d39b33d4124b3957c8803f87365e5d6ce12ae7d448 SHA512 dd2bb48a78953299459f3f8e48ff6cc9eb55b975623d1662b00d1b07a66b3bae1291d4be5f8aa09dea3b7a132643c9c58c977b0c6f0b331b7869eaaf4cbf2432
 MISC metadata.xml 506 BLAKE2B ff098a1c9341a94ebb21da57c3028d3d96e884e19e3adf2df8d50b694a1ca3eee61f5dfd90eaa557a0a0eee769fd11dfa7bbf63308386a11faa56d13687e33c3 SHA512 56baf0a5323057b4af83a7b7d760b2b1e071e15ca4eef6546eab4104fbdd026906f68d8023a3155f492d8d93cd7022c5d0017372cbaf2894b94bd253b2ce3665
diff --git a/net-im/discord/discord-0.0.57-r1.ebuild b/net-im/discord/discord-0.0.58.ebuild
index e7dde173394c..e7dde173394c 100644
--- a/net-im/discord/discord-0.0.57-r1.ebuild
+++ b/net-im/discord/discord-0.0.58.ebuild
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index c4f8b0e3d77e..de0642631a1d 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index e06d2b5494a4..1e086c0474c6 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -9,10 +9,13 @@ DIST weechat-4.3.1.tar.xz 2692548 BLAKE2B 5072bea7375802bfac1522ab97058f12705834
 DIST weechat-4.3.1.tar.xz.asc 833 BLAKE2B 1412d40e9f6950d6c8cfe51ea5ecd4423aa1e86d0aa522017d3af065c4aa64ed816c4bd8af701f1a8859c511b3b85377c22b7cf4f59a8ef2cfa44eb0abe0dada SHA512 358b41e4c27e1c32ed1c8c20fd4487c9445ea203cd76fb77c8a082baad38105c0e93a8aabb656680a0d429e76a26bb149f2f2b6a4eda4b8192f1520a9249458a
 DIST weechat-4.3.2.tar.xz 2693508 BLAKE2B 599ee64317f2a10c7bdd8636759b249d3db7c4c30bc9c12566e4dc2534ec932fa8f3b2fe1c570e2e40b20cac9af99f8429ee1bf6edc0aa2c7e32368058f515c6 SHA512 438d76cada9bb870c188b8fe0c8ad45d1d0dc71392ee8d5193c5b3c3424afad4f98bedc9a396b2294c4cb20bce9299e5a4f921525f7f976e5cd1f589a78b2caa
 DIST weechat-4.3.2.tar.xz.asc 833 BLAKE2B 14a71a4b66cf82fe7bb0e3c7eefe3f2f3d3b14f0c7ca26fd645716d33acd64598dfcfda9162bb07290cb9758eeef1471cde28183c559440597d45bc8984969a6 SHA512 ff9a3d3777fecf1de1898647b97f45ebe68c95f09cc098280ba4f0dc9e6d78f25119217bfb704eecbabed9bba09d567556913018f69d903858a84e8150298690
+DIST weechat-4.3.3.tar.xz 2694000 BLAKE2B 1fde0f51add8928f264c0f9418f60d03ff60cf3ea347413d0823b6a8d5781c59a893f1c047b08ff4760628f50189c3e8ffed89f8d78171bcaf260f957aac2146 SHA512 ca6f80b874fa7b1a5e2773b7b05bdd47e6dd9a622e72ce2f876a94d4c6edaa6834cea83a7294dd2acb2c0bc67bc9e731593b33252559bb26290f964911790b1b
+DIST weechat-4.3.3.tar.xz.asc 833 BLAKE2B 53ecaf3b58c9d894a026452e42e386e4beb819539f12653363dcf93caddcdd1790b338d91f347b788a01183621931011bb79cff1fc75900ce97cd947e8d397f5 SHA512 35a348b2dd230c738634acbd77c8ae786296b93b755f1b22b0b8500c5bc2787ab64128aaf51bf755b9ffeefb08ab3f78cd57e6e9403849964ef561b7c850a264
 EBUILD weechat-4.1.2.ebuild 4874 BLAKE2B 6dee373ab332ae62b7ec45f18c08fe482f12fae592dc19a9916366686be023287427176228166a18b91d6392e905d8d9379ef9f3047a276fb28c844b9c39c31e SHA512 3bc97d66ef52a171452edaf3d1737378228e8be8666c9aa5327b6bbaae6d2bea942ac66732a8fedc4f12bf7ce059b21f7490ff0eb9c3c9fdb57492ff21a4059e
 EBUILD weechat-4.2.1.ebuild 4895 BLAKE2B 55956a1c2c4889a47bc5a86709fdaf4dbbd2ccc70705e4b62d728a6be60649e23cce8b57a86f8fc0385e945057c93f111c3babc34688903e360c1d87c25299d9 SHA512 0094b099948779173e284c3e8f32a3d31fdb0b3003a3b7cedd12ed41fd15effe40ee62d9109303d923a7bf67d7171c8fc939806c54bcaff5d44b2095edd46a8a
 EBUILD weechat-4.2.3.ebuild 4898 BLAKE2B cccef046978eb24b4e7ca825f9b0a28d771e6d0051e8f7605bb08c2e70cd7f826669524127941f996e6e256d1c235da7c1f69792a197a36aa3b97f024720c43a SHA512 7a68157263ca21a3f0cc785b052be669ffe1dca22b7746a5b5d9b93aee117b678f5501a3dbff45c2aa16c790f50a9595d17c6d9ee6d888263ca0a474f336829a
 EBUILD weechat-4.3.1.ebuild 4965 BLAKE2B bb63a308dbf5e4798bc2de6885d2b19d84d3b7a49297f9e78baed0d7fe61c32f649916a1bc71e39aa50c94e612bdd82663f64211ac15e54607b54daf4fbd9a1a SHA512 9d6bfafecf00ca9d92d259810ad1758a43d13f4d2c2db8ed6c3971a92443979d0409c365ed8cebee5b769f615ec6b1e461d01bfa02a787520741d759bf8e7b93
 EBUILD weechat-4.3.2-r1.ebuild 4996 BLAKE2B 9a990aa051aa62ee99a629874428361edfdef3c1befab8da4a16bbaece0499e972dc8b910b926249b68aad7651e8521ace0af9971a096dbf8832706513105ac7 SHA512 6bdc1395ba624e42de4dfe9ba6c89e1ae7ceddc4d595d28ffcc81c9f234611d45a0edf07cd7c91e3a9d9e2ffdd455e6e4dff3f88e7ea8ac3b50376da2ade403e
+EBUILD weechat-4.3.3.ebuild 4996 BLAKE2B 9a990aa051aa62ee99a629874428361edfdef3c1befab8da4a16bbaece0499e972dc8b910b926249b68aad7651e8521ace0af9971a096dbf8832706513105ac7 SHA512 6bdc1395ba624e42de4dfe9ba6c89e1ae7ceddc4d595d28ffcc81c9f234611d45a0edf07cd7c91e3a9d9e2ffdd455e6e4dff3f88e7ea8ac3b50376da2ade403e
 EBUILD weechat-9999.ebuild 4983 BLAKE2B 765785ebd7511724ff7538f01c80ad00633134bd33a3d4d7789ece4590d249e56bd4ed2d756f1c95961ce5d60a6b7d828d792e74577649eab69afdd496403826 SHA512 e83f4d54bb3b0e5f50b743c03831e1e321e8275912f58d2a2c6e5eac181eed1e925f9c5b4450854e064440b09be8852d32e34876ccc9c08c73fbd2e532f05b03
 MISC metadata.xml 1535 BLAKE2B 654e2479cf1fa904e9f91a9a1214ac4bdc17da43ae6c0f344588c68a7dc1fbf200f08911cbc673debe71c7d72488390cbb30c33f6c504e5b1a68404c86a4ee21 SHA512 82b181c67a102f7625342c933c953c6e2fef2fcaec8abb11eb2237983590db8e1947e615e806c17c73efb55f47963a69a63d56174da9b3613f20d15aa5967876
diff --git a/net-irc/weechat/weechat-4.3.3.ebuild b/net-irc/weechat/weechat-4.3.3.ebuild
new file mode 100644
index 000000000000..d86207e4e6ef
--- /dev/null
+++ b/net-irc/weechat/weechat-4.3.3.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake lua-single python-single-r1 xdg
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	inherit verify-sig
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz
+		verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/weechat.org.asc
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3+"
+SLOT="0/${PV}"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+# dev-lang/php eclass support is lacking, php plugins don't work. bug #705702
+SCRIPT_LANGS="guile lua +perl +python ruby tcl"
+LANGS=" cs de es fr it ja pl ru"
+IUSE="doc enchant man nls relay-api selinux test +zstd ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+
+REQUIRED_USE="
+	enchant? ( spell )
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( nls )
+	relay-api? ( relay )
+"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	net-misc/curl[ssl]
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0:12= )
+	lua? ( ${LUA_DEPS} )
+	nls? ( virtual/libintl )
+	perl? (
+		dev-lang/perl:=
+		virtual/libcrypt:=
+	)
+	python? ( ${PYTHON_DEPS} )
+	relay-api? ( dev-libs/cJSON )
+	ruby? (
+		|| (
+			dev-lang/ruby:3.3
+			dev-lang/ruby:3.2
+			dev-lang/ruby:3.1
+		)
+	)
+	selinux? ( sec-policy/selinux-irc )
+	spell? (
+		enchant? ( app-text/enchant:* )
+		!enchant? ( app-text/aspell )
+	)
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+	zstd? ( app-arch/zstd:= )
+"
+
+DEPEND="${RDEPEND}
+	test? ( dev-util/cpputest )
+"
+
+BDEPEND+="
+	virtual/pkgconfig
+	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
+	man? ( >=dev-ruby/asciidoctor-1.5.4 )
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
+)
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	local j
+	for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \
+			| sed -e 's/.*set(\(\w\+\).*/\1/'); do
+		for j in $(grep set.${i} doc/CMakeLists.txt \
+				| sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do
+			if ! has ${j} ${LINGUAS-${j}} ; then
+				sed -i \
+					-e "s/\(set(${i}.*\) ${j}/\1/" \
+					doc/CMakeLists.txt || die
+			fi
+		done
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_NCURSES=ON
+		-DENABLE_PHP=OFF
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		# -DENABLE_DOC requires all plugins (except javascript).
+		# https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144
+		# Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702
+		-DENABLE_DOC=OFF
+		-DENABLE_DOC_INCOMPLETE=$(usex doc)
+		-DENABLE_ENCHANT=$(usex enchant)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_MAN=$(usex man)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_CJSON=$(usex relay-api)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_SPELL=$(usex spell)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_TYPING=$(usex typing)
+		-DENABLE_XFER=$(usex xfer)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		cmake_src_test -V
+	else
+		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
+		die "required locale missing"
+	fi
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 946c6bca0f71..fbe766a978f4 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index 175bd7be94b3..ecf3f293730a 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -10,7 +10,7 @@ EBUILD ngtcp2-1.1.0.ebuild 1212 BLAKE2B 3875ba79a79fed3e82d572c597975c7cfa27c674
 EBUILD ngtcp2-1.2.0.ebuild 1212 BLAKE2B d6b2095d78dd941d7d077872edcdb3a84fa7d2a948eec5093107b641e86c7e56d640b881a796ebe6df0d9aaef82ca00db701de1f2e36d93ce2aef27d6c6979f2 SHA512 035d5c88c5d003e4befdc0d751b41ca5ab57fec3665aca217fe88236b22a1a25172ff2ff94e1a0754a6f9ca7adc04f7e025e4cb75187b7f9b737c0c9239ef8f7
 EBUILD ngtcp2-1.3.0.ebuild 1212 BLAKE2B d6b2095d78dd941d7d077872edcdb3a84fa7d2a948eec5093107b641e86c7e56d640b881a796ebe6df0d9aaef82ca00db701de1f2e36d93ce2aef27d6c6979f2 SHA512 035d5c88c5d003e4befdc0d751b41ca5ab57fec3665aca217fe88236b22a1a25172ff2ff94e1a0754a6f9ca7adc04f7e025e4cb75187b7f9b737c0c9239ef8f7
 EBUILD ngtcp2-1.4.0.ebuild 1212 BLAKE2B d6b2095d78dd941d7d077872edcdb3a84fa7d2a948eec5093107b641e86c7e56d640b881a796ebe6df0d9aaef82ca00db701de1f2e36d93ce2aef27d6c6979f2 SHA512 035d5c88c5d003e4befdc0d751b41ca5ab57fec3665aca217fe88236b22a1a25172ff2ff94e1a0754a6f9ca7adc04f7e025e4cb75187b7f9b737c0c9239ef8f7
-EBUILD ngtcp2-1.5.0.ebuild 1284 BLAKE2B 27cfec0b6a3477d6c1537206ef7ecf0824941f1d50a1340e0443e541a83ce5bdb57c8c7a658e4e755838dd6801fbe4dc3f1f4820fc9d280d8b26a6c09655a843 SHA512 dca267e0da95cbf87ede5fcbbf24acad6ae0fc1ef877ac8fe5d7c9eab3920bcf00aa06b9718b6b8023a480fe1f67e1b2d3a575de319efda29e1f4a78809a4cab
+EBUILD ngtcp2-1.5.0.ebuild 1282 BLAKE2B 96abaf7ea3e9f625216cabcb2f9e5b14a425c3304779b318d01475caf837a34462cc6391eeb7b8b1faf602ad17c5d9c581e1044aea742ac185f2d7b210925232 SHA512 7a91e464cd238b396998404472dce1d2a3d5f67ef70638bbc48521e10c3f257a79984d09fa8068a5d6014fa699f10160a2f7f43381bec484eea357274089c820
 EBUILD ngtcp2-1.6.0.ebuild 1284 BLAKE2B 27cfec0b6a3477d6c1537206ef7ecf0824941f1d50a1340e0443e541a83ce5bdb57c8c7a658e4e755838dd6801fbe4dc3f1f4820fc9d280d8b26a6c09655a843 SHA512 dca267e0da95cbf87ede5fcbbf24acad6ae0fc1ef877ac8fe5d7c9eab3920bcf00aa06b9718b6b8023a480fe1f67e1b2d3a575de319efda29e1f4a78809a4cab
 EBUILD ngtcp2-9999.ebuild 1265 BLAKE2B 8312e2b64f40763ddedaf1f6919b11b8fe1c35b4ea363488e33478bafc0e4b795a97c884b5608fd6dee95184f176b1f3ee1e59b29434b2b0bf432558024aa773 SHA512 ed38e5101eb870d6c7c110dfa2671c2d67d8cb595a992aeeca2ee6e12884069796a5b0ff75aa39d91d251e35d2dab06cd8c527791bbcf97964bba69e53c066e1
 MISC metadata.xml 445 BLAKE2B d27a34331ff5bd772b6228ff26ca20440a3bf932ccc88720a33409f329d41165d5fad6750221bae1fed3386d6e8244458c1c5073df8b36251156598e599bb15e SHA512 c09f5ac61f3c3b16bda0f12c2f31188aaaba469fbfde31e71d4f9834609b4c8d0cb7152a688934ba0b90c491da4e8b707e6ad5e54d5965b4109cbdc29ee0a4a2
diff --git a/net-libs/ngtcp2/ngtcp2-1.5.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.5.0.ebuild
index da18d964561e..5594416602f8 100644
--- a/net-libs/ngtcp2/ngtcp2-1.5.0.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-1.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Implementation of the IETF QUIC Protocol"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index c4d3ef36fbc8..848bc563adc8 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -9,10 +9,10 @@ DIST node-v20.14.0.tar.xz 41795876 BLAKE2B 588c380751c12f05ccc95146f6e7f9c3eadfc
 DIST node-v20.15.0.tar.xz 41868532 BLAKE2B 07049df11e18b90ee3ebc72fdd953a64a4a925f234fcf7bfb26c472d841bd3f6f34233670d1cc67ba592eeaa714de74c6a7b89ac5a9f62a321764023a86760de SHA512 2b041ee368ca27fa1f92ec8a43237423b7e2f81dabf525e20df7b9b200a46e6d9a8c4b82beb33ec58a9351e0eea865eadfadac3d9e4d3733b1d699f0b5d4bbf3
 DIST node-v22.3.0.tar.xz 44517412 BLAKE2B 38ed4e6de9be48fb252b809a0174420f0f201f583ef5fb46a446d74168a25b39e1fa95ede44bfee8e7099dfe5636b3fb2bcd1ba3d626d7dfcac01dec0bd84d0a SHA512 70d1508bb576d98ef138db5618a5b07ca4412ec8a2aa35c8ff1d76fc93221bff6d7b418ff60b9194c420ad810523d5aeb0ffa662d2fa99f9cecf299317698710
 EBUILD nodejs-18.20.1.ebuild 7433 BLAKE2B e366853288364eddb38a0a598db70f83e5188a489ac2c5970eb21f9c993abd4807d87826536d0a1ea12315603edd5f0a714876d95d2aae1ef8e1ded8ee3e7030 SHA512 0a20a965b9c25f7319bc5dfca87e0ddf9f78f603a4dc334c68e750b847d5687b0e636fa199f089a004e72536435b334309ad042753a95f93800fb65515d77402
-EBUILD nodejs-18.20.3.ebuild 7438 BLAKE2B 485d422711687c69adb1d5e7bd6c4dcc63cd451c90bf893252d6c81ac6fdbcdf6a64675dcba588e5190de5a44717de7cefc84561265e5fb322a81fb600a7196b SHA512 ba369ee0899f78cfda0de173a4f61b2ecd5c4321f544cfe56d6c696f6971c7c897711697626e69a3d1283367efc77015e2adaefbdc6802d4cac7385a1ce8b044
+EBUILD nodejs-18.20.3.ebuild 7436 BLAKE2B 30e36570fd1e35fa4e695bc57c92b5405cea0893ccb3cf8dcf1a9bccf5b092c390aab06e8f45e5fce6b163b593cd3a70acee6a22bf6cd3e7910f4c28e5de0b18 SHA512 9de5d1c6e97c365d59ff05dd9da9c4e106a199ef698bfbd794389086a9062354577e39f18d81d1da1ee92db047ca582485764bc255768beda9c77b349dbf5100
 EBUILD nodejs-20.12.1.ebuild 7599 BLAKE2B 10339e186e827ab88b9830fbd76bab4a12a181fab9d6a6ce054948d8e1e64c32e54491bcc29ef6304827da39352f25ad73b01122c872c2667ee9d945f43368ca SHA512 cac02959f6cdfc3d99dbf918b910453a8175b2fce0a8dcaeebc64a21e4cb4186b19d5f4ce46b237de52c7e66e8f9a9dc4a353b9c12969f7370c82d91ef281b02
-EBUILD nodejs-20.14.0.ebuild 7567 BLAKE2B f91ca9f6bc88e927ae20a5af0f74a8fad87c995610eda2132a55ddbe9ab2df279d0f717dcc8e3e660358d6609de50dbb3fd76c6d4715c8e4d0e8b4016b7c65c0 SHA512 730eac7fa64742cda816d710720ca30d42a1a95db9b60e85282c7895115c437bb4e27986ff713657199a6947bb0b0cda8a2fc94912c8f7f0c032155eafe9509b
+EBUILD nodejs-20.14.0.ebuild 7565 BLAKE2B 9504d6478162ef6cf3272ab890d432087d639b7e7cf0051fc662a53d9e61bcccc36569fe2caf37a24b501f7dcb290b6f876b2d6c9396dcb604c3bd897df8eb60 SHA512 1f0617963f36a2de89d4cbb8436def4196334dcc4016170bf568b01eb340c3bfba1701efb392d0d3dd96b420317a32ef78b64a9307ce0ab835befb67c305b139
 EBUILD nodejs-20.15.0.ebuild 7567 BLAKE2B f91ca9f6bc88e927ae20a5af0f74a8fad87c995610eda2132a55ddbe9ab2df279d0f717dcc8e3e660358d6609de50dbb3fd76c6d4715c8e4d0e8b4016b7c65c0 SHA512 730eac7fa64742cda816d710720ca30d42a1a95db9b60e85282c7895115c437bb4e27986ff713657199a6947bb0b0cda8a2fc94912c8f7f0c032155eafe9509b
-EBUILD nodejs-22.3.0.ebuild 7861 BLAKE2B fb2ce11bdcaf245ab37ce6cdd96802fe99521779fce4862b554544b86dff5b7118f531d1897b0bb1f8ee1b4b1fd8646e92e7e6b77d65b25486021ad8341a1bd9 SHA512 73bb62bb04bbf600b0c49b49814a3e83e4c071c8c988349c5c76e820aba51670e4d924216f2e29fdc4e799bc461d56091e2531c8684496308ee0eccadb7c835c
+EBUILD nodejs-22.3.0.ebuild 7859 BLAKE2B 5978b66c66359d580983183e818467cb604be5a5181292396ecd4d2a125a273343f895135107aa93951efa53990ed25004e67290209bd238eadc4af91793accc SHA512 7a43cf069ac1949d9e4ed22ef13872bee8e02cfc2dd7f33e93e1034f7a11ef4440f1a956f9c2274ab49537e0716089345c5940cf5745b414860353f2af14eb26
 EBUILD nodejs-99999999.ebuild 7406 BLAKE2B 71b0f9acf3a3cdf3181c7f1dc3ca2a290c5fefce6be6ab017483750a31f7bf3c996984b91f03e1144b2b6bf3cb852529b9f620974ab0484928d6a390890cf2dc SHA512 bc0b7c5171f11b9b2d29915e03614272653baba609d505885e4aaf5d51ed40291e82c5970bb7e914e41604dcb3788ecb85a0d5e8a9770aea73f77136f6915d1e
 MISC metadata.xml 983 BLAKE2B 7e455047a955185d1e53797b2b0592c5242b7eb849617cf39366acbab41e4fd066d36d723dbc32760f591c933f068e643475fc1b58a2873a2f1221e1c5d44b71 SHA512 5e08a76e2704000aa83a2c63f6e821e83c302939c1a729c4ac73774cc85189da4eccc1a19b700babfe87c8f07327865171526550ddf16a4fc25fed834f4bf7a6
diff --git a/net-libs/nodejs/nodejs-18.20.3.ebuild b/net-libs/nodejs/nodejs-18.20.3.ebuild
index 4f03adc04f17..8aa2d9abf052 100644
--- a/net-libs/nodejs/nodejs-18.20.3.ebuild
+++ b/net-libs/nodejs/nodejs-18.20.3.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-20.14.0.ebuild b/net-libs/nodejs/nodejs-20.14.0.ebuild
index 1ce818bc4013..1701a1424832 100644
--- a/net-libs/nodejs/nodejs-20.14.0.ebuild
+++ b/net-libs/nodejs/nodejs-20.14.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-22.3.0.ebuild b/net-libs/nodejs/nodejs-22.3.0.ebuild
index ee0eb0823bd1..d0b6e626704d 100644
--- a/net-libs/nodejs/nodejs-22.3.0.ebuild
+++ b/net-libs/nodejs/nodejs-22.3.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 1a227508dee8..73a1ce2dc63e 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -5,25 +5,26 @@ DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97
 DIST anyhow-1.0.26.crate 26024 BLAKE2B 09cdaf61531f3a36b186fbebc2c783d472b54494c1dbd0e2b808be332bfba5783f40d66e46b2148a677ec61ed89f73bf2db04ebb6d43c8b395162177181d2094 SHA512 362a22854f90032f407875ee3687287f2c9c87e3b462e808219e0fd4d3067ad245544d1b6f38b3130d824af77390a331ac0b5a918498ee6c6b401fc8d0292ccc
 DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.2.0.crate 14808 BLAKE2B 122327d6ffd32e08dc9fbdb4dcf69128b19d56280f9d934311b946741003b40571cdd1f3ef54b2be02c8dc505aea11c962b244d33a92206bf4ee8f6b2b9da432 SHA512 66cbfd13e33b36284cf4c74c8d654f93adcc45893d127d9aaa4c1d183e47336096e72d74e7c17dd481fb7a98931ab6cfec7e4d4165cfb491861d4e3ffe2416fc
+DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST backtrace-0.3.37.crate 67955 BLAKE2B af9deeda806a9c47084df102ed6f5e6d57a81db9ac410678684c7026069be43bc4efd15bbf4b042d5aea9d85d619168484396d1dfc2ed83a69eeb29d750b6158 SHA512 d32ef8fa11cffeee298f7468f8f9b6d3492cdd805679fa72600115df7dd7e0ae65378ed7aa767a75a90743e278018cfb9631842e7eb633869d77485405dc520b
 DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
 DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
 DIST bindgen-0.68.1.crate 218997 BLAKE2B e3706a992c166c16cd8b8ef996b2eba6a0d67f493825e7257ba660f597de33002a32df7fea0fc2508fb47155f70ace0765e9ac4e4649d1f24b2bbac8ecf06d8f SHA512 29520e30db93ef3e239273854c926eba7bbbe2ec70e5162a4722e03947461510732319bfcfc20d5dfc0df137d69e8c1ad97daa0236c5bd4da8a1679bfd696a90
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
-DIST boring-4.6.0.crate 187355 BLAKE2B f3d8b9087351a742686839ee678c97fed25205fc6a2a57d7e23303230b94029472effbc3da00bb32701e0fb43c6081554048fe618554658fab0b91ac8977ae4f SHA512 8dde700cd043a9ade1a062c5021268a02ba128f85c932b92b867cd6a78c789b5c8549d7590d0a8dadc1f272ec44a4a1f707aa98cc38e1027f318527fbedb5f0c
-DIST boring-sys-4.6.0.crate 7087060 BLAKE2B 1fbbc360ba9262b544052ad96a92f3bf7dacb5ab13d4816579bd279fd1d131a473f92926b261aafb8335bd00d2332bdb5145500d92b263524c37d87857c2b933 SHA512 7a44e6188c2a437223ee5812054118247bdfda21d2f568095dd8ec7896ab50f9ee2c137e8294579f687c162c583ed7bb8d64ecdc8867694c78506b89f57e4542
+DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf
+DIST boring-4.7.0.crate 188531 BLAKE2B 807e6f7997f1135a8220581fea8f637aca85e3129246874d914f24d3161631d9f4ef1b0b41ea4ac0e3464ee69b26b8cc2bd93cfc8bc3f9e2ae13d10174f4c0b2 SHA512 40b9516edddd0cfbdb797407d8eb6c0411faa0c2217486ba321266ec2e6cbc2e819f0f61aab90f7fcfb0545a2caa24e18d5a2cd7efbf3ec6f5d6b8308d226e44
+DIST boring-sys-4.7.0.crate 3685358 BLAKE2B 1560de054224c941f42c617200b91557793de46ba660b9ef03789f03638ad9b2bbe1fd6cfd9cb8da1626f0ae2d96c6e24ae9bd0aad103c69f3279bd707dd1f27 SHA512 ef7b59250d11f2f02fb81ca33d0807873ac1278dd8365a72a4e9b565af31b2482e4f88e41a180756b76881b1255c0617b4f7aaa5c7dc65b6912b227beefb83dd
 DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
 DIST bumpalo-3.15.4.crate 85028 BLAKE2B 9ec98f430fef4e9b59e61d413b3703430f91bc818f3294aea7416cf8a35e0606357bb5b4d1edebe590f07fb614f832da16016c8530ff39ca853aff1d1369cc60 SHA512 59ca9f8e6b74bdd95b9b4ad1bff3bf4be46dacedeb1eea6196a65dfb0ca7b60e86ab6c25d0f91dae3caecd17ab73c48f953be0bc24bdc0ceaaf4c1726b9ffdc8
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0
-DIST cc-1.0.94.crate 76456 BLAKE2B bf72e0007d9fe022a66ccc12be48acbc5dd1b716a47f18e4062b415405140764db6ed26bcab071307142167309c9c9ab55382c7973ad43fd15d06e3fe6b24b69 SHA512 67ce0e73904cf7fac81b0b914ec5fd4d9e59f358602199530f51d203a2e42be9814b04f65497a644a0e2720cc6e58c5e4bf1ad4782ded35b710b22c9b0f2bee5
+DIST cc-1.0.101.crate 79446 BLAKE2B fbecc04723577abd209d16c34269b5ac2652fbd5385838190c744abf573912fa7a062e2fcf1dc76486c5b61677225a826a65dbd6eca58398ff60ddd1e47a3caf SHA512 6edaf3dcc2e58dffd7221a6b457057c83bdec03b6fad9cbd2d702af6820fd8354fdb3960cd78d8b38568ef408171354f0313f17a32f0caa64f97736c0840a148
+DIST cdylib-link-lines-0.1.5.crate 2946 BLAKE2B f1b3908b2cbca38e0dfb7b099188b7dc566d4332bd799a48000ceb509c995111fb6f9974aabf549e97e0d95ed43e17874bc555210f0181ba691ed6174e05aec9 SHA512 3080a84a4a414ce11956c004ebc7ab87c4617778f39a3979cd38057d08c401c11176ec2efb577ee129a730fca8f1186fea95029c7cb339a8813c504f8cdca62e
 DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.35.crate 234267 BLAKE2B 92552b9c8fb40160de9ee62ed8c5bea12bf8bae393caf91c1c64596d6b2efd09dce94355fb757ed46eaf4a13d27ee3ebb43af91e2d8c26df1f9a9f429869f319 SHA512 aed8bc3298c8f8dd8146c6a919610b6dda52c038a28b56c837a21590e41fda605cd466dc1b85e407f365e116d741cb82afbeff5d29f95f3f5bce4a62abf80812
-DIST clang-sys-1.7.0.crate 42088 BLAKE2B d1ed314a910c1b676eb780fc1c96f5ac391217ec135480d0a91b11d6f447ad06484b48966ae99115e35d921a506caf6aa7ffbc4ed86aa64367dca321678cfd7d SHA512 e544984d5bd76824ea2093f43f98b59a99e1ca8a5de40e49164b870ed4a91a530f3492faf0678190b91e74aa5d122bdbb32c649998d0ce24912dfb0b83ed6b81
+DIST clang-sys-1.8.1.crate 44009 BLAKE2B 9173de6dfbd3ef9d5d1fdc559700cd3a52f95cd77302063a97e8cf311a35825825e030b47f252c857853663ae8a16709e1f7bd0c608d67c2a74eb36ed588e778 SHA512 a68c426c20110fddb8bba07d6631517b0528fad45802e5a34a22561d7e6dad82dc5001387019a03f275e9a671b09ee0a06b6e86793c4fb4ec655700bb0f5e125
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST cmake-0.1.50.crate 16748 BLAKE2B cd3b131fbc27764e15fcefdac31f97a9d12f82ac9758b2aad256ccb371ce3e2db8aed3c76fbf4816df3483dad9fffe9973940ced65be6d31463d8c059c543646 SHA512 868d5cece75d79382ac6176aabde1723bb7e26dc745383a636516ff45856dc9187fe5a83e139f17e3bb0c114624e9e71b93c8a460b89b8facbafbca50d1d0923
 DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
@@ -35,13 +36,13 @@ DIST crossbeam-queue-0.2.1.crate 14543 BLAKE2B 0decf8fc19f33912d129eb73ac981142e
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST csv-1.1.3.crate 890849 BLAKE2B 4d5fcc75f693a7e5f224866c626f3e65c6af66c8f0c13bf7d3d5fddb31a5078c47b195c3e1068ebdb81a5cdfbd716db649b5f2f3e3ffbb4471bbd0176c3c7b5e SHA512 2e5319b50cdb96f85c129743c0ecfc23638713113641608b817e47ac34c6f9767079b98405808a387a8a870d52c44e858aea98b91126e5d996d4d3efecbab713
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
-DIST darling-0.20.8.crate 31234 BLAKE2B 13e8ec124715f743486d740241273fa5ff046b5ede86c39ad5413b3e767166dd90e7ba7344a69c1e14991f0572f7ffa24b081ef54236712c5286f211fcfbafd2 SHA512 2b4cf37cf7cce9af8e93f576dcf36b539816e1ee7b8881b5b8480c45e038c97ca2d3a80c54e243d7c6e1ae23782947efaf0d67a37c0d4dc66301c8a86ce0fcc3
-DIST darling_core-0.20.8.crate 64442 BLAKE2B bf1844eba6bac260104e2ef310721d3aae7ff222d99b01b9bb66e3c71ab700095af7dd5b3a77043d6751d94af131f02f23bd321fe9d4a7066f93d1fb7c0c605b SHA512 6f2d047758541355b81e43273cd1eb8865624096c951643e6ce777d716e17256528c47fe012f33eeb1f63883ca08f532b1ca52f43394dff82fd1bbf323763751
-DIST darling_macro-0.20.8.crate 1856 BLAKE2B d7087fa67033c897aae582e5f4d3126e06e024b7db203de7e7513308af7a0ff6ef0584a150c6f30ce434ba6ce4cc2a438f89f024c9d6338198aba3bd15cdd116 SHA512 97d18bb22b79dd95dc5ab23ea7226f9fd2d6e418b7ce9aecd4d43b7a15b37cb91e509607b89eb3a914a5d3dc562b2a292d1343f87f594ab32d41fb583d7cbdc0
+DIST darling-0.20.9.crate 31777 BLAKE2B f27b62e098461bdda18cbd78682e5d99d4f319ffca91cf9153c4aa99a55cbf91868a1fdb68b06910eaf12501f9f1bc0e2515375e6c425cd998052640b1e9af58 SHA512 801671ff5d63af09a861ef5c260c98477a49a75084ed4aabd2be2b8b5a01c742f106a71b94872a64ff2b1ec8f4e95809f334f0471343c9802549ebf2899a763d
+DIST darling_core-0.20.9.crate 65014 BLAKE2B 27422074f55ebc413ec893c27bcefec2cb4bd26156d272e637a1530ff63694a43929f55bd87baa517dba683ad6f24f97e097dd69e0407e24f656cf673c2ba07e SHA512 2c24469b2836139566713da59a3c2e3cf9cc7c1a01baa571cd59ae8a25b9c0a42bd9bd8ab7a9dae95cee2a46c344aef2c36792c05c799f195afb1925d82b81f1
+DIST darling_macro-0.20.9.crate 1875 BLAKE2B 80ef248c7699d7c6d45e0ff3d4828175c7c15967272cbdfd8a91037b57911c4c264b46bd6369da53e45a0970de2e9c8d7f7e13a1788c0e8069d01cc026ce83b4 SHA512 16ccf4b30b413377249fe7fade5976bb5230500783e784d765e7920b46d5f9cbc3c316dba6c8d5a23e82ab28509b31406bfd265caebfa9f127017fa2881c39e6
 DIST data-encoding-2.3.3.crate 19117 BLAKE2B d77962932be4aefd5855db78379b56a9fdeb784a9916a3e4d0bf3b085a8b3286396122066ad875395bf3be3fe026422fdf5554ca67e0f1b53d9fba36c11c14cb SHA512 5922cdfaaa9b4c3b2faa68e86018653dac7bccef3f2a1e16f6c599dc8c3e98a644f29c3a9082234d3a58f9feb0eb54842e57ab62ceadcf287c43f7eed1906d93
-DIST data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7c9916e6a70d41420ef1a0e5393284b49787c47af0868bceb7f5d3f1fadf203f5a547dc8cb97713d5225dc9181fdef SHA512 b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae
+DIST data-encoding-2.6.0.crate 20769 BLAKE2B 9d5713e63f6f6a4d6e5324fb0be9308a231ccefa20d69cda9e19609a2250e2cd72030ec28309068f71c932327a3ef680b749125658e27d35273354c3465f9931 SHA512 a685c7bbd251a5738b27ac3ac8121a0db049221510c99e0ada6f245ed7499d04ec29d725ad01c688ad283e3d2d5aae0751685c804f6d95cae84e63a160d04c9c
 DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43
-DIST either-1.11.0.crate 18973 BLAKE2B 31ece6eb44a367926b5f9ee817f6ac9d93746f5b95c95fab360361f6b3a02160c682d298d115f39615e5b4758953f3f29ece22a72fe4285875dce03483f87486 SHA512 f62a3859afdba762b004d4c766090a25d3bd81e4a14509c3bd0f39b0d433aeff997b39759f7dbc5a012bf3b680fc4510a4b2643d63dda8171bad7403554905ff
+DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322
 DIST env_logger-0.8.4.crate 33342 BLAKE2B b1bb359be2f34ca6f93f72154c86920b8254f574b48f693b2ae7296cd1ff25d34dea61e95fb2954569fdebb6c522c851ef7499c107005528aa2226df13b0de33 SHA512 9e4478ff609a2e1e1a902a55b221af43a52622fdb5668dc33fb0be354b964708b7b6d13b7f1ef11982f45fa7e71f0712a2ab3fd4ea98155a5115e5a7c3d33049
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
@@ -53,10 +54,10 @@ DIST fs_extra-1.3.0.crate 31298 BLAKE2B 96dfb4e886767d3d3850d94cc789867c3ed461fe
 DIST fslock-0.2.1.crate 13463 BLAKE2B dca565da8e760d016a659b7b81289034b8c48c416b326e403086a96aa4f50d6b30abe96f3026bc87e9deecbb49d7ee2b8352641f26d99dd9e9b85dfa7640d6ed SHA512 89f69658457994697f090c5ea090fed0699d032e2fa66fdafaab12d545ad6d21a324912e7132dab02e2bb1a09fc7b72d6562004c0321988a0b34332542f061f4
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST getrandom-0.2.14.crate 37307 BLAKE2B 5904388869335ea904d950ee83ad1867a0d3f6831b7139102b53f4bb4a2c12371c9396f1f1cbcc44e3ce69a4ea316651b1674722071bfa7562385ad4b6a88c33 SHA512 6c334415e09f570e3123e3c6c6eed1727533ac6c9c4142e16ae995c237a16effe146832a891be9fdde4335bd02b454e0fdd9160f20dc02f107ad106756221658
+DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
 DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
-DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
+DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
@@ -72,15 +73,15 @@ DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
-DIST libloading-0.8.3.crate 28480 BLAKE2B b8588be0e7034e94c808490adb8ee6e81c29e962aec436a0d8f8c7617b3ba9177887ce59b95b2f0af00ab030bc77b73e0a889d8a77b84deb437245211a969c94 SHA512 af8fa5fe2428fa98177d6adfc01bcd6e701b0d77ac18c95b8b8d5abb3a6376f16241ccc71b9fe100782c73c843ca53c9bad465545d8bb7def52320dad0eecef9
+DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
+DIST libloading-0.8.4.crate 28636 BLAKE2B 5961c69ce15cf2bfb4ad743ead808374f5a7a9d98ad5585d895fa4654b1c31309d968eb3f5d63e7dd5fa95b77ea59c80e666ab0e467849c858a807cc3a68ffb2 SHA512 670d82fde2ddbfcc28efaf7736d799690e4fe4b7872d95854b9c4320d64f45d4b33c0e1917228302a7625f2e5e55e5ad56e113ee8e67d59fb384b7054a0cc849
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
 DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b
 DIST matches-0.1.10.crate 2592 BLAKE2B 6e9e8ce8ade3fa0f144a1befae104f63764f8346fe864395be44f99d40ff0fbaeb45b6f2fafb2e7822d1ca72f1cbeaee4c5f9bc3e2485cfef2b8de2a4183ec04 SHA512 2248c6192238a8eda2dc389a5c27357555607b726d195c36c4cf647f793a4a9e17ecdf5145b5a4d8fe6eba7f9b23c7b2db1cbd553f5610d25976e3709bc2fe4d
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
-DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
+DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e3223715d52e181babb89b872b46511563985bcc16d7ff4e82f812c6e83ad904b0fe2501b14445119dfa8240e6 SHA512 8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1
@@ -88,7 +89,7 @@ DIST miow-0.4.0.crate 27567 BLAKE2B fbd395d3766c3874da8067dec37bfe40f3dd90c995af
 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
 DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100
-DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc
+DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
 DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
 DIST octets-0.3.0.crate 5760 BLAKE2B 0375ce7b14f37a072fc0269c3995004152759e14f4c933daff26b5fc0cbf5c6e8640746dd5bc65694810066729c3efdeba0791958180c4beb63c0b892230f135 SHA512 cf74ad97161da7db775d4f46db045b6aeb9a1a65cbf83539f765e9254735db1d8e18aa349b108a046bb7d931c71fd26e91957dd119abdef27248de031869f226
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
@@ -98,46 +99,46 @@ DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7
 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d
 DIST plotters-0.2.12.crate 3194754 BLAKE2B 21035d561321bc66b47cd3a1d3374f4e11d49cae62cc363a3bac98938328aebd527592270ac4014f558751bcdcf7e4994da5647baf98437200a93849bc9e549f SHA512 f9d8be381ffbb853b9a3bfdb0cf5b29c23fbab9b376ab2cc9a734fb7d573a1ef1ae3a32c5b4f080f534e52505fba1d6051475d62811da01205323420f2045dff
 DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
-DIST proc-macro2-1.0.80.crate 48227 BLAKE2B 1b4d2a1d613af8e03fab7a976707ed9ad4809ba50775992df54de10e5b8deabfcce423ca962fbce5c22090421cb0b8b26b8026d56562aa6569a8acfbb49d55de SHA512 d40181bbc4f83ee66be7721e8f89f9a08e368e12a8a0d4c1dcdb1c29cc72b1bcb8da598de1ad1a155a8182026ab7f8365f7a46fc76d589282fbffbd35aa228a0
+DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST qlog-0.13.0.crate 22388 BLAKE2B 62dd0a53852bcc40f2a9cf13eea582cb041d45ccf17ddc5b4c6240f6f4ce068b102dfeadf6b38e06f548915d401e88969400343e53f8147e16d6a19cf1a6caf9 SHA512 6ec2d870c890da33378ca33350ccda64f7502653b45813c14a1cfe7be6fbbeb98f85e79fd84697d27c02ee3448759cfe3b517d3fcb3f7a0cc6bb1b65e926d1d7
-DIST quiche-0.21.0.crate 3703765 BLAKE2B 9b9b09e272ee7b70575aa5aaa47a2cd6885df5bd7dd89174cafa1ea4e141ca6602bdc2a3c5141d4093e5f5259b9e1db1eacb46528bf3baea108cd57e3f1507e7 SHA512 b16eb5dd96fcd7487789f0e2d187519b660423bf8de37a0b13e2281575c9ed5a00483753a6593180a18c489ceede8a0eba28f80969aa0c677497baa8f8568eff
+DIST quiche-0.22.0.crate 3704420 BLAKE2B 72b1efa10e18b303330cc10ae9ac5c608d86d0cce2b5b463d608c671c0205405142166c64032ce9e108993e05103805ec7e1fa92bf583b35a9f8b428fc951fc0 SHA512 32a5a0ef35483b2a687448d3a17d35a4dfa5d8772d6c682d4f157e53b7b180f49f73bad0f112dca377179dc172c488a9f4f02557002ecc3d0414408771784c13
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST rayon-1.3.0.crate 143294 BLAKE2B c52c0ca7f3424eb6c251f91a4a8f556ff40120889b91fb0e4dce36401cbc653310c16393c12b73b29d56eb04846e06c04942b7fd41173cd8fcd8dc11046163f7 SHA512 176af1a8148026954e271ece820c67b215223cdf11b80ff4e3229e4871ad87ce9c21c0b5b5c9f1c9e8063102ed0722c3e5194c13bbe77d8688fdf81e0ba8a599
 DIST rayon-core-1.7.0.crate 58306 BLAKE2B ffcff7e465267a5c360fd92089787281fd1dc07af05cc49b62dd2030267fccb31ea7590509d2af8b7e7a87df9f23167358e91044bb61062bdfaef790d2a4684d SHA512 7bacda8330518c137b433ac1f7f65f64aaf7939d7fdae1c8263bdaefbdf6734003054a1fc7acf73d4e323f27e9f152f273ffb7388abbf6cca0fa2357f1362e2e
-DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
-DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1
-DIST regex-syntax-0.8.3.crate 347497 BLAKE2B 9ac2f63098ffa3fff51fe2bc0bcf9ef164cf9389a909a3f0cb668d2598e7ca65d573e47d571ee2e6bba3a1a96ef7c298b8d681e1ef89c8c53b7d590e0e22839b SHA512 925f7bcc50d94c65d34fcc770c6e58dd5b8a045541c0109e77b8efe842eef4c110087ac9c0f86c7c3022ed013abbc5c0a187d796dce292ad5361a0cdf7153d76
+DIST regex-1.10.5.crate 253805 BLAKE2B 9f5418b577209051640c3614a98b15604a1e71144763a6f00caa7757f0ff67fd833a7d14fe9d6acef96386a2a4eb60cf5d490472e73fd62ca8bb0e78d4f9f125 SHA512 177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb
+DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
+DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
 DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358
 DIST rust_decimal-1.35.0.crate 128340 BLAKE2B de57ffa9901ebf325dc3ae80226b20780fe6611c3a317419667940f55eaab01c4099abbc484af67b0d050880f03922de1861b7d624467f52d4529b9a1aeee7e6 SHA512 17ffd08f67305e428820d0e64ee06a381eb026f1ef1903da48f26c079505365c122d3159ebbd7566261ba3abb5360b8e80b51efc6ca5d182a8d68646aeaa9dcd
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustversion-1.0.6.crate 18380 BLAKE2B 2969bb40849dbd2f0d3f4a190629e53204cc5ef9065be6aec7a4504470e1dba6cde7172a3075a1bade421b30b88947cef6b29c0ab5aea8601695f72a7acc45d1 SHA512 fa9efca7e49eff6c510d062d02fc73d15341b1fe16d24dada86108202a4295d2e0519aecf3f1701540cd4d49a513c05e74d3d27e21e5eb3cb1aba46c70a992cc
-DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4
+DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
-DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994
-DIST serde_json-1.0.115.crate 147100 BLAKE2B baa2dce9d85e331d1308f2ece9dbeff24bcc70e37be3f06c7e819ad9f4eb59fb1f00658736fd336a41a65e3616d1bf75a0c9adb359eb606e1418159a9455132f SHA512 d1a60e20af770fdfe0585853c87c5631e56944a3c1bbdf9e1e91003af8e924a8076335bd37563d167c760aad10d4c08fe59ebd47fc52e461bc3586b835808d22
-DIST serde_with-3.7.0.crate 140905 BLAKE2B fa749055ab1b1f271d46f68a169b18c7e670640e937002ee6f59814c4ed7a7dcee13340ec4a4bc116c57224472f919dad85ac64270441987d3cb0110162d6b05 SHA512 a923993d3ebf1543de6f73e264f436849de6d9a292668ca5508e20c1231b78105307f62140d06bd401fa7001d83a46b56a14f3ad95a2360a55e276ec7b94e142
-DIST serde_with_macros-3.7.0.crate 30834 BLAKE2B 2da5db01fbbbc9e3ad94531c4947bab966e7284c3867f1bb2520cfad23f5a7f5dabe58b821ecfd8bd1f89041e57ee388910636479faea2506fad232c5c7aeafe SHA512 43d666624e6216de285aa3ff8435bc01bfacb675544f63922d1113c4d1a37e8556c61d19807558e002aa05888f8a5d19e7ff8b339b50c4b9c54f0a2cdfc4e9b0
+DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
+DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
+DIST serde_json-1.0.118.crate 146962 BLAKE2B b85f17cbef0cb9fcc8af5d8d18a74850804de631f8ac94193bdb0ff8c95d4c8507876e4802005e0bc8fc4745d52c79be153d825e106090b680b620acc5b1add4 SHA512 1fa7e01d849684e3ed6f9bd67ba9862f822dcecdcb9110a43182367225f559416f855d59f2b8bd943756957932710b930244963a1f47a3d7d530be19dd412f20
+DIST serde_with-3.8.1.crate 142294 BLAKE2B 92b3692f80b613b8d8d68e69c387a65285a969d5bb8b03d9c65af2e40b77e20be2e504044a0c59ed6de7e36b66dd31eff3686cc0b74199ae146d871b7d6f51e7 SHA512 1db8ea26a292c9c08c9451e946e74904a0a063bde854e22983a6575a6bf1c3cabeb8109dedbe028d6acb2abdb8c26adf4758b2f31c844cab692266e522a899c8
+DIST serde_with_macros-3.8.1.crate 30796 BLAKE2B e7fb0a20c839ecea75f52d6ad5841c918f2c01ead7efb5ec5f0dacca23715cb9868ad792c7811f20951429f289ebc5a90ec4c4f833ebeddc5ff484dce7839f1d SHA512 fc1b854729efb24377f830087c21b6d996b19024ed38fca31dd4377f65991189e32db481387143f6fbb4b16eb5e80a89d91e97f40fc1beedd873ee93b01abe7b
 DIST sfv-0.9.4.crate 22456 BLAKE2B ffb5a0da73eb11ea452b5ad8eef7c2019ad6f2e067aa4156485c78ea61fe0432fa3c0aec37c2593828f174d0ef614b208b22ca0277ef6c250fe474b59075c023 SHA512 78e55d45341d2133b4fd005aeecc083c04951970d20d74a44afbae3ef00341e90f0f9f23bf826e913226200fa09567e263ec861fa0acb444ee45e4b9e2a22301
 DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
 DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee
-DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-2.0.59.crate 255393 BLAKE2B 872c6fdf55eef2f050c02fd054f383ede1793286e787f447d242a0436186e67151ce4f47a63c7ac8ab00a87d2fa9452ccc166a32cc7f1c1de2e0f2581c01d2ee SHA512 0e9e1529a0ce43afeec5e9847f8f4c86939ebb1fa0236d25aab73a9fc253b97ebc62f1c741e137a5a3173e2342b33d776a488210ccbdcd36177a1df31188afdc
+DIST syn-2.0.68.crate 265035 BLAKE2B 8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975 SHA512 7b781f8ea2b0d01c06f47d165da99cd96e3b44a33de1d77c78a2cb37ebe3f8304f426ba3d0d1cf766241dcc0537908774504df7d455d63bf89ec22ac0499d372
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
 DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c
 DIST tinytemplate-1.0.3.crate 24781 BLAKE2B a965579d9551968f5134e2892595abb01950346fe083a32234fe7184d86b1003ed1a71800a1ddfb2eedd2f3a56baafd05eac5a34a4adcdb1477f5cf510027fe2 SHA512 bb3941d197e3d3f98709d2dfee977a35040eb50217fb017487aebec6d75e53d08cc281ead712bffa2ac606a8bdcb9e5e064993c2bf6e0fe66b1bd3d401ab5817
-DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
+DIST tinyvec-1.6.1.crate 46657 BLAKE2B 0579dd18a6ad47d995200535950ce0c2a0f63ac081ff5c54a5be5e6a9d5f0545266a2e44b09b847e2fbe88e374a9467ddcf7fcea6ad404e443c387d343eac3e9 SHA512 fc00617fe56c438ed417b9c18fb2525e624b6b6effd1b729da9b8f144b36cd02dbcefbbb6fd423c30b1f19309d42117a1eaab99deb0a46b2a474c2cdc02c1695
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
@@ -146,7 +147,7 @@ DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa53
 DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca51ece71082c127d3e2bf36773959f52df1c6df0d0d5cbc40ec4ee7f81820a094fd7ee99f01a2f99a1f7f68317223 SHA512 2adea0c8447c9450be34859f2b2e2b87a61b5e313685da994d21bc24a96dd94088f3320bcdb8d20466a3fdafb0bc0375823f0c28ec0077c9c42a9818f66ac1f5
 DIST unicode-xid-0.2.4.crate 15352 BLAKE2B 80c327b39f3b8f2cdb5747cde968cfa1efe7b65b6bee9136adc881fa19f66aa5b1010d9d08de55a61b322d665b5b0cb0395e9ac471f6333c40d8dca5d97e123c SHA512 e67bd1258e1961807d9d5fe583a89ab5b82b2a529ecd32cadfc79aa5331380eb4a2db9fd96b74c8eace47f2f29021587d69bcdbf79f7e2650e92a25f7839d03c
 DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416
-DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
+DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
@@ -186,6 +187,6 @@ DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a63
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
-EBUILD quiche-0.21.0.ebuild 5642 BLAKE2B e6f61d3ae6352baf5a3d6cef589969b4b9a84713790739413d727de550a913e9eafc09d8509ffdca8b6e6bb4e0398e7e97bb28cad84df8ff8d4a8746b4d04b3c SHA512 4f9140aa0ddea242fd78a08b8ae141c8e319e6c98855e7eef1ac124b841504c5e2718407656ac97f0bfa4ecf0295fe64cb30d42438631987bffa89949d0ac799
-EBUILD quiche-9999.ebuild 5642 BLAKE2B e6f61d3ae6352baf5a3d6cef589969b4b9a84713790739413d727de550a913e9eafc09d8509ffdca8b6e6bb4e0398e7e97bb28cad84df8ff8d4a8746b4d04b3c SHA512 4f9140aa0ddea242fd78a08b8ae141c8e319e6c98855e7eef1ac124b841504c5e2718407656ac97f0bfa4ecf0295fe64cb30d42438631987bffa89949d0ac799
+EBUILD quiche-0.22.0.ebuild 5667 BLAKE2B 80af26a6d99e0554c89791fa3a3cf26da57c25a80fad4d4fc35318f8090466bf422b44aab863daf10a02e40433b1640f6297f71ee73b3984e4995859ebf106db SHA512 d0f7ae28e6bbbdc69db363f9188d6965111d3e9d5ba52e70b7273433237e374c77befda3daa56b13184765919c5d345caf3f40208b2b5f1344d7368ee3f7cdb3
+EBUILD quiche-9999.ebuild 5667 BLAKE2B 80af26a6d99e0554c89791fa3a3cf26da57c25a80fad4d4fc35318f8090466bf422b44aab863daf10a02e40433b1640f6297f71ee73b3984e4995859ebf106db SHA512 d0f7ae28e6bbbdc69db363f9188d6965111d3e9d5ba52e70b7273433237e374c77befda3daa56b13184765919c5d345caf3f40208b2b5f1344d7368ee3f7cdb3
 MISC metadata.xml 331 BLAKE2B d0c7e9933d0377d9aa5c8c4249c3171ed475025e74cb36354ffea5e184acd2ca7239b577335c86bf48a456bbccf777ff4c4229f5c676f35bf3db41c52cdc0637 SHA512 3604e6eff391505fb81b215004b6e8ca4b240ee36413fc96b76e044dab63cdb1df2dcb55783a37e828c4a330679297fd6f58e4f53da66c29d966e8949ce85093
diff --git a/net-libs/quiche/quiche-0.21.0.ebuild b/net-libs/quiche/quiche-0.22.0.ebuild
index a9b28c4abdb5..85a385a6452c 100644
--- a/net-libs/quiche/quiche-0.21.0.ebuild
+++ b/net-libs/quiche/quiche-0.22.0.ebuild
@@ -12,25 +12,26 @@ android-tzdata@0.1.1
 android_system_properties@0.1.5
 arrayvec@0.7.4
 atty@0.2.14
-autocfg@1.2.0
+autocfg@1.3.0
 backtrace@0.3.37
 backtrace@sys-0.1.31
 base64@0.21.7
 bindgen@0.68.1
 bitflags@1.3.2
-bitflags@2.5.0
-boring@4.6.0
-boring-sys@4.6.0
+bitflags@2.6.0
+boring@4.7.0
+boring-sys@4.7.0
 bstr@0.2.12
 bumpalo@3.15.4
 byteorder@1.3.4
 cast@0.2.3
-cc@1.0.94
+cc@1.0.101
+cdylib-link-lines@0.1.5
 cexpr@0.6.0
 cfg@if-0.1.10
 cfg@if-1.0.0
 chrono@0.4.35
-clang-sys@1.7.0
+clang-sys@1.8.1
 clap@2.33.3
 cmake@0.1.50
 core-foundation-sys@0.8.6
@@ -42,13 +43,13 @@ crossbeam@queue-0.2.1
 crossbeam@utils-0.7.2
 csv@1.1.3
 csv@core-0.1.10
-data-encoding@2.5.0
-darling@0.20.8
-darling_core@0.20.8
-darling_macro@0.20.8
+data-encoding@2.6.0
+darling@0.20.9
+darling_core@0.20.9
+darling_macro@0.20.9
 data@encoding-2.3.3
 deranged@0.3.11
-either@1.11.0
+either@1.13.0
 env_logger@0.8.4
 equivalent@1.0.1
 fnv@1.0.7
@@ -60,10 +61,10 @@ fuchsia-zircon@0.3.3
 fuchsia-zircon-sys@0.3.3
 fs_extra@1.3.0
 fslock@0.2.1
-getrandom@0.2.14
+getrandom@0.2.15
 glob@0.3.1
 hashbrown@0.12.3
-hashbrown@0.14.3
+hashbrown@0.14.5
 hermit@abi-0.1.19
 hex@0.4.3
 humantime@2.1.0
@@ -78,14 +79,14 @@ itoa@1.0.11
 js-sys@0.3.69
 kernel32-sys@0.2.2
 lazycell@1.3.0
-lazy_static@1.4.0
-libc@0.2.153
-libloading@0.8.3
+lazy_static@1.5.0
+libc@0.2.155
+libloading@0.8.4
 libm@0.2.8
 log@0.4.21
 matches@0.1.10
 maybe-uninit@2.0.0
-memchr@2.7.2
+memchr@2.7.4
 memoffset@0.9.1
 minimal-lexical@0.2.1
 mio@0.8.11
@@ -93,7 +94,7 @@ miow@0.4.0
 net2@0.2.37
 nom@7.1.3
 num-conv@0.1.0
-num-traits@0.2.18
+num-traits@0.2.19
 num_cpus@1.12.0
 octets@0.3.0
 peeking_take_while@0.1.2
@@ -105,45 +106,45 @@ percent-encoding@2.3.1
 pkg-config@0.3.30
 plotters@0.2.12
 powerfmt@0.2.0
-proc-macro2@1.0.80
+proc-macro2@1.0.86
 qlog@0.13.0
 quote@1.0.36
 rayon@1.3.0
 rayon@core-1.7.0
-regex@1.10.4
-regex-automata@0.4.6
-regex-syntax@0.8.3
+regex@1.10.5
+regex-automata@0.4.7
+regex-syntax@0.8.4
 ring@0.17.8
 rustc_version@0.2.3
 rustc@hash-1.1.0
 rustversion@1.0.6
 rust_decimal@1.35.0
-ryu@1.0.17
+ryu@1.0.18
 same-file@1.0.6
 scopeguard@1.1.0
 sfv@0.9.4
 semver@0.9.0
 semver-parser@0.7.0
-serde@1.0.197
-serde_derive@1.0.197
-serde_json@1.0.115
-serde_with@3.7.0
-serde_with_macros@3.7.0
+serde@1.0.203
+serde_derive@1.0.203
+serde_json@1.0.118
+serde_with@3.8.1
+serde_with_macros@3.8.1
 shlex@1.3.0
 slab@0.4.9
 smallvec@1.13.2
 spin@0.9.8
 strsim@0.8.0
-strsim@0.10.0
+strsim@0.11.1
 syn@1.0.109
-syn@2.0.59
+syn@2.0.68
 termcolor@1.1.2
 textwrap@0.11.0
 time@0.3.34
 time-core@0.1.2
 time-macros@0.2.17
 tinytemplate@1.0.3
-tinyvec@1.6.0
+tinyvec@1.6.1
 tinyvec_macros@0.1.1
 unicode-bidi@0.3.15
 unicode-ident@1.0.12
@@ -152,7 +153,7 @@ unicode-width@0.1.10
 unicode-xid@0.2.4
 unicode-xid@0.2.3
 untrusted@0.9.0
-url@2.5.0
+url@2.5.2
 vec_map@0.8.2
 version_check@0.9.4
 walkdir@2.3.1
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index a9b28c4abdb5..85a385a6452c 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -12,25 +12,26 @@ android-tzdata@0.1.1
 android_system_properties@0.1.5
 arrayvec@0.7.4
 atty@0.2.14
-autocfg@1.2.0
+autocfg@1.3.0
 backtrace@0.3.37
 backtrace@sys-0.1.31
 base64@0.21.7
 bindgen@0.68.1
 bitflags@1.3.2
-bitflags@2.5.0
-boring@4.6.0
-boring-sys@4.6.0
+bitflags@2.6.0
+boring@4.7.0
+boring-sys@4.7.0
 bstr@0.2.12
 bumpalo@3.15.4
 byteorder@1.3.4
 cast@0.2.3
-cc@1.0.94
+cc@1.0.101
+cdylib-link-lines@0.1.5
 cexpr@0.6.0
 cfg@if-0.1.10
 cfg@if-1.0.0
 chrono@0.4.35
-clang-sys@1.7.0
+clang-sys@1.8.1
 clap@2.33.3
 cmake@0.1.50
 core-foundation-sys@0.8.6
@@ -42,13 +43,13 @@ crossbeam@queue-0.2.1
 crossbeam@utils-0.7.2
 csv@1.1.3
 csv@core-0.1.10
-data-encoding@2.5.0
-darling@0.20.8
-darling_core@0.20.8
-darling_macro@0.20.8
+data-encoding@2.6.0
+darling@0.20.9
+darling_core@0.20.9
+darling_macro@0.20.9
 data@encoding-2.3.3
 deranged@0.3.11
-either@1.11.0
+either@1.13.0
 env_logger@0.8.4
 equivalent@1.0.1
 fnv@1.0.7
@@ -60,10 +61,10 @@ fuchsia-zircon@0.3.3
 fuchsia-zircon-sys@0.3.3
 fs_extra@1.3.0
 fslock@0.2.1
-getrandom@0.2.14
+getrandom@0.2.15
 glob@0.3.1
 hashbrown@0.12.3
-hashbrown@0.14.3
+hashbrown@0.14.5
 hermit@abi-0.1.19
 hex@0.4.3
 humantime@2.1.0
@@ -78,14 +79,14 @@ itoa@1.0.11
 js-sys@0.3.69
 kernel32-sys@0.2.2
 lazycell@1.3.0
-lazy_static@1.4.0
-libc@0.2.153
-libloading@0.8.3
+lazy_static@1.5.0
+libc@0.2.155
+libloading@0.8.4
 libm@0.2.8
 log@0.4.21
 matches@0.1.10
 maybe-uninit@2.0.0
-memchr@2.7.2
+memchr@2.7.4
 memoffset@0.9.1
 minimal-lexical@0.2.1
 mio@0.8.11
@@ -93,7 +94,7 @@ miow@0.4.0
 net2@0.2.37
 nom@7.1.3
 num-conv@0.1.0
-num-traits@0.2.18
+num-traits@0.2.19
 num_cpus@1.12.0
 octets@0.3.0
 peeking_take_while@0.1.2
@@ -105,45 +106,45 @@ percent-encoding@2.3.1
 pkg-config@0.3.30
 plotters@0.2.12
 powerfmt@0.2.0
-proc-macro2@1.0.80
+proc-macro2@1.0.86
 qlog@0.13.0
 quote@1.0.36
 rayon@1.3.0
 rayon@core-1.7.0
-regex@1.10.4
-regex-automata@0.4.6
-regex-syntax@0.8.3
+regex@1.10.5
+regex-automata@0.4.7
+regex-syntax@0.8.4
 ring@0.17.8
 rustc_version@0.2.3
 rustc@hash-1.1.0
 rustversion@1.0.6
 rust_decimal@1.35.0
-ryu@1.0.17
+ryu@1.0.18
 same-file@1.0.6
 scopeguard@1.1.0
 sfv@0.9.4
 semver@0.9.0
 semver-parser@0.7.0
-serde@1.0.197
-serde_derive@1.0.197
-serde_json@1.0.115
-serde_with@3.7.0
-serde_with_macros@3.7.0
+serde@1.0.203
+serde_derive@1.0.203
+serde_json@1.0.118
+serde_with@3.8.1
+serde_with_macros@3.8.1
 shlex@1.3.0
 slab@0.4.9
 smallvec@1.13.2
 spin@0.9.8
 strsim@0.8.0
-strsim@0.10.0
+strsim@0.11.1
 syn@1.0.109
-syn@2.0.59
+syn@2.0.68
 termcolor@1.1.2
 textwrap@0.11.0
 time@0.3.34
 time-core@0.1.2
 time-macros@0.2.17
 tinytemplate@1.0.3
-tinyvec@1.6.0
+tinyvec@1.6.1
 tinyvec_macros@0.1.1
 unicode-bidi@0.3.15
 unicode-ident@1.0.12
@@ -152,7 +153,7 @@ unicode-width@0.1.10
 unicode-xid@0.2.4
 unicode-xid@0.2.3
 untrusted@0.9.0
-url@2.5.0
+url@2.5.2
 vec_map@0.8.2
 version_check@0.9.4
 walkdir@2.3.1
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 58cab94ec149..5dabde4fc9d2 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest
index 64924c152112..577660941e0f 100644
--- a/net-misc/asterisk-g729/Manifest
+++ b/net-misc/asterisk-g729/Manifest
@@ -12,9 +12,9 @@ DIST codec_g729a-18.0_3.1.9-x86_32.tar.gz 476626 BLAKE2B 7a8a0a763fcae579ac4be28
 DIST codec_g729a-18.0_3.1.9-x86_64.tar.gz 475817 BLAKE2B ef45f1edab67b1fdb57d11340d2b3885c72d9f09f00fdccfdaa8674d61cf95ddf8ace223f29049e1e700f0bdcabd824ffbfa5382e492a1e0d0a47e1ab030d606 SHA512 12bbd2bcef0b7138d0ef261b6b1265f803526ce3c4ec371be830267e01e0e674150f17169742fe72737291b162136ea5224b320b655112cbc10fa207733c7f54
 DIST codec_g729a-20.0_3.1.10-x86_32.tar.gz 476843 BLAKE2B 8d014823184f17c158de9720bc903f841f290f1171344bc7a54ad7cf40627b7fcac697e642c35feef4e6eccff58b7fc85775e5d5a31c518b35a3b6c7bf258b19 SHA512 81d7d0921c9f17b31d9d3a3dd7e81844ee17bc9afd58418c2add40409c3eda932330e93411f32b5af67a42877f6abfba5d9b599812cc0655b2cc9851f1257c3c
 DIST codec_g729a-20.0_3.1.10-x86_64.tar.gz 476178 BLAKE2B f27787c17929deecf048c0b79f38bd3630375d1e09afe142052ff7b4f9ef3d5577a09b11a11aa551ae6d82f44cf40931550fa5612ec132befa3c9e3776b7dd58 SHA512 91df558f4c88af703bde270d0e360ebba074ab5ff917f163f8a525b7fa0e4a2e7480884effafb1253d6a67a72e640d1cdaba75c10c24283655136d8a356dec56
-EBUILD asterisk-g729-16.0.3.1.10.ebuild 1853 BLAKE2B 720f1e9f968bec4f69fa13c5c2b003769a9d0e6c5df69e4b0289121f80a6ac75e817ddcb5e4850a4812268d1783e5e01100907bf1807d3181b9d21cc5ffeb444 SHA512 3975ded0445cb673d59edb14263dcf8cfe90152250d0ff550a796fb1b7e5e4ba88368d764bf41011af9d2b576aff29e3fb7069ea027bcfc21bbcef8f5132f9b7
+EBUILD asterisk-g729-16.0.3.1.10.ebuild 1852 BLAKE2B 34e1b05adf32ec9b39816e66c7aa7c6416bdedcd479faed20d05f9dbd901c8d132bc5954efdc7a686878d79f966b9e856cfa9e547e81d4af4c4e00a001cc406a SHA512 26aa3238448f4d4bd5ae55f17008e3f1fc7d1f89cea7a5bd291cf187285ed6c0dd53e3dba708a14b1cce311e775cd16eca92ac078c37a561b6bc14f2a4f1fc3c
 EBUILD asterisk-g729-16.0.3.1.9-r1.ebuild 1852 BLAKE2B 76fc3059359d737055dfcfe851abb44c5a8764723a626895f1a6ec9fa20ca3adf11bad371eb7ad532726b161951f510cdc3f3ce75b04bb2e494d8b92efd5c33c SHA512 6cf0de82b3f4a65949aafcead6d0801a0b666ee45b0e5ba6f0f1eb569a80bcb02ed82f39579b8eee0bf73dcefcc347ff334db5ad246487ee240dd811f73acfb3
-EBUILD asterisk-g729-18.0.3.1.10.ebuild 1853 BLAKE2B 720f1e9f968bec4f69fa13c5c2b003769a9d0e6c5df69e4b0289121f80a6ac75e817ddcb5e4850a4812268d1783e5e01100907bf1807d3181b9d21cc5ffeb444 SHA512 3975ded0445cb673d59edb14263dcf8cfe90152250d0ff550a796fb1b7e5e4ba88368d764bf41011af9d2b576aff29e3fb7069ea027bcfc21bbcef8f5132f9b7
+EBUILD asterisk-g729-18.0.3.1.10.ebuild 1852 BLAKE2B 34e1b05adf32ec9b39816e66c7aa7c6416bdedcd479faed20d05f9dbd901c8d132bc5954efdc7a686878d79f966b9e856cfa9e547e81d4af4c4e00a001cc406a SHA512 26aa3238448f4d4bd5ae55f17008e3f1fc7d1f89cea7a5bd291cf187285ed6c0dd53e3dba708a14b1cce311e775cd16eca92ac078c37a561b6bc14f2a4f1fc3c
 EBUILD asterisk-g729-18.0.3.1.9.ebuild 1852 BLAKE2B 76fc3059359d737055dfcfe851abb44c5a8764723a626895f1a6ec9fa20ca3adf11bad371eb7ad532726b161951f510cdc3f3ce75b04bb2e494d8b92efd5c33c SHA512 6cf0de82b3f4a65949aafcead6d0801a0b666ee45b0e5ba6f0f1eb569a80bcb02ed82f39579b8eee0bf73dcefcc347ff334db5ad246487ee240dd811f73acfb3
 EBUILD asterisk-g729-20.0.3.1.10.ebuild 1854 BLAKE2B 4c752b0a8237ca355f57a00146232a135f9f40acb867303d99e314212abca387a7fd71df63f9001eab2dd9b97ac1147fb04e779742cbc4b48b4c5f33231ac6a3 SHA512 329bc5ba0b42abee799a984b6bc55eaf47cdf2fc1559ed80cdacc8ba4a21cca710c5c676e72570fe574e0dc6df6151ccc82b9b3193babecb3e6d105c05501fdd
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild
index 9a1121ec9fb7..ba68b2878ec9 100644
--- a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild
@@ -22,7 +22,7 @@ amd64? (
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
 
diff --git a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild
index 9a1121ec9fb7..ba68b2878ec9 100644
--- a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild
@@ -22,7 +22,7 @@ amd64? (
 
 LICENSE="Digium"
 SLOT="0/${AST_PV}"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
 
diff --git a/net-misc/r8152/Manifest b/net-misc/r8152/Manifest
index 65187ab07bbe..78ee99b73a4f 100644
--- a/net-misc/r8152/Manifest
+++ b/net-misc/r8152/Manifest
@@ -3,8 +3,7 @@ AUX r8152-2.16.3-kernel-5.19-fix.patch 1599 BLAKE2B e1300601e2dcd98729481a6d146f
 AUX r8152-2.16.3-kernel-6.1-fix.patch 1473 BLAKE2B bebafaeaed61bff9ee058ddc64fef6299703bdf9b0c2cd086c86643b362122a8d691577963b9b64f45729bfa4e72f09fe33d6c61fc195d0675bdcd7affd63d7a SHA512 4c5115946a1086d88bc19aa556782aec45fc05f3e38fab8255bb13a863bd2744c08bca0fd6ed72da8c5171fe801436665f4b10bfc22203c500460942a0a6db2d
 AUX r8152-2.16.3-kernel-6.4.10-fix.patch 731 BLAKE2B 2d7820d7dc749bdd4dbbb165116135af2d6831f17b4721afc9c37bbd078f6915cc6c44ce9cb77941ffc52a399a6065269a578128b2c1bb0823658972f8f81dc2 SHA512 a274fc2d5f998ba0c6bfad74c0a56d50c9b146abe012fdd5eebe9719615876e63f55203f3dcf17397e4e28040cd0b253ef861e2cb9636da9c1d050fa844c226c
 AUX r8152-2.17.1-kernel-6.8-strscpy.patch 1298 BLAKE2B 057d7c31115e5903b040f53c964e62d79a3e05308d5b8b072ca6fbf4a3c08e13dc9975e0ca0b6f6342f9e70fc0c957e642ac6d9fdd9f7d915eb7ca7fb24e405a SHA512 4f19815e4f3f9bb3f7934fc13b7c912ab044270512c887b6c89f1409131b73d248d1462c7b1a464eb7e16c590e99bfe46032b36ca5b676896e995964d66d1028
-DIST r8152-2.16.3.tar.bz2 73331 BLAKE2B 9e22ee6d9d0197def782f77bfd0c88a2d8827d4f8cc0bbb1a6583ab67533cd07ba79a16cd9350272ed18c733fe809ea1ff70596627abdc65d452bdf817628bc8 SHA512 c37bf5199d3a857c9a7a12f3aa4ecfe9c04b49413aea862a053ebee24c137cd35769e5d5cc7e2bb7dd3bf9057f51ffada0b4e0c53cb3d417e05c8e3fc830705c
+AUX r8152-2.17.1-kernel-6.9-fix.patch 4008 BLAKE2B 6566782e57e8b69a2cf183a0d63a9e0c17ce9c83974dc23ef1d8588adca14105b4ef8682ca33225be0c4e2ed5121bbc4cd9d5180f44b9c36655d875505c99668 SHA512 4859d41116474e14aec2b03952d155ec07293941181db5cecb27b389c79d4c03ef8ec1abe540ce3b9f04c1ad835f98a11562484dcf168afb100cad91bc96d334
 DIST r8152-2.17.1.tar.bz2 75156 BLAKE2B 05b55ea17a579add9a9abee89db490685086bfe29aeea6cbfbdbb63a81dbee4d1cac151822c178e52febe4bee14a3b5deb20737f671fcdbc6dd6d01938b1d18c SHA512 e465b524ee8aaed12da8258195fb8a4c9fea0862812c1ab268e31ad6ec61444c4f4332d643124063b389fd1df7a271c6c057537d4cbe67188a1a2262b4793f42
-EBUILD r8152-2.16.3-r1.ebuild 1290 BLAKE2B 82d4ebe9fc9bca31b9a1307eae719745e7916c5d694a052e2e41c0178f2d18947d270ea19564347f8847f33dad132b9b4af1fb102e3a0b8e10ed87cfcdb0e4be SHA512 460cef4288683e56e13885a1a3bbc588b4816a9770bbffb22b81e980c50f9848b7cb15b5808ba88a204d0e5ad8372a8e741fc8617efac2e1b3cffc6309a802c3
-EBUILD r8152-2.17.1.ebuild 1244 BLAKE2B 39a421b6c3e0dac8894e75a11b8a435a656096a1de1dabeaf72db5ea672b9f76c6e2630e728b1af7abc2fdd4d0364e734fd23635a59b64e6bec124ecc3145bf9 SHA512 61adcbff9e86f1ec8aab62a384dfc3e8484606cd0b59dfee4f1434af802fddd0ce95b13d5f62218f362951ae638e6bfe10f24bf73d968345b1090c81656be6fa
+EBUILD r8152-2.17.1.ebuild 1293 BLAKE2B 19c8c4a1507ce6722f552c2c566e449b06a3b114b5b04e89c9259832e23e03d4d655084ee0d2aaf55d862573a524f762e8afc997a36ac8e61873c6e9d0ecf005 SHA512 069a53b153ac5d61fdebd8bcaa1411b904002b46124e81799efa601ca7ceb2fb4200e49eec7d8818b1a5abda049460e08ba3bdc0d94358116c1b4224ee10dafb
 MISC metadata.xml 660 BLAKE2B 1f7bd7d75e5fc3b88b140f88b82390b09cbffed8770b73b4584f7d9114fd1b97a84f745881d424f30c1a738c332bb04bab3d651bd9734f0170164eb8158ef098 SHA512 c0258ae24671a18801a9a499869267b2c3d2d0350e1fbbf91db6fe2358326bb27551623ef93c9c9a9bebde3c08520463eae00a05802053a0f5b7ade1b0f5ea4d
diff --git a/net-misc/r8152/files/r8152-2.17.1-kernel-6.9-fix.patch b/net-misc/r8152/files/r8152-2.17.1-kernel-6.9-fix.patch
new file mode 100644
index 000000000000..433d3deab34e
--- /dev/null
+++ b/net-misc/r8152/files/r8152-2.17.1-kernel-6.9-fix.patch
@@ -0,0 +1,117 @@
+From: https://github.com/wget/realtek-r8152-linux/pull/41
+From a5b3b4a882a3a637ccfa447dc7d2e84eac9ef0fc Mon Sep 17 00:00:00 2001
+From: "oleg.hoefling" <oleg.hoefling@gmail.com>
+Date: Wed, 22 May 2024 00:44:37 +0200
+Subject: [PATCH] add compat for 6.9.X kernels
+
+Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com>
+--- a/r8152.c
++++ b/r8152.c
+@@ -950,7 +950,10 @@ struct r8152 {
+ 		void (*up)(struct r8152 *tp);
+ 		void (*down)(struct r8152 *tp);
+ 		void (*unload)(struct r8152 *tp);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++		int (*eee_get)(struct r8152 *tp, struct ethtool_keee *eee);
++		int (*eee_set)(struct r8152 *tp, struct ethtool_keee *eee);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ 		int (*eee_get)(struct r8152 *tp, struct ethtool_eee *eee);
+ 		int (*eee_set)(struct r8152 *tp, struct ethtool_eee *eee);
+ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */
+@@ -19099,7 +19102,11 @@ static void rtl8152_get_strings(struct net_device *dev, u32 stringset, u8 *data)
+ }
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++static int r8152_get_eee(struct r8152 *tp, struct ethtool_keee *eee)
++#else
+ static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee)
++#endif
+ {
+ 	u32 lp, adv, supported = 0;
+ 	u16 val;
+@@ -19115,17 +19122,32 @@ static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee)
+ 
+ 	eee->eee_enabled = tp->eee_en;
+ 	eee->eee_active = !!(supported & adv & lp);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++	ethtool_convert_legacy_u32_to_link_mode(eee->supported, supported);
++	ethtool_convert_legacy_u32_to_link_mode(eee->advertised, tp->eee_adv);
++	ethtool_convert_legacy_u32_to_link_mode(eee->lp_advertised, lp);
++#else
+ 	eee->supported = supported;
+ 	eee->advertised = tp->eee_adv;
+ 	eee->lp_advertised = lp;
++#endif
+ 
+ 	return 0;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++static int r8152_set_eee(struct r8152 *tp, struct ethtool_keee *eee)
++#else
+ static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee)
++#endif
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++	u32 advertised = 0;
++	ethtool_convert_link_mode_to_legacy_u32(&advertised, eee->advertised);
++	u16 val = ethtool_adv_to_mmd_eee_adv_t(advertised);
++#else
+ 	u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);
+-
++#endif
+ 	tp->eee_en = eee->eee_enabled;
+ 	tp->eee_adv = val;
+ 
+@@ -19134,7 +19156,11 @@ static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee)
+ 	return 0;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++static int r8153_get_eee(struct r8152 *tp, struct ethtool_keee *eee)
++#else
+ static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee)
++#endif
+ {
+ 	u32 lp, adv, supported = 0;
+ 	u16 val;
+@@ -19150,15 +19176,25 @@ static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee)
+ 
+ 	eee->eee_enabled = tp->eee_en;
+ 	eee->eee_active = !!(supported & adv & lp);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++	ethtool_convert_legacy_u32_to_link_mode(eee->supported, supported);
++	ethtool_convert_legacy_u32_to_link_mode(eee->advertised, tp->eee_adv);
++	ethtool_convert_legacy_u32_to_link_mode(eee->lp_advertised, lp);
++#else
+ 	eee->supported = supported;
+ 	eee->advertised = tp->eee_adv;
+ 	eee->lp_advertised = lp;
++#endif
+ 
+ 	return 0;
+ }
+ 
+ static int
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata)
++#else
+ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
++#endif
+ {
+ 	struct r8152 *tp = netdev_priv(net);
+ 	int ret;
+@@ -19185,7 +19221,11 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
+ }
+ 
+ static int
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
++rtl_ethtool_set_eee(struct net_device *net, struct ethtool_keee *edata)
++#else
+ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
++#endif
+ {
+ 	struct r8152 *tp = netdev_priv(net);
+ 	int ret;
diff --git a/net-misc/r8152/r8152-2.16.3-r1.ebuild b/net-misc/r8152/r8152-2.16.3-r1.ebuild
deleted file mode 100644
index 82753f37ac20..000000000000
--- a/net-misc/r8152/r8152-2.16.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod-r1 udev
-
-DESCRIPTION="r8152 driver for Realtek USB FE / GBE / 2.5G Gaming Ethernet Family Controller"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software"
-SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}"
-
-IUSE="+center-tap-short"
-
-# https://github.com/wget/realtek-r8152-linux/ keeps reasonably up to date
-# with kernel support patches. It appears to be used by the AUR maintainer.
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.16.3-kernel-5.19-fix.patch
-	"${FILESDIR}"/${PN}-2.16.3-kernel-6.1-fix.patch
-	"${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch
-	"${FILESDIR}"/${PN}-2.16.3-asus-c5000-support.patch
-)
-
-src_compile() {
-	local modlist=( ${PN}=kernel/net/usb:. )
-	local modargs=(
-		KERNELDIR="${KV_OUT_DIR}"
-		CONFIG_CTAP_SHORT="$(usex center-tap-short on off)"
-	)
-
-	linux-mod-r1_src_compile
-}
-
-src_install() {
-	linux-mod-r1_src_install
-	udev_dorules 50-usb-realtek-net.rules
-}
-
-pkg_postinst() {
-	linux-mod-r1_pkg_postinst
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-misc/r8152/r8152-2.17.1.ebuild b/net-misc/r8152/r8152-2.17.1.ebuild
index 865057ee5c0d..0c0485efb61b 100644
--- a/net-misc/r8152/r8152-2.17.1.ebuild
+++ b/net-misc/r8152/r8152-2.17.1.ebuild
@@ -24,6 +24,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch
 	"${FILESDIR}"/${PN}-2.16.3-asus-c5000-support.patch
 	"${FILESDIR}"/${PN}-2.17.1-kernel-6.8-strscpy.patch
+	"${FILESDIR}"/${PN}-2.17.1-kernel-6.9-fix.patch
 )
 
 src_compile() {
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index c6476b827e30..9a6687343a1b 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index 6decf447de4a..0c9eeed2b0f9 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -14,11 +14,12 @@ DIST bitcoin-core-26.1.tar.gz 12822211 BLAKE2B 9093133f025a47cc93cc02056c2588be0
 DIST bitcoin-core-26.2_rc1.tar.gz 12889436 BLAKE2B 59a517597f2482ea297bbe251464e635937e166379d9dcd420a14cb1ed8af3f02c5480a1d2501a3c43c461938728e06b1c48944ad653bada2ab183ce5051647d SHA512 cd67cbd5b813d34c098a0724e00375d8a2daa3509756055a7a60fd86ef681e7e65df9c21322b38a652e580f72122b0e01bea1dd2dfb46a337cfcc0645e5b9f53
 DIST bitcoin-core-27.0.tar.gz 13087956 BLAKE2B f625eaa2ce98cd8ed771f97d5a7e66733e94523d2ddda99cd858777bfb88a6e7eafae71e10fbf1ddadfcf629f2e3f790fb48c39f0e016d3fb22f1da7e7c93614 SHA512 0833fbd654570bc3e50efbe4da1f0bcab7744b92becc76d0dfea39a551325bd1b64ae746f7d9824d9e93fc53c95bc5eb5977869f0af04e26bd8ccb992d4c6e7c
 DIST bitcoin-core-27.1.tar.gz 13146683 BLAKE2B 9df45ca67565aa1f1cb851e86302ab5e7edbc573642cbd66585910cbd20ecbe8b3a89f7441fc7f299bb3ff32cf687a617f7449cd1a4164e9ac78637501f619da SHA512 b3c2f90b125705401dbf1318db44be586f3609473a9aa3b7330d6c7f48bf5b31951f822e494ae607ebb96e5ffb62b909bea51be14fd91ed71ea62324d2736862
-EBUILD bitcoin-core-25.1-r2.ebuild 12629 BLAKE2B ca23ce3077968fd5be33f331ca0ca56414a7cbedc8be85dd495f5a4da7d15317dcae5fbc3ba493e43cd77e43208650ba8d8a7c5185e4f04bb897594ca70e1396 SHA512 8dd9d7a39fa36ed915577f52e08cf9af1c2bf4acc04cf8a0f84f1409ebd88e24cb7252ab68aff7c307e9a979742890d61919551f78390852f77735a703602088
-EBUILD bitcoin-core-25.2.ebuild 12733 BLAKE2B 10f1ba77bcf0a71d5c4d727720e1c4af66937982515de291bb88561d2a64bfa3d433cffd876715cf9eb18da5cb5c57b322e67426f04c9b890a56b97b239a1a35 SHA512 1af55a71303828a528671b8772a76123484eef1f6ca6470e13a8d9af4cdac45af6522d372b032468b55687501f73d8590021127bb40cb661e1a512351484e901
-EBUILD bitcoin-core-26.0-r1.ebuild 13052 BLAKE2B 6f4863f10ac953c7b9520463cafc139f5b4cfa3fc0f36e0ac8bc4c8a761e3bc40d1742d5ba28169f94412cf4163b29e89319b511f19e9cdcb5b1df28f4e95401 SHA512 2a7abe6b9916a42165578e45e72be33f3a408224e400d45a47bb825be3cac0494829daf512f241d92ab2983db5f646222cfe429da4e1012d56641f4315e99f67
-EBUILD bitcoin-core-26.1.ebuild 12991 BLAKE2B 1fda4fe735113c0cd106378caa5f3b11ac5fc82e48ca914eb5b1525a009bea70a9a26c195ba1c6733e0cdecc916e13e18df138887191eba381f1cafbfba1009a SHA512 80900ed365e5977a2758843f90c43a9472e07a1a605705e19ab5b08598cafe3a043c7529a3debe9306f96c5a6cd45f318ea51615d0ae018cfca59f2c10150e4b
-EBUILD bitcoin-core-26.2_rc1.ebuild 12992 BLAKE2B 465a73cc72652773581fd6bd33703426b4d9cd25842fa263eabf480411f86b4da8941df4b16423a960b4ffd803a3da3f1fd1521c37fa38e6b36fbf3daecf1270 SHA512 b97b8c1648caea11510d3cba2e7638ae5989483ff279686e53ed4c164c88a22cdd75d6adf2229be1dbd4bd6b0e8f989392e59a897b1d6f3dd3a3e9245713b656
-EBUILD bitcoin-core-27.0.ebuild 12992 BLAKE2B 24bf4eb3b2429d72280cf78b346a8e6fd2f142ad2bd451d217becee5239d985e26f29706d717f2a4d386b1f37d80ce7a6e86239655105373b2f3bcd40dc690a9 SHA512 5e607a6d8e25ff99c92f8ec36839f801339e380593dcf2d03905651a100998a36e00845e9f77a5972b1e21991f7d9ff034245f7f271d3760b472f738b9dac2d9
-EBUILD bitcoin-core-27.1.ebuild 12992 BLAKE2B e8bc87083a2745f8d1c7cc611ad18acfd20e749866d9115367cdb84d364cbf618e9e9f5f9a86c8a8bf2bcc14d0bf8652f1ff3b8d3cb06c83907e38cded6861fa SHA512 a7d5db0cb7f43cb364c8918329404187a9771356e40a2fec7f8a3605de3c6604ae8b30c028286488b09d3a7e051817016cd16963e2c796afaaec5e2ee66684d3
+DIST bitcoin-core-miniupnpc-2.2.8-compat.patch 1130 BLAKE2B 4b1e8eaf4c7f13e9317fa4f69f6c2bce5f1663d8e4731bfe5ca5b4622fcd140e6532acdae544259727a59050b7f3f7bd7dab6f7f23dccebef4caf8fdef0f0c83 SHA512 ec0890d90a5ec3555b2e5477ead75ea5874c57aa3312dc64df5688224f51569f3f7c59593ed2f4336b283fff71c87b5d4fd786ab3cfecbb6407ef143b5018ba5
+EBUILD bitcoin-core-25.1-r2.ebuild 12822 BLAKE2B 7a738341ba08012d66d1308b9b8f778c31e4b3a21e5541543e55db0cd0dfeba66b70d22b26e345bbff84e24dcb02f4c4647f9611595932f5cca51d4c56160e44 SHA512 4271e3edaebc070a7f29fe22c83879c0d9dbfcd3bd6402bb576b5cb1dc4b5fa11b5b6561445b2a4b0b75d4893340de23f610e4d8fa5e75e737e21561c9703684
+EBUILD bitcoin-core-25.2.ebuild 12926 BLAKE2B 2fb614a47736f39df8123e3382a729434fb6fb06fa7f34e2e70e2ec3dea171984ee29410d0a56c20a52d8dd2548d5a80cf3672aed1745bb482c4cba794794fa9 SHA512 a4b7e2f13c6631319d8788a09eaa97f4f4fd6c29ea1ce42f5d66ec0c0bb78a809e91eabdc08ced79a220578814a58083173b5c5fd1c2c71ba7e039bca6d7eb0e
+EBUILD bitcoin-core-26.0-r1.ebuild 13245 BLAKE2B b56303447b3a7a3f966b8e145cb9093922019796fd562feda349d93839bc77e47b10563a189530326cfaf9fc15e0f845a2aef790158d029a235263d7b267400a SHA512 cf9b9efce7a48a58e06ea7082ae35d083115fc4d27b7be7be58788d0b72a032bf8e8126ba3ef8029a5d44644d31c3bda1cc7fbd0836dd4d90f4d5dd570aa8812
+EBUILD bitcoin-core-26.1.ebuild 13184 BLAKE2B f613bd537bc220777d77fc5b4babf243cd9bfb90b094f5de4543a9b855ba7b7595348d2b64919ddb5f0b862f0cb4c72f360330159bd8beabd731a1d746bd5a5d SHA512 993c78ab0ac133a271a414e036777532deeaf8859d416b1e13558c54dcff9a0c3739083e97219b8d59684c996fb4219a4d006453a32dc51c9a87fe367369ecec
+EBUILD bitcoin-core-26.2_rc1.ebuild 13185 BLAKE2B b613ad78cef8069daa1298dde1cba8c056b0aef1770797072cbb1d52753e9cba46c2bc17a22e826c00a4918c4f368ddcfa95711d8c28cd50b826b1adf279a08c SHA512 0b551cb80b220724a90a1513a598733213373dc40e75051f0d329bb989eb39466899a6b7136d58f60b60068da230e661a3a2f9fabd949639ee21f239bcf25a7f
+EBUILD bitcoin-core-27.0.ebuild 13185 BLAKE2B e9ff9dd6778c7a6791545b0c01bd851f24ae40c7b6ad941f0649ee5c3904ec2c3c02f75514b89db39d4fbbb5625c3ef40d6e086a81d54fa43000e632ddbe5965 SHA512 a70ad744357d4837349fea01b16917022ecf62ef1935d52424b5c64dbec477ca8729e15f93d57ad9ddaf16b73cf4b0461a56a78cab4cecedbf26d21a7edafc7b
+EBUILD bitcoin-core-27.1.ebuild 13185 BLAKE2B 58849f1af366a2db5fa6b200f7710998406c68a4c5910dcd80fde6ee16697ba0ef34b8124c243a5fd19744a0c579f55e9b904a62f07996f45796caea7b0a7321 SHA512 930f0a2f4faf6d8be1d9392559378644f7d58b22fc3f0fe97bdd0259637f9bb12cc96bab9cdc1886eb123fc415ec6503c1e92a8947bd5bd706880449334dcd9b
 MISC metadata.xml 1731 BLAKE2B 82448eebdb2fb1de884d8df8a61449a4895c9670997fe590d6cdd2473a3831f12338c736739cef110a38ca0673053317bb21c93f2016b1b0c329407c7255e068 SHA512 84a029da788f4c41679bc9fa1fcc8d23ca74ddb11abc678bf436744239b1135e4c8aac9e40974b64414990e6892cc39fe08aa3a005f7a924f0802853c013d163
diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.1-r2.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.1-r2.ebuild
index 1b14729e0a7c..52a3f31055e3 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.1-r2.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.1-r2.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/"
-SRC_URI="https://bitcoincore.org/bin/${P}/${P/-core}.tar.gz"
+SRC_URI="
+	https://bitcoincore.org/bin/${P}/${P/-core}.tar.gz
+	https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${P/-core}"
 
 LICENSE="MIT"
@@ -91,6 +94,7 @@ DOCS=(
 )
 
 PATCHES=(
+	"${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
 	"${FILESDIR}/25.0-syslibs.patch"
 	"${FILESDIR}/init.patch"
 )
diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild
index b51f27a43b29..d3b23526e37c 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/"
-SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz
+	https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 
 LICENSE="MIT"
@@ -92,6 +95,7 @@ DOCS=(
 )
 
 PATCHES=(
+	"${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
 	"${FILESDIR}/25.0-syslibs.patch"
 	"${FILESDIR}/init.patch"
 )
diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.0-r1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.0-r1.ebuild
index bc609a903ac0..27e0238e5b62 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-26.0-r1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.0-r1.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/"
-SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV}.tar.gz -> ${P/-core}.tar.gz"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/v${PV}.tar.gz -> ${P/-core}.tar.gz
+	https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${P/-core}"
 
 LICENSE="MIT"
@@ -91,6 +94,7 @@ DOCS=(
 )
 
 PATCHES=(
+	"${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
 	"${FILESDIR}/26.0-syslibs.patch"
 	"${FILESDIR}/26.0-init.patch"
 )
diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild
index 54533f4ae6a8..5327852ba303 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/"
-SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz
+	https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 
 LICENSE="MIT"
@@ -92,6 +95,7 @@ DOCS=(
 )
 
 PATCHES=(
+	"${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
 	"${FILESDIR}/26.0-syslibs.patch"
 	"${FILESDIR}/26.0-init.patch"
 )
diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild
index eacdbc50d800..73ea8bc6302b 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/"
-SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz
+	https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 
 LICENSE="MIT"
@@ -92,6 +95,7 @@ DOCS=(
 )
 
 PATCHES=(
+	"${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
 	"${FILESDIR}/26.0-syslibs.patch"
 	"${FILESDIR}/26.0-init.patch"
 )
diff --git a/net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild b/net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild
index 44f1f8378b82..f35da4dc4869 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/"
-SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz
+	https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 
 LICENSE="MIT"
@@ -92,6 +95,7 @@ DOCS=(
 )
 
 PATCHES=(
+	"${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
 	"${FILESDIR}/27.0-syslibs.patch"
 	"${FILESDIR}/26.0-init.patch"
 )
diff --git a/net-p2p/bitcoin-core/bitcoin-core-27.1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-27.1.ebuild
index 820fbbb16b31..9ee8d0810153 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-27.1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-27.1.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/"
-SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz
+	https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 
 LICENSE="MIT"
@@ -92,6 +95,7 @@ DOCS=(
 )
 
 PATCHES=(
+	"${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
 	"${FILESDIR}/27.0-syslibs.patch"
 	"${FILESDIR}/26.0-init.patch"
 )
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f8702cc057a7..5a58f42ac5b4 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index a32c717e5294..aa4f7d7393b0 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -1,10 +1,22 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# WARNING: UnmatchedProfilePackageUnmask has a bug with false positives here
+# https://github.com/pkgcore/pkgcheck/issues/685
+
+# matoro <matoro_gentoo@matoro.tk> (2024-06-10)
+# Unmask for ppc64le, #892183
+-dev-python/sympy
+-dev-python/symengine
+
 # Michał Górny <mgorny@gentoo.org> (2024-04-24)
 # Unmask ppc64le binpkg.
 -dev-python/pypy-exe-bin
 
+# Rahil Bhimjiani <me@rahil.rocks> (2024-03-20)
+# https://bugs.gentoo.org/925111
+-app-containers/podman
+
 # Sam James <sam@gentoo.org> (2022-01-18)
 # No bootstrap binary available on big endian PPC64 right now, but there is
 # one for ppc64le.
diff --git a/profiles/package.mask b/profiles/package.mask
index c0b37949457f..ef2790bad2f5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -605,17 +605,6 @@ sec-keys/openpgp-keys-jiatan
 # Test failure in watchpoints.dem, undefined function FresnelC.
 ~sci-visualization/gnuplot-6.0.0
 
-# Patrick Lauer <patrick@gentoo.org> (2023-12-23)
-# ROCm-6 builds but has runtime issues for me
->=dev-libs/roct-thunk-interface-6.0.0
->=dev-libs/rocr-runtime-6.0.0
->=dev-libs/rocm-comgr-6.0.0
->=dev-libs/rocm-device-libs-6.0.0
->=dev-libs/rocm-opencl-runtime-6.0.0
->=dev-util/hipcc-6.0.0
->=dev-util/hip-6.0.0
->=dev-util/rocminfo-6.0.0
-
 # Sam James <sam@gentoo.org> (2023-12-14)
 # Gentoo's kernel maintainers have decided to discontinue gentoo-sources and
 # gentoo-kernel for old kernel LTS branches because of the resources to require
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 8efb9de03f3f..7b2def1875fd 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2915,6 +2915,10 @@ dev-util/google-perftools:pagesize-32k - Use 32K page size for tcmalloc. Larger
 dev-util/google-perftools:pagesize-64k - Use 64K page size for tcmalloc. Larger size makes tcmalloc faster, at the cost of using more space (due to internal fragmentation)
 dev-util/heaptrack:gui - Install Qt5-based analyzer tool
 dev-util/hfstospell:clang - Use different logic in ebuild when clang is used
+dev-util/hip:hip - Build HIP runtime
+dev-util/hip:opencl - Build OpenCL runtime
+dev-util/hip:video_cards_amdgpu - Build for AMD platform
+dev-util/hip:video_cards_nvidia - Build for Nvidia platform
 dev-util/intel-graphics-compiler:vc - Enable VectorCompiler for a better performance.
 dev-util/intel-graphics-system-controller:cli - Build CLI tools for flashing manually a firmware upgrade.
 dev-util/kcov:binutils - Use sys-libs/binutils-libs for --verify support
@@ -5354,6 +5358,7 @@ net-analyzer/linkchecker:sqlite - Mozilla Bookmark parsing
 net-analyzer/monitoring-plugins:dns - Install net-dns/bind-tools required for monitoring DNS servers. Disabling the flag does not remove any plugins.
 net-analyzer/monitoring-plugins:fping - Install net-analyzer/fping required for fancy ping monitoring. Disabling the flag does not remove any plugins.
 net-analyzer/monitoring-plugins:game - Install games-util/qstat required for monitoring FPS servers. Disabling the flag does not remove any plugins.
+net-analyzer/monitoring-plugins:ipv6 - Enable ipv6 checks.
 net-analyzer/monitoring-plugins:snmp - Install dev-perl/Net-SNMP and net-analyzer/net-snmp required for monitoring SNMP values. Disabling the flag does not remove any plugins.
 net-analyzer/monitoring-plugins:ssh - Install net-misc/openssh required for monitoring SSH servers. Disabling the flag does not remove any plugins.
 net-analyzer/mtr:ipinfo - Disable support for IP address lookups
@@ -7389,6 +7394,7 @@ sci-libs/gsl:deprecated - Enable deprecated functions
 sci-libs/hdf5:hl - Enable high level API (https://support.hdfgroup.org/HDF5/doc/HL/index.html)
 sci-libs/hdf5:unsupported - Enable unsupported combinations of configuration options
 sci-libs/hipCUB:benchmark - Build and install benchmark binaries.
+sci-libs/hipSOLVER:sparse - Build hipSOLVER with sparse functionality (sci-libs/cholmod)
 sci-libs/hypre:int64 - Build the 64 bits integer library
 sci-libs/indilib:rtlsdr - Enable support for devices supported by net-wireless/rtl-sdr
 sci-libs/indilib:websocket - Enable support for WebSocket protocol
@@ -7467,7 +7473,7 @@ sci-libs/plplot:qhull - Add bindings for media-libs/qhull
 sci-libs/plplot:shapefile - Enable support for ESRI shapefiles
 sci-libs/rocBLAS:benchmark - Build and install rocblas-bench.
 sci-libs/rocBLAS:test - Perform rocblas-test to compare the result between rocBLAS and system BLAS.
-sci-libs/rocFFT:benchmark - Build and install [dyna-]rocfft-rider.
+sci-libs/rocFFT:benchmark - Build and install rocfft benchmark tools.
 sci-libs/rocFFT:perfscripts - Install rocfft-perf performance visualization suite.
 sci-libs/rocPRIM:benchmark - Build and install benchmark programs.
 sci-libs/rocRAND:benchmark - Build and install benchmark programs.
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index db1cdc7e87ce..a5698ccde3b5 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/chemex/Manifest b/sci-chemistry/chemex/Manifest
index 7e7e50a2bb05..e79b0c6d82fe 100644
--- a/sci-chemistry/chemex/Manifest
+++ b/sci-chemistry/chemex/Manifest
@@ -1,5 +1,5 @@
 DIST chemex-2024.05.2.tar.gz 2757082 BLAKE2B e231f2b4da566b633cdd10c54f413b319847e86ab909b81ca78e0cf5c368f4cd039fc26d4214f464de1ca618ea5bbd8579e9bfeaa4a97e01ef3ddecb1d8c8227 SHA512 29e137a1d275f5c6b078081350b8d9a6f9172858adb744afdbbdbbe94dc9953f1fb37ad49e10f2d39db89e90c2c8d5b17a53ec9be337772bb531052ae4ab86f1
 DIST chemex-2024.05.3.tar.gz 2757407 BLAKE2B 8f98cda5158224bf06b4e81271157b7d6dd6c28526a6fd0362090d51d2fb2402a5dffc422862f129ffe7db22ec87ee49a12a1bd1a812e88014d4b1956e626ff7 SHA512 f2a29c03d9375b440206e1cd08d0f656ec6f9c627b15645663ee0d249731adb9619fa2ad5792e55e7219e11165d20a7d25b00ee9766daf580490cb4c8ea77ebf
-EBUILD chemex-2024.05.2.ebuild 1343 BLAKE2B eb695b0c3dfdcf00c651fb7dab2953a9b382233f343098bff90dfc1ea8bc5ddb9107bd039ba399f9dd0f176edde15224853585acc9b55c9cff0440fe007046ca SHA512 34ed74f6fe89bf5a22752d91989456878754d4b3ab1ced0cd606254e0b725cd56c4b2a4a70c87865917b3477d71acb978f6371ab9dc249edacbdcc86c24b6fb1
-EBUILD chemex-2024.05.3.ebuild 1343 BLAKE2B eb695b0c3dfdcf00c651fb7dab2953a9b382233f343098bff90dfc1ea8bc5ddb9107bd039ba399f9dd0f176edde15224853585acc9b55c9cff0440fe007046ca SHA512 34ed74f6fe89bf5a22752d91989456878754d4b3ab1ced0cd606254e0b725cd56c4b2a4a70c87865917b3477d71acb978f6371ab9dc249edacbdcc86c24b6fb1
+EBUILD chemex-2024.05.2-r1.ebuild 1298 BLAKE2B f5a3146ad927d9e00edf573abc5e93c028c9e0eeb806e9196e1dea31f431dccbdf2595a7781e52f1426d3d6a31baccb8a853e4b610ac06f6969e62748ba42d84 SHA512 471992fc58cad9cb9ec3d0420289e27aa0c54492b0a9e422f096b22212d4423aae0eaa25219b4139c834b1c8a0522dd49a9542e7e8fe87bc9b4e10211afc9785
+EBUILD chemex-2024.05.3-r1.ebuild 1298 BLAKE2B f5a3146ad927d9e00edf573abc5e93c028c9e0eeb806e9196e1dea31f431dccbdf2595a7781e52f1426d3d6a31baccb8a853e4b610ac06f6969e62748ba42d84 SHA512 471992fc58cad9cb9ec3d0420289e27aa0c54492b0a9e422f096b22212d4423aae0eaa25219b4139c834b1c8a0522dd49a9542e7e8fe87bc9b4e10211afc9785
 MISC metadata.xml 300 BLAKE2B a1ad769918094ddbda13ac92462ec69fa469dfcacde1202c653a4aa7443db661ffa5739cd039b6e38b13f0345a2680f276b4e071362106b162c95cd92007b5a8 SHA512 755c273f6bf67f79c388d06d970702a1d4a9f84338f8d889dd9146905c6994621917952225406ffba5bfe1e1b69f0bfd0f471374178b15343f4927af9de49aef
diff --git a/sci-chemistry/chemex/chemex-2024.05.3.ebuild b/sci-chemistry/chemex/chemex-2024.05.2-r1.ebuild
index 449970b2c4ce..87646d2c3045 100644
--- a/sci-chemistry/chemex/chemex-2024.05.3.ebuild
+++ b/sci-chemistry/chemex/chemex-2024.05.2-r1.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 		>=dev-python/rapidfuzz-3.7.0[${PYTHON_USEDEP}]
 		>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
 		>=dev-python/scipy-1.13.0[${PYTHON_USEDEP}]
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/sci-chemistry/chemex/chemex-2024.05.2.ebuild b/sci-chemistry/chemex/chemex-2024.05.3-r1.ebuild
index 449970b2c4ce..87646d2c3045 100644
--- a/sci-chemistry/chemex/chemex-2024.05.2.ebuild
+++ b/sci-chemistry/chemex/chemex-2024.05.3-r1.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 		>=dev-python/rapidfuzz-3.7.0[${PYTHON_USEDEP}]
 		>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
 		>=dev-python/scipy-1.13.0[${PYTHON_USEDEP}]
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index f6f5a4d4d4da..e149cbc63dfd 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 8f3eb1566540..c0fcf1756d9c 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,4 +1,5 @@
+AUX viking-1.10-terraserver.patch 1286 BLAKE2B a10fb99632db730a03b1e34d2f3021ff5ab02905676052b409b25577b7f7e03f90572ddf201b0b6345b80c3704cc30582b266a613144cfb21e30afd7b9a78a88 SHA512 82a868cdd85b1d1886fa4b8e86fef5bf67b283453e5bb160b9fc9b15685727cab558f2b73f61c1a8e63e8bb366cfc0c22abca68865aba9fbc45bb6fc5153ec36
 DIST viking-1.10.tar.gz 6014926 BLAKE2B 667a5cd854449f54c6f5969118a445903cafae4e8f046f14b6802f53a76c217cf960dd11876ed237112026f96da2906bb68b2474ba4e72696bd8b8a082cf7189 SHA512 8d0b3b46e139b8c03730140d89e8eaf6f1dbcde504011710d122e5239d11d1115464b087edd531228be199286605df0deb3f4b75fae0222128b0f5098344527e
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
-EBUILD viking-1.10.ebuild 2051 BLAKE2B 51692a09fbfe7343fdbfbe0416882750fef2bed1ac71abc430201205923581ddf18e3fe80c4fb4fed7819432b4baec2dee57316f3aa2e642a096c56e072ef9fc SHA512 f0cecea28b66e0f1b07b832d6561d10299ef815d6ce89d990d161a5318bf64a78851be611f6268a27de7d2529847a27ec766e19982780c910b8b8a1898df2d50
-MISC metadata.xml 734 BLAKE2B 7fd63ec5238ee628cb9f6cb485643fb7f029e83735d3e85b79ea2c27e3c4d50698c6fc1b67d122a4261f0ff0b6271b3001102d07a7495c0ab58d54b7feec94a5 SHA512 a0568859ea1fedda5839ed1d055097687210d938867473e31be9c5331d6d1b1b26305049d5fee9d36e945343cd2dcd08951eb5921d0683a69433b2cd6539c209
+EBUILD viking-1.10.ebuild 2100 BLAKE2B 4346b9649e6252d5f69a809d44437237f9382b1ce58289468e3e09d4558a996db763ae30d79c8fabf01d00490357f3b8debeb362a4ef887060dcc313dbff3e80 SHA512 96b280af85f57f1ca63e9e05f38aaf7739fe42d95137859fbd64e1b19c879f2d8f0fe8200b0c8f7e06e0dbc6bc3b4d0d1e25eed00c6990ec3afd1d7f5f4494b6
+MISC metadata.xml 793 BLAKE2B 21b6c3d0751f98fd8d90b260b54b9a3ef004b35f9fbb088dd664f60a72a1618df90464288075043d30754d95ebea1aa6e261ce3a280fda005a029c4dd4dac971 SHA512 9e436dedcc783f3c0c1c678905ec1381f7fe56f50480680448401b4ce06ccaffbc954debd52bb98af8008df468220482f155ee53db071e6b8b5adf1a6d600da5
diff --git a/sci-geosciences/viking/files/viking-1.10-terraserver.patch b/sci-geosciences/viking/files/viking-1.10-terraserver.patch
new file mode 100644
index 000000000000..143f80af838e
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-1.10-terraserver.patch
@@ -0,0 +1,31 @@
+From 71e5d6bb1b2f9481788ce7d54d5124f468515852 Mon Sep 17 00:00:00 2001
+From: Rob Norris <rw_norris@hotmail.com>
+Date: Thu, 24 Mar 2022 19:26:37 +0000
+Subject: [PATCH] Maintain terraserver code building
+
+---
+ src/terraservermapsource.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/terraservermapsource.c b/src/terraservermapsource.c
+index 8d9edfac..0e8cf09a 100644
+--- a/src/terraservermapsource.c
++++ b/src/terraservermapsource.c
+@@ -32,7 +32,7 @@ static gboolean _is_mbtiles ( VikMapSource *self );
+ 
+ static gchar *_get_uri( VikMapSourceDefault *self, MapCoord *src );
+ static gchar *_get_hostname( VikMapSourceDefault *self );
+-static DownloadFileOptions *_get_download_options( VikMapSourceDefault *self );
++static DownloadFileOptions *_get_download_options( VikMapSourceDefault *self, MapCoord *src );
+ 
+ /* FIXME Huge gruik */
+ static DownloadFileOptions terraserver_options = { FALSE, FALSE, NULL, 0, NULL, NULL, 0, a_check_map_file, NULL, FALSE, FALSE, NULL };
+@@ -247,7 +247,7 @@ _get_hostname( VikMapSourceDefault *self )
+ }
+ 
+ static DownloadFileOptions *
+-_get_download_options( VikMapSourceDefault *self )
++_get_download_options( VikMapSourceDefault *self, MapCoord *src )
+ {
+ 	g_return_val_if_fail (TERRASERVER_IS_MAP_SOURCE(self), NULL);
+ 
diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml
index d113d8a61afa..10d05ec65b71 100644
--- a/sci-geosciences/viking/metadata.xml
+++ b/sci-geosciences/viking/metadata.xml
@@ -21,5 +21,6 @@
   </use>
   <upstream>
     <remote-id type="sourceforge">viking</remote-id>
+    <remote-id type="github">viking-gps/viking</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-geosciences/viking/viking-1.10.ebuild b/sci-geosciences/viking/viking-1.10.ebuild
index 35fb8f0196c1..f3cde20cb986 100644
--- a/sci-geosciences/viking/viking-1.10.ebuild
+++ b/sci-geosciences/viking/viking-1.10.ebuild
@@ -7,14 +7,15 @@ inherit autotools xdg-utils
 
 DESCRIPTION="GPS data editor and analyzer"
 HOMEPAGE="https://github.com/viking-gps/viking/"
-IUSE="doc +exif libexif geoclue gps +magic nls oauth"
 SRC_URI="
 	https://github.com/viking-gps/${PN}/archive/${P}.tar.gz
 	doc? ( https://github.com/viking-gps/${PN}/releases/download/${P}/${PN}.pdf )"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="doc +exif libexif geoclue gps +magic nls oauth"
 
 COMMONDEPEND="
 	app-arch/bzip2
@@ -47,7 +48,7 @@ DEPEND="${COMMONDEPEND}
 	sys-devel/gettext
 "
 
-S="${WORKDIR}/${PN}-${P}"
+PATCHES=( "${FILESDIR}/${P}-terraserver.patch" )
 
 src_prepare() {
 	default
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b4c6241b487c..693cb9f0df50 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 08523c57be39..79cf2c8c93df 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -14,7 +14,7 @@ AUX caffe2-2.3.0-rocm-fix-std-cpp17.patch 3378 BLAKE2B 9e88fa1bf68c397c8122ea5b3
 DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B 0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a SHA512 7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0
 DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c
 DIST pytorch-2.3.1.tar.gz 117035696 BLAKE2B d419d7fa1342f1fb317ffce09ec9dc1447414627cc83d36578fe60f68c283c620b2b4d49f414cd206d537b90b16432a06cd1941662720db05d5e2b6c493325f5 SHA512 e1bcae44f9939fc7ccb1360a9b1970d92426f25e5de73e36964df3dd15ad5d8d9f5bd2f9a7dda6b8f64e2bba3674005bd869f542489cc442ad0125a02676f587
-EBUILD caffe2-2.2.2-r1.ebuild 7452 BLAKE2B 6b4c14a8304ef36349f6442616bb1e2a9563596293ea507ffd1d9083fc01c251dd237db3babbdc9841273b7c31b8ac4b420e3047e6ffd128763ca9afc4b6aa16 SHA512 cfa525d40f3dfbcd4dcf7e31cb772dcd809d528981925b50239961e91ae2147723d261b71f433e5a22e73f59b0bd156a97d84b385d1d5bfffd51db9fc6db2b57
+EBUILD caffe2-2.2.2-r1.ebuild 7452 BLAKE2B 31ef525960d7c3866580985f9ba9736e5419f17c2a63251b8c4fe961a6789a33dee746b14b12fa331c8c20a6c821565b92dd2cb7c6cdd61678bba7ddf5fc7400 SHA512 f232d901c08e3fefd0d6260d07915786747df8f83269c3980c16112c968114c3cdb7daccd8132a6a3850a266a04b38f6df6d2b1f1bc35f473fb9a58d5fff3452
 EBUILD caffe2-2.3.0-r3.ebuild 7542 BLAKE2B 6b230db4d2a033b5078e8c61e40955a0981aa3b6b06734145e4bec8f78719329a3825218045a8f57efce9bfddad7b252ee4447d82cc0637db8656d5f8178b9cc SHA512 d3861111081d26a883790e7a5097ddf77ef2e491eb4471a3cc95d25e659ad8c283c22bda5674cb09d575768da5b6a401ea5347febd4f194dbedd4196d1ac628d
-EBUILD caffe2-2.3.1.ebuild 7563 BLAKE2B 9baa8fc31f572e2f16b193c9e5820d3e8f53d06d2ee4707c275e5070d13d6e90d52cf2df32a13b4566707ddb1e298efad79c80812fb54950486f6b8589915ff1 SHA512 fbbe1d6fdd03e55b9beb63ae5934b873552e68662cff1a5f2eaa9ae35bf326f637b040f4864e4d59775c509d2b4aebef0c11d67c54f3464625a6163ed001df2d
+EBUILD caffe2-2.3.1.ebuild 7563 BLAKE2B 17433295ef6aaf94567a5261e9df6a2b5aeac0b2c18eb4c45375ed828cbba7ac874811c0da8ca51de84482d5e4b62b48ccecd8924ad42c72a1320ff8b3b715c6 SHA512 c6868b614f7a9c3847e32ba054d821e96486d57cdf1d4597d3a6bb6f9045bd19fa65d5462af31c471eafddd4d5e72278d68de59c21cb21ab17df381fd181fe10
 MISC metadata.xml 1225 BLAKE2B ab7fb0bf8b2d37ddaa1a9ecc815eb094e85465d20d3a30af081b42e0b60ade9858d0053b101ba0e7750a90cb48b5b79db9bdc2729bf66d0420732489da62fe54 SHA512 dfb58597fb4bcdd7df0fcc3f2514518e118e8fc9b1cd24868aab60c32a62ff419b8b72a7c294925eff4c8871cc8df606af7fa60bfa99901091d8195101ee1153
diff --git a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
index cd3d8757daa6..6649975ddf2d 100644
--- a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild
@@ -62,18 +62,18 @@ RDEPEND="
 	opencv? ( media-libs/opencv:= )
 	qnnpack? ( sci-libs/QNNPACK )
 	rocm? (
-		>=dev-util/hip-5.7
-		>=dev-libs/rccl-5.7[${ROCM_USEDEP}]
-		>=sci-libs/rocThrust-5.7[${ROCM_USEDEP}]
-		>=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipFFT-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipRAND-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipCUB-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}]
-		>=sci-libs/miopen-5.7[${ROCM_USEDEP}]
-		>=dev-util/roctracer-5.7[${ROCM_USEDEP}]
+		=dev-util/hip-5.7*
+		=dev-libs/rccl-5.7*[${ROCM_USEDEP}]
+		=sci-libs/rocThrust-5.7*[${ROCM_USEDEP}]
+		=sci-libs/rocPRIM-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipBLAS-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipFFT-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipSPARSE-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipRAND-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipCUB-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipSOLVER-5.7*[${ROCM_USEDEP}]
+		=sci-libs/miopen-5.7*[${ROCM_USEDEP}]
+		=dev-util/roctracer-5.7*[${ROCM_USEDEP}]
 	)
 	distributed? ( sci-libs/tensorpipe[cuda?] )
 	xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
diff --git a/sci-libs/caffe2/caffe2-2.3.1.ebuild b/sci-libs/caffe2/caffe2-2.3.1.ebuild
index 53c270458dd2..51bab7c5dac7 100644
--- a/sci-libs/caffe2/caffe2-2.3.1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.3.1.ebuild
@@ -65,18 +65,18 @@ RDEPEND="
 	opencv? ( media-libs/opencv:= )
 	qnnpack? ( sci-libs/QNNPACK )
 	rocm? (
-		>=dev-util/hip-5.7
-		>=dev-libs/rccl-5.7[${ROCM_USEDEP}]
-		>=sci-libs/rocThrust-5.7[${ROCM_USEDEP}]
-		>=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipFFT-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipRAND-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipCUB-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}]
-		>=sci-libs/miopen-5.7[${ROCM_USEDEP}]
-		>=dev-util/roctracer-5.7[${ROCM_USEDEP}]
+		=dev-util/hip-5.7*
+		=dev-libs/rccl-5.7*[${ROCM_USEDEP}]
+		=sci-libs/rocThrust-5.7*[${ROCM_USEDEP}]
+		=sci-libs/rocPRIM-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipBLAS-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipFFT-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipSPARSE-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipRAND-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipCUB-5.7*[${ROCM_USEDEP}]
+		=sci-libs/hipSOLVER-5.7*[${ROCM_USEDEP}]
+		=sci-libs/miopen-5.7*[${ROCM_USEDEP}]
+		=dev-util/roctracer-5.7*[${ROCM_USEDEP}]
 	)
 	distributed? ( sci-libs/tensorpipe[cuda?] )
 	xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
diff --git a/sci-libs/composable-kernel/Manifest b/sci-libs/composable-kernel/Manifest
index 316f4e33f9d2..91879beba858 100644
--- a/sci-libs/composable-kernel/Manifest
+++ b/sci-libs/composable-kernel/Manifest
@@ -1,5 +1,10 @@
 AUX composable-kernel-5.7.1-enable-test-examples.patch 507 BLAKE2B aae585262ad83f2a4e4f07e00e79a99d8cddae9c590e503f8ea1d3ffef84b3d829e61526a8c9b7977a6d604b5310cce521fb179155aba2ffc620c45db76c51cc SHA512 447ee2ec28442d610f185af4d6733d86d183a8f451fca00eafb0d6950d0a65f5d5396a8edcb4a3a1dd4733a6524ba4b9da9ca08b1bcdbd7ecaf7600bf0b14c60
+AUX composable-kernel-6.1.1-enable-examples.patch 379 BLAKE2B 38c3909c98686f97d527f01801043923d26f9f1352a66136cc0c3ce79fabfc7780c822cda7a7e3cc06b36637f6dc5cb5d2c2f055fd79641d3b03f57c241278db SHA512 32d362da7138a7f4c687cbb8ba8be6910d0a562ac79d26ecb7322ecae34e892fc19a79e7be32edbec8290632cef1d97f577accccde2a024e10445fd4cd71f93a
+AUX composable-kernel-6.1.1-fix-clang-17-no-offload-uniform-block.patch 918 BLAKE2B 04a17e4e9fd1a2c340a3d93a41f072ad24a836dcf5956644e3eeccb9269f7058a18135f324327aadf48f0e4369bcce8af900a72344515b46992c6deb68b15c71 SHA512 f8ac68ecc9d42673b1b66d3ddde80d042dab2e548a89ebeb50db153c3ec60308f1019a67d1a644d3320435936af0aef4e744b1c12a9f504dc32b18b808921767
+AUX composable-kernel-6.1.1-no-git-no-hash.patch 688 BLAKE2B e3588a306816cf4380bf8987a6fc1660a70a6fc29b811d31381bae4aa2a00b55340d13f43246b70bbc439a462fcb8f664505bfaaac0e4cab793f2e4cb0611aed SHA512 94c59971b95b48e267280989d332240e236cea4cda8b6153945940f01c8f367a8da569403d802d733b7d46728861110b1d916b32be797e62c7a927a42b7b72b7
 DIST composable-kernel-5.7.1.tar.gz 2158402 BLAKE2B 660c205c2a99cd17f29a9077e9e7b8b88e41f42ab40d92d0a235e7a60683a04234cce6b2eb6110265c2f461dd132c40151b2521b7d64df4cebb7f27094d8b2b0 SHA512 3931c5dbcab59513541103ebf7446311a1e318421a9e12aeafa7a98cf0717a75e1519140e6b2fbcaf4cb90829a11f03a724ff3ccc6636139c61667ac82558c55
+DIST composable-kernel-6.1.1.tar.gz 2520967 BLAKE2B 549d76c5c36b0a273a4c51159abd162403ad035520f97c43dd4b66560ad30021199d2f4cf7e2c12ffe33beee2fb49604db6d7c40b3b33fdcbfde111b9d4833aa SHA512 3f7667cea91760447c3f6ac0bfc261c0bca95abafbfce209d1c889e04f01ec29849e8d7f0e1cb1d77a4309ac06b3c2557721a773e4a67be383de91668cb279b2
 DIST gtest-1.14.0_p20220421.tar.gz 849107 BLAKE2B e9c32d9c1d98959583b696430a6be411f5d69e3db96669b16cffc0f1dcad42512391c0a4733f6e829c82953ff33fa243ee782f3cf6e86436f0d290f45d1a3db7 SHA512 967aac7d85da0e216fe13b17d10f894a31d763d9b88201bac7d3dfc37600552b5472d30a166a6ef27f2778677e73fd3e43d082695a48f47824262eb9cd4fcd2f
-EBUILD composable-kernel-5.7.1-r1.ebuild 1786 BLAKE2B ca0f01b34ce48f190a57b9e3b0d788f4bd8422ecae782bb7e9d9e21886bdba0dac8776f1183e57b96e9ef824cde482476746d30b1d5cba5fe93eb7cea9453ce9 SHA512 11b806f90b2a4a94d2535a86cd490a992e39ded8aa648c6b327cd407338a326375850935515338b7fd15946799118821e0d40b0c024cdaaac95cd87bdad1c560
-MISC metadata.xml 473 BLAKE2B fdeace65d8ada21cb0b0fd3a7e1c0c48338c10b51cdad675ffb33e4bd8b9da4ef83ffee85606ef436b2f0315ed323266fa28c70ac5553952ee800fe0450fb066 SHA512 38c79eb08baedccfa7e7a46ef138520d7a939379c4120883d1f8b1187624ca78d9c8dfcf5759867a0b78253b4724a4da944f7384ec27bc2f9846198c1386af9d
+EBUILD composable-kernel-5.7.1-r1.ebuild 1769 BLAKE2B 4e51c1eb8f331df322d9427b00d2cb8cba81f10b335533bc131142719d224d9bc89f98a0b54ec20d65f9622a081ab74d2a6bbae9289d1807958a9ded7f08fe4a SHA512 610bc66d4a374c6de7a0afb15a84255dae71911175c05674550478f5850b20f99a5bd0f5c40103c17e42ca774c80423d6a68b5bd0307be9c0ef3eaffa2912a58
+EBUILD composable-kernel-6.1.1.ebuild 1826 BLAKE2B 51c50ead79442a5d3beb92deac4555ae5b74e18e1ad95f27ee0522dc7afa190b307f26e5a0d0e54ffe557d2d91da4ed4a1b501a7fdf8308d8473101312facd2f SHA512 2334d9bb2ce3858ca07b54dbd07b3dac6039ff0afe25b85efa56340866c02852d4b92ccce30298d97029763ea0554518304e82f8d6f1d84d5eda23e0e2227836
+MISC metadata.xml 457 BLAKE2B 3ea71ee5eb1ef715b76f1ff2132c8d487f9360d5ea4a062bcb785eda19a997bed1ffcb251a98046661d647c3eac24db5cf5eeb9b3a6792c450c277038ac8c9e3 SHA512 efc4309c8c4ac98a59cb9634d64410d8a0c8b136accc13aff2f943594a0b4fe8d333010fd5ad59b46fbd7c2d29a244839bb3687cfef6e2c880431ffd80ed873b
diff --git a/sci-libs/composable-kernel/composable-kernel-5.7.1-r1.ebuild b/sci-libs/composable-kernel/composable-kernel-5.7.1-r1.ebuild
index fbaa9356f722..30016b8dbf79 100644
--- a/sci-libs/composable-kernel/composable-kernel-5.7.1-r1.ebuild
+++ b/sci-libs/composable-kernel/composable-kernel-5.7.1-r1.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-BDEPEND="dev-libs/half:0/1
+BDEPEND="
 	dev-build/rocm-cmake
 "
 
diff --git a/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild
new file mode 100644
index 000000000000..8c096e29135a
--- /dev/null
+++ b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake flag-o-matic rocm
+
+GTEST_COMMIT="b85864c64758dec007208e56af933fc3f52044ee"
+GTEST_FILE="gtest-1.14.0_p20220421.tar.gz"
+
+DESCRIPTION="High Performance Composable Kernel for AMD GPUs"
+HOMEPAGE="https://github.com/ROCm/composable_kernel"
+SRC_URI="https://github.com/ROCm/composable_kernel/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )"
+S="${WORKDIR}/composable_kernel-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="debug test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip
+	>=dev-db/sqlite-3.17
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	>=dev-libs/boost-1.72
+	dev-cpp/nlohmann_json
+	dev-cpp/frugally-deep
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-build/rocm-cmake
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-enable-examples.patch
+	"${FILESDIR}"/${PN}-6.1.1-fix-clang-17-no-offload-uniform-block.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-git-no-hash.patch
+)
+
+src_prepare() {
+	sed -e '/-Werror/d' -i cmake/EnableCompilerWarnings.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	if ! use debug; then
+		append-cflags "-DNDEBUG"
+		append-cxxflags "-DNDEBUG"
+		CMAKE_BUILD_TYPE="Release"
+	else
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_DEV=OFF
+		-DGPU_TARGETS="$(get_amdgpu_flags)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DGOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
+		)
+	fi
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	LD_LIBRARY_PATH="${BUILD_DIR}"/lib cmake_src_test -j1
+}
diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.1.1-enable-examples.patch b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-enable-examples.patch
new file mode 100644
index 000000000000..bedc79c562bd
--- /dev/null
+++ b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-enable-examples.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -470,7 +470,10 @@ if(NOT DEFINED INSTANCES_ONLY)
+         LIBRARY_NAME composablekernel
+         PACKAGE_NAME examples
+    )
+-   add_subdirectory(example)
++   option(BUILD_EXAMPLES "Build examples" OFF)
++   if(BUILD_EXAMPLES)
++     add_subdirectory(example)
++   endif()
+    if(BUILD_TESTING)
+       add_subdirectory(test)
+    endif()
diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-clang-17-no-offload-uniform-block.patch b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-clang-17-no-offload-uniform-block.patch
new file mode 100644
index 000000000000..3a102bec49cd
--- /dev/null
+++ b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-fix-clang-17-no-offload-uniform-block.patch
@@ -0,0 +1,18 @@
+`-fno-offload-uniform-block` flag was added in Clang 18; do not use it if hipcc uses Clang 17
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -144,11 +144,9 @@ else()
+     message("Building CK for the following targets: ${AMDGPU_TARGETS}")
+ endif()
+ find_package(hip)
+-# No assumption that HIP kernels are launched with uniform block size for backward compatibility
+-# SWDEV-413293 and https://reviews.llvm.org/D155213
+-math(EXPR hip_VERSION_FLAT "(${hip_VERSION_MAJOR} * 1000 + ${hip_VERSION_MINOR}) * 100000 + ${hip_VERSION_PATCH}")
+-message("hip_version_flat=${hip_VERSION_FLAT}")
+-if(NOT WIN32 AND ${hip_VERSION_FLAT} GREATER 500723302)
++
++check_cxx_compiler_flag("-x hip -fno-offload-uniform-block" COMPILER_HAS_OPTION_OFFLOAD_UNIFORM_BLOCK)
++if(COMPILER_HAS_OPTION_OFFLOAD_UNIFORM_BLOCK)
+    message("Adding the fno-offload-uniform-block compiler flag")
+    add_compile_options(-fno-offload-uniform-block)
+ endif()
diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.1.1-no-git-no-hash.patch b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-no-git-no-hash.patch
new file mode 100644
index 000000000000..6c6b161b1a14
--- /dev/null
+++ b/sci-libs/composable-kernel/files/composable-kernel-6.1.1-no-git-no-hash.patch
@@ -0,0 +1,14 @@
+Fix "Could NOT find Git (missing: GIT_EXECUTABLE)", git is not needed for releases
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,9 +84,7 @@ include(getopt)
+ # CK config file to record supported datatypes, etc.
+ configure_file(include/ck/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/ck/config.h)
+ 
+-# CK version file to record release version as well as git commit hash
+-find_package(Git REQUIRED)
+-execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD OUTPUT_VARIABLE COMMIT_ID OUTPUT_STRIP_TRAILING_WHITESPACE)
++# CK version file to record release version
+ configure_file(include/ck/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/ck/version.h)
+ 
+ set(ROCM_SYMLINK_LIBS OFF)
diff --git a/sci-libs/composable-kernel/metadata.xml b/sci-libs/composable-kernel/metadata.xml
index 9236dd2846d7..afd22272458c 100644
--- a/sci-libs/composable-kernel/metadata.xml
+++ b/sci-libs/composable-kernel/metadata.xml
@@ -10,6 +10,6 @@
     <name>Science Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/composable_kernel</remote-id>
+    <remote-id type="github">ROCm/composable_kernel</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest
index eea500c42794..ffcc305f1a9c 100644
--- a/sci-libs/hipBLAS/Manifest
+++ b/sci-libs/hipBLAS/Manifest
@@ -1,7 +1,9 @@
 DIST hipBLAS-5.1.3.tar.gz 526704 BLAKE2B d32d7029ea910c341e00dccab1ee9ab984518368cf38524f2264bb808cc1242b3d57db283937650f54460cb01174ec90f02c4bd66866cba4be5d0a1855814f0e SHA512 41dbc86b7ea53e7c0f1d629130f90b719f864ceddae972f1c68911e97b6233286f0c22c0fcfce049ae7db73a1ed41bdaf730040c72f1790fca367362c14ac707
 DIST hipBLAS-5.4.2.tar.gz 930814 BLAKE2B 702df09010b50652feb8f7e5741b27117aa58fc3e3b1b5f89f5043073a47581d1710f0831740453e84f7594b1b305e95d2681709898e5231c3eee2e8207404a3 SHA512 a941350d2d25022cf5142f68559242a048136bdd048dafcd544a0241cf3b510062273163f7a0eecc55f17ec47a1063d84d6102ca766ba7cde9b704eee5c44cd8
 DIST hipBLAS-5.7.1.tar.gz 669163 BLAKE2B e065f77eba0bb99d347f71920e733d30b7693f9eaf0c1f2a87a169360ccff23b8294e367eebfd6489440308b9bb1ae662c39617c5bb94275bf9b0ed60d555f85 SHA512 24c074f07865e1a3dfb0aca0b1d494e340a584ecb408813bb5b053f8282437cfd3644d730163f4faf1b93da306626ba68904141f9c3730a29749537fb7fd1a63
+DIST hipBLAS-6.1.1.tar.gz 835570 BLAKE2B dc8a54f3b6c780f63e57f208d67b15e965d3a7c98e20766ef22ecfd41e8780a6b9464e31efad8003b52562222ec7ad06801d93a502ff99f8456f415db09e5ace SHA512 390b9a9bf0238a5c72d51d034c0053ec8c6b007547b1ec9561064828c24335e099ddb0402ad76e60018ec96742d5acfbb29b9d218a613e1c6d54e4b8b05ceca7
 EBUILD hipBLAS-5.1.3.ebuild 1290 BLAKE2B 2d5722359ad1192d245a0d344aa2d3ab794f49be3cf7d6e0e90936d8813c29e7d2b96fb571f0b34aa5cf2883186bf20c5a4e8d974bba148ac20370b032176d1d SHA512 a95a0f8ae694e346aa00d4de3b09938515e8f104e731fa14936dd6f335996c32136d043f326887b8bcde718b5782cb464fc9a23641ea9641492fa21efee4b3a3
 EBUILD hipBLAS-5.4.2.ebuild 929 BLAKE2B ce433ff82d693d8b446bc47ce93e7ded4a4401cb423d45cbe9040d5a6b19bd1daa1b0b62e227c69505f941778fd3832827e867894f1ddb92538aebedddc26f67 SHA512 09813a2e0878222efdee2a5e87401671337dedb76441bbc5cca3c42f2aea3e88281ac503feb93b5ec3d4a904ceebe34bb9344ac577b9fdedb9f65e6678ead8fa
-EBUILD hipBLAS-5.7.1.ebuild 930 BLAKE2B 701197e3a06e56cd231b127cdb10d1a407f9c3ff83549d0f974e168f4aab2dc30565db602221244a18f7e4b6d55c2c192327573575956896b4f33b04ac77936a SHA512 d21079acf0101f779672eb033b0626099b29f18567f5b68697d988122a5ea1b775022625cd397dfb9ff8c6077d19b3fa796cd04ea99ebe80fe7a3dc5e303e2d6
-MISC metadata.xml 550 BLAKE2B f138aed628130d69e0e24f818e407e7ca940c90d3c2b5552fd8371a15ca7d1a4c2d26b4e521b71b67a18804dd31f0287b2d7af285c0cb77c000f2904e0618eae SHA512 6fc45e338865b72a9a876316c5bf9604eba1b8182ebfba2dcd229d4ff09ac02f73e263be63a330dd806a72e0a4e935eeec49fa7fe445e323674ebf2f67342f78
+EBUILD hipBLAS-5.7.1.ebuild 919 BLAKE2B 35676f043ad9ab3f3dc3398915e285fd5d8f15fd7ada8b1f3dc9af667853e7c57f79a51a3868141f91b8804b31353794038c0dd8be4a206ad44843609e385fb3 SHA512 2d825e3e69473d0fb0c8b718b0bc2751363bf0cf6f77f7afef54a9a4d2616cc09d8910a8196e44eb31aac8a3d3db389d702d5f2fa70107eae2ff8b38b72c15e0
+EBUILD hipBLAS-6.1.1.ebuild 877 BLAKE2B ffbb8660064b81317ffef15907d5203d213117787efce6bff92ffece9f47eb923048952113efa74fa187d9516298997ff1a5d78ad1c2481e28d3f17d5b21388c SHA512 c68564244a262ed0f2fd779a7ace6eda8ad65e5e1b43473098a2be4e4818e2ca6f7660924b75b7ab6e6f1b24b23cf5cfbc3d7bccf8c4da7f81a0b1860cd627e5
+MISC metadata.xml 647 BLAKE2B b4e941583a6b55bfa45a58e3173c6cecfcadaffd5e782c052f9cc8a46b37e1a09d9fd48b93fd0bd2977a982ec6752aed254f341caad0035a5dd8d2a1dad98b18 SHA512 d3ca380b71547c0e28be4dfbcc0b568fc2e2d89ae2ed0eca3bd087650d352539e5921d89d28bfd255e1564ec6c79dff5df2cddd3c008f91990f8c6f37ae3f3a8
diff --git a/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild b/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild
index f5afa385cdee..f979363cda25 100644
--- a/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild
+++ b/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,6 @@ RDEPEND="dev-util/hip
 	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
 	sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]"
 DEPEND="${RDEPEND}"
-BDEPEND=""
 
 S="${WORKDIR}/hipBLAS-rocm-${PV}"
 
diff --git a/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild b/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild
new file mode 100644
index 000000000000..439a778540e9
--- /dev/null
+++ b/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+DESCRIPTION="ROCm BLAS marshalling library"
+HOMEPAGE="https://github.com/ROCm/hipBLAS"
+SRC_URI="https://github.com/ROCm/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/hipBLAS-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		# currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here
+		-DBUILD_CLIENTS_TESTS=OFF
+		-DBUILD_CLIENTS_BENCHMARKS=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipBLAS/metadata.xml b/sci-libs/hipBLAS/metadata.xml
index 65b9259ded18..128eeacea7f9 100644
--- a/sci-libs/hipBLAS/metadata.xml
+++ b/sci-libs/hipBLAS/metadata.xml
@@ -12,7 +12,11 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/hipBLAS</remote-id>
+    <remote-id type="github">ROCm/hipBLAS</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/hipBLASLt/Manifest b/sci-libs/hipBLASLt/Manifest
new file mode 100644
index 000000000000..23aeb5897dba
--- /dev/null
+++ b/sci-libs/hipBLASLt/Manifest
@@ -0,0 +1,8 @@
+AUX hipBLASLt-6.1.1-clang-19.patch 341 BLAKE2B 7e486930db9a406e3665eb4d276c0df4790018ce4f8f6f7a72bd986da61a0ccfc6619ea0de6a2a488cb1ee64f92470aaa337b4590a5be0044be0bf9a014bad25 SHA512 894596742720d947fb25fd3332c34efbb5cc2fdc790c29919e0d65df85d2add6f1ac2a6c7b8f4796428bc69197af0f6227132a6711f3106e9a7b84f285ecfa83
+AUX hipBLASLt-6.1.1-fix-msgpack-dependency.patch 1094 BLAKE2B 9606ba01ead2aefd52ec2d2f424c735d361ffab67fc1bc2a6800cd81a34ae7e8d3a189fa79ef84f2caf4d6186687d6eddd8083ca8a912beaa0bce0ae72ad0393 SHA512 8b1b383611a88d9af6be546b985d4d460be830c370ec149eb7c4ae56dfedb57583ea463470029d099a779161f8b582637cf62ec0fbbd3617023002cc903cf82c
+AUX hipBLASLt-6.1.1-gentoopath.patch 724 BLAKE2B ac3acc8c444de7a8072337cadb3c9976d94cd019a1ecf51a18a4ccd59500efd4de798f710738c818f495dd018d0c8885e8754fede2d308a50c355f2a39236370 SHA512 59358f5d0c22d9188cf4e70215c0e42415831b0e804709f1c97d42fce15049edb3e58320c252b413b016490ed72fc27ab59660880fe71e4226bace0808529b32
+AUX hipBLASLt-6.1.1-no-arch.patch 1967 BLAKE2B d73ede48e0254a99df1b632437a4d820d1f639600bdda216d38c74dca38e6234a3ef4dd8bdc3a1e0450cfd64e07c9c2806f5378ec1097be0e130f6f6b5c4b934 SHA512 a4aae7c3117821e72ce63b72b2017eedb414046c9e0f52c2cb16c8a6c7aa84efcd1960adfe85dd89f3a247c8f7bccc7a586e36d494c6e9bc1a8fbd39f6febe87
+AUX hipBLASLt-6.1.1-no-git.patch 365 BLAKE2B 47b7f23a4ce0919cfd6d2d1a946d98822db912571d908c82d35d734ea2bfee15a1e537f50e8fb2ada474e819274654462b26f97fcb5dc010354df9f6ba30c377 SHA512 a44aa357bdc035ffcfe4d30fb81db205dfcfd28c00543a4c55f7f61f5a90ae228bcfce71be2f4290e842f60f534287b2f25a4cd2a27369ddbbaf1e0d1171a7d5
+DIST hipBLASLt-6.1.1.tar.gz 78448557 BLAKE2B 08ac9ce45d7d1e4384a36939af22f65589ed87e25b4db77f5f7ff5fbe65b8070e9c55fbb09db3b7bd49be98981dc8bf939e646ea27571bf1d1ccfa52a50b0f92 SHA512 1aa3a1cb8e9c7f653db66909b38be065b7386b97d4bd6b52ecc6c2bf72c6cdfabde6f12ebc6016b5fa195f979359af875eda8d54ea6772329312cb357bc2ebc5
+EBUILD hipBLASLt-6.1.1.ebuild 3260 BLAKE2B c22ce042c79793e78b9e91bea880ec853d6faa6cda427393729f39ba8fd9af491454da04cfd6330c85cb6bf7b8bd1034c7dac120d2dba1d1be0956c56d40b761 SHA512 f640b0c0db0089627341f102b87c23b892874cd90d49d89b3257234c65105db2c377c835b8e2876d3034401112303a7f17d025f7a268c410a948f9cb38b77814
+MISC metadata.xml 416 BLAKE2B 72248e12cd10654326a6685df0e03c508d413d2728d8e687eb8ad3d8dc928e518e3ba21df1ee774282c45363f61eed98b47b862cab2354d743ca530047084281 SHA512 02acf2d17f2c56f09c599fcde965bd5ceb07c335d7c2b4fd57a06a6b1a591a250d22de7a002f299cc99cacd1fd72f183adf51fc1b9ebff1338c6d83450da9c3b
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-clang-19.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-clang-19.patch
new file mode 100644
index 000000000000..5d082cc704b6
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-clang-19.patch
@@ -0,0 +1,11 @@
+Clang 19 is so smart, it can analyze templates before instantiation
+--- a/tensilelite/Tensile/Source/lib/include/Tensile/MasterSolutionLibrary.hpp
++++ b/tensilelite/Tensile/Source/lib/include/Tensile/MasterSolutionLibrary.hpp
+@@ -36,6 +36,7 @@
+ 
+ namespace Tensile
+ {
++    enum class LazyLoadingInit;
+ 
+     /**
+  * \ingroup SolutionLibrary
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-msgpack-dependency.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-msgpack-dependency.patch
new file mode 100644
index 000000000000..ef0b8395c527
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-fix-msgpack-dependency.patch
@@ -0,0 +1,29 @@
+Gentoo uses "msgpack-cxx" as library name and adds important
+MSGPACK_NO_BOOST compile definition when msgpack-cxx us installed with USE=-boost
+--- a/tensilelite/Tensile/Source/lib/CMakeLists.txt
++++ b/tensilelite/Tensile/Source/lib/CMakeLists.txt
+@@ -102,22 +102,9 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK)
+ endif()
+ 
+ if(TENSILE_USE_MSGPACK)
+-    find_package(msgpack REQUIRED)
++    find_package(msgpack-cxx REQUIRED)
+     target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1)
+-
+-    if(TARGET msgpackc-cxx)
+-        get_target_property(msgpack_inc msgpackc-cxx INTERFACE_INCLUDE_DIRECTORIES)
+-    elseif(TARGET msgpackc)
+-        get_target_property(msgpack_inc msgpackc INTERFACE_INCLUDE_DIRECTORIES)
+-    endif()
+-
+-    if(DEFINED msgpack_inc)
+-        # include C++ headers manually
+-        # External header includes included as system files
+-        target_include_directories(TensileHost
+-            SYSTEM PRIVATE $<BUILD_INTERFACE:${msgpack_inc}>
+-        )
+-    endif()
++    target_link_libraries(TensileHost PRIVATE msgpack-cxx)
+ endif()
+ 
+ if(TENSILE_USE_LLVM)
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-gentoopath.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-gentoopath.patch
new file mode 100644
index 000000000000..17c5d9c534c0
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-gentoopath.patch
@@ -0,0 +1,24 @@
+--- a/tensilelite/Tensile/Ops/gen_assembly.sh
++++ b/tensilelite/Tensile/Ops/gen_assembly.sh
+@@ -32,7 +32,7 @@ if ! [ -z ${ROCM_PATH+x} ]; then
+     rocm_path=${ROCM_PATH}
+ fi
+ 
+-toolchain=${rocm_path}/llvm/bin/clang++
++toolchain=@LLVM_PATH@/bin/clang++
+ 
+ . ${venv}/bin/activate
+ 
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -97,10 +97,6 @@ endif()
+ # hipBLASLt project
+ project(hipblaslt LANGUAGES CXX)
+ 
+-# Force library install path to lib (CentOS 7 defaults to lib64)
+-set(CMAKE_INSTALL_LIBDIR "lib" CACHE INTERNAL "Installation directory for libraries" FORCE)
+-
+-
+ # Build options
+ option(BUILD_SHARED_LIBS "Build hipBLASLt as a shared library" ON)
+ option(BUILD_CLIENTS_TESTS "Build tests (requires googletest)" OFF)
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch
new file mode 100644
index 000000000000..6bd608c94d0e
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-arch.patch
@@ -0,0 +1,56 @@
+Add ability to build without specitying any arch.
+This produces dummy library, which can be linked to other project (like caffe2 in pytorch).
+
+Related upstream bug: https://github.com/ROCm/hipBLASLt/issues/535
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -220,6 +220,10 @@ else()
+     else()
+       find_package(Tensile 4.33.0 EXACT REQUIRED HIP LLVM OpenMP PATHS "${INSTALLED_TENSILE_PATH}")
+     endif()
++    else()  # link to Tensile (required), but don't generate libraries
++      cmake_policy(SET CMP0074 NEW)
++      set(Tensile_ROOT "${CMAKE_SOURCE_DIR}/tensilelite/Tensile")
++      find_package(Tensile REQUIRED HIP LLVM OpenMP)
+     endif()
+ 
+     # setup hipblaslt defines used for both the library and clients
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -75,7 +75,7 @@ add_library(roc::hipblaslt ALIAS hipblaslt)
+ 
+ # Target compile definitions
+ if(NOT BUILD_CUDA)
+-if( BUILD_WITH_TENSILE )
++if( TRUE )  # link with Tensile is always reqiured
+ 
+   if( BUILD_SHARED_LIBS )
+     target_link_libraries( hipblaslt PRIVATE TensileHost )
+@@ -194,7 +194,7 @@ rocm_install_targets(TARGETS hipblaslt
+                        ${CMAKE_BINARY_DIR}/include
+ )
+ 
+-if ( NOT BUILD_CUDA )
++if ( NOT BUILD_CUDA AND BUILD_WITH_TENSILE )
+     if (WIN32)
+       set( HIPBLASLT_TENSILE_LIBRARY_DIR "\${CPACK_PACKAGING_INSTALL_PREFIX}hipblaslt/bin" CACHE PATH "path to tensile library" )
+     else()
+--- a/library/src/amd_detail/rocblaslt/src/CMakeLists.txt
++++ b/library/src/amd_detail/rocblaslt/src/CMakeLists.txt
+@@ -100,7 +100,16 @@ if( BUILD_WITH_TENSILE )
+   set( Tensile_INC
+     ${CMAKE_CURRENT_SOURCE_DIR}/src/amd_detail/rocblaslt/src/Tensile
+   )
++else()
++  set_target_properties( TensileHost PROPERTIES POSITION_INDEPENDENT_CODE ON )
+ 
++  set( Tensile_SRC
++  src/amd_detail/rocblaslt/src/tensile_host.cpp
++  )
++
++  set( Tensile_INC
++  ${CMAKE_CURRENT_SOURCE_DIR}/src/amd_detail/rocblaslt/src/Tensile
++  )
+ endif( ) # BUILD_WITH_TENSILE
+ 
+ set(DL_LIB dl)
\ No newline at end of file
diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-git.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-git.patch
new file mode 100644
index 000000000000..55c26680673f
--- /dev/null
+++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.1.1-no-git.patch
@@ -0,0 +1,13 @@
+Git is not used
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -23,9 +23,6 @@
+ 
+ # Dependencies
+ 
+-# Git
+-find_package(Git REQUIRED)
+-
+ # Workaround until hcc & hip cmake modules fixes symlink logic in their config files.
+ # (Thanks to rocBLAS devs for finding workaround for this problem!)
+ list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild
new file mode 100644
index 000000000000..cf2ad2ac5382
--- /dev/null
+++ b/sci-libs/hipBLASLt/hipBLASLt-6.1.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_SKIP_GLOBALS=1
+PYTHON_COMPAT=( python3_{10..13} )
+
+# gfx941 and gfx942 assembly uses directives of LLVM >= 18.1.0
+LLVM_COMPAT=( 18 )
+
+inherit cmake python-any-r1 llvm-r1 prefix rocm
+DESCRIPTION="General matrix-matrix operations library for AMD Instinct accelerators"
+HOMEPAGE="https://github.com/ROCm/hipBLASLt"
+SRC_URI="https://github.com/ROCm/hipBLASLt/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/hipBLASLt-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+SUPPORTED_GPUS=( gfx90a gfx940 gfx941 gfx942 )
+IUSE_TARGETS=( "${SUPPORTED_GPUS[@]/#/amdgpu_targets_}" )
+IUSE="${IUSE_TARGETS[@]/#/+} test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip
+	dev-cpp/msgpack-cxx
+	sci-libs/hipBLAS:${SLOT}
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-build/rocm-cmake
+	$(python_gen_any_dep '
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/joblib[${PYTHON_USEDEP}]
+	')
+	$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
+	test? (
+		dev-cpp/gtest
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-fix-msgpack-dependency.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-arch.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-git.patch
+	"${FILESDIR}"/${PN}-6.1.1-clang-19.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/msgpack[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/joblib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+pkg_pretend() {
+	if [[ "${AMDGPU_TARGETS[@]}" = "" ]]; then
+		ewarn "hipBLASLt supports only few GPUs: ${SUPPORTED_GPUS[@]},"
+		ewarn "but none of them were defined in AMDGPU_TARGETS USE_EXPAND variable."
+		ewarn
+		ewarn "Library will continue to be built in \"dummy\" mode,"
+		ewarn "serving as a non-functional placeholder for end-user applications."
+	fi
+}
+
+src_prepare() {
+	sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix),g" \
+		"${FILESDIR}"/${PN}-6.1.1-gentoopath.patch > "${S}"/gentoopath.patch || die
+	eapply $(prefixify_ro "${S}"/gentoopath.patch)
+
+	local shebangs=($(grep -rl "#!/usr/bin/env python3" tensilelite/Tensile || die))
+	python_fix_shebang -q ${shebangs[*]}
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local targets="$(get_amdgpu_flags)"
+	local build_with_tensile=$([ "${AMDGPU_TARGETS[@]}" = "" ] && echo OFF || echo ON )
+
+	local mycmakeargs=(
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_WITH_TENSILE="${build_with_tensile}"
+		-DAMDGPU_TARGETS="${targets}"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+	)
+
+	use test && mycmakeargs+=( -DBUILD_FORTRAN_CLIENTS=ON )
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_compile() {
+	local -x ROCM_PATH="${EPREFIX}/usr"
+	# set PYTHONPATH to load Tensile from virtualenv, not the system-wide one
+	local -x PYTHONPATH="${S}_build/virtualenv/lib/${EPYTHON}/site-packages"
+	local -x TENSILE_ROCM_ASSEMBLER_PATH="$(get_llvm_prefix)/bin/clang++"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	# Stop llvm-strip from removing .strtab section from *.hsaco files,
+	# otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes
+	dostrip -x /usr/$(get_libdir)/hipblaslt/library/
+}
+
+src_test() {
+	check_amdgpu
+	cmake_src_test -j1
+}
diff --git a/sci-libs/hipBLASLt/metadata.xml b/sci-libs/hipBLASLt/metadata.xml
new file mode 100644
index 000000000000..da84ad53885c
--- /dev/null
+++ b/sci-libs/hipBLASLt/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+  </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm/hipBLASLt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest
index 5ddc70706c77..eb15875aba99 100644
--- a/sci-libs/hipCUB/Manifest
+++ b/sci-libs/hipCUB/Manifest
@@ -1,6 +1,8 @@
 AUX hipCUB-4.3.0-add-memory-header.patch 421 BLAKE2B cd05a027dbf75098fd199783c0abc2c37627e5b55b92f1b4ffb828995fbdb7ebf46f3f1d66a87c37eb35ddd16bd472541537d1ea250474c541bd01b10bd386c5 SHA512 7865f3942b7b157095c477da8790bf9632a630aa3456cde3b1a7b267e62db720a257e1c0e0501b88f8a0b187aa8ec520c4e7693e97af72358a6ff518be1f10a3
 DIST hipCUB-5.1.3.tar.gz 278021 BLAKE2B f30e567370fea80ef63a455c2c27b3f4ff241e7e405688fa4dc33d1e0ce3dffb016a1a1523b20613a7963bff061758eac0c0d110243a9a6cedbc100bb087d7d4 SHA512 dd3ca341b78cf6985ba723feeeb560c0503ab283b63067e9a5e68d12ad42f752a7f56fd60f0f0c26c2853538853e09a102cfc6006c18c31c3162fa7b536ffb9f
 DIST hipCUB-5.7.1.tar.gz 322980 BLAKE2B a9b2a69b47661532858f18e7296ef37be41da814bb4886f7b8b444829e6ad1374d1c3117b57e7599095253ed56ea2403c895bb820dbde9cec77c28a041af3898 SHA512 7cf7dc819a3d8bac2cf70aa077616e65d785d76bae3ad3991db7b940a061f694ac82b1e4219aa16476351f1329e3f0d09a818b0ff0b9c5ad261937879c21dca8
+DIST hipCUB-6.1.1.tar.gz 343181 BLAKE2B 3943278597c5e9d41c225ad86c3cdcc113f35cf1bf218ba357a112c25ae14df8d0e3f385aacd82ab4c694ae2382012aea06c02d40d982d00929d03d0d3908b55 SHA512 37297f6791146cc9db11d3d494555672c021dea06bec1e8a780ca926df1e5de140c8ee560657668df6221279a0418af9e34a235b3b52df3df2a66adabea7ca6f
 EBUILD hipCUB-5.1.3.ebuild 1930 BLAKE2B 9a686ada92902f9ee2fed32ac68e5599a38fd25ab639a22316293efe868701399d6d26c401d9c09b328139d94fe4fccbe8a33e6dd3eb675b7b9704c906af3ce9 SHA512 91a0e1284bb43502525120d031586b12238a71c28583135848b824e555c5ed84ab7d2258eb38945090a00def1ba060ae2ba8aefa7c2fe5cd35ae38808b4df94d
 EBUILD hipCUB-5.7.1-r1.ebuild 1303 BLAKE2B b5702011d5ef9ffc482cec9a74bf6b05bc952d8d071b38d7dfe8ae5aa48d8944ec248d23eef9bbdf25e25085cb99e5b578a291b206fb6dfb97f2ca257245b515 SHA512 97e716391c5f75d05396b46cf05f73130eefc12566c07f550d25ed38fb764a02d3bee0b77ab0cdb849261bce8dba0fe66d01e9d261a110e4a06dbde1d201ffe5
-MISC metadata.xml 625 BLAKE2B 7f927357a005110b37accb6841e4248e22e8080d0e0d6eb28e50e96c84807f663faf2f85dd222e5f5af448211cc05004d371a6d57ac6f17393609e76980bda81 SHA512 7d16cebc8c7df7dcc5d63e02e88e9d16d2321485de688621fd8628b8473d5ae614d63b0578363ee3b47f5e0aa7f45da9a00950b6a09a8cc9c6e3c77ae856c798
+EBUILD hipCUB-6.1.1.ebuild 1265 BLAKE2B 8a64bc81af9c541be86c30e3b1553620f45cc10805102e68d7f85b15bd59ab31d2a8534eb40bf0e6aeedab4adfb79c28bae14d6eaaf8c692466d9b59671cd711 SHA512 5b2f574c4de7089be0554e486421633dc1fa3369adce90316d7d159b6ac95780ad9e8366ea07e3cb878de04f4d9d8778e785a05987f1a7c605a63bf94230e7fb
+MISC metadata.xml 716 BLAKE2B 433c3fdc53e3748b67a65d62ce8380044a4c5456191a14cc723e614d90da63b2e4bf4ff6d8f1fd9a7595041f6380a17c502d3bb5f17d8d0c08e0b7b1205ac8f5 SHA512 5130451d65a122a242bc9c553efed4289f54aa3e7bd56c1b3ac636ae902ce0df4502d9bbdca61e58c4a94bb4ea8adb00d94baacced1e487ed563c6c489377587
diff --git a/sci-libs/hipCUB/hipCUB-6.1.1.ebuild b/sci-libs/hipCUB/hipCUB-6.1.1.ebuild
new file mode 100644
index 000000000000..8a38588c8d4c
--- /dev/null
+++ b/sci-libs/hipCUB/hipCUB-6.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="Wrapper of rocPRIM or CUB for GPU parallel primitives"
+HOMEPAGE="https://github.com/ROCm/hipCUB"
+SRC_URI="https://github.com/ROCm/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz"
+S="${WORKDIR}/hipCUB-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="
+	benchmark? ( ${ROCM_REQUIRED_USE} )
+	test? ( ${ROCM_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}]
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" \
+		-i cmake/ROCMExportTargetsHeaderOnly.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	# uses HMM to fit tests to default <512M iGPU VRAM
+	HIPCUB_USE_HMM="1" cmake_src_test -j1
+}
diff --git a/sci-libs/hipCUB/metadata.xml b/sci-libs/hipCUB/metadata.xml
index 5e18b914d070..64944bcdc745 100644
--- a/sci-libs/hipCUB/metadata.xml
+++ b/sci-libs/hipCUB/metadata.xml
@@ -12,8 +12,12 @@
 		<email>gentoo@holzke.net</email>
 		<name>Wilfried Holzke</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>lockalsash@gmail.com</email>
+		<name>Sv. Lockal</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">ROCm-Developer-Tools/hipCUB</remote-id>
+		<remote-id type="github">ROCm/hipCUB</remote-id>
 	</upstream>
 	<use>
 		<flag name="benchmark">Build and install benchmark binaries.</flag>
diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
index f8b276e95075..359f9f3077eb 100644
--- a/sci-libs/hipFFT/Manifest
+++ b/sci-libs/hipFFT/Manifest
@@ -5,6 +5,8 @@ AUX hipFFT-5.1.3_hip-config.patch 2792 BLAKE2B 275010cb9b4fe0b2f530bc1fe4fd027e7
 AUX hipFFT-5.7.1_hip-config.patch 1256 BLAKE2B 240423151a9eede7398289049294c28322dca1480038ca6a88b234e5222df12bd56ef1ad1c56939ce695e1aa0161ca838327902a047a92cd509beaa330a9247c SHA512 915b512e847ccaf02466c9f105365c354d4e51a1a54506844cdefc895eca555d10c0e10716686aebbd1e3b5f6a547fa8ab093b56ccf655e172a0154171f4f2c2
 DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B 3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68 SHA512 8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706
 DIST hipFFT-rocm-5.7.1.tar.gz 102616 BLAKE2B ee8d6dcb7924c8989987b02533126c4e4419d8dc83067a816f2253efe4537e094f1665d95699d4bf27f30cd13f3fc5df7d3b0062c267ecbdcbb3aad961fab6f6 SHA512 4bfd812fa1e949574b4170833755a435f47e893f0615b65d8d273af6e8f89ea4d28632a208de20321e834c8bc237b11816e2af0363b60adca9af736b9bc87465
+DIST hipFFT-rocm-6.1.1.tar.gz 170796 BLAKE2B 8c957db8e7e2548918539c94262d912c2f33b70d8482b727c78c13323bdb6822c3e95439854b8ab4fed970d21ed0c6fd2ab8c2805db59d3a3606d73e7eb47468 SHA512 531be32b12ed5f0f2352e3e0a893ca988a4c8492e66fc9347b6754ae4e769549d6f638a760de35cb15ef2d301ab4200a76c832d769ecb0cd55e9e42f839a1876
 EBUILD hipFFT-5.1.3-r1.ebuild 1055 BLAKE2B 421cdf532e119730b6d3115b40d304b24156b0724f80188dd6059e0bcc017b66744bb66c52e520349e5423d80edd6c9c7eec57476a7553cfbef3965777c51caa SHA512 fe8dfd3e06dcec747dd182bd9eba449f5947d72214d2865c2789cfa0ded17e9394762d8e4a4b307de45169461cbbc6facaaa188f5f0c8b68a9b48be77c297a2e
 EBUILD hipFFT-5.7.1-r1.ebuild 988 BLAKE2B 8a15335790603e3499c1824bfc0dd5aa4fb305320bacc37dc17579fab895b1d7dbfca8da3a47efdf8a8fc1f32d7eca72db24d59fc764fc5c09997e2e1a232ff1 SHA512 7af50918064c2792e194ad9da8e00b96c84f275c2f38f8ad831109024d16e92c0aaad059e4da7bb3862368e1b776b416628b743e5ff7e7831fa9253cce11f645
-MISC metadata.xml 617 BLAKE2B d5ab7f2a7c98fdafe1e50bff4708e7a2bf58680e9ee2cadaa2eea018b81032b4e1d82849144684a1100acb9a4e2651fb07572c0e46cbda87ef585b290e4b865c SHA512 7859cff3011e71bb1e6a2668c6d1f035cdd47ad214aefe6c0c225a8ac7133081a9e2bad5a7bb7ea94b7a9c3761f131228e5da66b0190e35234cd10c626e01734
+EBUILD hipFFT-6.1.1.ebuild 782 BLAKE2B 772222101b586e9ef1426cdb084a1fd096f398d5dc7cbee73b7684ffa89883c1c9c1dda2b1504883945385385fbaf9aae9f813b9b3bf6ee450c9f732b924a6ac SHA512 d040a4f4c7d622f11d3d7d06dfa073e2a42d4b2edbee9b0f76912944f21b20f8af1030c924590ce33a35a5f54fa1d8d090c65245332a0bbdaf2b10548e46318b
+MISC metadata.xml 714 BLAKE2B 092bc9b24f4f4471096402455b42f65bc7850a46a08dc1e5721d25d630a9dbfd3ba9e770e7c529187cb483161a47e6fd0bdbd617e54b80280704c58a6c6256e8 SHA512 4da0b797299b620d14b2f1ce5dd2c7adcad555dacf11a5f1aa991773895730330c381759e29f43b2a2bbd3d3f50995b1cbb654fdd0d2e8b622db1e1385b9a8d1
diff --git a/sci-libs/hipFFT/hipFFT-6.1.1.ebuild b/sci-libs/hipFFT/hipFFT-6.1.1.ebuild
new file mode 100644
index 000000000000..d9700529cd24
--- /dev/null
+++ b/sci-libs/hipFFT/hipFFT-6.1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="CU / ROCM agnostic hip FFT implementation"
+HOMEPAGE="https://github.com/ROCm/hipFFT"
+SRC_URI="https://github.com/ROCm/hipFFT/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz"
+S="${WORKDIR}/hipFFT-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_CLIENTS_TESTS=OFF
+		-DBUILD_CLIENTS_RIDER=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipFFT/metadata.xml b/sci-libs/hipFFT/metadata.xml
index 54e78eb20141..1e3fd1c52d20 100644
--- a/sci-libs/hipFFT/metadata.xml
+++ b/sci-libs/hipFFT/metadata.xml
@@ -13,7 +13,11 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/hipFFT</remote-id>
+    <remote-id type="github">ROCm/hipFFT</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest
index 4d04e283f14d..09cdb4661bd7 100644
--- a/sci-libs/hipRAND/Manifest
+++ b/sci-libs/hipRAND/Manifest
@@ -1,5 +1,7 @@
 DIST hipRAND-rocm-5.6.0.tar.gz 477597 BLAKE2B fdc88ac7076ab6b31ba794f9274881323fba32295bab5b90e38d8c8f336e0255b7d20dcba6e334b7bacd8b67eaac8a3ac6e11e3d490e7c95a973d16c9598922f SHA512 47d0cca92b458f8ef682b3c15fe4ccc5201370b1458e541080dc2150e98256962b78806c20b26d789b232d420eb305639fa50180e379ba123851d35d24d40cb2
 DIST hipRAND-rocm-5.7.1.tar.gz 478352 BLAKE2B 5f435cf53d213b1d95ee8b766df2c9bc4b4d590ccf63fe867bd033eeb4b7fef67e2bde22242525686a8dee59fd811363857312481e9cb3575357c612ab519a41 SHA512 b3c51728c1d7cc37760f49f36ab7765c166f105bc5b1b6ce65ac4a1de9bb70f8e2c10f5c41f89040288b09c9257d913d745a416bd4785b71f170a4f57e1f95e2
-EBUILD hipRAND-5.6.0-r1.ebuild 826 BLAKE2B c3018b88618d5f741b45fe5272c1d1ab30a23663b586917f16ce70d8692ff64daee77fb1b1881a1023712cf7fd50facd6d536f3a57865ad0f99d0b2bf2bbcb77 SHA512 6943fc2034c0fbf71eca8c83b33c7fe6b73df66d0af931645ca5372e9cb9a85f6d6957f48e187b44a6373ab659079ce9684380d1f575296faef3d8bd7cb03b4e
-EBUILD hipRAND-5.7.1.ebuild 826 BLAKE2B c3018b88618d5f741b45fe5272c1d1ab30a23663b586917f16ce70d8692ff64daee77fb1b1881a1023712cf7fd50facd6d536f3a57865ad0f99d0b2bf2bbcb77 SHA512 6943fc2034c0fbf71eca8c83b33c7fe6b73df66d0af931645ca5372e9cb9a85f6d6957f48e187b44a6373ab659079ce9684380d1f575296faef3d8bd7cb03b4e
-MISC metadata.xml 489 BLAKE2B 9dbd5a5d1c3d7deeb191eb70c48ec9f4abd11a6362a81f93fb54116a4687edf9cf1113179af884bd346b9bfb4c785437dd674251903b233589ba8556e5316644 SHA512 4f85aa13c08b7ccab6c1db816f805a987a3ee33991dacba683fabf7f40ff7288660f725296dfdda68d9ae9ff5d5150cde9b6e9303f481960665a2085b5f62ef0
+DIST hipRAND-rocm-6.1.1.tar.gz 119063 BLAKE2B dc314d8b09c15351075594335d14f65024be54597e7cbdfb7671ebea29fa208c9a33530a2d406a8a2a9d8738f0aae7e9fc25d8c39304ef2ef27aaf8b327b5975 SHA512 4c350c8a75e6b4064e22cd73679f66e5caf28f7922fc47ef9670c1023b58b36bf3a2a35580463ee7c89e26ed924aaaa68166a11f64823b99f2f8302f80d6e87a
+EBUILD hipRAND-5.6.0-r1.ebuild 815 BLAKE2B 568be23ee847e47d5aeee9cb63b318961057a6787140ef54ce5bce289703b0b611cb52f501bc6fc73c2365549af482ba7483a6edda9e91b5cbe419f5b9cfb07f SHA512 8e8eabb6d74cdaffb3e8c9c41fddb166e8b49317285c4f79574253854b70c8f7b43689df767a3b8117f0591a9ea9f2a0652c1b7696b8cbfb04481a41c61de37b
+EBUILD hipRAND-5.7.1.ebuild 815 BLAKE2B 568be23ee847e47d5aeee9cb63b318961057a6787140ef54ce5bce289703b0b611cb52f501bc6fc73c2365549af482ba7483a6edda9e91b5cbe419f5b9cfb07f SHA512 8e8eabb6d74cdaffb3e8c9c41fddb166e8b49317285c4f79574253854b70c8f7b43689df767a3b8117f0591a9ea9f2a0652c1b7696b8cbfb04481a41c61de37b
+EBUILD hipRAND-6.1.1.ebuild 783 BLAKE2B f16cf94ffd74feade782c956cef6b01a19d59667dd1b14c75a8dfa266cf0252d90859fa4c6de477df161665fb55837f45b6cfadbbee794ea0acd1bc0a0d34b12 SHA512 418859dfe9690ecef18d85a6437902ea590607677d506bad73e9d2df74238925c6dc4b995cffd99f45f26db2efaf67adbf1e27b0db1a5063b6e3bf71b7c3cbab
+MISC metadata.xml 586 BLAKE2B 98f8745143ec4d1c89f1e12747e1f1abe97ec74bab97f2afeea257f3a900b87c76efccebb39abd500f36ff88eab2284ec73a89db90ff0c5e616dba912f084f11 SHA512 71778ca99fb19bf30fc2f301f188e4ded754eafd2eba8abe1143cbecbf143d7f3cc8ce908592dee9e7cdc242d4f05f4a2d10739893357abb0a30362ec4448b85
diff --git a/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild b/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild
index 006440bb6a29..1674ad72718f 100644
--- a/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild
+++ b/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,6 @@ RESTRICT="test"
 RDEPEND="dev-util/hip
 	sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]"
 DEPEND="${RDEPEND}"
-BDEPEND=""
 
 S="${WORKDIR}/hipRAND-rocm-${PV}"
 
diff --git a/sci-libs/hipRAND/hipRAND-5.7.1.ebuild b/sci-libs/hipRAND/hipRAND-5.7.1.ebuild
index 006440bb6a29..1674ad72718f 100644
--- a/sci-libs/hipRAND/hipRAND-5.7.1.ebuild
+++ b/sci-libs/hipRAND/hipRAND-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,6 @@ RESTRICT="test"
 RDEPEND="dev-util/hip
 	sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]"
 DEPEND="${RDEPEND}"
-BDEPEND=""
 
 S="${WORKDIR}/hipRAND-rocm-${PV}"
 
diff --git a/sci-libs/hipRAND/hipRAND-6.1.1.ebuild b/sci-libs/hipRAND/hipRAND-6.1.1.ebuild
new file mode 100644
index 000000000000..2a123df19544
--- /dev/null
+++ b/sci-libs/hipRAND/hipRAND-6.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="CU / ROCM agnostic hip RAND implementation"
+HOMEPAGE="https://github.com/ROCm/hipRAND"
+SRC_URI="https://github.com/ROCm/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipRAND-rocm-${PV}.tar.gz"
+S="${WORKDIR}/hipRAND-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
diff --git a/sci-libs/hipRAND/metadata.xml b/sci-libs/hipRAND/metadata.xml
index 27c8916b67d4..c47caac8ebdf 100644
--- a/sci-libs/hipRAND/metadata.xml
+++ b/sci-libs/hipRAND/metadata.xml
@@ -9,7 +9,11 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/hipRAND</remote-id>
+    <remote-id type="github">ROCm/hipRAND</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/hipSOLVER/Manifest b/sci-libs/hipSOLVER/Manifest
index 6c96ae23564d..2ba646602c30 100644
--- a/sci-libs/hipSOLVER/Manifest
+++ b/sci-libs/hipSOLVER/Manifest
@@ -1,3 +1,6 @@
+AUX hipSOLVER-6.1.1-find-cholmod.patch 965 BLAKE2B 0d4f37dbae67bf2605a981f3a01c9c4fe681953d59c4b17c4abbe9953154dafd94a9e66b710f4384035521e6b2e0d98ebaa63d41a44ba263e53f71725ca7e2f0 SHA512 e22bb5470ed857faa7aed8522fcc67f92994260386f302af6112dc6a7bb8f9ca20b22fe1261f4f7dec87c0e04138a8a1f64894556db003e2fccf924dd5cd4c7b
 DIST hipSOLVER-rocm-5.7.1.tar.gz 1516012 BLAKE2B 8d0966d34877978784b9872150283719602465c85036c3a74a72a2fe7c516b6029af3f4aefbc022088b2cf37bb1e0a450c0221aef0ac3227018020de340adfcd SHA512 f9c14b51ea582f17d1b323c7d066d9c0c95f4250f08515768d7a11067774fd2841fa3dec7354d3c98e56bd8dd53cff3b993c68b1d7df4b24f562b3afe9c4625e
+DIST hipSOLVER-rocm-6.1.1.tar.gz 2553462 BLAKE2B 77731b876a7fe5f80f79e5af5128a84d8a5d4dee6d511f3e1cf4964845b636380f7f1e19f07e84ed24b98e99c3bdfbba623b97b48cf4ea1bc09a4c1bd3dccaed SHA512 4f28ecd807717013318f293df8c48d7674f64fd3a538c2b827f4188a00a36165f48277d5ac50e806461d52a8a3b6d626cab91ff7c6687b17fea2580461e08de9
 EBUILD hipSOLVER-5.7.1.ebuild 820 BLAKE2B 2e172aea78616bb75696b6dcf81e7ebee8902ff15335a5d7d36e9728e74eb20c320124491bccfb6cef9b4804e14fd7c58accacce500d13c043f6a104407f0c77 SHA512 83d99abbb856cfe7ce029fd8c7529fdd07be56e60a4ce6f00b662c5a6c3c829e99e66081fa907e61ee673320991fcbccca26b493022cdcae5e6d12dac04b62ea
-MISC metadata.xml 618 BLAKE2B a62e9c459afe2c341849d43f9dbf2304389dfa1f50ace6616c5bd2903488e49d0e1d235808a46dafb782d638a3f209706220d66264fda845b701c19e55febce2 SHA512 c9654b6e8a610638093d3f26710292cf62e0d9e1a9dddc160c4d30e59e7a12f70e39eb965995187fe54b6f3648fb44810ca8b983a886af7a731d62eb06c9464b
+EBUILD hipSOLVER-6.1.1.ebuild 1002 BLAKE2B 463115ba89403b1f0a0788aebd8bba9b48c6c6a39585a79ffe6b3ef8e1602f22e5257949bf2cddf2f3819dc4610981da6efcaff63d699fb6b9c8b7c31e58ed89 SHA512 99c71c0f1b9276331754c9de130b11edbf1a7336a6d42020bb4a9bb5dc5e7591dc6b603821810976d69c7a3a4cce9318635be9b58c9ac90d677240e657924d97
+MISC metadata.xml 727 BLAKE2B d10c0be13cf9f705b7c7c0b223b91da6f0d06faccaf5a7c5e8a6ed03e0c3d32e943a742f1a9feb9452f21f36de99f1b74b3ec91ad2d32a6c7c94088eee66ed22 SHA512 14521a8ef7d65220b9b5ee23c7600f11a8329adb23993bbbda70ccfeb3cc4de5eb25713cb523890f2868983a409ae2a735d4191457b1fd8647b01751193e2cde
diff --git a/sci-libs/hipSOLVER/files/hipSOLVER-6.1.1-find-cholmod.patch b/sci-libs/hipSOLVER/files/hipSOLVER-6.1.1-find-cholmod.patch
new file mode 100644
index 000000000000..da43f4ff116b
--- /dev/null
+++ b/sci-libs/hipSOLVER/files/hipSOLVER-6.1.1-find-cholmod.patch
@@ -0,0 +1,29 @@
+cholmod.h is in /usr/include in Gentoo, use pkg-config to find it
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -221,11 +221,9 @@ if( NOT USE_CUDA )
+   if( BUILD_WITH_SPARSE )
+     list(APPEND hipsolver_pkgdeps "rocsparse >= 2.3.0")
+ 
+-    if( SYSTEM_OS STREQUAL "centos" OR SYSTEM_OS STREQUAL "rhel" )
+-      list(APPEND hipsolver_pkgdeps "suitesparse")
+-    else()
+-      list(APPEND hipsolver_pkgdeps "libcholmod3" "libsuitesparseconfig5")
+-    endif()
++    find_package(PkgConfig REQUIRED)
++    pkg_check_modules(CHOLMOD REQUIRED IMPORTED_TARGET cholmod)
++    target_link_libraries(hipsolver-common INTERFACE PkgConfig::CHOLMOD)
+   endif( )
+ 
+   rocm_package_add_dependencies(DEPENDS ${hipsolver_pkgdeps})
+--- a/library/src/amd_detail/hipsolver_sparse.cpp
++++ b/library/src/amd_detail/hipsolver_sparse.cpp
+@@ -45,7 +45,7 @@
+ 
+ #ifdef HAVE_ROCSPARSE
+ #include <rocsparse/rocsparse.h>
+-#include <suitesparse/cholmod.h>
++#include <cholmod.h>
+ #endif
+ 
+ #undef TRUE
diff --git a/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
new file mode 100644
index 000000000000..be450babaed3
--- /dev/null
+++ b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="CU / ROCM agnostic marshalling library for LAPACK routines on the GPU"
+HOMEPAGE="https://github.com/ROCm/hipSOLVER"
+SRC_URI="https://github.com/ROCm/hipSOLVER/archive/refs/tags/rocm-${PV}.tar.gz -> hipSOLVER-rocm-${PV}.tar.gz"
+S="${WORKDIR}/hipSOLVER-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="sparse"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-util/hip
+	sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]
+	sparse? (
+		sci-libs/suitesparseconfig
+		sci-libs/cholmod
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-find-cholmod.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_WITH_SPARSE=$(usex sparse ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
diff --git a/sci-libs/hipSOLVER/metadata.xml b/sci-libs/hipSOLVER/metadata.xml
index dfd45574f216..9aa1438b519c 100644
--- a/sci-libs/hipSOLVER/metadata.xml
+++ b/sci-libs/hipSOLVER/metadata.xml
@@ -16,4 +16,7 @@
   <upstream>
     <remote-id type="github">ROCmSoftwarePlatform/hipSOLVER</remote-id>
   </upstream>
+  <use>
+    <flag name="sparse">Build hipSOLVER with sparse functionality (sci-libs/cholmod)</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest
index 78ab79c4c59b..17a6b95df054 100644
--- a/sci-libs/hipSPARSE/Manifest
+++ b/sci-libs/hipSPARSE/Manifest
@@ -1,6 +1,7 @@
 AUX hipSPARSE-5.0.2-remove-matrices-unpacking.patch 3940 BLAKE2B e3815659b32856206bc3291d09f59514e59dc06c3c33454c24afb68955d6a55411c71535693325be06bdb097e7cedc558ec2b8fa6a2d3886d774d79e038557ad SHA512 39db7d6fe0a085ef5a92f6ec1613376ffd9152d8d31a78f0864c971e7b61d4dfbda2e170940c82dae286d024333621722b249d5bd601399e76e68e8029fc7e81
 DIST hipSPARSE-5.1.tar.gz 449838 BLAKE2B 7727ecb9fa397e2730cfda4c9367188c37ad201d501b50129994869c6ef15b51cdf2d1f481f19f2f37cf0530f1ec3689c40a9651924f70fabe945d80732df64a SHA512 8b01c01a10b8419d14a532ebccfa5b5b5b5c3f6a6e73f3f0ecee58c7e240d2754485a9da020fe4693df3ef9fc08e5bb09b05396472ccbeebf89bc2635d94eb64
 DIST hipSPARSE-5.7.tar.gz 458521 BLAKE2B 94695ef3cf4294f571723e31ab5d4295b5aaa24528e90838375ee8477cf0957b297663d80e5fe3406762b475b6ef4741f9ccfb4dfb1448ce71ea4014da14b46e SHA512 bb28cd81b7ec298eb2e6462a8588ed93eee7b4892923b11087a91d1c32341f29f488fd4e6797debe51a989f463db31030eae02d07be6512d6b755367ba221aac
+DIST hipSPARSE-6.1.tar.gz 471148 BLAKE2B 18119ac355e180adb5ce38561f44e39119226d209a970ae8cac6b85575bad1ab2a690a3bb72de1c179c1190aa2c29d691e6ce02855f3df89a58f634d42e54103 SHA512 09f9e94c5f976e6f17c07f9be2fde31c2e740871215a6b77b49675644b883bd9994fcaacb19864ace3883bb5aea7a7dc589ddbaf9b6aaf3d9f411c7e452a0b78
 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03
 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0
 DIST rocSPARSE_amazon0312.tar.gz 11303646 BLAKE2B 388947a29380253bb5eecb22d3a3b6f3378711044b3fe98d6d2517cd27330f11b3d12fdb96320a2889e139224f1a6a5ad1c455ff8e91a262aa2aadbe16301330 SHA512 aed2d62581763742d9c7faf3dcaf1eaa983caa1e2e7ad4abebe97c5e7c2aec9942e0e32291092b348b60052c92b130e721ec19ed59bda22e1b233ef72ac7d2ff
@@ -22,4 +23,5 @@ DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b1
 DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161
 EBUILD hipSPARSE-5.1.3-r1.ebuild 3605 BLAKE2B 15ab47a0fd3a822f981021bdfffcf8c5f5f996347ad2c8c00c84e65fec8584f1854a550726e2f6a31f93767071950f8ab533adadde1f813407da73bd6dbd4f45 SHA512 2036a56e753aa80da9ce11bb71ae3539fc16257850d5f58114f696b5bb855101f5994d2016a96e4ab0b7383a3156b919b04dc1ede2e0e4f706751b6b2029d8ce
 EBUILD hipSPARSE-5.7.1.ebuild 3561 BLAKE2B 95ae56d53f834219bae36405315be1bab61d325efd634fbe1e270c5b20ecb1440fcc51daca805530a0d721f852d042ebe7d7eb5b03f3a7f2a9132de73aaf865f SHA512 bfc349c8b1a1f7d66e19db8fdcb5bf23ace3541e99fb3328ea59438587322678e641af121e59e71e2a9b65834b5d985c83f85771592f68346e169ce5b847e993
-MISC metadata.xml 603 BLAKE2B 21c5f53de40b5582b8541e1cef239a4a2eff2eaaaa966a4168439417cd6f80ea00dbd48636bea73aedbaaf580950803768f02ab5f0cca0f76d433d80a80026e1 SHA512 4ff1ebefa7203326a5c2feed7c0deffa10f17383bb4a05fdf3057d8ab1d6f8427a45126ec17aa88e02a93e9114e79f6d89cd4564e72faebf970b7f63814d701a
+EBUILD hipSPARSE-6.1.1.ebuild 3141 BLAKE2B 9a12847d571dd213fe0cfbf5152e65d16104c073e03b22d932901f108f39d961f56de2f48f598e91e9cc098505e7925d8385b4aa59b06b29dcbaf5319ea648e0 SHA512 8c30bfae688927d1e3d3d1ffb177ef4dd230917a7d4a6ad926ee2c397d96192c69c57d467c6016af3560d3776b6359c57818ab50d34871bf0f58f07ac6f2b88c
+MISC metadata.xml 716 BLAKE2B f070df7c312bbe29cf150da488b6f862eb4768ff01385b34c613864da3bc7d44c3adf506e7f92c7beef729c538f176194ec1cb828fe5c97203591873f0aa706a SHA512 cb2bf1a7e03444af8bb5ca08ea3544c974a577c3bab2a194fcaa45750e9cecbc68571adc288b457de01fa84615738130ef8e2a3d002219d2870963d7e53e0570
diff --git a/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild
new file mode 100644
index 000000000000..46d70c4b6625
--- /dev/null
+++ b/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm toolchain-funcs
+
+DESCRIPTION="ROCm SPARSE marshalling library"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE"
+# share some test datasets with rocSPARSE
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-$(ver_cut 1-2).tar.gz
+test? (
+https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz
+https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz
+https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz
+https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz
+https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz
+https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz
+https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz
+https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz
+https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz
+https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz
+https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz
+https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz
+https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz
+https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz
+https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz
+https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz
+https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz
+)"
+S="${WORKDIR}/hipSPARSE-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0"/$(ver_cut 1-2)
+KEYWORDS="~amd64"
+IUSE="test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/rocminfo
+		dev-util/hip
+		sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-build/rocm-cmake
+	>=dev-build/cmake-3.22
+	test? ( dev-cpp/gtest )"
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use test; then
+		mkdir -p "${BUILD_DIR}"/clients/matrices
+		# compile and use the mtx2bin converter. Do not use any optimization flags!
+		edo $(tc-getCXX) deps/convert.cpp -o deps/convert
+		find "${WORKDIR}" -maxdepth 2 -regextype grep -E -regex ".*/(.*)/\1\.mtx" -print0 |
+			while IFS= read -r -d '' mtxfile; do
+				destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).bin
+				ebegin "Converting ${mtxfile} to ${destination}"
+				deps/convert ${mtxfile} ${destination}
+				eend $?
+			done
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHIP_RUNTIME="ROCclr"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	edob ./${PN,,}-test
+}
diff --git a/sci-libs/hipSPARSE/metadata.xml b/sci-libs/hipSPARSE/metadata.xml
index 693bc03ef766..db85e1426e8f 100644
--- a/sci-libs/hipSPARSE/metadata.xml
+++ b/sci-libs/hipSPARSE/metadata.xml
@@ -13,6 +13,10 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ROCmSoftwarePlatform/hipSPARSE</remote-id>
   </upstream>
diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest
index 671f703e1bc3..dc22e32055e2 100644
--- a/sci-libs/miopen/Manifest
+++ b/sci-libs/miopen/Manifest
@@ -9,9 +9,12 @@ AUX miopen-5.1.3-gfx1031.patch 19268 BLAKE2B b3d10c57601fd5f39ae431d101687863de3
 AUX miopen-5.1.3-include-array.patch 343 BLAKE2B 993a8f3e301f4c16088ca216b2d820b17ceb42eeda4550b4291a70e00592281f992bf184407d024a0f8b2207a26fef2d56c26ef95e7a452d3b97090e1335a404 SHA512 887ac13f25c1bfd524bb2a3be701bf688f002a95ef8218cb798e41feaeb0678dbbd2ffaf905c59070a125001093bf5ede1bb6a77fdfe6f7a4ff19cbccfdc6624
 AUX miopen-5.1.3-no-strip.patch 608 BLAKE2B 3173d95219542a48c6dcd2b87e7157dcf483ff714c3d1c1c47aab8fc8af7b1fd4f6ac52b9d8e892cc25bff973597f4a05426fa4714b0764733b810867af59cfe SHA512 201357718203ee9a4062362541c483e069321b825708c6aa0e8892cc7722bcd520808797307e320df34c4fbf0003198f7a46717d5ff3819b1e2c3a5a3a045725
 AUX miopen-5.7.1-fix-miopendriver-gemm.patch 2818 BLAKE2B fd839ec500b297272f70cc1ee2fa87e74b8a70197cc72291c99c1372c9eeb7f2af33de8067fa1dc42d873bd96f93615074521c00f00b0676835c912ec0e2b73b SHA512 22c852082e0de5115acfa208c325cdb7870823dfe3b5984887c848b702a2fc5072c1d1944b218e27776f0e116d391c6039c3f8485ca65282e9699f3fc1885985
+AUX miopen-6.1.1-build-all-tests.patch 548 BLAKE2B be700c5401e288a4da5423047303a316ea82fc928c88e46be3da9cd41ac473bf6e232b68d1791e2fea0534c8233e4c2431c9a7536a24125651ce2f55aea1e667 SHA512 c8df1b24d61c9b7a132b77bddacb3d614653257c61b8b5936ea666a3e130b76a183618d5384abe5b871ae144bf9b2f2cf622850a59e7d5c53cf89adbf9dfa32b
 DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd
 DIST MIOpen-5.7.1.tar.gz 100751593 BLAKE2B c5f847fe4374ab22737c281a65401125012328412d584fc09244b431ea6265d6d5028429115ee15fa8b04cbe0edd020e4e7ac8deb22561183ed76cb8c3d4d9d4 SHA512 3354b3b154f29a6337403abc5a71ec47c0b2558320c5a1b0cbfbbdb370c4fada2db12d4a19a312b5e30ca2e2302ee50ece3390603e84d132b2212a168e9523fa
+DIST MIOpen-6.1.1.tar.gz 101935496 BLAKE2B 5aadaa5eefa1b22dedfe87deb36f8acdbe57962cac8b7b6b20bc76f136ef29f0441e48112010280c2e674a1ae9fd202ca3e07be47cf4a4bc797234d6dc618be5 SHA512 b8860583919bf2f3e0da7ace30fdb0595ab45b85a367be3737e0b15a22a5565b8d6660c652ee070f21c36ac7d17ef3ba8e2eda7ed89bd6a0c65a4df799626d1a
 DIST gtest-1.11.0_p20210611.tar.gz 887296 BLAKE2B 8f29b7028a6dd8190a113cd93398705b23b61d88bee38beaf9dcc0dfc8a463aed7fcd3719f6f1b131d4363aa57231629aaeffa108f6558efb58416cfface6d6e SHA512 cf9e7f3fd3e31ce6677eac355fb8bfe19c5b56a8ec3af8b9417d0904cdf5da92f99f7411a08131cc9fa4fc7d38e6a71fcfac993648e47b269a74a27de7607f7a
-EBUILD miopen-5.1.3-r1.ebuild 3131 BLAKE2B 70a9e8325d5611aaad84ebba69873c1177bad75b5a7c90ccee74dc26a3283ee555c0826203851b2ea1234837cd0ec26103c8891b5ba6fdca27a18659bcb59e4d SHA512 a61ebfdbe769d5f7d463c293df8b0f17f5a8c5e732c67d6c3be492fe0ffe433a5c9a30d5c735fb6661cdf1ea96a2edce76d7429936ff295b197522017717a36a
-EBUILD miopen-5.7.1-r1.ebuild 3287 BLAKE2B 926b187675d85525e3679a5a95f8c9451bd6e5758ca91d6e65b3341aa624d3c5dbfd2682960ca3d05dc241bde69a447eae8d8d582bb676dd45d7e8b9afc2c47f SHA512 823bfc7f122c9ed91ef3fca2af6ea027b163f1564a87f0d60603348888465770d0c300f97fa46194658dc14002cf78dbb55567c4b4880350f70336788bc1e886
-MISC metadata.xml 549 BLAKE2B 6bf2f670de2b8f61584d0a930dd65c4c36c251a68a232d0de5bdf3a732b242c7cbddff642ee37909fe54506c7f231c86adf53d71816f46469320e90925076fc1 SHA512 f5d23eacb988af92506012ccaa2d32a0b7e3d2c93b10bfce1eee6ac51ae113bc572a39e2386fd4816fe62ed563b0cb384d5480bd2bd44184cf77f5e53d8ded61
+EBUILD miopen-5.1.3-r1.ebuild 3182 BLAKE2B a6ae78e487ea88d31693fcf1b96a7ce6a1cb0505311c2f101be498bcafce5436cc678ca83e10dafc27549b3121c01cbf0c5d2a35e7f6117de086879002ecc138 SHA512 2165e4d250f125f699963bc7b6f1c22598467e962c9aac1bb7eeff24d6091fa3b72a696a11e1ab80ea18710525ef00f99889cc5b972068e23340c4eb14b621ef
+EBUILD miopen-5.7.1-r1.ebuild 3338 BLAKE2B bbd84a39a04c4ef9e1b2dc42ff1bbe7b7e4ceda90ca0c82f416a05a55b1324727418e1c2c1446fe7a82800d23380cfb9a3e30463289a18e9af20ab10239cbfc7 SHA512 5a8ddf01d2c088325fd377499f80b3c1f84881d52596b53450f2ce07714e53a552304bd8a24aecf394a57ee039fd6f364642f93e7920d8d9df63bb7dd312057e
+EBUILD miopen-6.1.1.ebuild 2332 BLAKE2B 04154b1c66d6e91dca12201e4e61dfaed46b60e10d31809906ca6f43a75b34d8334944da3f2223a14684f9a1ff0ed2a58b3e5878c25a54721ab4ec25f017ec70 SHA512 2e90d3a0d51e3206b6e90fb0e435d4ec2ac5ddaa94b155e27750902942f5e0c2dca139acfcf1bbf45183fb9f8ecb68461650688be0e929eb60b978f7e87fe6a2
+MISC metadata.xml 646 BLAKE2B 76ad8db32707d804dcee5a8ff3adb66444464aa2bef2e3415326b485b67f6b0c26a36e45b30cd632b0e41e96cbcfad9c785f5145ddbf89fcdabe66456b35d22a SHA512 d7b219b8800178385725fc92fe72fe65c291a451963263271731580548e3319f2bac83e73bba66d3a6442aa6f9dfc8ff8955cdbbfd7f057825dda992e8dfe772
diff --git a/sci-libs/miopen/files/miopen-6.1.1-build-all-tests.patch b/sci-libs/miopen/files/miopen-6.1.1-build-all-tests.patch
new file mode 100644
index 000000000000..49ec1ccbff3b
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-6.1.1-build-all-tests.patch
@@ -0,0 +1,13 @@
+Normally, MIOpen compiles tests during test phase instead of "compile".
+This patch allows to build testing executables during compile phase.
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -330,7 +330,7 @@ endfunction()
+ separate_arguments(MIOPEN_TEST_FLAGS_ARGS NATIVE_COMMAND ${MIOPEN_TEST_FLAGS})
+ 
+ function(add_test_executable TEST_NAME)
+-    add_executable (${TEST_NAME} EXCLUDE_FROM_ALL ${ARGN})
++    add_executable (${TEST_NAME} ${ARGN})
+     if(WIN32)
+         target_compile_definitions(${TEST_NAME} PRIVATE NOMINMAX)
+     endif()
diff --git a/sci-libs/miopen/metadata.xml b/sci-libs/miopen/metadata.xml
index 08c299887077..e08e7753394d 100644
--- a/sci-libs/miopen/metadata.xml
+++ b/sci-libs/miopen/metadata.xml
@@ -12,7 +12,11 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/MIOpen</remote-id>
+    <remote-id type="github">ROCm/MIOpen</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/miopen/miopen-5.1.3-r1.ebuild b/sci-libs/miopen/miopen-5.1.3-r1.ebuild
index 2ef5b8fb50b8..7d02435948f7 100644
--- a/sci-libs/miopen/miopen-5.1.3-r1.ebuild
+++ b/sci-libs/miopen/miopen-5.1.3-r1.ebuild
@@ -87,6 +87,7 @@ src_configure() {
 		-DMIOPEN_USE_MLIR=OFF
 		-DBUILD_TESTS=$(usex test ON OFF)
 		-DMIOPEN_TEST_ALL=$(usex test ON OFF)
+		-DHALF_INCLUDE_DIR="${EPREFIX}/usr/include/half"
 	)
 
 	if use test; then
diff --git a/sci-libs/miopen/miopen-5.7.1-r1.ebuild b/sci-libs/miopen/miopen-5.7.1-r1.ebuild
index 93bcde8190ae..b13e6354554f 100644
--- a/sci-libs/miopen/miopen-5.7.1-r1.ebuild
+++ b/sci-libs/miopen/miopen-5.7.1-r1.ebuild
@@ -91,6 +91,7 @@ src_configure() {
 		-DBUILD_TESTS=$(usex test ON OFF)
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
 		-DROCM_SYMLINK_LIBS=OFF
+		-DHALF_INCLUDE_DIR="${EPREFIX}/usr/include/half"
 	)
 
 	if use test; then
diff --git a/sci-libs/miopen/miopen-6.1.1.ebuild b/sci-libs/miopen/miopen-6.1.1.ebuild
new file mode 100644
index 000000000000..7cf62bdcb790
--- /dev/null
+++ b/sci-libs/miopen/miopen-6.1.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+LLVM_COMPAT=( 18 )
+
+inherit cmake flag-o-matic llvm-r1 rocm
+
+DESCRIPTION="AMD's Machine Intelligence Library"
+HOMEPAGE="https://github.com/ROCm/MIOpen"
+SRC_URI="https://github.com/ROCm/MIOpen/archive/rocm-${PV}.tar.gz -> MIOpen-${PV}.tar.gz"
+S="${WORKDIR}/MIOpen-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip
+	>=dev-db/sqlite-3.17
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	sci-libs/composable-kernel:${SLOT}[${ROCM_USEDEP}]
+	dev-util/roctracer:${SLOT}[${ROCM_USEDEP}]
+	>=dev-libs/boost-1.72
+	dev-cpp/nlohmann_json
+	dev-cpp/frugally-deep
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	>=dev-libs/half-1.12.0-r1
+	dev-build/rocm-cmake
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-build-all-tests.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/MIOPEN_TIDY_ERRORS ALL/d' \
+		-e 's/FLAGS_RELEASE} -s/FLAGS_RELEASE}/g' \
+		-i CMakeLists.txt || die
+
+	sed -e "/add_test/s:--build \${CMAKE_CURRENT_BINARY_DIR}:--build ${BUILD_DIR}:" \
+		-i test/CMakeLists.txt || die
+
+	sed -e "s:\${PROJECT_BINARY_DIR}/miopen/include:\${PROJECT_BINARY_DIR}/include:" \
+		-i src/CMakeLists.txt || die
+}
+
+src_configure() {
+	if ! use debug; then
+		append-cflags "-DNDEBUG"
+		append-cxxflags "-DNDEBUG"
+		CMAKE_BUILD_TYPE="Release"
+	else
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DMIOPEN_BACKEND=HIP
+		-DBoost_USE_STATIC_LIBS=OFF
+		-DMIOPEN_USE_MLIR=OFF
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DMIOPEN_HIP_COMPILER="${ESYSROOT}/usr/bin/hipcc"
+		-DMIOPEN_AMDGCN_ASSEMBLER="$(get_llvm_prefix)/bin/clang"
+		-DHIP_OC_COMPILER="$(get_llvm_prefix)/bin/clang"
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DMIOPEN_TEST_ALL=ON
+			-DMIOPEN_TEST_GDB=OFF
+		)
+		# needed by rocminfo
+		addpredict /dev/random
+		check_amdgpu
+	fi
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	LD_LIBRARY_PATH="${BUILD_DIR}"/lib MIOPEN_SYSTEM_DB_PATH="${BUILD_DIR}"/share/miopen/db/ cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest
index 9d9423b200c5..3c591309db7a 100644
--- a/sci-libs/rocBLAS/Manifest
+++ b/sci-libs/rocBLAS/Manifest
@@ -7,12 +7,15 @@ AUX rocBLAS-5.4.2-cpp_lib_filesystem.patch 898 BLAKE2B 403b42f0193f2d21585fe8f8a
 AUX rocBLAS-5.4.2-link-cblas.patch 508 BLAKE2B ab53db7c73cc174039880ebd8987adc88f83d61e84bf024e2a6367f5bc9414ac343843610382bae43b4dcf874f6cf9e91bc3bd865264e37517f280d50881b4ff SHA512 fa91f817a06f517b38d3d3a71110da59d6579bf7915d6f47deefc46c532ca10d17802815662d8909ee52fb155b82339122601793858e52c13c6cc93cac283fc9
 AUX rocBLAS-5.4.2-unbundle-Tensile.patch 1373 BLAKE2B 944771b7511de883aa106016cf59e3cb94248119af472aed75c76c712fc9ee2e9e765d472ef727776d95ee478f1701c12853c37be269ee4940a3cde9e1f41cc7 SHA512 bdf01803a0594b53f248bc57594e7bed2f3f4cc772de8b5a043fa849798887291cb14d273511d33453c0685a113a9064a218a56d57631d2e9c1126eb62853668
 AUX rocBLAS-5.7.1-expand-isa-compatibility.patch 3771 BLAKE2B 3be8a45734c4d3ce0d54981e48685c500d6cf8ba1981b6035f2cb83cad1c221afcf50e5d9fbdaa9966ce64e99845c57b32267adda7983bb9a511fec661a0cfeb SHA512 86eedaa1bf6d0430f4b059d9257539dd95d56bdfc0cb61ceb0d180e29f76e280505c8b0002eba71c8152522c637917cd0b9ac7fb2f07059b3b5b6076f8ac7c59
+AUX rocBLAS-6.0.2-expand-isa-compatibility.patch 3792 BLAKE2B 55a57fad4cce821f83d04156942c33ab1842389dc0c4ad1ceea0c2435a37d9912bf24f0359023735b503bea5505b47e2e707b0798d93cdc5622d34821b1e3950 SHA512 c21de66ddc126b5ac5b588c9e68283e8d32574ec0a28963e62244a176edfb0c9188236a75b3985d2cf9043f4fb919a837326ede94045dce9158e9651228b0c38
 DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fccf1f8829ad41baf15ad31bbbb313b48825841834c7ec1b9f8ece794aebdf9fda42b54a38f642beb1bc1e374f2f3b4e43d8ba9dfd1eb6e3ece5 SHA512 8f6946cf9d68afd195640ae7e0da8dc33341c67f28813813b5361a56531fa2af4453d075703ea52c66d93a1936cf74688b86aa2fa62b52a7ed5f03272290c232
 DIST rocBLAS-5.4.2-Tensile-asm_full-navi22.tar.gz 1057686 BLAKE2B aa755595bbcd48775713f1d94c18b9bfa6464cae97653dd5beda9e4ed600802b62c4159e6edef7fbd4c92e629bbda1c284e6c48e096c7eaf22bbaad86bdcdace SHA512 cdc928528e7ce5bcc3ae32ec18e3aee48533f24e77c1e42f6e0398858eefebd52b8812caabe01a0ef7fa552e00118b862e025f1675a9642b009f1e38efbcdd53
 DIST rocm-rocBLAS-5.1.3.tar.gz 13741546 BLAKE2B af10d8cb69bee44ef5aab2dc350e1d9f3b6fddb3a840c17230c4b55b2649a4724c9f2e58c1eafdb3e2716eea016a72a35c3ddb498881b1ce682d780baa8d8b07 SHA512 5ab71838fdd0e9c5848cbf28a19d113353b619a878d8c7d05f64feb32faae2054169c95ed6e9dd6b05a2e807b57229dd2c361c4d289b6e6f17c196558640890f
 DIST rocm-rocBLAS-5.4.2.tar.gz 15938434 BLAKE2B 14ebafa944fdac443800bb7f9b16f8ecf0f420b168d3c6534f68ad7d14bf058a4cc1673fce8f4b9be53e4a6c1cf05011e01853cd901bce0b59827d2aca4d029f SHA512 e62bb80457c1e89454885499bdce9d60beecd706806724418983c78c65c2ae303550f9670b5a6e71dae6a61c0e42b223ab01b36b8406430731ebcbff54c4a8f4
 DIST rocm-rocBLAS-5.7.1.tar.gz 55389700 BLAKE2B 9e58b1d29c8a04aa58ce17fdd9b0c2504934261851619dc5b696a04e8c6a79e7c44d86a6db7a9c76a434d76593de8c191cba6f163cf398d01cfc001e5fa32b5a SHA512 cfc73f6c490595a3c153c2ac2a3cb5926c48c2c19baa07ff3dcdf3a7ccaed82cfdff64ed5a3be64c349cb43d654d4b104d9090e2ec9f2061049d6a4921c07722
+DIST rocm-rocBLAS-6.1.1.tar.gz 100103895 BLAKE2B df89a21e47730714b80c62717a86d65ac0d819c2d33b2a3c6252b60b8d7cc9eb5f8f1db27159b0a8dfc87aba7ccad97e2f832bc0044e92d0b69c526d382c745a SHA512 74e847c4ddee16cae7f41e268a815ea03875519c365abe7dfce313a9545df245baa73301b432f64a36cc988281fec7530629a0d72583e9ea287c98ec8a0b3907
 EBUILD rocBLAS-5.1.3-r4.ebuild 3050 BLAKE2B 79866dab3479b657dc21aabf7140d465c144b8ea778f1f620a6dad8425883b8a2feb6eff15e936074c5947d44be104e5c391732596c185cb360592981f4cf461 SHA512 b14cf2ec87859a56f314f161fdb6f96695e6f68838699406365f619e56481c99559e6a5e115f16376ea323b9cbf6b57307c2b8531d6bb31a6339639d1eb2d734
 EBUILD rocBLAS-5.4.2-r3.ebuild 2689 BLAKE2B a3713d44891b79166ff1bcf5e2290853b85545a7cbe4a0605ace885f350d8de2ba119090c9bc9ac15bd768ebb7e58ae450cd31e58402f87e3ad0ca5344aeabc7 SHA512 95da8f3dd111894bfc18f522c44bd92e34e91a3215ef89e2bc24ffa63e6fd320d04ee2c98d9261482793e583064a7d77ed364a0ad0a72270009f302c6de28703
 EBUILD rocBLAS-5.7.1-r2.ebuild 2718 BLAKE2B 78b35d4032fd97fa5ff63273c213ecde3b7d7900b4002da27355ce1ab8f4af2a6e796560b955df6fb3b1d517752a153ccf4a9980e31733a141b880a11f676db7 SHA512 943f734ef9a089b5a16032614813b8e528de81a4b81c81734814ab4a986e3c01a3d9e6f0bdee32efd850f476f83380cb445ac3da2a6dc102cbd18414ff19a1db
-MISC metadata.xml 739 BLAKE2B 38ace9571ca717a5bf7251888b4537522326f34778be98cfe717a06dbbd3a04a2bf905ec1cabafe9bbd3fea90adfb5c25c8b41e46c034a7793363ea5fc0c7f29 SHA512 60f1d5aa2a6ebe17cfcf24780529e1eef521bb7c838e48d18180a52d580cf91430ac1f4fdd0e70b9804ec5f0b5957dbd431149f6e0b0b9033cf8ad683510c582
+EBUILD rocBLAS-6.1.1.ebuild 2833 BLAKE2B 56df33992129fa096291dd2809431de8423ccace0c0ea7ad7162411972ecd9c24460b26b96c29bb0ac6e11407a797222933fe37b06615d62ff6ca214ea75d1de SHA512 b03ccda2a28e6a68081f150a46f248b10fa276d73a2f72d99e9c9203840733b34d114d2f3dfb002cb589b9e3d1dfd9c7bf1d6d9165927ef68d0df35daf567cbd
+MISC metadata.xml 852 BLAKE2B c358ef9128e50c5052fea39876550419dc037a8750c8dd12f10415a02dd2a64893ecd11c4c0ee4acc8db83999a4f709a98da53f6d12f71d0782f98af92a37a96 SHA512 18de129cceb076f84235ccb5706287ee16c5843dab654dc9494013b89b07bbb9f82d1e4980e1c1a8e0c8ce2b0e125633cefef069b0e97b3127e0240071d5a53a
diff --git a/sci-libs/rocBLAS/files/rocBLAS-6.0.2-expand-isa-compatibility.patch b/sci-libs/rocBLAS/files/rocBLAS-6.0.2-expand-isa-compatibility.patch
new file mode 100644
index 000000000000..ca895c4b4ff5
--- /dev/null
+++ b/sci-libs/rocBLAS/files/rocBLAS-6.0.2-expand-isa-compatibility.patch
@@ -0,0 +1,96 @@
+--- a/library/src/handle.cpp
++++ b/library/src/handle.cpp
+@@ -21,6 +21,7 @@
+  * ************************************************************************ */
+ #include "handle.hpp"
+ #include <cstdarg>
++#include <cstring>
+ #include <limits>
+ #ifdef WIN32
+ #include <windows.h>
+@@ -80,6 +81,20 @@ static Processor getActiveArch(int deviceId)
+     // strip out xnack/ecc from name
+     std::string deviceFullString(deviceProperties.gcnArchName);
+     std::string deviceString = deviceFullString.substr(0, deviceFullString.find(":"));
++    // coerce to compatible arch
++    int gcnArch = deviceString.substr(0, 3) == "gfx" ? std::stoi(deviceString.substr(3)) : 0;
++    switch(gcnArch)
++    {
++    case 902: case 909: case 912:
++        std::strcpy(deviceProperties.gcnArchName, "gfx900");
++        break;
++    case 1013:
++        std::strcpy(deviceProperties.gcnArchName, "gfx1010");
++        break;
++    case 1031: case 1032: case 1033: case 1034: case 1035: case 1036:
++        std::strcpy(deviceProperties.gcnArchName, "gfx1030");
++        break;
++    }
+ 
+     if(deviceString.find("gfx803") != std::string::npos)
+     {
+--- a/library/src/rocblas_auxiliary.cpp
++++ b/library/src/rocblas_auxiliary.cpp
+@@ -24,6 +24,7 @@
+ #include "logging.hpp"
+ #include "rocblas-auxiliary.h"
+ #include <cctype>
++#include <cstring>
+ #include <cstdlib>
+ #include <memory>
+ #include <string>
+@@ -1242,6 +1243,20 @@ std::string rocblas_internal_get_arch_name()
+     hipGetDevice(&deviceId);
+     hipDeviceProp_t deviceProperties;
+     hipGetDeviceProperties(&deviceProperties, deviceId);
++    // coerce to compatible arch
++    int gcnArch = strncmp(deviceProperties.gcnArchName, "gfx", 3) == 0 ? std::stoi(deviceProperties.gcnArchName + 3) : 0;
++    switch(gcnArch)
++    {
++    case 902: case 909: case 912:
++        std::strcpy(deviceProperties.gcnArchName, "gfx900");
++        break;
++    case 1013:
++        std::strcpy(deviceProperties.gcnArchName, "gfx1010");
++        break;
++    case 1031: case 1032: case 1033: case 1034: case 1035: case 1036:
++        std::strcpy(deviceProperties.gcnArchName, "gfx1030");
++        break;
++    }
+     return ArchName<hipDeviceProp_t>{}(deviceProperties);
+ }
+ 
+--- a/library/src/tensile_host.cpp
++++ b/library/src/tensile_host.cpp
+@@ -45,6 +45,7 @@ extern "C" void rocblas_shutdown();
+ #include <Tensile/hip/HipUtils.hpp>
+ #include <atomic>
+ #include <complex>
++#include <cstring>
+ #include <exception>
+ #include <future>
+ #include <iomanip>
+@@ -802,6 +803,23 @@ namespace
+                         std::string deviceFullString(prop.gcnArchName);
+                         std::string deviceString
+                             = deviceFullString.substr(0, deviceFullString.find(":"));
++                        // coerce to compatible arch
++                        int gcnArch = deviceString.substr(0, 3) == "gfx" ? std::stoi(deviceString.substr(3)) : 0;
++                        switch(gcnArch)
++                        {
++                        case 902: case 909: case 912:
++                            std::strcpy(prop.gcnArchName, "gfx900");
++                            deviceString = prop.gcnArchName;
++                            break;
++                        case 1013:
++                            std::strcpy(prop.gcnArchName, "gfx1010");
++                            deviceString = prop.gcnArchName;
++                            break;
++                        case 1031: case 1032: case 1033: case 1034: case 1035: case 1036:
++                            std::strcpy(prop.gcnArchName, "gfx1030");
++                            deviceString = prop.gcnArchName;
++                            break;
++                        }
+                         m_devicePropMap[deviceString] = std::make_shared<hipDeviceProp_t>(prop);
+                     }
+                 }
diff --git a/sci-libs/rocBLAS/metadata.xml b/sci-libs/rocBLAS/metadata.xml
index 066f5c749e3f..0e8f76b2a76e 100644
--- a/sci-libs/rocBLAS/metadata.xml
+++ b/sci-libs/rocBLAS/metadata.xml
@@ -12,6 +12,10 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <use>
     <flag name="test">Perform rocblas-test to compare the result between rocBLAS and system BLAS.</flag>
     <flag name="benchmark">Build and install rocblas-bench.</flag>
diff --git a/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild b/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
new file mode 100644
index 000000000000..26bfc2ada24d
--- /dev/null
+++ b/sci-libs/rocBLAS/rocBLAS-6.1.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="docs/.doxygen"
+DOCS_DEPEND="media-gfx/graphviz"
+ROCM_VERSION=${PV}
+inherit cmake docs edo multiprocessing rocm
+
+DESCRIPTION="AMD's library for BLAS on ROCm"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test video_cards_amdgpu"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+BDEPEND="
+	>=dev-build/rocm-cmake-5.3
+	video_cards_amdgpu? (
+		dev-util/Tensile:${SLOT}
+	)
+	test? ( dev-cpp/gtest )
+"
+
+DEPEND="
+	>=dev-cpp/msgpack-cxx-6.0.0
+	=dev-util/hip-6*
+	test? (
+		virtual/blas
+		dev-cpp/gtest
+		sys-libs/libomp
+	)
+	benchmark? (
+		virtual/blas
+		sys-libs/libomp
+	)
+"
+
+QA_FLAGS_IGNORED="/usr/lib64/rocblas/library/.*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.2-cpp_lib_filesystem.patch
+	"${FILESDIR}"/${PN}-5.4.2-add-missing-header.patch
+	"${FILESDIR}"/${PN}-5.4.2-link-cblas.patch
+	"${FILESDIR}"/${PN}-6.0.2-expand-isa-compatibility.patch
+	)
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die
+}
+
+src_configure() {
+	addpredict /dev/random
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_WITH_TENSILE="$(usex video_cards_amdgpu)"
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocblas"
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DBUILD_CLIENTS_TESTS="$(usex test)"
+		-DBUILD_CLIENTS_BENCHMARKS="$(usex benchmark)"
+		-DBUILD_WITH_PIP=OFF
+	)
+
+	if usex video_cards_amdgpu; then
+		mycmakeargs+=(
+			-DTensile_LOGIC="asm_full"
+			-DTensile_COMPILER="hipcc"
+			-DTensile_LIBRARY_FORMAT="msgpack"
+			-DTensile_CODE_OBJECT_VERSION="default"
+			-DTensile_ROOT="${EPREFIX}/usr/share/Tensile"
+			-DTensile_CPU_THREADS="$(makeopts_jobs)"
+		)
+	fi
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_compile() {
+	docs_compile
+	cmake_src_compile
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library"
+	export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src"
+	edob "./${PN,,}-test"
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dolib.a clients/librocblas_fortran_client.a
+		dobin clients/staging/rocblas-bench
+	fi
+
+	# Stop llvm-strip from removing .strtab section from *.hsaco files,
+	# otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes
+	dostrip -x "/usr/$(get_libdir)/rocblas/library/"
+}
diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index 25de558512b6..bc4c89d928d5 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -5,6 +5,8 @@ AUX rocFFT-5.1.3-unbundle-sqlite.patch 2326 BLAKE2B 5a08f2ec7486f0687c4af46e09a0
 AUX rocFFT-5.7.1-fix-rocm-link-path.patch 492 BLAKE2B daf4d865d8b2b5f3dc97a845f262c266588da910f517e31a10cf7896c6bc1c4fd794c01be39c7aa74d5eb80e4066b8d3dd8a8841210e0075ad4e593dc0f85f66 SHA512 b715c08515b6d289f1b045db7053ff08a27aa9cf940beacba47167a72f168d75f4652d98b33fc2bef303832f0689cf51d71f893e415ba4b4cd7a0f21c677de69
 DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43
 DIST rocFFT-5.7.1.tar.gz 1192841 BLAKE2B 58f880f7ff866f85af70666d17e8b1a3ac8e63e853520546f746d74cecd805687fd689367a09d2b1ec4e1059b44b858377dce362cd4cae91cb85aad7c3185c00 SHA512 48467589cb4bc1334a4074bacc6a726c850dc2a79ef82622301d61c4269fb81c0b2b9fce56d72bddca584d1797a8634d243a9a6b8cf943e687b2b0f5c931116f
+DIST rocFFT-6.1.1.tar.gz 1257210 BLAKE2B 01d383d32bb91a9cd1d68a3b1ef2c6d71b33a9a49389c558adca2673ce4a74aab9f0a420977d4f4d5e8b8e72f3d9bfe3a8019e137968b58984edac4f2e1a9146 SHA512 fb35b4d21b8bd598702f79707cdf19b7c30a9e62176f5f7a71b93076f904a98446dac4fa8bffcd7ba20ecb797aec727e730c8232de881a52d519c0c00a907bf9
 EBUILD rocFFT-5.1.3-r1.ebuild 3921 BLAKE2B 98eb96a54b1f73e0674299da7300c68ccee073a9a87a27213f865d8cc0b229078416b7fb4a98ade73ea13baa59d3e57c3117c457e59e710177287d726fe6f189 SHA512 a3feeec5c089171f6476bcfe5f1a8d154a1117be087f57151d4efc4403dcefb689dfee8241b7ad3651c8b008106314a7f5f8ae65a5147cc617beef1e63b1b803
 EBUILD rocFFT-5.7.1-r2.ebuild 3945 BLAKE2B e663c5ef2aa609daec68644c943a4b4dbb7963f1506ef6dcd6c907c0b2bf9f5cddb768fb7e37503e5aba02c998655785bb44412205e2c5575fa95cf9b98a4dce SHA512 f49656ba5e5691bd83a3e18c22c343b254bafe3b8ea893b482e32421e6612cd4cb3cf14607751ffd78f8b0bfe56057ad563b624e27036a80b4db4b6e02f94fe9
-MISC metadata.xml 676 BLAKE2B dbf1364ede458c08dde2ebd4a8ca7053a1dc00813f647fc09268ef5a97150945c19b2375f13cc74aec8ff0af831625221bfa675b5ded7769ff5e1a322ae8b5dc SHA512 352c744ece6202b976170615927c09b82513a73669cd5efc5ca626ac2b6929d18f8ecd0b8a91d87bef86aab17713158f1e7efaef0aee01b7ac6e7d6cd2a3a4f3
+EBUILD rocFFT-6.1.1.ebuild 3735 BLAKE2B 4dfc2b602df3707956c3958d6289eb89d9f6e0df1d62faccd9545a2f311ad69304c4a0e2b446bc76076bc5f8922486e72c5ffcc374a1fb2cc0029d793b492cc9 SHA512 a3b20704d3a310106046ea433d93dc23f3365b5848b7e7ece83794960dc07fdb771b27e31d097cde909ee657122246266b92a32527cb307e08f26b755d8bc28a
+MISC metadata.xml 764 BLAKE2B 0490d64e75e9269408f31d4ac87f4845f01a306adf829d57d89401cab19c84412896f351c1dc9f6a918679447f1fe62a7fc958bff9c98f1990fe021f99b35e01 SHA512 0135bae193ac9439a86dca5e26a32366eae7b67175c955aace1a1d620f1df5176a3e3a302a5e6f1e6473777e5b51ab772aa67a01ba023e9c8bbb180352ae8e0b
diff --git a/sci-libs/rocFFT/metadata.xml b/sci-libs/rocFFT/metadata.xml
index 5774b6a548d7..ab2a20524390 100644
--- a/sci-libs/rocFFT/metadata.xml
+++ b/sci-libs/rocFFT/metadata.xml
@@ -9,11 +9,15 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/rocFFT</remote-id>
+    <remote-id type="github">ROCm/rocFFT</remote-id>
   </upstream>
-    <use>
-        <flag name="benchmark">Build and install [dyna-]rocfft-rider.</flag>
-        <flag name="perfscripts">Install rocfft-perf performance visualization suite.</flag>
-    </use>
+  <use>
+    <flag name="benchmark">Build and install rocfft benchmark tools.</flag>
+    <flag name="perfscripts">Install rocfft-perf performance visualization suite.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
new file mode 100644
index 000000000000..4eef4ea268dc
--- /dev/null
+++ b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+ROCM_VERSION=${PV}
+
+inherit cmake check-reqs edo multiprocessing python-r1 rocm
+
+DESCRIPTION="Next generation FFT implementation for ROCm"
+HOMEPAGE="https://github.com/ROCm/rocFFT"
+SRC_URI="https://github.com/ROCm/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz"
+S="${WORKDIR}/rocFFT-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+# RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask
+RDEPEND="
+perfscripts? (
+	>=media-gfx/asymptote-2.61
+	dev-texlive/texlive-latex
+	dev-tex/latexmk
+	sys-apps/texinfo
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}] )
+${PYTHON_DEPS}"
+
+DEPEND="=dev-util/hip-6*
+	${PYTHON_DEPS}
+	benchmark? (
+		dev-libs/boost
+		sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
+	)
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost
+		>=sci-libs/fftw-3
+		sys-libs/libomp
+		sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
+	)
+"
+
+BDEPEND="
+	>=dev-build/cmake-3.22
+	dev-build/rocm-cmake
+	dev-db/sqlite
+"
+
+CHECKREQS_DISK_BUILD="7G"
+
+IUSE="benchmark perfscripts test"
+REQUIRED_USE="perfscripts? ( benchmark ) ${PYTHON_REQUIRED_USE} ${ROCM_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch
+)
+
+required_mem() {
+	if use test; then
+		echo "52G"
+	else
+		if [[ -n "${AMDGPU_TARGETS}" ]]; then
+			# count how many archs user specified in ${AMDGPU_TARGETS}
+			local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1))
+		else
+			# The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future.
+			local NARCH=7
+		fi
+		echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required
+	fi
+}
+
+pkg_pretend() {
+	return # leave the disk space check to pkg_setup phase
+}
+
+pkg_setup() {
+	export CHECKREQS_MEMORY=$(required_mem)
+	check-reqs_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	if use perfscripts; then
+		pushd scripts/perf || die
+		sed -e "/\/opt\/rocm/d" -e "/rocmversion/s,rocm_info.strip(),\"${PV}\"," -i perflib/specs.py || dir
+		sed -e "/^top/,+1d" -i rocfft-perf suites.py || die
+		sed -e "s,perflib,${PN}_perflib,g" -i rocfft-perf suites.py perflib/*.py || die
+		sed -e "/^top = /s,__file__).*$,\"${EPREFIX}/usr/share/${PN}-perflib\")," \
+			-i perflib/pdf.py perflib/generators.py || die
+		popd
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-Wno-dev
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCH=$(usex benchmark ON OFF)
+		-DSQLITE_USE_SYSTEM_PACKAGE=ON
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}/clients/staging" || die
+	export LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device
+	edob ./${PN,,}-test
+	edob ./${PN,,}-selftest
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/clients/staging || die
+		dobin dyna-rocfft-bench rocfft-bench
+		dosym dyna-rocfft-bench /usr/bin/dyna-rocfft-rider
+		dosym rocfft-bench /usr/bin/dyna-rocfft-rider
+
+		if ! use perfscripts; then
+			# prevent collision with dev-util/perf
+			rm -rf "${ED}"/usr/bin/perf || die
+		fi
+	fi
+
+	if use perfscripts; then
+		cd "${S}"/scripts/perf || die
+		python_foreach_impl python_doexe rocfft-perf
+		python_moduleinto ${PN}_perflib
+		python_foreach_impl python_domodule perflib/*.py
+		insinto /usr/share/${PN}-perflib
+		doins *.asy suites.py
+	fi
+}
diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest
index 195f501ff097..63daeae9a910 100644
--- a/sci-libs/rocPRIM/Manifest
+++ b/sci-libs/rocPRIM/Manifest
@@ -1,6 +1,8 @@
 AUX rocPRIM-5.7.1-expand-isa-compatibility.patch 1655 BLAKE2B 23392f6237ec706e0763c6165f854b0638757d70b5dc756125b6a5e861f2d5dc9e557362035a57dc2557241a1e32a631cb2e8660d1e8107c73a7aff734af76eb SHA512 f2ffc71c6322b66685de4c78737d546ea27779e36d952d06fd14017e2bf4efb905f2f6da8f56e3a3f5314aa594b624cd3cd9f749bf74c97a425982f264cf82ee
 DIST rocPRIM-5.1.3.tar.gz 374510 BLAKE2B ab6960e7bd2159ac7a0d72ba6d594684f8d47028eca0940eabd35b346ac3d432a734ec575ee71341f339a9d0dead10dfafe81fb651a3b7da681aa900a5132d0e SHA512 54e14f2b40795153b862a64c9b3d336f35feccfda725daad75fae356b0147c577735884b65218c26c370ebec710af0f84aeef3103067a50db077cf9e24d2b64a
 DIST rocPRIM-5.7.1.tar.gz 535649 BLAKE2B 469bf59b5c92c37df96f58bac5a6559dc2cb879e5f82e539881d79bda57d23c25a9b114466042258e87862a88cd53d260155d7785c9a69a1800b0d05e931f56d SHA512 b2f0bc07dbc5cd111dd513f6c05dbc533908c52ea99caf77d6a4dd35db2b28f98c80006bd1f50a232873eab00b70e54231c38bfd1035c8845029d53690fd5e71
+DIST rocPRIM-6.1.1.tar.gz 611372 BLAKE2B 984df214179a6d2c90b31bd30ec9472a0b985d9d488ea195968f25df4cac97ce48bfa4c322f2d578771ac63caeafc2c69c9dae911bc3a9d920ab9558ba7d6e15 SHA512 298eebc8a5d3fd7da71ab98a22fd39183436b3d9e14945e450f0fb35e38ea8fb99c5f2b342f1f77f21899a14d506ce96a965fbdb24f106ec9638dcd6afe6ae98
 EBUILD rocPRIM-5.1.3.ebuild 2012 BLAKE2B db384e213038bbe8dc5e925905b9637bf5dc14de1b59f1f574abcc0f46aebe876484c0b9704acd0bf447a01727e1a94b388de9989669f64569043bf46cfb6e5e SHA512 3cf65a5a20fcb5b90cc871e266df7d96e791c70f82c33f088349a5cf03a39f0b114972a7fbf25ce8df4d80fc47af379f8cc0bd0466d261a1acee79e4ca7b3dbe
 EBUILD rocPRIM-5.7.1.ebuild 2234 BLAKE2B 504db3f20d2bc78f46e3a93d5eac96b275197444448185b0ebce64df866f6e27aa966cc940be9d91cdb3756bfaad2bb00e76cea40fe489e7603e63571d50f590 SHA512 bb10e2ded213c8e5554707e25cde78205cd0b6eb217e68242def0c2126fcd2dbc1dd0182c56df65e6bba5ed7c1931637079106d012a748cf3c53eeb13589e04a
-MISC metadata.xml 583 BLAKE2B c7ec5d60d52e656c8e1808803ded22d8a49dba10ea8cfce85c15025cb39ebbc7e66da25c3db8b5281e264167ff860e24ec39ecdab5286a79beaedb4a6d2090b4 SHA512 f89eeedcbfe6a86245fd00bc4114d64b1464d151db3b6b998f5679949310c7513ffdca1c5f320cc7d22f011dc67807d39f5e74e11155b3fbf50f439245e7176b
+EBUILD rocPRIM-6.1.1.ebuild 1536 BLAKE2B 3e96a188cae858765055e6b31daa5f5f92da227f5f782d78b1f9d749a7a80845216ba00031f78b881f2be630839997372d0e0813e3f24a32e1bd5b5d86d5c672 SHA512 a31f2017d7f2fda1cbaebdf3ecdbcaddce1a9d9b1a36f3f8929d628c9f75f873933ae7e1fa07f3ae61fde02f12aa481d0d54d0f3f24f00aabe1b952ac6afecb0
+MISC metadata.xml 672 BLAKE2B 93644f07bd8f34b43e335ec631b69abdfee76bfe55fcccc9c33b772945e72870f4307803a121226d2d87aa55a07f31274f376a6d8a44a9f5996a861d21dc5c38 SHA512 e8f5caa76c96a1ef5affce0a29f07e12fc4a10057c77bbc9f53288fd886488fddde59a713be80fd72dbaa9656abb6d4851995a000e160398c09ed28000a53712
diff --git a/sci-libs/rocPRIM/metadata.xml b/sci-libs/rocPRIM/metadata.xml
index 6d29bd1f8901..b98edd6a4e2b 100644
--- a/sci-libs/rocPRIM/metadata.xml
+++ b/sci-libs/rocPRIM/metadata.xml
@@ -9,10 +9,14 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/rocPRIM</remote-id>
+    <remote-id type="github">ROCm/rocPRIM</remote-id>
   </upstream>
-    <use>
-        <flag name="benchmark">Build and install benchmark programs.</flag>
-    </use>
+  <use>
+    <flag name="benchmark">Build and install benchmark programs.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild b/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild
new file mode 100644
index 000000000000..cd85f27b6500
--- /dev/null
+++ b/sci-libs/rocPRIM/rocPRIM-6.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+inherit cmake rocm
+
+DESCRIPTION="HIP parallel primitives for developing performant GPU-accelerated code on ROCm"
+HOMEPAGE="https://github.com/ROCm/rocPRIM"
+SRC_URI="https://github.com/ROCm/rocPRIM/archive/rocm-${PV}.tar.gz -> rocPRIM-${PV}.tar.gz"
+S="${WORKDIR}/rocPRIM-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="
+	benchmark? ( ${ROCM_REQUIRED_USE} )
+	test? ( ${ROCM_REQUIRED_USE} )
+"
+
+RDEPEND="dev-util/hip
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )"
+BDEPEND="dev-build/rocm-cmake
+	>=dev-build/cmake-3.22"
+DEPEND="${RDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.7.1-expand-isa-compatibility.patch )
+
+src_prepare() {
+	# install benchmark files
+	if use benchmark; then
+		sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \
+			-e "/add_executable/a\  install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	# uses HMM to fit tests to default <512M iGPU VRAM
+	ROCPRIM_USE_HMM="1" cmake_src_test -j1
+}
diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest
index a8e0198de41b..43caf94db9a8 100644
--- a/sci-libs/rocRAND/Manifest
+++ b/sci-libs/rocRAND/Manifest
@@ -6,7 +6,9 @@ DIST hipRAND-de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz 80820 BLAKE2B f2894
 DIST rocRAND-5.1.3.tar.gz 11729425 BLAKE2B f61aaedb7b72ceba3868a2069c93db1e2cd88a7a0188a9d5a33f520af3b42235c0dca62495460fd5e7abbca5fe7acc01acfdc90e53ae9a6e45128df5da472f49 SHA512 12859e52b79e40fcd1fb97d0915c191bbbc24e31e00aac4dbeecb625f9978a00ece3d7a42d0f9d37516031c1fbeb66e14dcd476ea83fe32fb13e0dd5c3964a28
 DIST rocRAND-5.6.0.tar.gz 23189913 BLAKE2B 2418a90c323f483d1f92630df7134bc060b9052f580259924e79680a7ec37857574973dda69dc3c28fdd5b88a5fc1d29757ed637fcde0730c53b9a5f09668aba SHA512 cccd26a6b80a7705644803a85dad3a43de3f4e2f73f964f2b5aa410f71d3782b68d6cc1ad60b7f7be5193a94098ed3fa25cad30c3acbc141522cdd738d3328a5
 DIST rocRAND-5.7.1.tar.gz 23189653 BLAKE2B c70ab6f3b718c2430394f63b93bee15fa72daae704883fdb203b98b0dc4763b46bc27886af64c48bf4ebe8da9b919158b8cd346f70f9b76bf0492ce3b2c1e20e SHA512 4d74bce9fbd3cb45e3f057d38df747270c6986fea7ad524f7a88109b6a53a4ea5dcd60d4bbf2364888501e9444245fb6898bb79fccad0e37b61e819e8c4ed863
+DIST rocRAND-6.1.1.tar.gz 26683143 BLAKE2B 4108584c6372adbf2f9ef887cf1aa08f5afdfa489ba0739d247e693628f3e23978fe023c2896e7bff666b8822b0011fd3f635338b013898f8d76b3f31ec21f6c SHA512 d8df0e6bf843719e59434c952ef56b112ada23d0c226bec9f2974ed762500202ac809f495de61a4086289e35c2f4b670f4ed7dcd7092a158c0a731c368950a44
 EBUILD rocRAND-5.1.3.ebuild 1983 BLAKE2B ea0f8aeebc7d7eaf8bbfe682ea1b4f52c789df5250b05cba6728db6af46c30f852d783c9c5254bde7f7eec36854ab857a18ab0d3536db50ebd0bc016bf82bbb6 SHA512 f4a139505f8b64ae36d912730ac40c78b14dee492cc75499536f8b0697bc3fdaa31c37efc1572faba02ff10952cef0f489a90a72904fc589cd71f5a222f2e2aa
 EBUILD rocRAND-5.6.0-r1.ebuild 1381 BLAKE2B 398870e0a0a5d68eaccf173fca87e1d5086e8818e45b56a9811113e3d2038add46bf370af35771079928dfd0770575c74d79aeff92cc149eacf4dbf55ee67643 SHA512 a0d94616f9b63904aab41dbee8e73ba013a6e1e59a8be3526d7f48ec0c7b2463b7282c66f6ad1c0984ee254b9a13d39ae40ea9a272cf9f2213c1a0b5d680a586
 EBUILD rocRAND-5.7.1.ebuild 1512 BLAKE2B 52baabeaa5bf7af55555cde6afb2165f36a409150a5d64a0662145d59cff880352a10a42c352b1d989626283295061222be87c9ecff74b998bc3bd4adff98488 SHA512 a909992ee8631bbd0fc4b875d5bc10ca9cb2f6aaead2611978632f0df55a078cf784e9833613c45b28916e6806de5bfecdeb9872784eba7eea990b9c3f720884
-MISC metadata.xml 583 BLAKE2B 5713db2187eb2c1c8f40e9f9774215a880b67ad90ffe943f66724619b90cff92ccc06e09e1f6d7092e4d6e374cd26300ca13c8654a3f2ca2cc65d796356b5a42 SHA512 a42e669f1ce6ed3a83a8648f7c43a85cc1223c2bf73fe14e2e06df5c6573dfa55751198b374f151ed36e75ada831406654d7f3d8429e3e05c14036e26057608c
+EBUILD rocRAND-6.1.1.ebuild 1356 BLAKE2B a6cd2febabea79999841a1cdf3973bc6cd0a5ed323b65d906e9c4148d8b0725821fd6c3480d49b54ff6564f4a90ee5c6672d106ff669c2653e981ead0eff8596 SHA512 90f431872013aa462da49b09765ba81ae0e8ad617c9da9bf135a6107911d3fa594d61abaadc02e799d65aa3762c72edc700e4fb7848036dc01a2cd60f49724bd
+MISC metadata.xml 672 BLAKE2B 418c0adb9c54e60ffbcfdc6abf3bee2c7ca17a5d4e4022f84ed9cdd654f6470a2bb2336f6fdf01766f9ff42eb599d1a155fa575a658c1459c3580396a21847c4 SHA512 9be6210f28457c4e71adaabf3f66f0f58bf8f1db78bb69ea43ed9e621d8f8115a04f05d8db7814725198f2a3e70dbcb723d89ccf5b88ed08b090c5f15f6e370f
diff --git a/sci-libs/rocRAND/metadata.xml b/sci-libs/rocRAND/metadata.xml
index 4add606d2dbe..1c9d7fffbee6 100644
--- a/sci-libs/rocRAND/metadata.xml
+++ b/sci-libs/rocRAND/metadata.xml
@@ -9,10 +9,14 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/rocRAND</remote-id>
+    <remote-id type="github">ROCm/rocRAND</remote-id>
   </upstream>
-    <use>
-        <flag name="benchmark">Build and install benchmark programs.</flag>
-    </use>
+  <use>
+    <flag name="benchmark">Build and install benchmark programs.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/rocRAND/rocRAND-6.1.1.ebuild b/sci-libs/rocRAND/rocRAND-6.1.1.ebuild
new file mode 100644
index 000000000000..1cfbcdbd04f3
--- /dev/null
+++ b/sci-libs/rocRAND/rocRAND-6.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="Generate pseudo-random and quasi-random numbers"
+HOMEPAGE="https://github.com/ROCm/rocRAND"
+SRC_URI="https://github.com/ROCm/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/rocRAND-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.1_fix_generator_alignment.patch
+)
+
+RDEPEND="dev-util/hip"
+DEPEND="${RDEPEND}
+	dev-build/rocm-cmake
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )"
+BDEPEND="dev-build/rocm-cmake
+	>=dev-build/cmake-3.22"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	export LD_LIBRARY_PATH="${BUILD_DIR}/library"
+	# uses HMM to fit tests to default <512M iGPU VRAM
+	ROCRAND_USE_HMM="1" cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/benchmark
+		dobin benchmark_rocrand_*
+	fi
+}
diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest
index cf0f37d09490..543c7a3b5c20 100644
--- a/sci-libs/rocSOLVER/Manifest
+++ b/sci-libs/rocSOLVER/Manifest
@@ -4,7 +4,9 @@ AUX rocSOLVER-5.4.2-libfmt9.patch 1478 BLAKE2B a5f3774483c38bb059873509d326d46a5
 DIST rocSOLVER-5.1.3.tar.gz 545627 BLAKE2B 2cca24a1310efba7f8c66d1614fb50704221ebc8aa50d6aba11083baf9a7427575642fd28218ce80f8a7b83d3406348c2dd18373fb32e533509d01d37cf06927 SHA512 38e7a4ed6b67e83960ad3416d1008f82f895d19dc85427cd6f9c76f00b1ce18f78a4dd73d1ab53ffe81588890cd5545315029e903e2e09b85d6cfb854d405753
 DIST rocSOLVER-5.4.2.tar.gz 674866 BLAKE2B 0628353d567da92e3f7c3a11e19859329f3ea916184d554ee9c7172084ee4698c93408f397f493331d4dc47d833c56ead41bb4445081ba9ac73809ca0478770c SHA512 b3a60c65a18c3864568e1e0b1524850eb1b322f6005cf8a2763c9b457e43e03c8ce74be1d13f3cc3adef1f6ac979f54fb903831f4a60447a9a915a40dcbe5ff6
 DIST rocSOLVER-5.7.1.tar.gz 1859403 BLAKE2B f7a40494deda9dd66f2fb2f57e13665688e89e1f82733701ec60a520bc4b9f7d5899ada618a37e73baa3a910757be4f11d5fced5d4d2ad82c56918b34d265511 SHA512 78e0a2b5b069378696afebf5e3e023449b3d7705aa79099eb7721c142d7525255825b41bf413324c33178091315e3909980a1bf0cbb66e0891c85e757858ee1c
+DIST rocSOLVER-6.1.1.tar.gz 2971118 BLAKE2B 2611b6b65704e7cd64df682728013f07d20c6e17e6729cec7befb91dbed57aabaaed2887a252d4ae610fe0bcb336dfcd4b98d63c107694c22e35be06d06363db SHA512 a96901226cbe5b410fa2885023a080b5ca7dc4659be92b363c37e10eba97d3da09d97488ecdc040452a535ad3284017c64b3b68646f258655583302baa009f34
 EBUILD rocSOLVER-5.1.3-r1.ebuild 1939 BLAKE2B 5106e36577bdfbbba5039de1007a9d96587354bb634f2ae4cec76c644144ab6b5527082ba96a0039c42c2e0984c1abf99cc30c6d8bb3a3867c45348245ced66f SHA512 8d6abd695f2596fef6f6c2fb66e168ba5b087b71360ffebfd4a0aaa3796d21b9e9deb215e4368ca36a42ede7ac91415ed6641e20e4ac1d40fa420bbdf1cf44b9
 EBUILD rocSOLVER-5.4.2.ebuild 1537 BLAKE2B 8881bd0881366f2315011b8fca3562bf85f2fbed0c5522b47b18794366e6d26bf800da60a5f1d73f74b0f4397b6407cea042e6ed9e10595017e51441fe221ea6 SHA512 b9d212bc359301a901750ce682f4658a9ba927950800f5e4692f26991ee1aee86d0465e9a7af5eeef61750fe5799a7e4e636dffd097a8a604208ef8764e961b9
 EBUILD rocSOLVER-5.7.1.ebuild 1536 BLAKE2B c85b59fc74642843d586c33e81b6d0e3504e8b53d639072eb65a46112ca56fb229fa6a312b5b2f7e3d8061e89716530b38a4f497ed1c0a512117312c81cafc67 SHA512 36f9bcff6650fe09fbe4227904d1b05259208fed1935f4b8a29e297102e81d77ded767c3392a78b126790ea56413fc56e6828774881bc4313a2714c2a0b9ef2c
-MISC metadata.xml 761 BLAKE2B 6247276c89fddaf929633dca9a73a6e1a07e0d1fdca8f58d55145e29822917a7fc1a0309632ed9dfe42d57b327bda743be1445f96a86cb557edc7a90f76356cb SHA512 f4eadda6ec691cb0b17969249b4dc18b0fa4f020e929a8ab982e490b1358b569d028f9d054982987d225e88cf3a97914c0557f02381f0272d008dddaed678d36
+EBUILD rocSOLVER-6.1.1.ebuild 1432 BLAKE2B 3a6ff6ec59b749c042241e6e650da23d3afb69cac7b49f9e5bc1e2c52fa54bef0443de18f6f4ee7560b05211145aaa03eab6b3a30afc88c60340aa44dd7459eb SHA512 239f322c030b04ddd92199c13d0cd04f0824ab056fea07d58c2962c1a6127d0f642ddff1b370cf300902815a74f86089de37196dddad00b9302f81c61fa42445
+MISC metadata.xml 846 BLAKE2B 4f740804d76db5a55b3ee7bfc1e4e79edb192a0cb3962bee1e1326af0e1b2cdf9e1e410bf0557d0adc2a8e34592b8bf01eb49b951c50c4af3a97c7275c9e3629 SHA512 c8c0d4b5559b2ebb6323137bb6d7017cf50d674e05fb36533c75d3ffe53711b126798cc787521b0f9920c9e510ac163aaefd723b509fe1563d138f393bccbf2c
diff --git a/sci-libs/rocSOLVER/metadata.xml b/sci-libs/rocSOLVER/metadata.xml
index da8fc11173b1..97b4749ddd6d 100644
--- a/sci-libs/rocSOLVER/metadata.xml
+++ b/sci-libs/rocSOLVER/metadata.xml
@@ -12,11 +12,15 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/rocSOLVER</remote-id>
+    <remote-id type="github">ROCm/rocSOLVER</remote-id>
   </upstream>
-    <use>
-        <flag name="test">Perform rocsolver-test to compare the result between rocSOLVER and system LAPACK.</flag>
-        <flag name="benchmark">Build and install rocsolver-bench.</flag>
-    </use>
+  <use>
+    <flag name="test">Perform rocsolver-test to compare the result between rocSOLVER and system LAPACK.</flag>
+    <flag name="benchmark">Build and install rocsolver-bench.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild b/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild
new file mode 100644
index 000000000000..4fe2bbbdaca1
--- /dev/null
+++ b/sci-libs/rocSOLVER/rocSOLVER-6.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm
+
+DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm platform"
+HOMEPAGE="https://github.com/ROCm/rocSOLVER"
+SRC_URI="https://github.com/ROCm/rocSOLVER/archive/rocm-${PV}.tar.gz -> rocSOLVER-${PV}.tar.gz"
+S=${WORKDIR}/${PN}-rocm-${PV}
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="test benchmark"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]
+	dev-libs/libfmt
+	benchmark? ( virtual/blas )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest
+	>=dev-build/cmake-3.22
+	virtual/blas )"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-Wno-dev
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_CLIENTS_SAMPLES=NO
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	LD_LIBRARY_PATH="${BUILD_DIR}/library/src" edob ./rocsolver-test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dobin clients/staging/rocsolver-bench
+	fi
+}
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
index a49bf66b16f3..46296fa11110 100644
--- a/sci-libs/rocSPARSE/Manifest
+++ b/sci-libs/rocSPARSE/Manifest
@@ -3,6 +3,7 @@ AUX rocSPARSE-5.0.2-remove-incorrect-assert.patch 1658 BLAKE2B 26aa66d7d61657eb5
 AUX rocSPARSE-5.0.2-remove-matrices-unpacking.patch 1205 BLAKE2B 0d903453692025f6f239c8b5d2f11dd6f9dfe5c09a63395898920326e0dbd6aeff37fdf2dde8e89ea1cbdc60252ab87b7ef020b56a726853d2f7261addcf00c8 SHA512 52ec3913f89f7886d6b8fb9ef54ca313c64e4c9d374507a0d89a8c7cf846e8f8f6b8a4ad266b23015869a79d2eaadb75c5540ca53e40163cb0fbdc2b1819e645
 DIST rocSPARSE-5.1.3.tar.gz 943788 BLAKE2B f9d5fc34d74bc10f3e5bd0a18da41fe9b35a2f01aca3a74979960958fd0e7648fca96493ba9d767119a452dd75ede0733959d0d4bae84615b7a1ff212c8412a3 SHA512 735aa210bbdc3f31b0ed4defe0288606e255788e877f24ed25506d780552a779305fe5bfd692a3e720e9b286073894300fcbcf161d41e1b23abf2110a9536bf3
 DIST rocSPARSE-5.7.1.tar.gz 1167162 BLAKE2B 20ed88c87afbb041a31aa8bf867dca7ee670af093347c9c6a68b0750e70c796e7cfd599f84a58de2b8038f7681524bcb5909230fc340d1575dae3b72089ec650 SHA512 cd48884c51fcddcb26c42920cf477999160b3f06da4ab182f746a18d1fe54f697d89b1e470c550bd2330b26fb596d4a5baadf64366145e0d07f3fd8891f9af59
+DIST rocSPARSE-6.1.1.tar.gz 1367035 BLAKE2B fc981df5913ea527bb4a7d3eba69373ebc7b74319f387e9f42a94feb1ec029ecca15618ea2d5ff7a91cb6e8959f164ab4be57755ee17db5f155f3b0e373cc487 SHA512 f87bd724b92fdb35e1c70cafcf09d95ab65f514bacfe1c59c5f0a2a75a8bae7a7dca2ee093ecd2e05adf542cc00165c0f8bf0a67e98013e2c4c72145ba951db2
 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03
 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0
 DIST rocSPARSE_Chevron2.tar.gz 3210636 BLAKE2B 919bc19931cbcb32c09e6b623c9d3890400895dfd65e83845d351a8e3dd8b30ef43374c3c0ca3ee9708c81b5fb8886f1a4adbea6086495f08f9498f19a2279d5 SHA512 22b71deddec4f1af5b239d4065089230cf70e521102803a77ab3f16b34a0d69534817e54d81dfa7f8d1f299932c0f0424237baeb3d8289bcfffa4b902b00e256
@@ -29,4 +30,5 @@ DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b1
 DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161
 EBUILD rocSPARSE-5.1.3-r1.ebuild 4962 BLAKE2B 75563a04a39be35abc1dc388026ccba17ed40c389f5c3d6b274035fe06f21cee93d4eb46abaf60e09723243768668ddae38d639b371eec65d0798296862dcbaa SHA512 792b4f541ccb30c32863889565de114a334088e29fadeeee54671a67aa6e69c57ad69054d44a8382bf56cae7af815feea5650f5bafe27348f97f8e9a8f831dd7
 EBUILD rocSPARSE-5.7.1-r2.ebuild 4919 BLAKE2B 68d80886d30d233fdbc601dd5ac0b08f1d3ccc00de1a9bccf79d49012706b9e88a053ee0b99a44d4b87ce8d1fa9f1b1c647d73c678948d61a328eb01b843a2bb SHA512 5007ca4f6b79122fae121ba290356d1f967752a545f89f4263a42cf74b567a4014d32f15761e6d49cb84c1c1d2c05138203cfc292d70ae769d465cadaa0f3f2c
-MISC metadata.xml 580 BLAKE2B be266a810a64b24ad0fdddf97e9ec46036c84e6dc0f7d00bc8e4447062fd78f14d0b73c4dccb542dade7db194b8d9034efd08f518aa913fa5e3ea88ae7972ada SHA512 1063ecc68c4634f2819dcab271fda7d12a32c44074e140503f09b0a80e7d599533f2b3a732215ed66a49b3e653e90c843e0b92c3bf0ec07c0ab749c90d7013ea
+EBUILD rocSPARSE-6.1.1.ebuild 4356 BLAKE2B 266dde88eaaca0bf73c438d5e7126795d0a64f171f1b44445cfa90eba7b160190f24daac96f5a8c42f319b6549cf0c49096b53875ce8b7ee52a86ad375a8968a SHA512 cf940ada8be18c529bb4d7fe943143b07cf217e4efef5e63fe4b98a9827f7b014144772624d052d6c5f8f7d403be4d02c1932b63ed7bb5e4e20e8b2c9068e1ec
+MISC metadata.xml 669 BLAKE2B 62133bd86a945eedaba10a5507a30d2dac62984558e74540860bbde3d12cf971de129d5c6e046b3916f4cf048c60aeb87553385b8f28d50ce0046ec04e90385d SHA512 6717bc1ad49a85001695265b3571c3936da67d3ded431149d6d9c98b094386a8899fcbf2375ca799c3e9c742c48460ac482418a53189097f5a12510f8a3ce628
diff --git a/sci-libs/rocSPARSE/metadata.xml b/sci-libs/rocSPARSE/metadata.xml
index f4e399df67a8..0cc6b903bb24 100644
--- a/sci-libs/rocSPARSE/metadata.xml
+++ b/sci-libs/rocSPARSE/metadata.xml
@@ -9,10 +9,14 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/rocSPARSE</remote-id>
+    <remote-id type="github">ROCm/rocSPARSE</remote-id>
   </upstream>
-    <use>
-        <flag name="benchmark">Build and install rocblas-bench.</flag>
-    </use>
+  <use>
+    <flag name="benchmark">Build and install rocblas-bench.</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild
new file mode 100644
index 000000000000..093273002e65
--- /dev/null
+++ b/sci-libs/rocSPARSE/rocSPARSE-6.1.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+ROCM_VERSION=${PV}
+
+inherit cmake edo python-any-r1 toolchain-funcs rocm
+
+DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation"
+HOMEPAGE="https://github.com/ROCm/rocSPARSE"
+
+SRC_URI="https://github.com/ROCm/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz
+test? (
+https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz
+https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz
+https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz
+https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz
+https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz
+https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz
+https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz
+https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz
+https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz
+https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz
+https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz
+https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz
+https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz
+https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz
+https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz
+https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz
+https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz
+https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz
+https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz
+)"
+
+S="${WORKDIR}/rocSPARSE-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RDEPEND="=dev-util/hip-6*
+	sci-libs/rocPRIM:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
+	dev-cpp/gtest
+	>=dev-build/cmake-3.22
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+)
+"
+
+RESTRICT="!test? ( test )"
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	# use python interpreter specifyied by python-any-r1
+	sed -e "s/\${python}/${EPYTHON}/" \
+	    -i clients/tests/CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	# Test need download data from https://sparse.tamu.edu (or other mirror site), check MD5,
+	# unpack and convert them into csr format
+	# This process is handled default by ${S}/cmake/ClientMatrices.cmake, but should be the responsibility of portage.
+	if use test; then
+		mkdir -p "${BUILD_DIR}"/clients/matrices
+		# compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error!
+		edo $(tc-getCXX) deps/convert.cpp -o deps/convert
+		find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 |
+			while IFS= read -r -d '' mtxfile; do
+				destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).csr
+				ebegin "Converting ${mtxfile} to ${destination}"
+				deps/convert ${mtxfile} ${destination}
+				eend $?
+			done
+	fi
+}
+
+src_configure() {
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}/clients/staging" || die
+	LD_LIBRARY_PATH="${BUILD_DIR}/library" edob ./${PN,,}-test
+}
+
+src_install() {
+	cmake_src_install
+
+	# rm unwanted copy
+	rm -rf "${ED}/usr/rocsparse" || die
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dobin clients/staging/rocsparse-bench
+	fi
+}
diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest
index 6643af178e41..61b039b05f9c 100644
--- a/sci-libs/rocThrust/Manifest
+++ b/sci-libs/rocThrust/Manifest
@@ -1,6 +1,8 @@
 AUX rocThrust-4.0-operator_new.patch 1699 BLAKE2B 1f8e4eb035768acd424cc2bae173c2c107b15b7f670c430ff5db5bb3657fdcafcea7933890176537c6147c1bee3cb675464d6d948724ba186868ff277eaa71f2 SHA512 5d9d48561e7feabc9341f13877d7e6bd49b59b140fe249956e87e785ed8afd1222aa1e7d77759af6ad8843e87d21362ba85ac9204bfcf160f30a4bcfb3d2e88b
 DIST rocThrust-5.1.3.tar.gz 1186518 BLAKE2B 2defe71247915940917438d4f0d0a811dca7de39e5168248968fa9c165b81d94b0e20f3df9b84db1fbdcd2eb87942dec5d3adbbe1a699eb51eeb4e1b2f0a88d0 SHA512 189c70343a410cf3f3c1589ef24c68a38b5270d8780d15261a124b8250f279a3c3c7afef38e6310d57cb1741b3ee75f0b4ac0bb9dfcf4a4fb0e7e6c0516faf74
 DIST rocThrust-5.7.1.tar.gz 1122808 BLAKE2B 41a5d57d03c7f95baf861b772c9513c7fbc26eee8a2f388897eb9b9f9fad3cdad81e2a79932c5b9a6d88b4e1596bf64e59e01337943a036ddb792f7b352ecd31 SHA512 52a9640808f0ed78ae2d6f25e741af59ae4e977535a0431f16c0fa1ee9a395e6f389cf29e61c02ac274cf16fcd193e5df6fb2edc340059ab282ed7cd877fc8b4
+DIST rocThrust-6.1.1.tar.gz 1147635 BLAKE2B e71288a4666ba1f23cf85d2d269f61f9085efaeb2921b7f3142c5ce0808380b27a8c07945a44b6a651747046020b412838a667232b1ba65308fd7fd336b840b4 SHA512 30eeb6df73ee0dc2361879337faae09cf19cd151510c6e22d774c22b4be19272f9980cc6ba2b2e42f43738a1e475f49fcb4384d66b24639746a05685a90e37d4
 EBUILD rocThrust-5.1.3.ebuild 1929 BLAKE2B 04ef6dbe75793a05c9d2f994eb82d7816ec99abed0415e0a3a555aeda4e09267adac4db686d76c409a942c636f035433d33d0727e9c793cf3afdf8bfeaedc371 SHA512 e3867e21e481ccfb13318cb2ba02596e81be6e86b5026083b7091916adc850fe74a926cb98c129a3dbe6ee0ea9c12665849979d63628e081fe56465f746098c4
 EBUILD rocThrust-5.7.1.ebuild 2054 BLAKE2B 16f51ff532eb679fa80ab0494066e3113962d01f7fd0927fa70efc923017cabcf09149df2f730a15d17fbd2f95162f051fa8b9b71cd984109236c0be090f2574 SHA512 ca20c3485ab1a0a5f19d15f0275a440176671a808411352582460c203ff00dcd8cde327cf70b54227b2e7eb3ae29005a00eb5e9b6f2a492080086b620a88d1d9
-MISC metadata.xml 541 BLAKE2B bab886722d16c8fb7095c256dabd189817881b1b9707351efa2d83c327b6a448f7fe829e93c6cc25b3379ae11d121fd6049dcb15d8fa7273bf891f6ae7643a76 SHA512 a3c55751d755b67531a8ba70a6183e50208fe7c5ecf7feb4eef2acb0671803aafe54a6c3d3b430a592e39d3ec15ed964fda3d552c216546af31608cea796a559
+EBUILD rocThrust-6.1.1.ebuild 1306 BLAKE2B 42213722ef4bf3d3e6e47c6a596c75477101e77dab7ccbbf13e5beca42dd85938c7c8ca9c1c7427c05cb00d985c81f3846c24fca8fe5d8e7edde4fe4d93515f8 SHA512 2817565bcdab2c63b91ce55f7a1cdf400d5e57005c47d1d3588ad4eddaeea403af0cf107c5263018e7db60bce2fd65d55bff31b1c7df7658d44406a285f4cb28
+MISC metadata.xml 631 BLAKE2B 99edd995566ee67d4e2fb4fdc67eca30299e81bd657d57c24932b0bc0545c805abce9d2542dfcb9d61d7aa5639ac02dc5385a5d90bfa5fcb757b5fab9f1f11d6 SHA512 bc0f9411724711f1806f1681c6c55877b828807e9deb22123a92b1b1cfc19c2f423ddd111978bf04a3993555cdc984f654c049617e5919e18d09a093c4559136
diff --git a/sci-libs/rocThrust/metadata.xml b/sci-libs/rocThrust/metadata.xml
index 61a33c63bbf4..03efe0482dfe 100644
--- a/sci-libs/rocThrust/metadata.xml
+++ b/sci-libs/rocThrust/metadata.xml
@@ -8,10 +8,14 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCm-Developer-Tools/rocThrust</remote-id>
+    <remote-id type="github">ROCm/rocThrust</remote-id>
   </upstream>
-    <use>
-      <flag name="benchmark">Build and install benchmark binary.</flag>
-    </use>
-</pkgmetadata>
+  <use>
+    <flag name="benchmark">Build and install benchmark binary.</flag>
+  </use>
+</pkgmetadata>
\ No newline at end of file
diff --git a/sci-libs/rocThrust/rocThrust-6.1.1.ebuild b/sci-libs/rocThrust/rocThrust-6.1.1.ebuild
new file mode 100644
index 000000000000..7a04d78cbe0f
--- /dev/null
+++ b/sci-libs/rocThrust/rocThrust-6.1.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="HIP back-end for the parallel algorithm library Thrust"
+HOMEPAGE="https://github.com/ROCm/rocThrust"
+SRC_URI="https://github.com/ROCm/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz"
+S="${WORKDIR}/rocThrust-rocm-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="
+	benchmark? ( ${ROCM_REQUIRED_USE} )
+	test? ( ${ROCM_REQUIRED_USE} )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}]
+	test? ( dev-cpp/gtest )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-build/cmake-3.22"
+
+PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARKS=$(usex benchmark ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	# uses HMM to fit tests to default <512M iGPU VRAM
+	ROCTHRUST_USE_HMM="1" cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	use benchmark && dobin "${BUILD_DIR}"/benchmarks/benchmark_thrust_bench
+}
diff --git a/sci-libs/rocWMMA/Manifest b/sci-libs/rocWMMA/Manifest
index fcc5b5ff7c23..340a27ed24b0 100644
--- a/sci-libs/rocWMMA/Manifest
+++ b/sci-libs/rocWMMA/Manifest
@@ -1,4 +1,8 @@
 AUX rocWMMA-5.7.1-use-system-googletest.patch 1211 BLAKE2B 2db14b5ef68502ca2aa66507a394eb3959c58802cb6350f40d15c3047d56cab3ee26be3688a4f99b9b7aa3dca687369ebaed0283f2e1af015475147bddc33d7f SHA512 a5d646361a95d96c97c594de4c63dd76d3cb571300446ca90f5b0f5a2e9af5d676fc9cac48b5dd04b921fb34fe951f396a93a7c2e47b09c1f59014a48bc74f7a
+AUX rocWMMA-6.0.2-use-system-googletest.patch 1292 BLAKE2B 358e7024dd80664ffc3f92c0c0442c0a325807cd143135d82c95ab72c006f7607c3ad085db80490dbdb7a1e98908bd6bc827a01f202ca21e03e6b10ffc2e701d SHA512 075da1871a8aabbccaff9155e21be2300c471b52e270c15349359e738c8cd9379bb83aee809a299381370ccc2b8ebe73d52002f5cfcb416aa208d4c910931ce9
+AUX rocWMMA-6.1.1-no-test-install.patch 854 BLAKE2B b8d4c15e578cae34eb116a633819eeb941ec85d98e3209fb0359ae9943e9a82ae905513f9ffdd5eed1f1f33fa613b7acb9544dfd314891863a72c54698d3f9ad SHA512 ae2b22e44092d876ad29c8bcabc01aae2ef4279e0ee8b2e8fa80ff2bae0bf3ef30f8f0d7a3e873d12b8ba876cb3aa7ca8cc4b919167f8d229263fc4f982e3e49
 DIST rocWMMA-5.7.1.tar.gz 3163060 BLAKE2B 47ca55c0cd388ca51ad3843e656a31ce04d9e07988c26bfb69a7c61bfe497609408cfd20dcbe9c6698bd79b800a114ab67d582ced43dc6f1c4db4072e2901d99 SHA512 92c9c634fdf1f5319d34fabbf691df45600abdc5285a76b40255e7d6d260553076f65baa1eda566a163725e2a0cec0a85372eb07add39c65368e84505c176f50
+DIST rocWMMA-6.1.1.tar.gz 3189782 BLAKE2B fd96d8f3ba8f21ee3544d532a59ffdefa1aefc94d73401f48d470f7f699e28771d5495e98c1ee316d8379167b70b945220be6670dee2757a62af162276a2fb0f SHA512 db2bfe805a4f33c48ee98c821efe0b261eca474af9e954843c83faa3335459bfe635326ba2cfc7b8b8ece2cf0f2c418f49ff6aa81537f8d3747cc729738a6b18
 EBUILD rocWMMA-5.7.1.ebuild 1212 BLAKE2B e0bd4413db21ddf0c3933154fd60c561462f21f054bac0990ce3788de9d437a51d128447cf38a59ba29f352e8a39d9e66f3c27ee1eb794f09edcdbf757a9a32f SHA512 cd78d160bee5e49c085b33defc407c26d493e4c9405003dc4d09a5f3fcde7fa22a0db140a6a0736e21e59bd8af39758dd519ba7d8c52c924799fc56bd55808b8
+EBUILD rocWMMA-6.1.1.ebuild 1540 BLAKE2B 49a7d2d9ebc1ecc4d692dd54f23d2ff670564c04656d81ec3034458a5b131959c11ba56ef91c379849350a800f1939ee949afaf45b171d14e4fbda16fd8d0622 SHA512 84362a0f54fa252ab5e900bdfb7043e3b002d3cb769553e65fed3f9572251e8aee13c96bd2a136746e871d36b5433408e468ef2eb21ab6ba63e7b1d88678e115
 MISC metadata.xml 468 BLAKE2B 00be6e38c18a77eebb430632acdd9da61aaa299c92cb733735bc7a40e1017e33d778783dd821f4122f46e9f390d7bc37c05c1b43e0abda915586eb83928e5f0a SHA512 9ed778246d9895dfdb2e881b533a2f53a0f6c0361671c33c065ce37e5f2ea4677e9885e28a66466c95e261dea909ec5de9fb79de44d9857520ed269849145247
diff --git a/sci-libs/rocWMMA/files/rocWMMA-6.0.2-use-system-googletest.patch b/sci-libs/rocWMMA/files/rocWMMA-6.0.2-use-system-googletest.patch
new file mode 100644
index 000000000000..de29d5b70410
--- /dev/null
+++ b/sci-libs/rocWMMA/files/rocWMMA-6.0.2-use-system-googletest.patch
@@ -0,0 +1,28 @@
+Add an option to use system PR
+Upstream PR: https://github.com/ROCm/rocWMMA/pull/353
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -29,11 +29,15 @@ include( CMakeDependentOption )
+ cmake_dependent_option( ROCWMMA_BUILD_VALIDATION_TESTS "Build validation tests" ON "ROCWMMA_BUILD_TESTS" OFF )
+ cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests" OFF "ROCWMMA_BUILD_TESTS" OFF )
+ cmake_dependent_option( ROCWMMA_BUILD_EXTENDED_TESTS "Build extended test parameter coverage" OFF "ROCWMMA_BUILD_TESTS" OFF )
++cmake_dependent_option( ROCWMMA_USE_SYSTEM_GOOGLETEST "Use system Google Test library instead of downloading and building it" OFF "ROCWMMA_BUILD_TESTS" OFF )
+ 
+ add_compile_options(-mcmodel=large)
+ add_link_options(-mcmodel=large)
+ 
+ # Test/benchmark requires additional dependencies
++if(ROCWMMA_USE_SYSTEM_GOOGLETEST)
++  find_package(GTest 1.12.1 REQUIRED)
++else()
+ include( FetchContent )
+ 
+ FetchContent_Declare(
+@@ -59,6 +63,7 @@ if(NOT googletest_POPULATED)
+   # Restore shared libs setting
+   set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE INTERNAL "Build SHARED libraries" FORCE)
+ endif()
++endif()
+ 
+ set(ROCWMMA_TEST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
+ set(ROCWMMA_COMMON_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/hip_device.cpp
diff --git a/sci-libs/rocWMMA/files/rocWMMA-6.1.1-no-test-install.patch b/sci-libs/rocWMMA/files/rocWMMA-6.1.1-no-test-install.patch
new file mode 100644
index 000000000000..d4219baf3496
--- /dev/null
+++ b/sci-libs/rocWMMA/files/rocWMMA-6.1.1-no-test-install.patch
@@ -0,0 +1,25 @@
+Don't install tests into /usr/bin
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -114,11 +114,6 @@ function(add_rocwmma_test TEST_TARGET TEST_SOURCE)
+   add_test(NAME ${TEST_TARGET} COMMAND ${TEST_TARGET})
+   set_property(TEST ${TEST_TARGET} PROPERTY SKIP_REGULAR_EXPRESSION "no ROCm-capable device" "unsupported host device")
+ 
+-  rocm_install_targets(
+-    TARGETS ${TEST_TARGET}
+-    COMPONENT tests
+-  )
+-
+   get_target_property(EXE_NAME ${TEST_TARGET} RUNTIME_OUTPUT_NAME)
+   if(EXE_NAME STREQUAL "EXE_NAME-NOTFOUND")
+       get_target_property(EXE_NAME ${TEST_TARGET} OUTPUT_NAME)
+@@ -148,9 +143,3 @@ add_subdirectory(gemm)
+ add_subdirectory(unit)
+ add_subdirectory(dlrm)
+ 
+-rocm_install(
+-    FILES "${INSTALL_TEST_FILE}"
+-    DESTINATION "${CMAKE_INSTALL_BINDIR}/${PROJECT_NAME}"
+-    COMPONENT tests
+-    RENAME "CTestTestfile.cmake"
+-)
diff --git a/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild b/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild
new file mode 100644
index 000000000000..a3f8d61463b1
--- /dev/null
+++ b/sci-libs/rocWMMA/rocWMMA-6.1.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_SKIP_GLOBALS=1
+
+inherit cmake rocm flag-o-matic
+
+DESCRIPTION="library for accelerating mixed precision matrix multiply-accumulate operations"
+HOMEPAGE="https://github.com/ROCm/rocWMMA"
+SRC_URI="https://github.com/ROCm/rocWMMA/archive/rocm-${PV}.tar.gz -> rocWMMA-${PV}.tar.gz"
+S="${WORKDIR}/rocWMMA-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+DEPEND="=dev-util/hip-6*"
+
+IUSE_TARGETS=( gfx908 gfx90a gfx940 gfx941 gfx942 gfx1100 gfx1101 gfx1102 )
+IUSE_TARGETS=( "${IUSE_TARGETS[@]/#/amdgpu_targets_}" )
+ROCM_USEDEP_OPTFLAGS=${IUSE_TARGETS[*]/%/(-)?}
+ROCM_USEDEP=${ROCM_USEDEP_OPTFLAGS// /,}
+ROCM_REQUIRED_USE=" || ( ${IUSE_TARGETS[*]} )"
+
+BDEPEND="
+	test? (
+		dev-cpp/gtest
+		sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	)
+	dev-build/rocm-cmake
+"
+
+IUSE="${IUSE_TARGETS[*]/#/+} test"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.2-use-system-googletest.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-test-install.patch
+)
+
+src_configure() {
+	# ld.lld bug https://github.com/llvm/llvm-project/issues/61101
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DROCM_SYMLINK_LIBS=OFF
+		-DROCWMMA_BUILD_SAMPLES=OFF
+		-DROCWMMA_BUILD_TESTS="$(usex test)"
+	)
+	use test && mycmakeargs+=(-DROCWMMA_USE_SYSTEM_GOOGLETEST=ON)
+	CC=hipcc CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cmake_src_test -j1
+}
diff --git a/sci-libs/rpp/Manifest b/sci-libs/rpp/Manifest
new file mode 100644
index 000000000000..87c4ef72363a
--- /dev/null
+++ b/sci-libs/rpp/Manifest
@@ -0,0 +1,4 @@
+AUX rpp-6.1.1-skip-install-license.patch 1046 BLAKE2B 3000d90e9d2ccb3191e18cba7b74c4318ded903103cc31a998cca9591297bd3203c578bac2a1415db7980dcd7db0c5678f9f5dbdce66bc0112b4fdbe6405909d SHA512 5b2818a151dd3dd27c1af9ae19a73cbdf3c1bb69ad16d51ad075f50e2488742792bd1ec6f00b38392660e765911942fb41fdea2c5f31bc76998d5f9b5c9fd2db
+DIST rpp-6.1.1.tar.gz 37016755 BLAKE2B 884090ab50e0a4a3aed4e52c5bbd934a8c5b62eca310471c30cf4c5a7cafdd36fed7894320b4d5246620b3c47e90fafd0f8160a7d4ed0295c7668c8d147f4b18 SHA512 a7c10bdd08739eba08209783decf0f4fd7c12194b9ebc63bd16e4cb998645110c089833efb83a77d4bed7f8599cf3a320608be28633f0dc956079f9d70e765f8
+EBUILD rpp-6.1.1.ebuild 2071 BLAKE2B 8be3e4ff071215995b4b0ac07b9d9e2e8f9ad01ebe8d3b7e97ff20861ffae46e0e79cc84f486e33e871fda39159fe5e40b1201d1c2ebc0bdb9c6b07127445cdb SHA512 c617d733d2ab79e6e838a721cf437d0dc187bbf5c3883256cf1a3a29831b777e32be6fcc71d64de266cd9316663717a1c34b8261f4d69f8d97c69e879ee0450c
+MISC metadata.xml 410 BLAKE2B 196192c40a427e78cfb88efe5ba4cd77399a2945bc1c8bb8728f0c43cab51f95ecf992e832c95e6607b48043a04f0680b21cd059cdfca3def9286530a4899e7b SHA512 a66340c6c4d62c10a5fdada9b63cab9784f75973a5132be56e52233341796c93423ed766a58733e3f22091057488aed9e0731e7cedd55caa0721e703df137d31
diff --git a/sci-libs/rpp/files/rpp-6.1.1-skip-install-license.patch b/sci-libs/rpp/files/rpp-6.1.1-skip-install-license.patch
new file mode 100644
index 000000000000..2253bb5aed67
--- /dev/null
+++ b/sci-libs/rpp/files/rpp-6.1.1-skip-install-license.patch
@@ -0,0 +1,17 @@
+Skip installation of license: it will be installed by ebuild to correct place
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -343,13 +343,6 @@ install(FILES ${PROJECT_BINARY_DIR}/include/rpp_backend.h
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/utilities/test_suite/ DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test)
+ 
+-# set license information
+-set(CPACK_RESOURCE_FILE_LICENSE  "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime)
+-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-asan COMPONENT asan)
+-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-dev COMPONENT dev)
+-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION ${CMAKE_INSTALL_DOCDIR}-test COMPONENT test)
+-
+ # CTest - Needs RPP Installed
+ enable_testing()
+ include(CTest)
diff --git a/sci-libs/rpp/metadata.xml b/sci-libs/rpp/metadata.xml
new file mode 100644
index 000000000000..944efd183177
--- /dev/null
+++ b/sci-libs/rpp/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+  </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm/rpp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/rpp/rpp-6.1.1.ebuild b/sci-libs/rpp/rpp-6.1.1.ebuild
new file mode 100644
index 000000000000..d38645f9ff56
--- /dev/null
+++ b/sci-libs/rpp/rpp-6.1.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake flag-o-matic rocm
+
+DESCRIPTION="AMD ROCm Performance Primitives (RPP) high-performance computer vision library"
+HOMEPAGE="https://github.com/ROCm/rpp"
+SRC_URI="https://github.com/ROCm/rpp/archive/refs/tags/rocm-${PV}.tar.gz -> rpp-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+# pkgcheck warning: RequiredUseDefaults
+REQUIRED_USE="
+	cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_f16c
+	${ROCM_REQUIRED_USE}
+"
+
+RDEPEND="
+	dev-util/hip:${SLOT}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-build/cmake-3.22
+	>=dev-libs/half-1.12.0-r1
+	test? ( dev-cpp/gtest )
+"
+
+IUSE="cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_f16c test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-skip-install-license.patch
+)
+
+DOCS=( CHANGELOG.md LICENSE README.md )
+
+rcc_test_wrapper() {
+	local S="${WORKDIR}/${PN}-rocm-${PV}/utilities/rpp-unittests/HIP_NEW"
+	local CMAKE_USE_DIR="${S}"
+	local BUILD_DIR="${BUILD_DIR}/utilities/rpp-unittests/HIP_NEW"
+	cd "${S}" || die
+	$@
+}
+
+src_prepare() {
+	sed -e "s:\${ROCM_PATH}/llvm/bin/clang++:hipcc:" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+	use test && rcc_test_wrapper cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DROCM_PATH=/usr
+		-DBACKEND=HIP
+		-DBUILD_WITH_AMD_ADVANCE=OFF
+	)
+
+	cmake_src_configure
+
+	if use test; then
+		append-cxxflags -I"${S}/include"
+		append-ldflags -L"${BUILD_DIR}/lib64"
+		local mycmakeargs=(-DROCM_PATH=/usr)
+		use test && rcc_test_wrapper cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+	use test && rcc_test_wrapper cmake_src_compile
+}
+
+src_test() {
+	check_amdgpu
+
+	cd "${BUILD_DIR}"/utilities/rpp-unittests/HIP_NEW || die
+	for params in "0 0" "0 1" "1 1" "2 1" "5 1" "0 2" "0 3" "0 4" "0 5" "0 8"; do
+		LD_LIBRARY_PATH="${BUILD_DIR}"/lib64 ./uniqueFunctionalities_hip $params || die
+	done
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index b9481e3cbea6..6027661c0d03 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index c2a578e829ee..b9cd649810e6 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,10 +1,10 @@
-AUX flint-2.9.0-remove-hardcoded-CFLAGS.patch 2131 BLAKE2B f52fbcf321fd0f0beb302480c220b1f83e382ffe893e9b22a5eed839d02c2436ba101575c272cea0fbcbdd42110d5b9dde7cf6516403cb6dde1b0fa081dae63f SHA512 fa5c057cf664cd3ba83d3ec6b31a96c8a8e4a971a8f07b11a40150e22c1e55c7ad2d8b480f119213f867e502417c48741bb438b1724393b42da27d3577116fb5
 AUX flint-3.0.1-find-cblas.patch 1755 BLAKE2B bdf73d282a98f11126271d1afb5dd27daa2242fbd4923558a720753db85fcc71474ab559822a3549d60c555ab72c8273350c9df3fea2ba4d134bd7a45ec4c089 SHA512 1dc9342031472e59a5ba68540f070dc410134be5d52d7545a780c5b2867fad3c84410c5719ada517a0f2780f384c02487d128e0264bdaa54e8cdf34d2a5b71df
 AUX flint-3.1.0-fix-pc-install.patch 1035 BLAKE2B 30f80d5a75353344c1dd2216395263adf13ca00545b019e1fe4f00f4cb2f92adab970092c2f237c8b9b15e60e0943b5b46d36f719c9a87f0039e50bd9db65e58 SHA512 859aaf547599fa7103de12020f569d13e7545cdcff09a3dcbbe05bd239daaa4d4f58780a4247910e115478117af8a7e266671104dec36d87feddce93255d9650
-DIST flint-2.9.0.tar.gz 5283894 BLAKE2B a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa SHA512 4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba
+AUX flint-3.1.3_p1-c99-I.patch 14288 BLAKE2B b0c030835fa6f239367fd169e428c09551893f4b7a7d525344d33ee8c9756f6652b570543af5bd0ffccc292753bde9dad4cbe933aa71187660fe96852f65fea5 SHA512 7698f3003cab0909a7a42d8c6701a3a4837325aa595ab171781faef482850b1c013dcf9f11e089fe860de7fa7aad0b9f62830b3f41a73343fb0663135f5067e3
 DIST flint-3.0.1.tar.gz 7624944 BLAKE2B 0d94252075945f39af3dd2e49803cbe16aa65b108964dfc0c12bdfd9188748944c1e839401e17b974f8f6f8832e4da84d62a63f20b63cfff0ff5c2736bfd2d47 SHA512 4b5b432b962135cd708a0ce4242343f3226f0fdf73c3f541728ed4540e7ef6cb7812a48b6b46e65a8fcc1f5cae93d8bb59838d24728024cd9aa0f7b8e5c6f98f
 DIST flint-3.1.0.tar.gz 7585407 BLAKE2B 697be5bd88e7793eb160d5f0e2110a7b8371ef8d3ca82b576c4cc755983a660a884d35d3cbb442288caa074b7f41699f4c6bc3c244272d9e9f5755d8d209004d SHA512 1d33bb35853f4bdca047899ebb4ac9873748c6d57ad3b6aded32219261e95713fb26b394d8c86f6183b9f44db58697def07e6c565ac789461d5ccc4dca3e9ba7
-EBUILD flint-2.9.0.ebuild 1726 BLAKE2B dd2ef05aacb1642cc35807306af41237bb362662a8b7b50d5814f42212125d8a83aa716c7699d554e66e41a298bf5470b454d6e67ae9dd7fae6d8bb6cd503e82 SHA512 d40e144f5e2efeb72fe39b7c9948517ab6b59588a184e3b449932c914d8f85ba5db0cd2b1f4a56925288877705956b0ff2c175327dd24f385a12014e577e5506
+DIST flint-3.1.3_p1.tar.gz 7588734 BLAKE2B 87acf8778e21e37c01e12b198ff81e62ab113df3e0e9c6155ff7dd505828f79d5c49d85093e261ea96397e906350caa03477e3ecbdd1fc09d6ae5c984397a2be SHA512 1b16ff2fb9cb2ac4b75513278b8c14683e8d83db39985631df14d6ea74bee4d6ea818a200321d5f0de6f1af89898f7a99dc7088f712f4c6db1a2546199aefba7
 EBUILD flint-3.0.1.ebuild 1983 BLAKE2B bba189fe6f49d2991abc592b99cf725add9abb69f1d683432aa1954e46293afe3fc0b5a8afa7e77acb09455598c91388e29cde07dc845bd2bd66fc98ef9734d8 SHA512 0e68cb71137a24a696f49b21f1523d694af56fda47b9d1343aca9d9a58f55196a304bbb236125e7313429311e7b4ba36a88d365d55f1ac7ff8840e4da4d9ac68
 EBUILD flint-3.1.0.ebuild 2023 BLAKE2B ebddd22bcbdc40778d36947998c266f0baaf146b07e902c7174ddacf7b26a22b28c366a4d1710b031e84e06532479ee6d1c183aaad05fdd5ca7346fcf66ecac3 SHA512 230fc27efc3ea58352c759a5be3a1a81e7138c9bbc1c9cdc723ef752d0dd1e7199a72a003759f62f64f9d9d3cfe916d38376f9f3a8817c95e1cfec9bb05da55a
+EBUILD flint-3.1.3_p1.ebuild 2093 BLAKE2B a7e288546940bc407d07a2f3d0147b89d57aeb2c709b2cfee58a24447a834140f87f513fe69355e5dfc139087af8344f42ded31e39875072b0a966d2a3206edf SHA512 eaa36ee26b3feffcba4220ed76c618b1f309aef29757a022e29c69494a4a01081f072ac6baa2342181d93adbb15fe585525a08e180ec3b0c45890da3729f0b22
 MISC metadata.xml 640 BLAKE2B b95d6f493564025e43604bffa340fffd88fcedf29c282fcc3c18e08ac089cdf1e10837787af664dd250a77a62237bf3665ff0a3045ca52680dd67aa0b39eeba7 SHA512 a9a64076e7f0df29e6a05a9d349c530a4ee4285b6a444425681eddf6ae1e8b41f610fda0bd7cc86b5177b36f34bc3072b67c7edac2cc8c0709a032b000576a14
diff --git a/sci-mathematics/flint/files/flint-2.9.0-remove-hardcoded-CFLAGS.patch b/sci-mathematics/flint/files/flint-2.9.0-remove-hardcoded-CFLAGS.patch
deleted file mode 100644
index b057ea207bbd..000000000000
--- a/sci-mathematics/flint/files/flint-2.9.0-remove-hardcoded-CFLAGS.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9784633c4..641ab9ed4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,5 @@
- cmake_minimum_required(VERSION 3.9)
- 
--include(CheckIPOSupported)
- include(CheckIncludeFiles)
- include(CheckFunctionExists)
- include(CheckPrototypeDefinition)
-@@ -126,13 +125,6 @@ with open(join('${CMAKE_SOURCE_DIR}','qadic', 'CPimport.txt')) as fin:
- )
- configure_file(${CMAKE_BINARY_DIR}/CPimport.h.in ${CMAKE_BINARY_DIR}/CPimport.h COPYONLY)
- 
--# Setup for flint-config.h
--check_c_compiler_flag("-mpopcnt" HAS_FLAG_MPOPCNT)
--check_c_compiler_flag("-funroll-loops" HAS_FLAG_UNROLL_LOOPS)
--
--if(HAS_FLAG_MPOPCNT)
--  set(CMAKE_REQUIRED_FLAGS "-mpopcnt")
--endif()
- # Testing __builtin_popcountl...
- check_c_source_runs([[int main(int argc, char ** argv) {
-   #if defined(_WIN64)
-@@ -141,7 +133,6 @@ check_c_source_runs([[int main(int argc, char ** argv) {
-   return __builtin_popcountl(argc) == 100;
-   #endif
-   }]] FLINT_USES_POPCNT)
--unset(CMAKE_REQUIRED_FLAGS)
- 
- # fenv configuration
- check_c_source_compiles([[#include <fenv.h>
-@@ -250,13 +241,6 @@ if(BUILD_SHARED_LIBS AND WIN32)
-     target_compile_definitions(flint PUBLIC "MSC_USE_DLL")
- endif()
- 
--if (HAS_FLAG_MPOPCNT)
--    target_compile_options(flint PUBLIC "-mpopcnt")
--endif()
--if (HAS_FLAG_UNROLL_LOOPS)
--    target_compile_options(flint PUBLIC "-funroll-loops")
--endif()
--
- # Versioning
- 
- set_target_properties(flint PROPERTIES
-@@ -279,21 +263,6 @@ elseif (WIN32)
-     set_target_properties(flint PROPERTIES RUNTIME_OUTPUT_NAME "flint-${FLINT_MAJOR}")
- endif()
- 
--if(NOT DEFINED IPO_SUPPORTED)
--    message(STATUS "Checking for IPO")
--    check_ipo_supported(RESULT ipo_supported LANGUAGES C)
--    if(ipo_supported)
--        message(STATUS "Checking for IPO - found")
--    else()
--        message(STATUS "Checking for IPO - not found")
--    endif()
--    set(IPO_SUPPORTED ${ipo_supported} CACHE INTERNAL "Introprocedural Optimization" FORCE)
--endif()
--
--if(IPO_SUPPORTED)
--    set_target_properties(flint PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
--endif()
--
- if(NOT MSVC)
- 	target_link_libraries(flint PUBLIC m)
- endif()
diff --git a/sci-mathematics/flint/files/flint-3.1.3_p1-c99-I.patch b/sci-mathematics/flint/files/flint-3.1.3_p1-c99-I.patch
new file mode 100644
index 000000000000..1ebe43d6243b
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-3.1.3_p1-c99-I.patch
@@ -0,0 +1,320 @@
+From 1b93e73d00881be12e04b7f13e070214a3c9e1cc Mon Sep 17 00:00:00 2001
+From: Dima Pasechnik <dima@pasechnik.info>
+Date: Wed, 19 Jun 2024 22:16:34 +0100
+Subject: [PATCH] ensure C99 compliance in headers, as 'I' is reserved
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Note that the following code
+---- cut here: save as t.c
+---- cut here
+
+fails to compile with a suffciently new compiler, e.g. clang 16 or gcc 14.
+
+$ gcc -c t.c
+In file included from t.c:1:
+/usr/include/flint/mpoly.h:1319:43: error: expected ‘)’ before ‘__extension__’
+ 1319 | void mpoly_gcd_info_init(mpoly_gcd_info_t I, slong nvars);
+      |                                           ^
+In file included from /usr/include/flint/fmpz_types.h:15,
+                 from /usr/include/flint/fmpz_mod_types.h:15,
+                 from /usr/include/flint/mpoly_types.h:15,
+                 from /usr/include/flint/mpoly.h:23,
+                 from t.c:2:
+/usr/include/flint/mpoly.h:1319:46: error: expected ‘;’, ‘,’ or ‘)’ before ‘mp_limb_signed_t’
+ 1319 | void mpoly_gcd_info_init(mpoly_gcd_info_t I, slong nvars);
+
+...
+---
+ src/fft_small.h             |  6 +++---
+ src/fmpz_mod_mpoly_factor.h |  8 ++++----
+ src/fmpz_mpoly.h            |  2 +-
+ src/fmpz_mpoly_factor.h     | 18 +++++++++---------
+ src/fq_nmod_mpoly_factor.h  |  6 +++---
+ src/fq_zech_mpoly_factor.h  |  6 +++---
+ src/mpoly.h                 | 18 +++++++++---------
+ src/nmod_mpoly.h            |  4 ++--
+ src/nmod_mpoly_factor.h     |  6 +++---
+ 9 files changed, 37 insertions(+), 37 deletions(-)
+
+diff --git a/src/fft_small.h b/src/fft_small.h
+index 3f62f2e988..b7404f196d 100644
+--- a/src/fft_small.h
++++ b/src/fft_small.h
+@@ -242,10 +242,10 @@ FLINT_INLINE double sd_fft_ctx_get_fft_index(double* d, ulong i)
+ }
+ 
+ /* sd_fft.c */
+-void sd_fft_trunc(const sd_fft_lctx_t Q, ulong I, ulong S, ulong k, ulong j, ulong itrunc, ulong otrunc);
++void sd_fft_trunc(const sd_fft_lctx_t Q, ulong Iv, ulong S, ulong k, ulong j, ulong itrunc, ulong otrunc);
+ 
+ /* sd_ifft.c */
+-void sd_ifft_trunc(const sd_fft_lctx_t Q, ulong I, ulong S, ulong k, ulong j, ulong z, ulong n, int f);
++void sd_ifft_trunc(const sd_fft_lctx_t Q, ulong Iv, ulong S, ulong k, ulong j, ulong z, ulong n, int f);
+ 
+ /* sd_fft_ctx.c */
+ void sd_fft_ctx_clear(sd_fft_ctx_t Q);
+@@ -428,7 +428,7 @@ typedef struct {
+ 
+ typedef mpn_ctx_struct mpn_ctx_t[1];
+ 
+-void _convert_block(ulong* Xs, sd_fft_ctx_struct* Rffts, double* d, ulong dstride, ulong np, ulong I);
++void _convert_block(ulong* Xs, sd_fft_ctx_struct* Rffts, double* d, ulong dstride, ulong np, ulong Iv);
+ ulong flint_mpn_nbits(const ulong* a, ulong an);
+ int flint_mpn_cmp_ui_2exp(const ulong* a, ulong an, ulong b, ulong e);
+ unsigned char flint_mpn_add_inplace_c(ulong* z, ulong zn, ulong* a, ulong an, unsigned char cf);
+diff --git a/src/fmpz_mod_mpoly_factor.h b/src/fmpz_mod_mpoly_factor.h
+index 359fdd1e3d..460695dd23 100644
+--- a/src/fmpz_mod_mpoly_factor.h
++++ b/src/fmpz_mod_mpoly_factor.h
+@@ -1203,15 +1203,15 @@ typedef struct {
+ typedef fmpz_mod_mpoly_pfrac_struct fmpz_mod_mpoly_pfrac_t[1];
+ 
+ 
+-int fmpz_mod_mpoly_pfrac_init(fmpz_mod_mpoly_pfrac_t I,
++int fmpz_mod_mpoly_pfrac_init(fmpz_mod_mpoly_pfrac_t Iv,
+     flint_bitcnt_t bits, slong l, slong r, const fmpz_mod_mpoly_struct * betas,
+                           const fmpz * alpha, const fmpz_mod_mpoly_ctx_t ctx);
+ 
+-void fmpz_mod_mpoly_pfrac_clear(fmpz_mod_mpoly_pfrac_t I,
++void fmpz_mod_mpoly_pfrac_clear(fmpz_mod_mpoly_pfrac_t Iv,
+                                               const fmpz_mod_mpoly_ctx_t ctx);
+ 
+ int fmpz_mod_mpoly_pfrac(slong r, fmpz_mod_mpoly_t t, const slong * deg,
+-                     fmpz_mod_mpoly_pfrac_t I, const fmpz_mod_mpoly_ctx_t ctx);
++                     fmpz_mod_mpoly_pfrac_t Iv, const fmpz_mod_mpoly_ctx_t ctx);
+ 
+ int fmpz_mod_mpoly_hlift(slong m, fmpz_mod_mpoly_struct * f, slong r,
+             const fmpz * alpha, const fmpz_mod_mpoly_t A, const slong * degs,
+@@ -1290,7 +1290,7 @@ int fmpz_mod_mpolyn_gcd_brown_smprime(
+     fmpz_mod_mpolyn_t B,
+     slong var,
+     const fmpz_mod_mpoly_ctx_t ctx,
+-    const mpoly_gcd_info_t I,
++    const mpoly_gcd_info_t Iv,
+     fmpz_mod_poly_polyun_mpolyn_stack_t St);
+ 
+ int fmpz_mod_mpolyl_gcdp_zippel(
+diff --git a/src/fmpz_mpoly.h b/src/fmpz_mpoly.h
+index b7c9677915..4be3d05c56 100644
+--- a/src/fmpz_mpoly.h
++++ b/src/fmpz_mpoly.h
+@@ -1084,7 +1084,7 @@ void fmpz_mpoly_vec_randtest_not_zero(fmpz_mpoly_vec_t vec, flint_rand_t state,
+ 
+ void fmpz_mpoly_spoly(fmpz_mpoly_t res, const fmpz_mpoly_t f, const fmpz_mpoly_t g, const fmpz_mpoly_ctx_t ctx);
+ void fmpz_mpoly_vec_set_primitive_unique(fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx);
+-void fmpz_mpoly_reduction_primitive_part(fmpz_mpoly_t res, const fmpz_mpoly_t f, const fmpz_mpoly_vec_t I, const fmpz_mpoly_ctx_t ctx);
++void fmpz_mpoly_reduction_primitive_part(fmpz_mpoly_t res, const fmpz_mpoly_t f, const fmpz_mpoly_vec_t Iv, const fmpz_mpoly_ctx_t ctx);
+ int fmpz_mpoly_vec_is_groebner(const fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx);
+ void fmpz_mpoly_buchberger_naive(fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx);
+ int fmpz_mpoly_buchberger_naive_with_limits(fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F,
+diff --git a/src/fmpz_mpoly_factor.h b/src/fmpz_mpoly_factor.h
+index 0da7c1052b..a04ef8021e 100644
+--- a/src/fmpz_mpoly_factor.h
++++ b/src/fmpz_mpoly_factor.h
+@@ -298,11 +298,11 @@ void fmpz_mpoly_from_mpolyl_perm_inflate(fmpz_mpoly_t A,
+ 
+ int fmpz_mpolyl_gcd_brown(fmpz_mpoly_t G,
+         fmpz_mpoly_t Abar, fmpz_mpoly_t Bbar, fmpz_mpoly_t A, fmpz_mpoly_t B,
+-                         const fmpz_mpoly_ctx_t ctx, const mpoly_gcd_info_t I);
++                         const fmpz_mpoly_ctx_t ctx, const mpoly_gcd_info_t Iv);
+ 
+ int fmpz_mpolyl_gcd_brown_threaded_pool(fmpz_mpoly_t G,
+         fmpz_mpoly_t Abar, fmpz_mpoly_t Bbar, fmpz_mpoly_t A, fmpz_mpoly_t B,
+-                         const fmpz_mpoly_ctx_t ctx, const mpoly_gcd_info_t I,
++                         const fmpz_mpoly_ctx_t ctx, const mpoly_gcd_info_t Iv,
+                         const thread_pool_handle * handles, slong num_handles);
+ 
+ int fmpz_mpolyl_gcd_zippel(fmpz_mpoly_t G, fmpz_mpoly_t Abar,
+@@ -340,15 +340,15 @@ typedef struct {
+ 
+ typedef fmpz_poly_pfrac_struct fmpz_poly_pfrac_t[1];
+ 
+-void fmpz_poly_pfrac_init(fmpz_poly_pfrac_t I);
++void fmpz_poly_pfrac_init(fmpz_poly_pfrac_t Iv);
+ 
+-void fmpz_poly_pfrac_clear(fmpz_poly_pfrac_t I);
++void fmpz_poly_pfrac_clear(fmpz_poly_pfrac_t Iv);
+ 
+-int fmpz_poly_pfrac_precompute(fmpz_poly_pfrac_t I,
++int fmpz_poly_pfrac_precompute(fmpz_poly_pfrac_t Iv,
+                                           const fmpz_poly_struct * b, slong r);
+ 
+ int fmpz_poly_pfrac_precomp(fmpz_poly_struct * c,
+-                                     const fmpz_poly_t A, fmpz_poly_pfrac_t I);
++                                     const fmpz_poly_t A, fmpz_poly_pfrac_t Iv);
+ 
+ typedef struct {
+     flint_bitcnt_t bits;
+@@ -372,15 +372,15 @@ typedef struct {
+ 
+ typedef fmpz_mpoly_pfrac_struct fmpz_mpoly_pfrac_t[1];
+ 
+-int fmpz_mpoly_pfrac_init(fmpz_mpoly_pfrac_t I, flint_bitcnt_t bits,
++int fmpz_mpoly_pfrac_init(fmpz_mpoly_pfrac_t Iv, flint_bitcnt_t bits,
+                             slong r, slong w, const fmpz_mpoly_struct * betas,
+                                const fmpz * alpha, const fmpz_mpoly_ctx_t ctx);
+ 
+-void fmpz_mpoly_pfrac_clear(fmpz_mpoly_pfrac_t I,
++void fmpz_mpoly_pfrac_clear(fmpz_mpoly_pfrac_t Iv,
+                                                    const fmpz_mpoly_ctx_t ctx);
+ 
+ int fmpz_mpoly_pfrac(slong l, fmpz_mpoly_t t, const slong * degs,
+-                             fmpz_mpoly_pfrac_t I, const fmpz_mpoly_ctx_t ctx);
++                             fmpz_mpoly_pfrac_t Iv, const fmpz_mpoly_ctx_t ctx);
+ 
+ int fmpz_mpoly_hlift(slong m, fmpz_mpoly_struct * f, slong r,
+                 const fmpz * alpha, const fmpz_mpoly_t A, const slong * degs,
+diff --git a/src/fq_nmod_mpoly_factor.h b/src/fq_nmod_mpoly_factor.h
+index 6289d3f1c5..29caa99aa4 100644
+--- a/src/fq_nmod_mpoly_factor.h
++++ b/src/fq_nmod_mpoly_factor.h
+@@ -427,7 +427,7 @@ typedef fq_nmod_mpoly_pfrac_struct fq_nmod_mpoly_pfrac_t[1];
+ 
+ 
+ int fq_nmod_mpoly_pfrac_init(
+-    fq_nmod_mpoly_pfrac_t I,
++    fq_nmod_mpoly_pfrac_t Iv,
+     flint_bitcnt_t bits,
+     slong l, slong r,
+     const fq_nmod_mpoly_struct * betas,
+@@ -435,14 +435,14 @@ int fq_nmod_mpoly_pfrac_init(
+     const fq_nmod_mpoly_ctx_t ctx);
+ 
+ void fq_nmod_mpoly_pfrac_clear(
+-    fq_nmod_mpoly_pfrac_t I,
++    fq_nmod_mpoly_pfrac_t Iv,
+     const fq_nmod_mpoly_ctx_t ctx);
+ 
+ int fq_nmod_mpoly_pfrac(
+     slong r,
+     fq_nmod_mpoly_t t,
+     const slong * deg,
+-    fq_nmod_mpoly_pfrac_t I,
++    fq_nmod_mpoly_pfrac_t Iv,
+     const fq_nmod_mpoly_ctx_t ctx);
+ 
+ int fq_nmod_mpoly_hlift(
+diff --git a/src/fq_zech_mpoly_factor.h b/src/fq_zech_mpoly_factor.h
+index 06f31369f9..3d3c51419f 100644
+--- a/src/fq_zech_mpoly_factor.h
++++ b/src/fq_zech_mpoly_factor.h
+@@ -652,7 +652,7 @@ typedef fq_zech_mpoly_pfrac_struct fq_zech_mpoly_pfrac_t[1];
+ 
+ 
+ int fq_zech_mpoly_pfrac_init(
+-    fq_zech_mpoly_pfrac_t I,
++    fq_zech_mpoly_pfrac_t Iv,
+     flint_bitcnt_t bits,
+     slong l, slong r,
+     const fq_zech_mpoly_struct * betas,
+@@ -660,14 +660,14 @@ int fq_zech_mpoly_pfrac_init(
+     const fq_zech_mpoly_ctx_t ctx);
+ 
+ void fq_zech_mpoly_pfrac_clear(
+-    fq_zech_mpoly_pfrac_t I,
++    fq_zech_mpoly_pfrac_t Iv,
+     const fq_zech_mpoly_ctx_t ctx);
+ 
+ int fq_zech_mpoly_pfrac(
+     slong r,
+     fq_zech_mpoly_t t,
+     const slong * deg,
+-    fq_zech_mpoly_pfrac_t I,
++    fq_zech_mpoly_pfrac_t Iv,
+     const fq_zech_mpoly_ctx_t ctx);
+ 
+ int fq_zech_mpoly_hlift(
+diff --git a/src/mpoly.h b/src/mpoly.h
+index b0950e3a48..fe0ccbe7c4 100644
+--- a/src/mpoly.h
++++ b/src/mpoly.h
+@@ -1363,9 +1363,9 @@ typedef struct
+ 
+ typedef mpoly_gcd_info_struct mpoly_gcd_info_t[1];
+ 
+-void mpoly_gcd_info_init(mpoly_gcd_info_t I, slong nvars);
++void mpoly_gcd_info_init(mpoly_gcd_info_t Iv, slong nvars);
+ 
+-void mpoly_gcd_info_clear(mpoly_gcd_info_t I);
++void mpoly_gcd_info_clear(mpoly_gcd_info_t Iv);
+ 
+ void mpoly_gcd_info_limits(ulong * Amax_exp, ulong * Amin_exp,
+                        slong * Amax_exp_count, slong * Amin_exp_count,
+@@ -1378,25 +1378,25 @@ void mpoly_gcd_info_stride(ulong * strides,
+                              const ulong * Bmax_exp, const ulong * Bmin_exp,
+                                                        const mpoly_ctx_t mctx);
+ 
+-void mpoly_gcd_info_set_perm(mpoly_gcd_info_t I,
++void mpoly_gcd_info_set_perm(mpoly_gcd_info_t Iv,
+                          slong Alength, slong Blength, const mpoly_ctx_t mctx);
+ 
+-slong mpoly_gcd_info_get_brown_upper_limit(const mpoly_gcd_info_t I,
++slong mpoly_gcd_info_get_brown_upper_limit(const mpoly_gcd_info_t Iv,
+                                                        slong var, slong bound);
+ 
+-void mpoly_gcd_info_measure_hensel(mpoly_gcd_info_t I,
++void mpoly_gcd_info_measure_hensel(mpoly_gcd_info_t Iv,
+                          slong Alength, slong Blength, const mpoly_ctx_t mctx);
+ 
+-void mpoly_gcd_info_measure_brown(mpoly_gcd_info_t I,
++void mpoly_gcd_info_measure_brown(mpoly_gcd_info_t Iv,
+                          slong Alength, slong Blength, const mpoly_ctx_t mctx);
+ 
+-void mpoly_gcd_info_measure_bma(mpoly_gcd_info_t I,
++void mpoly_gcd_info_measure_bma(mpoly_gcd_info_t Iv,
+                          slong Alength, slong Blength, const mpoly_ctx_t mctx);
+ 
+-void mpoly_gcd_info_measure_zippel(mpoly_gcd_info_t I,
++void mpoly_gcd_info_measure_zippel(mpoly_gcd_info_t Iv,
+                          slong Alength, slong Blength, const mpoly_ctx_t mctx);
+ 
+-void mpoly_gcd_info_measure_zippel2(mpoly_gcd_info_t I,
++void mpoly_gcd_info_measure_zippel2(mpoly_gcd_info_t Iv,
+                          slong Alength, slong Blength, const mpoly_ctx_t mctx);
+ 
+ int mpoly_monomial_cofactors(fmpz * Abarexps, fmpz * Bbarexps,
+diff --git a/src/nmod_mpoly.h b/src/nmod_mpoly.h
+index 2a8136e6eb..716ac9669a 100644
+--- a/src/nmod_mpoly.h
++++ b/src/nmod_mpoly.h
+@@ -1619,13 +1619,13 @@ int nmod_mpolyn_gcd_brown_smprime_bivar(
+ int nmod_mpolyn_gcd_brown_smprime(nmod_mpolyn_t G,
+                                   nmod_mpolyn_t Abar, nmod_mpolyn_t Bbar,
+                                  nmod_mpolyn_t A, nmod_mpolyn_t B, slong var,
+-                         const nmod_mpoly_ctx_t ctx, const mpoly_gcd_info_t I,
++                         const nmod_mpoly_ctx_t ctx, const mpoly_gcd_info_t Iv,
+                                                          nmod_poly_stack_t Sp);
+ 
+ int nmod_mpolyn_gcd_brown_smprime_threaded_pool(nmod_mpolyn_t G,
+                                 nmod_mpolyn_t Abar, nmod_mpolyn_t Bbar,
+                                nmod_mpolyn_t A, nmod_mpolyn_t B, slong var,
+-                         const nmod_mpoly_ctx_t ctx, const mpoly_gcd_info_t I,
++                         const nmod_mpoly_ctx_t ctx, const mpoly_gcd_info_t Iv,
+                         const thread_pool_handle * handles, slong num_workers);
+ 
+ int nmod_mpolyn_gcd_brown_lgprime(nmod_mpolyn_t G,
+diff --git a/src/nmod_mpoly_factor.h b/src/nmod_mpoly_factor.h
+index a46afc860f..b16c802b9b 100644
+--- a/src/nmod_mpoly_factor.h
++++ b/src/nmod_mpoly_factor.h
+@@ -362,15 +362,15 @@ typedef struct {
+ typedef nmod_mpoly_pfrac_struct nmod_mpoly_pfrac_t[1];
+ 
+ 
+-int nmod_mpoly_pfrac_init(nmod_mpoly_pfrac_t I, flint_bitcnt_t bits,
++int nmod_mpoly_pfrac_init(nmod_mpoly_pfrac_t Iv, flint_bitcnt_t bits,
+                          slong l, slong r, const nmod_mpoly_struct * betas,
+                           const mp_limb_t * alpha, const nmod_mpoly_ctx_t ctx);
+ 
+-void nmod_mpoly_pfrac_clear(nmod_mpoly_pfrac_t I,
++void nmod_mpoly_pfrac_clear(nmod_mpoly_pfrac_t Iv,
+                                                    const nmod_mpoly_ctx_t ctx);
+ 
+ int nmod_mpoly_pfrac(slong r, nmod_mpoly_t t, const slong * deg,
+-                             nmod_mpoly_pfrac_t I, const nmod_mpoly_ctx_t ctx);
++                             nmod_mpoly_pfrac_t Iv, const nmod_mpoly_ctx_t ctx);
+ 
+ int nmod_mpoly_hlift(slong m, nmod_mpoly_struct * f, slong r,
+             const mp_limb_t * alpha, const nmod_mpoly_t A, const slong * degs,
diff --git a/sci-mathematics/flint/flint-2.9.0.ebuild b/sci-mathematics/flint/flint-2.9.0.ebuild
deleted file mode 100644
index 8294eb140a41..000000000000
--- a/sci-mathematics/flint/flint-2.9.0.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
-
-# ninja doesn't like "-lcblas" so using make.
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake python-any-r1
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-
-# flintlib.org tarballs have been broken in the past, Bill Hart suggests
-# we get them from Github (which he has control over).
-SRC_URI="https://github.com/wbhart/flint2/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-
-# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
-SLOT="0/17"
-
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc ntl test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? (
-	dev-python/sphinx
-	app-text/texlive-core
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-	dev-tex/latexmk
-	)
-	${PYTHON_DEPS}"
-DEPEND="dev-libs/gmp:=
-	dev-libs/mpfr:=
-	ntl? ( dev-libs/ntl:= )
-	virtual/cblas"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/flint2-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-2.9.0-remove-hardcoded-CFLAGS.patch" )
-
-src_prepare() {
-	# https://github.com/wbhart/flint2/issues/1140
-	rm test/t-sdiv_qrnnd.c || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_NTL="$(usex ntl)"
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_DOCS="$(usex doc)"
-		-DCBLAS_INCLUDE_DIRS="${EPREFIX}/usr/include"
-		-DCBLAS_LIBRARIES="-lcblas"
-	)
-
-	cmake_src_configure
-
-	if use doc ; then
-		HTML_DOCS="${BUILD_DIR}/html/*"
-		DOCS=(
-			"${S}"/README
-			"${S}"/AUTHORS
-			"${S}"/NEWS
-			"${BUILD_DIR}"/latex/Flint.pdf
-		)
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc ; then
-		cmake_build html
-		cmake_build pdf
-	fi
-}
diff --git a/sci-mathematics/flint/flint-3.1.3_p1.ebuild b/sci-mathematics/flint/flint-3.1.3_p1.ebuild
new file mode 100644
index 000000000000..09d8ddd97e09
--- /dev/null
+++ b/sci-mathematics/flint/flint-3.1.3_p1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="https://www.flintlib.org/"
+
+MY_PV="${PV/_/-}"
+SRC_URI="https://github.com/flintlib/flint/archive/refs/tags/v${MY_PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+LICENSE="LGPL-2.1+"
+
+# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
+SLOT="0/19"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	doc? (
+		app-text/texlive-core
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+DEPEND="dev-libs/gmp:=
+	dev-libs/mpfr:=
+	ntl? ( dev-libs/ntl:= )
+	virtual/cblas"
+# flint 3 includes arb and arb cannot use flint 3.
+RDEPEND="${DEPEND}
+	!sci-mathematics/arb"
+
+# The rst files are API docs, but they're very low-effort compared to
+# the PDF and HTML docs, so we ship them unconditionally and hide only
+# the painful parts behind USE=doc.
+DOCS="AUTHORS README.md doc/source/*.rst"
+
+PATCHES=(
+	"${FILESDIR}/flint-3.0.1-find-cblas.patch"
+	"${FILESDIR}/flint-3.1.3_p1-c99-I.patch"
+)
+
+src_configure() {
+	# Test failures:
+	# * https://bugs.gentoo.org/934463
+	# * https://github.com/flintlib/flint/issues/2029
+	filter-flags -floop-nest-optimize \
+				 -ftree-loop-linear \
+				 -floop-strip-mine \
+				 -floop-block \
+				 -fgraphite-identity
+
+	local mycmakeargs=(
+		-DWITH_NTL="$(usex ntl)"
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_DOCS="$(usex doc)"
+	)
+
+	cmake_src_configure
+
+	if use doc; then
+		# Avoid the "html/_source" directory that will contain a copy of
+		# the rst sources we've already installed, and also avoid
+		# installing html/objects.inv.
+		HTML_DOCS="${BUILD_DIR}/html/*.html
+			${BUILD_DIR}/html/*.js
+			${BUILD_DIR}/html/_static"
+		DOCS+=" ${BUILD_DIR}/latex/Flint.pdf"
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cmake_build html
+		cmake_build pdf
+	fi
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 22466ed8b66c..a4ad2cb133a8 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index d674f20a1336..b0d81f0f8f2e 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -2,9 +2,9 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.48.tar.gz 250249 BLAKE2B 4d99d0562e268ad747562ee39cae645ea9221a705fb344969388d2f5f8e0597e62c12bda9dffe0d98eab6437aac0af2c873ad082ec8db01cd61e48b8637f421b SHA512 c67c0a1c87f44a6fde0a7634fcdff0683a821eef5183a4f3e1ef850d04dd7f6c23ec0a72b4a76d9f6c08cb34e362d5e204937caec549eadc638c286c2389c5ee
 DIST openrc-0.53.1.tar.gz 251312 BLAKE2B c44570b489621ac097f057dd25a9a7fd6274fc68c987d548a8c7ab49068bc2025375527c97b82b919ff955d27ce8e4110d6e8f0472abfd83b6911ea9e501198d SHA512 f4e53c28c62b8f184935387d3d8b30dea5953b28d7e50dc00a2b48d84fa3b0c9c19d27a9cdf0b9879b4e4b2a3f91604b893ad5178680e7af0bbbdbd00e108537
-DIST openrc-0.54.tar.gz 250242 BLAKE2B cdc420a3fa1733664eab0c556cb71712ecd1da17895aef6c77f229b3a9f9258b049c5f67d817a808253adb37afd0e65a276c7d89c77a64e3a1fd619f0a68e0ab SHA512 25a7c6b042608627b4cabb98208205c0cffafefcfa62ab4c7a6747a134583c3c6d54adcbb0d837cae6fbae5b082b964b60ebd1762e90efeae23a14bc5f1e348e
+DIST openrc-0.54.1.tar.gz 250301 BLAKE2B a63eb4e475c040c7e4f9bea87bbaa37b1c1ba180edff754b4bc6feb253710cf047d8f7f5f4ee4edf2296bc75c5ac5e7c827ef197b83a0147f84c563f3f4785ed SHA512 ef494704711e716b6937a335c3e12d3d7da6bfcacebb1a063060165fe95dbfb55cdb673e1512195b7b11477b86dfbc78d2411a1eacc016585e4b236dc9597f03
 EBUILD openrc-0.48.ebuild 4547 BLAKE2B e0fdbd7a9668d0b0cac96e67cae7c9ca05b995857a16784e9c71dc2504d9e9f546c08f5163ec9f18c93b641a1e3a8333d74df07659215bd8b11356a0d48640f7 SHA512 caca44a4aefe5fa61be9e023c14b80d65630db0fdea7e3ed76b31b33168dcfd38228c3c3599e8217cd76fdfb28f44536816efe9c2a90fb053960886c174fe044
 EBUILD openrc-0.53.1.ebuild 4543 BLAKE2B 27bbb8ff46608decda06ece2e8b73b0a1a63e81a4911dba4c89b345d3be01581798da274adbd19be16b03e2634547e660fa2ccb90994fa6b478ecd0ef07aeb3a SHA512 1c1d0c4f64e0fe9301f52283296f7089e96435f60a58a73d53b33b4381bb0ac276858b2f9155d3159ba6bb04b6c087fbaf44fe8b77eeddb0cd6a2cf59f109682
-EBUILD openrc-0.54.ebuild 4511 BLAKE2B afb10568dca77bb25cbca3a4f5349732ccc70bc0aee17479729eae6622d6531951e7ecbd5c4bdc4b298203a30e376656315f6309875d0c1057436b8560bd74f1 SHA512 8cde1a112fe8a7d0309a9e04d15ef0dc1f634976429683b48b2e8be4e0dc246d5fca46d264d1717f35121e648bfa01537eb6523f79da4a95c6bd3967c00722af
-EBUILD openrc-9999.ebuild 4519 BLAKE2B 7f9fbc6ac6a2caf7664701b9641cf78da1ede24467e9711c28c88595dabb6c7874d9aeee6b98e445458a37081c4a928f8478fd9f61a81ac4866615c31f3a4ce9 SHA512 86e20b46d42e07c0cde26536bdf5fdad9d7118a7f42446851b16c61395c96e584273901632435dc2cad40bce2fa07c10b015a8462f4f5d1f3b680e0f3f1bad8c
+EBUILD openrc-0.54.1.ebuild 4510 BLAKE2B 70a73c14a5ba399120525e4831eae7d7d159a2222be84b92dba1086c9a980f45afdfa882075972e8f511dde3de9cb58916c1033f0614cf55ece247645981c7f1 SHA512 6ed3fb8e714e62a960e25c55178d675c3520536414ad1301301be1ca4dc38a34d55b0744b3c02d7c18e866f02d2d3146a2efc10872da92c3f64a07276ff1a65c
+EBUILD openrc-9999.ebuild 4518 BLAKE2B 6cfa049a914cb5abe4db1a7e8af876d73a69b3240cf37d6545d58eb490e31b4a6effbcc8e4070c77c47f306823ce7f5200d9239f26630625969971368cf92ecf SHA512 55b2e22f787348c569f356b94748fc38542067ad84b8a45ad5aca2ae36f5c24ce62b4925d24db78adb423b8488c5d9affb74b2b84d715f81c22a4239160661ec
 MISC metadata.xml 842 BLAKE2B 696a5ccdf7eca47ac64ee7f317817a06d93664bcbaa3e94cc4420cc9452c97781d69b6b259350a4c5caf681c2e3394019f9f208eec661c861f3f6e3f5c214542 SHA512 dee510e527b885c19b57f5831081d47a422c88d65b7d50dc5c3e74c0a439ddbd1d1d87e241734d08e35a7551b500ab25d01f7a6be73e36dccde576df59974f36
diff --git a/sys-apps/openrc/openrc-0.54.ebuild b/sys-apps/openrc/openrc-0.54.1.ebuild
index e40c480c62b5..1bd6d7589105 100644
--- a/sys-apps/openrc/openrc-0.54.ebuild
+++ b/sys-apps/openrc/openrc-0.54.1.ebuild
@@ -54,7 +54,7 @@ src_configure() {
 	local emesonargs=(
 		$(meson_feature audit)
 		"-Dbranding=\"Gentoo Linux\""
-		$(meson_features caps capabilities)
+		$(meson_feature caps capabilities)
 		$(meson_use newnet)
 		-Dos=Linux
 		$(meson_use pam)
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index e66d97df2608..24d92426858e 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -54,7 +54,7 @@ src_configure() {
 	local emesonargs=(
 		$(meson_feature audit)
 		"-Dbranding=\"Gentoo Linux\""
-		$(meson_features caps capabilities)
+		$(meson_feature caps capabilities)
 		$(meson_use newnet)
 		-Dos=Linux
 		$(meson_use pam)
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 0c6ccdda947d..c694b72190e5 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -15,7 +15,7 @@ DIST systemd-stable-255.3.tar.gz 14873273 BLAKE2B e22ef391c691fcf1e765c5112e1a55
 DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
 DIST systemd-stable-255.6.tar.gz 15060034 BLAKE2B 27e14a870bd8ae85e3c7679a69b7dcd6f1165430c4cdea57d3f7092a40a22085bafc3e3e397a7429b53773f7460bde0ad0af9afb6852c6d0c9cc681d25c34c03 SHA512 523c5d973e2ccd47f8ba33d1fb8264a8de58cb639fab22be0d0854f96009dce700d6f022d30aad5ab7b9292b33047cbbc1eefc3c6141328e337b9a245944c237
 DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
-EBUILD systemd-254.10.ebuild 15377 BLAKE2B ce4888ff93d461cbd6822e5ccd22096f3768b5c4d0225b0abe1e3e61110dc7f683926fec396be0cdde08c34024b1cae10c31df897adee62d12a5aac68feda133 SHA512 51357d0ef5230863f21401c0898bdcdf92c9a38ffe91b56512e58bdeef20eadd1ebf663a347fa584e6ed28ce64c4a947fbcc66cbb7a4d1bf7ef0186e1ea967c5
+EBUILD systemd-254.10.ebuild 15376 BLAKE2B 80e1843bf35af94585e9675df47fdf42ad3706d09c9949067e2e15247384578154775549d623a9be2c3788c3a27bd23de61b85097708176873afa32aaf27212f SHA512 6fb5993e53a593b14a6e19bfce38961096cd258f588fdd958c62087b56fd653f12406815cefd98c2239d21c567a9716ed9e22be0f08b2397c0e9301341906ce6
 EBUILD systemd-254.12.ebuild 15384 BLAKE2B 2fd289f3f5c73c3e520a532965d488f15e4644e0a9e233e6f7a211ba1ed8d6cfa3eeb937fc8fd28850a2d8d6c0e9139816f87117046651ac1cc305453eb5938c SHA512 da1ead3fb668c74005111bedc03a77ab8a4047325d99c861baadfedd8dc901717730c8a95ef60c4f1381294a08147a90ffcc5046f8e1372685fc47d9a0d6755f
 EBUILD systemd-254.13.ebuild 15376 BLAKE2B 80e1843bf35af94585e9675df47fdf42ad3706d09c9949067e2e15247384578154775549d623a9be2c3788c3a27bd23de61b85097708176873afa32aaf27212f SHA512 6fb5993e53a593b14a6e19bfce38961096cd258f588fdd958c62087b56fd653f12406815cefd98c2239d21c567a9716ed9e22be0f08b2397c0e9301341906ce6
 EBUILD systemd-254.8-r1.ebuild 15496 BLAKE2B 5d5c93316937fa101ff4ded77c87b8e4930aa6464d596a0a251bf02afda1691fcd2b4660f9460c77c3a7bc66acc3b8cf34cbfd869a7723dd211751d4b3238ba1 SHA512 5ffa7ae4c92aeb3dd92ad18980bd7ee2661c1ab7ee02da23a2eed198c87e4e9edbfdd1aad4df7215618c13e711769fe37b07031778624b00c02619ca61de4a1c
diff --git a/sys-apps/systemd/systemd-254.10.ebuild b/sys-apps/systemd/systemd-254.10.ebuild
index 3b01f6ae67e4..4f86b3dc5b5e 100644
--- a/sys-apps/systemd/systemd-254.10.ebuild
+++ b/sys-apps/systemd/systemd-254.10.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	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"
 fi
 
 inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 32c0df446258..cebff8eaa385 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 144233f2786d..2589cbda0a0d 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -4,18 +4,14 @@ AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511
 DIST kubernetes-1.27.10.tar.gz 39183865 BLAKE2B 948197dbca1fd7d12d7d1947faa82b983189b9dc8f8af26f9b0ccf26629b7daa609b85c492dc977adc9a6e095f30bb38cafea9e1feb06aabba1847a364277af0 SHA512 cb0e2c9186d2d504c28a02b4a3e222b766fdc942226853b4669a505313abc2fef76ebdc36677ca8bf55bfbe5aaeafdc2e6fa053dbd85779eb824395bffa08060
 DIST kubernetes-1.27.12.tar.gz 39200862 BLAKE2B ce4112403399121bfd71ec61fe4c434a6a0b6a732f8abb965c213a2675a7ebf94b3fe8c4293917aaaaadadc1fecf98f0fb290a6c9758c27478a52efc52a426c8 SHA512 524138b1294e845d2bfd4e4f488abcf4aa9606df11c03019b09fe60bc35816c268251cadab4b657e129fddd795383b7b84ce181814780d6861dfdf1c51c59923
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
-DIST kubernetes-1.28.6.tar.gz 39955920 BLAKE2B d492139efad8328ee1024445e568e4b446af3ba7f9c39b748eb005198b6ad448eca71cd5ad698ba5dd1fcaef727b6b3884e7bfbad0cc8ae7b7cdfc858f8a712c SHA512 bdb20da05001c67418e9e9c6d2640b974a1690bbdad7d0ede6ab1577d9bca0e998802737ceccc023fd34fd2f0e63cc7b1b9c2a90ee7d24429f8109b9393d7551
 DIST kubernetes-1.28.8.tar.gz 39978242 BLAKE2B 3e2aaa7e79ccb5f9f71be0e6c33b58237d297b79cd4f5d5bb4b09e7196d933dcb2aa8cafb9e74360e204116c8684a7263ac4db6dc257adc77a98d31c22a502e8 SHA512 2bbc48394784b34712c6b419cd07971780410223e7015c5fe6ed2c25c4e9499e81c9ea1f4269d399fd7e908971f5b8e873595d2b67332f7b49f61a5411a2aed1
-DIST kubernetes-1.29.1.tar.gz 41130463 BLAKE2B d75807ec1b0ee92f7f91f985b10c37ebd352286d12a25b08fa2ad71e54f45e51aba49967a268b996932f421fd4163bd8815b4abef1aeb3776576ca76f2dc1779 SHA512 aee9da0fb1da355cbcdc9db584d99969c13cf8c4fce669f209b6e309cf059556f2820e66a90e8ea09dd56d7c289c6a9cb2bf817e2d260220c77d0a9cd2a4850a
 DIST kubernetes-1.29.3.tar.gz 41151982 BLAKE2B 6eec9ee21caa2da737185f64a1fa49fda6ad914e9f1cb0c9fd8f0e43d6eaec1e2efaa23bcbbf06c116d554ace1eaef98ff2e9db409487b2317f631768d79b54f SHA512 853b7d38c850780a5e39fcb817012b35eea91b62d055f6611aba8f14cd7f6c176a047dc7e79ecc11d3bd7815f3ececb26b8e5d419124c03c4aecf6f0670ca603
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 EBUILD kube-apiserver-1.27.10.ebuild 1009 BLAKE2B 519c563cb72b057e2537293e2b36161a390dd403229b833290b1f3c870e5fbad4bd18c1df387129268a5e2ce250ff8ef15720799e673c5081bc0154e54458c42 SHA512 5320d764c9f02cf6f93cce0c8a8a1716a6df7a339b3074879fbf83887a0ffbfd97c8f2016249c3967eea4d87ec75767c48a89f0f27ae752ad00d69fd8ab1ecb8
 EBUILD kube-apiserver-1.27.12.ebuild 1009 BLAKE2B 519c563cb72b057e2537293e2b36161a390dd403229b833290b1f3c870e5fbad4bd18c1df387129268a5e2ce250ff8ef15720799e673c5081bc0154e54458c42 SHA512 5320d764c9f02cf6f93cce0c8a8a1716a6df7a339b3074879fbf83887a0ffbfd97c8f2016249c3967eea4d87ec75767c48a89f0f27ae752ad00d69fd8ab1ecb8
 EBUILD kube-apiserver-1.28.11.ebuild 1012 BLAKE2B 221d54edfdfcf3c03199b9afeb99271c35c9ea0bed9a4b63e32a869861931440501636f298c8a54bd3104edbf059a309547163d37f8b4c1903c92b092bf3d549 SHA512 d2a8f78b1dfc50294fc8c25d750bee92001c678941d3c61c1df5ecbabb1c19fbf2d4834da91a1ffd4f21f50d6a6a7400683b7c5bee73e914239785468edf5612
-EBUILD kube-apiserver-1.28.6.ebuild 1011 BLAKE2B b9b690506e1fa8144d04629569261617662fa79c6ef9642eb3653f08ffbf9b607507d3ab0215e61422c2a9092edd5195dbbd5a3f94129de8b804ed2b022b601c SHA512 33a20363d21b508a277b7afb8170a80da493f6c7da0f064d4bb123a283376279ad349148fa4b610f560b8e945ce714f8ef192b71e19d837fe131e01d2fd5ff57
 EBUILD kube-apiserver-1.28.8.ebuild 1011 BLAKE2B b9b690506e1fa8144d04629569261617662fa79c6ef9642eb3653f08ffbf9b607507d3ab0215e61422c2a9092edd5195dbbd5a3f94129de8b804ed2b022b601c SHA512 33a20363d21b508a277b7afb8170a80da493f6c7da0f064d4bb123a283376279ad349148fa4b610f560b8e945ce714f8ef192b71e19d837fe131e01d2fd5ff57
-EBUILD kube-apiserver-1.29.1.ebuild 1011 BLAKE2B b9b690506e1fa8144d04629569261617662fa79c6ef9642eb3653f08ffbf9b607507d3ab0215e61422c2a9092edd5195dbbd5a3f94129de8b804ed2b022b601c SHA512 33a20363d21b508a277b7afb8170a80da493f6c7da0f064d4bb123a283376279ad349148fa4b610f560b8e945ce714f8ef192b71e19d837fe131e01d2fd5ff57
 EBUILD kube-apiserver-1.29.3.ebuild 1011 BLAKE2B b9b690506e1fa8144d04629569261617662fa79c6ef9642eb3653f08ffbf9b607507d3ab0215e61422c2a9092edd5195dbbd5a3f94129de8b804ed2b022b601c SHA512 33a20363d21b508a277b7afb8170a80da493f6c7da0f064d4bb123a283376279ad349148fa4b610f560b8e945ce714f8ef192b71e19d837fe131e01d2fd5ff57
 EBUILD kube-apiserver-1.29.6.ebuild 1014 BLAKE2B e1a16fab69deb688ffffef185f286ce05480f66d4f94bd924431b706b5568f6ba307658e5751159d9adc47b45db7d54586b0d60e118aa09c46d5e8b63fb3235c SHA512 818810b629502cbaa057bec3dfd6711417c3db3e57613df5554e4f2eca502601e49d5fd6bbbaa356b141d1be539b471e79dbb1e6145590ad2063b74546a8479a
 EBUILD kube-apiserver-1.30.2.ebuild 1014 BLAKE2B 9d5ed496a96d9cf0b689d96723c0950c48e7fed440f883ded9c9e62ca21120ee0f9e4364d2bdfed11061eba34232a6922d2b9f6123bd84ed6f40e32fa16eae6e SHA512 450a54b7ddd910aee02d7b100111c89e67de4dcdb96d08d6796da3ef5d77af989fdf0f289f51b7fbea81bbbe89b4a3ce5fb3d976f14843eb277e7fa7fd42f84a
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.28.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.28.6.ebuild
deleted file mode 100644
index 6a3a360634ba..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.28.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.20"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.29.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.29.1.ebuild
deleted file mode 100644
index 6a3a360634ba..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.29.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="
-	acct-group/kube-apiserver
-	acct-user/kube-apiserver"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.20"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index c81abcaeaffb..dfe12f1a9bbf 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -4,18 +4,14 @@ AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcd
 DIST kubernetes-1.27.10.tar.gz 39183865 BLAKE2B 948197dbca1fd7d12d7d1947faa82b983189b9dc8f8af26f9b0ccf26629b7daa609b85c492dc977adc9a6e095f30bb38cafea9e1feb06aabba1847a364277af0 SHA512 cb0e2c9186d2d504c28a02b4a3e222b766fdc942226853b4669a505313abc2fef76ebdc36677ca8bf55bfbe5aaeafdc2e6fa053dbd85779eb824395bffa08060
 DIST kubernetes-1.27.12.tar.gz 39200862 BLAKE2B ce4112403399121bfd71ec61fe4c434a6a0b6a732f8abb965c213a2675a7ebf94b3fe8c4293917aaaaadadc1fecf98f0fb290a6c9758c27478a52efc52a426c8 SHA512 524138b1294e845d2bfd4e4f488abcf4aa9606df11c03019b09fe60bc35816c268251cadab4b657e129fddd795383b7b84ce181814780d6861dfdf1c51c59923
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
-DIST kubernetes-1.28.6.tar.gz 39955920 BLAKE2B d492139efad8328ee1024445e568e4b446af3ba7f9c39b748eb005198b6ad448eca71cd5ad698ba5dd1fcaef727b6b3884e7bfbad0cc8ae7b7cdfc858f8a712c SHA512 bdb20da05001c67418e9e9c6d2640b974a1690bbdad7d0ede6ab1577d9bca0e998802737ceccc023fd34fd2f0e63cc7b1b9c2a90ee7d24429f8109b9393d7551
 DIST kubernetes-1.28.8.tar.gz 39978242 BLAKE2B 3e2aaa7e79ccb5f9f71be0e6c33b58237d297b79cd4f5d5bb4b09e7196d933dcb2aa8cafb9e74360e204116c8684a7263ac4db6dc257adc77a98d31c22a502e8 SHA512 2bbc48394784b34712c6b419cd07971780410223e7015c5fe6ed2c25c4e9499e81c9ea1f4269d399fd7e908971f5b8e873595d2b67332f7b49f61a5411a2aed1
-DIST kubernetes-1.29.1.tar.gz 41130463 BLAKE2B d75807ec1b0ee92f7f91f985b10c37ebd352286d12a25b08fa2ad71e54f45e51aba49967a268b996932f421fd4163bd8815b4abef1aeb3776576ca76f2dc1779 SHA512 aee9da0fb1da355cbcdc9db584d99969c13cf8c4fce669f209b6e309cf059556f2820e66a90e8ea09dd56d7c289c6a9cb2bf817e2d260220c77d0a9cd2a4850a
 DIST kubernetes-1.29.3.tar.gz 41151982 BLAKE2B 6eec9ee21caa2da737185f64a1fa49fda6ad914e9f1cb0c9fd8f0e43d6eaec1e2efaa23bcbbf06c116d554ace1eaef98ff2e9db409487b2317f631768d79b54f SHA512 853b7d38c850780a5e39fcb817012b35eea91b62d055f6611aba8f14cd7f6c176a047dc7e79ecc11d3bd7815f3ececb26b8e5d419124c03c4aecf6f0670ca603
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 EBUILD kube-controller-manager-1.27.10.ebuild 1006 BLAKE2B 58607bd89a2da4038c25b14d82b620a2476c6251fcb0e3fa871fed8f14eda722713d3f25e4a4b06a5c6dd6780f12053a5822f382f5db27fbb938c603f8ba9dca SHA512 32b5589c93d0691b0e6be331f15840565fbbecc157aa1cc2d8f4144f5234d140012b284c302214b33c0af4688d02d481305ce227b39ae19e6f84649816da50eb
 EBUILD kube-controller-manager-1.27.12.ebuild 1006 BLAKE2B 58607bd89a2da4038c25b14d82b620a2476c6251fcb0e3fa871fed8f14eda722713d3f25e4a4b06a5c6dd6780f12053a5822f382f5db27fbb938c603f8ba9dca SHA512 32b5589c93d0691b0e6be331f15840565fbbecc157aa1cc2d8f4144f5234d140012b284c302214b33c0af4688d02d481305ce227b39ae19e6f84649816da50eb
 EBUILD kube-controller-manager-1.28.11.ebuild 1013 BLAKE2B 1da7acccda20c292bb49ff832f890dfb650e194caf95b4f3d9ed8306e3827593e4afe50ea1f265e0beccd19ebe7a506f03e644c92996006289bea9e1bd8da36f SHA512 103de0ea609a5b09e1201e960ebd6450b3388a410cc3350c20aba94c4534e9484c12a95e57ba46232e6e2aa6c1dfd651495d1a1c556a4c8d0af638fe0d762a18
-EBUILD kube-controller-manager-1.28.6.ebuild 1010 BLAKE2B 27f28d54669eb80158f0252478fe792179490447e7e8661986923048036f7db819e90d6aa42b610ae9d1f6e2bd641e8e3e331a3cda831da18257410796c8e673 SHA512 1c28a5098163c26f3e0833f7db443b396519e7505fb8d067853874807ad10d33fb5575547cc8843221794e6761194d495716524cc9ed1b25c7db1b60b7749605
 EBUILD kube-controller-manager-1.28.8.ebuild 1010 BLAKE2B 27f28d54669eb80158f0252478fe792179490447e7e8661986923048036f7db819e90d6aa42b610ae9d1f6e2bd641e8e3e331a3cda831da18257410796c8e673 SHA512 1c28a5098163c26f3e0833f7db443b396519e7505fb8d067853874807ad10d33fb5575547cc8843221794e6761194d495716524cc9ed1b25c7db1b60b7749605
-EBUILD kube-controller-manager-1.29.1.ebuild 1010 BLAKE2B 27f28d54669eb80158f0252478fe792179490447e7e8661986923048036f7db819e90d6aa42b610ae9d1f6e2bd641e8e3e331a3cda831da18257410796c8e673 SHA512 1c28a5098163c26f3e0833f7db443b396519e7505fb8d067853874807ad10d33fb5575547cc8843221794e6761194d495716524cc9ed1b25c7db1b60b7749605
 EBUILD kube-controller-manager-1.29.3.ebuild 1010 BLAKE2B 27f28d54669eb80158f0252478fe792179490447e7e8661986923048036f7db819e90d6aa42b610ae9d1f6e2bd641e8e3e331a3cda831da18257410796c8e673 SHA512 1c28a5098163c26f3e0833f7db443b396519e7505fb8d067853874807ad10d33fb5575547cc8843221794e6761194d495716524cc9ed1b25c7db1b60b7749605
 EBUILD kube-controller-manager-1.29.6.ebuild 1013 BLAKE2B 1da7acccda20c292bb49ff832f890dfb650e194caf95b4f3d9ed8306e3827593e4afe50ea1f265e0beccd19ebe7a506f03e644c92996006289bea9e1bd8da36f SHA512 103de0ea609a5b09e1201e960ebd6450b3388a410cc3350c20aba94c4534e9484c12a95e57ba46232e6e2aa6c1dfd651495d1a1c556a4c8d0af638fe0d762a18
 EBUILD kube-controller-manager-1.30.2.ebuild 1013 BLAKE2B 3f357a3dd2cedb979cf719ac72002ece4d94bbbfe92a2e8659a0d7b472c2005dde0576f5a6edda2fd9893b0eda22c79f69dd3a96d1df6a6cab69e82d9e06386d SHA512 0da7657b7cef2b73fe0f1b5d0f4f1af78b3c0b460cc73678358bd34fad0e892a0649bdf62dfbf9c0724a7339c1bb4a19d450f7692e59c0ef251894e81962fe34
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.6.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.6.ebuild
deleted file mode 100644
index 4254435b542c..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.20"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.1.ebuild
deleted file mode 100644
index 4254435b542c..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.29.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-controller-manager
-	acct-user/kube-controller-manager"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.20"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index b7878f139c73..753ea4a0b7f4 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -4,18 +4,14 @@ AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528
 DIST kubernetes-1.27.10.tar.gz 39183865 BLAKE2B 948197dbca1fd7d12d7d1947faa82b983189b9dc8f8af26f9b0ccf26629b7daa609b85c492dc977adc9a6e095f30bb38cafea9e1feb06aabba1847a364277af0 SHA512 cb0e2c9186d2d504c28a02b4a3e222b766fdc942226853b4669a505313abc2fef76ebdc36677ca8bf55bfbe5aaeafdc2e6fa053dbd85779eb824395bffa08060
 DIST kubernetes-1.27.12.tar.gz 39200862 BLAKE2B ce4112403399121bfd71ec61fe4c434a6a0b6a732f8abb965c213a2675a7ebf94b3fe8c4293917aaaaadadc1fecf98f0fb290a6c9758c27478a52efc52a426c8 SHA512 524138b1294e845d2bfd4e4f488abcf4aa9606df11c03019b09fe60bc35816c268251cadab4b657e129fddd795383b7b84ce181814780d6861dfdf1c51c59923
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
-DIST kubernetes-1.28.6.tar.gz 39955920 BLAKE2B d492139efad8328ee1024445e568e4b446af3ba7f9c39b748eb005198b6ad448eca71cd5ad698ba5dd1fcaef727b6b3884e7bfbad0cc8ae7b7cdfc858f8a712c SHA512 bdb20da05001c67418e9e9c6d2640b974a1690bbdad7d0ede6ab1577d9bca0e998802737ceccc023fd34fd2f0e63cc7b1b9c2a90ee7d24429f8109b9393d7551
 DIST kubernetes-1.28.8.tar.gz 39978242 BLAKE2B 3e2aaa7e79ccb5f9f71be0e6c33b58237d297b79cd4f5d5bb4b09e7196d933dcb2aa8cafb9e74360e204116c8684a7263ac4db6dc257adc77a98d31c22a502e8 SHA512 2bbc48394784b34712c6b419cd07971780410223e7015c5fe6ed2c25c4e9499e81c9ea1f4269d399fd7e908971f5b8e873595d2b67332f7b49f61a5411a2aed1
-DIST kubernetes-1.29.1.tar.gz 41130463 BLAKE2B d75807ec1b0ee92f7f91f985b10c37ebd352286d12a25b08fa2ad71e54f45e51aba49967a268b996932f421fd4163bd8815b4abef1aeb3776576ca76f2dc1779 SHA512 aee9da0fb1da355cbcdc9db584d99969c13cf8c4fce669f209b6e309cf059556f2820e66a90e8ea09dd56d7c289c6a9cb2bf817e2d260220c77d0a9cd2a4850a
 DIST kubernetes-1.29.3.tar.gz 41151982 BLAKE2B 6eec9ee21caa2da737185f64a1fa49fda6ad914e9f1cb0c9fd8f0e43d6eaec1e2efaa23bcbbf06c116d554ace1eaef98ff2e9db409487b2317f631768d79b54f SHA512 853b7d38c850780a5e39fcb817012b35eea91b62d055f6611aba8f14cd7f6c176a047dc7e79ecc11d3bd7815f3ececb26b8e5d419124c03c4aecf6f0670ca603
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 EBUILD kube-proxy-1.27.10.ebuild 921 BLAKE2B 72677413931b8e95222f2b2040002ce861bafd86219ede2e3135ba93df7360cfbf4c4722d7cb65bd2f39f48079136d030a3605a16cb0d105a578b07567742f04 SHA512 61d45d2071e0ead0d09efa33b04b2b8b426e276975f6443374ee741c469053e3c070e83bd619f44522b3b6ee8e312238f66a1d237833d8fbb7e2ae65c26d1452
 EBUILD kube-proxy-1.27.12.ebuild 921 BLAKE2B 72677413931b8e95222f2b2040002ce861bafd86219ede2e3135ba93df7360cfbf4c4722d7cb65bd2f39f48079136d030a3605a16cb0d105a578b07567742f04 SHA512 61d45d2071e0ead0d09efa33b04b2b8b426e276975f6443374ee741c469053e3c070e83bd619f44522b3b6ee8e312238f66a1d237833d8fbb7e2ae65c26d1452
 EBUILD kube-proxy-1.28.11.ebuild 928 BLAKE2B 5e1964735d27c898c394f89b2a7db618a3b4594ab9174ed1721f33866cd47382aae9aade4bd3f04328c58584dedfe1d2f04720c20c1024cb7ba9b39ef8ed6a4e SHA512 1c8038bf98a19aa17d340826d03aa128b96e662f87f6cb7a4211957dcb9c512e45bc3bfa64d711299f9e3b2c24f0080d5dc1f73762459bd207216103f65ce883
-EBUILD kube-proxy-1.28.6.ebuild 925 BLAKE2B 62a73d830ca7eea424ab3cb24bb51fd176370099bb999c0e4ba39230c477b5a15e6f799eda5ced50fe78ad18329dd93320a3ab02d6ca7a9a2841fd96c747e6b2 SHA512 5435127fe07cb68da754ba9491895949b3e58422c0e0fd2ef4fd7ba69dcdfe86e30e7ed21b92cae42ce9051ec27265f9fc2353b36b8d7356a4abd024c0b0ba36
 EBUILD kube-proxy-1.28.8.ebuild 925 BLAKE2B 62a73d830ca7eea424ab3cb24bb51fd176370099bb999c0e4ba39230c477b5a15e6f799eda5ced50fe78ad18329dd93320a3ab02d6ca7a9a2841fd96c747e6b2 SHA512 5435127fe07cb68da754ba9491895949b3e58422c0e0fd2ef4fd7ba69dcdfe86e30e7ed21b92cae42ce9051ec27265f9fc2353b36b8d7356a4abd024c0b0ba36
-EBUILD kube-proxy-1.29.1.ebuild 925 BLAKE2B 62a73d830ca7eea424ab3cb24bb51fd176370099bb999c0e4ba39230c477b5a15e6f799eda5ced50fe78ad18329dd93320a3ab02d6ca7a9a2841fd96c747e6b2 SHA512 5435127fe07cb68da754ba9491895949b3e58422c0e0fd2ef4fd7ba69dcdfe86e30e7ed21b92cae42ce9051ec27265f9fc2353b36b8d7356a4abd024c0b0ba36
 EBUILD kube-proxy-1.29.3.ebuild 925 BLAKE2B 62a73d830ca7eea424ab3cb24bb51fd176370099bb999c0e4ba39230c477b5a15e6f799eda5ced50fe78ad18329dd93320a3ab02d6ca7a9a2841fd96c747e6b2 SHA512 5435127fe07cb68da754ba9491895949b3e58422c0e0fd2ef4fd7ba69dcdfe86e30e7ed21b92cae42ce9051ec27265f9fc2353b36b8d7356a4abd024c0b0ba36
 EBUILD kube-proxy-1.29.6.ebuild 928 BLAKE2B 5e1964735d27c898c394f89b2a7db618a3b4594ab9174ed1721f33866cd47382aae9aade4bd3f04328c58584dedfe1d2f04720c20c1024cb7ba9b39ef8ed6a4e SHA512 1c8038bf98a19aa17d340826d03aa128b96e662f87f6cb7a4211957dcb9c512e45bc3bfa64d711299f9e3b2c24f0080d5dc1f73762459bd207216103f65ce883
 EBUILD kube-proxy-1.30.2.ebuild 928 BLAKE2B 2a8359b85be090f5fa93729e65223ceef317f49aed0f560d0560d8a8c484e8a39f81a041701c53783dc5052bd4d40ef1aed44ecf8a36d603ff969f90b8b31ef2 SHA512 c673a8b1a463f7aaab6f2885787823f9d64d2fdb84054ba086d8c4522aa7cf80cbf0e65e0dbb94c0e7f019b882318e1602963109dc9d5c47458e19a3a0a26a51
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.28.6.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.28.6.ebuild
deleted file mode 100644
index 03d23c9c0a7b..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.28.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.20"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.29.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.29.1.ebuild
deleted file mode 100644
index 03d23c9c0a7b..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.29.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-RDEPEND="net-firewall/conntrack-tools"
-BDEPEND=">=dev-lang/go-1.20"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 1c288e9df079..5b698fc64c01 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -4,18 +4,14 @@ AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a
 DIST kubernetes-1.27.10.tar.gz 39183865 BLAKE2B 948197dbca1fd7d12d7d1947faa82b983189b9dc8f8af26f9b0ccf26629b7daa609b85c492dc977adc9a6e095f30bb38cafea9e1feb06aabba1847a364277af0 SHA512 cb0e2c9186d2d504c28a02b4a3e222b766fdc942226853b4669a505313abc2fef76ebdc36677ca8bf55bfbe5aaeafdc2e6fa053dbd85779eb824395bffa08060
 DIST kubernetes-1.27.12.tar.gz 39200862 BLAKE2B ce4112403399121bfd71ec61fe4c434a6a0b6a732f8abb965c213a2675a7ebf94b3fe8c4293917aaaaadadc1fecf98f0fb290a6c9758c27478a52efc52a426c8 SHA512 524138b1294e845d2bfd4e4f488abcf4aa9606df11c03019b09fe60bc35816c268251cadab4b657e129fddd795383b7b84ce181814780d6861dfdf1c51c59923
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
-DIST kubernetes-1.28.6.tar.gz 39955920 BLAKE2B d492139efad8328ee1024445e568e4b446af3ba7f9c39b748eb005198b6ad448eca71cd5ad698ba5dd1fcaef727b6b3884e7bfbad0cc8ae7b7cdfc858f8a712c SHA512 bdb20da05001c67418e9e9c6d2640b974a1690bbdad7d0ede6ab1577d9bca0e998802737ceccc023fd34fd2f0e63cc7b1b9c2a90ee7d24429f8109b9393d7551
 DIST kubernetes-1.28.8.tar.gz 39978242 BLAKE2B 3e2aaa7e79ccb5f9f71be0e6c33b58237d297b79cd4f5d5bb4b09e7196d933dcb2aa8cafb9e74360e204116c8684a7263ac4db6dc257adc77a98d31c22a502e8 SHA512 2bbc48394784b34712c6b419cd07971780410223e7015c5fe6ed2c25c4e9499e81c9ea1f4269d399fd7e908971f5b8e873595d2b67332f7b49f61a5411a2aed1
-DIST kubernetes-1.29.1.tar.gz 41130463 BLAKE2B d75807ec1b0ee92f7f91f985b10c37ebd352286d12a25b08fa2ad71e54f45e51aba49967a268b996932f421fd4163bd8815b4abef1aeb3776576ca76f2dc1779 SHA512 aee9da0fb1da355cbcdc9db584d99969c13cf8c4fce669f209b6e309cf059556f2820e66a90e8ea09dd56d7c289c6a9cb2bf817e2d260220c77d0a9cd2a4850a
 DIST kubernetes-1.29.3.tar.gz 41151982 BLAKE2B 6eec9ee21caa2da737185f64a1fa49fda6ad914e9f1cb0c9fd8f0e43d6eaec1e2efaa23bcbbf06c116d554ace1eaef98ff2e9db409487b2317f631768d79b54f SHA512 853b7d38c850780a5e39fcb817012b35eea91b62d055f6611aba8f14cd7f6c176a047dc7e79ecc11d3bd7815f3ececb26b8e5d419124c03c4aecf6f0670ca603
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 EBUILD kube-scheduler-1.27.10.ebuild 979 BLAKE2B 73352dc72a743762119276f41f8a08b297182f69ca615df65650872df2eb24c5d1afae59944b35f21d40935261bb5aec76cc7a67607d7faed77e7cf157bf9e8d SHA512 5f94f037ea278455eca950a533b980d62cea77f324a8300fe8b3aaa61224d825a02f797ab8c28895a0f9e3007acc7eb34a0e0e9b6040049039e2c3d3390dba7f
 EBUILD kube-scheduler-1.27.12.ebuild 979 BLAKE2B 73352dc72a743762119276f41f8a08b297182f69ca615df65650872df2eb24c5d1afae59944b35f21d40935261bb5aec76cc7a67607d7faed77e7cf157bf9e8d SHA512 5f94f037ea278455eca950a533b980d62cea77f324a8300fe8b3aaa61224d825a02f797ab8c28895a0f9e3007acc7eb34a0e0e9b6040049039e2c3d3390dba7f
 EBUILD kube-scheduler-1.28.11.ebuild 986 BLAKE2B 3294a84c4b36ef5c2ded7a2d10318c11887287be94020b4ef3254d1b8ae03d4051138e60ee3c7e87225c788336326ffc322b14e56334fb22fc31525bae131107 SHA512 2a17958304758c996a7fcfef9e6b383a571c162448d15b98be1f2848987b0963d446a182514e3907c24e3444cbe405145937c4e45b2ca13fa067eb7fa65ee537
-EBUILD kube-scheduler-1.28.6.ebuild 983 BLAKE2B 55b8a468574f6906fc2f7c1b615f6df390f8081b914dd42156f1d7a4d5701a6326ec79a8a7230daf1fe03b9fbef7a6d540e01d3fa53082d008afdb592e677355 SHA512 d83ff295f89558f4c42d9170706a32ed5c4b474720f78eaea12d7a972fdcdf07c0008a8c32fb19cdf569a71f29865b737d4303d469b1ca45928a6ca11efcc455
 EBUILD kube-scheduler-1.28.8.ebuild 983 BLAKE2B 55b8a468574f6906fc2f7c1b615f6df390f8081b914dd42156f1d7a4d5701a6326ec79a8a7230daf1fe03b9fbef7a6d540e01d3fa53082d008afdb592e677355 SHA512 d83ff295f89558f4c42d9170706a32ed5c4b474720f78eaea12d7a972fdcdf07c0008a8c32fb19cdf569a71f29865b737d4303d469b1ca45928a6ca11efcc455
-EBUILD kube-scheduler-1.29.1.ebuild 983 BLAKE2B 55b8a468574f6906fc2f7c1b615f6df390f8081b914dd42156f1d7a4d5701a6326ec79a8a7230daf1fe03b9fbef7a6d540e01d3fa53082d008afdb592e677355 SHA512 d83ff295f89558f4c42d9170706a32ed5c4b474720f78eaea12d7a972fdcdf07c0008a8c32fb19cdf569a71f29865b737d4303d469b1ca45928a6ca11efcc455
 EBUILD kube-scheduler-1.29.3.ebuild 983 BLAKE2B 55b8a468574f6906fc2f7c1b615f6df390f8081b914dd42156f1d7a4d5701a6326ec79a8a7230daf1fe03b9fbef7a6d540e01d3fa53082d008afdb592e677355 SHA512 d83ff295f89558f4c42d9170706a32ed5c4b474720f78eaea12d7a972fdcdf07c0008a8c32fb19cdf569a71f29865b737d4303d469b1ca45928a6ca11efcc455
 EBUILD kube-scheduler-1.29.6.ebuild 986 BLAKE2B 3294a84c4b36ef5c2ded7a2d10318c11887287be94020b4ef3254d1b8ae03d4051138e60ee3c7e87225c788336326ffc322b14e56334fb22fc31525bae131107 SHA512 2a17958304758c996a7fcfef9e6b383a571c162448d15b98be1f2848987b0963d446a182514e3907c24e3444cbe405145937c4e45b2ca13fa067eb7fa65ee537
 EBUILD kube-scheduler-1.30.2.ebuild 986 BLAKE2B 31ee68cb5803f60d7515c6377eaaabad4cc7c6a5b97c78a3d86ee148ddb2d7fb1d1b6745661ebdad5195facf2d0ce32834828f30743cb131e353df46a5d3f5f1 SHA512 71371907e9a18ed37d8aa1cb671972a28d44e9674cfa9ecf9c426f49d9d20cfae78ea4d6678551acaec6c59a2bb0be74488f7a18742af345b6ec851e7a843801
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.28.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.28.6.ebuild
deleted file mode 100644
index cc297702c9e0..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.28.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.20"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.29.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.29.1.ebuild
deleted file mode 100644
index cc297702c9e0..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.29.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-COMMON_DEPEND="acct-group/kube-scheduler
-	acct-user/kube-scheduler"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND=">=dev-lang/go-1.20"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 1263d357e29d..bc9aafa1cc69 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,18 +1,14 @@
 DIST kubernetes-1.27.10.tar.gz 39183865 BLAKE2B 948197dbca1fd7d12d7d1947faa82b983189b9dc8f8af26f9b0ccf26629b7daa609b85c492dc977adc9a6e095f30bb38cafea9e1feb06aabba1847a364277af0 SHA512 cb0e2c9186d2d504c28a02b4a3e222b766fdc942226853b4669a505313abc2fef76ebdc36677ca8bf55bfbe5aaeafdc2e6fa053dbd85779eb824395bffa08060
 DIST kubernetes-1.27.12.tar.gz 39200862 BLAKE2B ce4112403399121bfd71ec61fe4c434a6a0b6a732f8abb965c213a2675a7ebf94b3fe8c4293917aaaaadadc1fecf98f0fb290a6c9758c27478a52efc52a426c8 SHA512 524138b1294e845d2bfd4e4f488abcf4aa9606df11c03019b09fe60bc35816c268251cadab4b657e129fddd795383b7b84ce181814780d6861dfdf1c51c59923
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
-DIST kubernetes-1.28.6.tar.gz 39955920 BLAKE2B d492139efad8328ee1024445e568e4b446af3ba7f9c39b748eb005198b6ad448eca71cd5ad698ba5dd1fcaef727b6b3884e7bfbad0cc8ae7b7cdfc858f8a712c SHA512 bdb20da05001c67418e9e9c6d2640b974a1690bbdad7d0ede6ab1577d9bca0e998802737ceccc023fd34fd2f0e63cc7b1b9c2a90ee7d24429f8109b9393d7551
 DIST kubernetes-1.28.8.tar.gz 39978242 BLAKE2B 3e2aaa7e79ccb5f9f71be0e6c33b58237d297b79cd4f5d5bb4b09e7196d933dcb2aa8cafb9e74360e204116c8684a7263ac4db6dc257adc77a98d31c22a502e8 SHA512 2bbc48394784b34712c6b419cd07971780410223e7015c5fe6ed2c25c4e9499e81c9ea1f4269d399fd7e908971f5b8e873595d2b67332f7b49f61a5411a2aed1
-DIST kubernetes-1.29.1.tar.gz 41130463 BLAKE2B d75807ec1b0ee92f7f91f985b10c37ebd352286d12a25b08fa2ad71e54f45e51aba49967a268b996932f421fd4163bd8815b4abef1aeb3776576ca76f2dc1779 SHA512 aee9da0fb1da355cbcdc9db584d99969c13cf8c4fce669f209b6e309cf059556f2820e66a90e8ea09dd56d7c289c6a9cb2bf817e2d260220c77d0a9cd2a4850a
 DIST kubernetes-1.29.3.tar.gz 41151982 BLAKE2B 6eec9ee21caa2da737185f64a1fa49fda6ad914e9f1cb0c9fd8f0e43d6eaec1e2efaa23bcbbf06c116d554ace1eaef98ff2e9db409487b2317f631768d79b54f SHA512 853b7d38c850780a5e39fcb817012b35eea91b62d055f6611aba8f14cd7f6c176a047dc7e79ecc11d3bd7815f3ececb26b8e5d419124c03c4aecf6f0670ca603
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 EBUILD kubeadm-1.27.10.ebuild 982 BLAKE2B 73361c421a78e15d67ec8b300c333d9314d8b00fce79c87e069c44dc18b795d0668030263967fcf1046c423f300f149a3897d497612c65b65a6702f3d610141c SHA512 700b1d571e87d215af979ae4c4b4b073e991063c06574f85839d486c60b2aa1ef108f4158723f5b8d298916afe452cbb82d75a9df8c451ba7d45c1a7aeb2d0b1
 EBUILD kubeadm-1.27.12.ebuild 982 BLAKE2B 73361c421a78e15d67ec8b300c333d9314d8b00fce79c87e069c44dc18b795d0668030263967fcf1046c423f300f149a3897d497612c65b65a6702f3d610141c SHA512 700b1d571e87d215af979ae4c4b4b073e991063c06574f85839d486c60b2aa1ef108f4158723f5b8d298916afe452cbb82d75a9df8c451ba7d45c1a7aeb2d0b1
 EBUILD kubeadm-1.28.11.ebuild 985 BLAKE2B c5583798d960f2a9bf3c6c389136e1302de48dd3125845c5da22bfe5fc5035730469a011cf7a1f1d40574d865fcd22f3308a0cf8a3d83a4782d6e66207d0b416 SHA512 ad67f70713bc62c4769789a2f2d236848cb071c9b5db50bada364abc20fdefe60989cf42813203432cf4f05031fc7354895b6684309cf79283910cc0fb99a4a3
-EBUILD kubeadm-1.28.6.ebuild 982 BLAKE2B 73361c421a78e15d67ec8b300c333d9314d8b00fce79c87e069c44dc18b795d0668030263967fcf1046c423f300f149a3897d497612c65b65a6702f3d610141c SHA512 700b1d571e87d215af979ae4c4b4b073e991063c06574f85839d486c60b2aa1ef108f4158723f5b8d298916afe452cbb82d75a9df8c451ba7d45c1a7aeb2d0b1
 EBUILD kubeadm-1.28.8.ebuild 982 BLAKE2B 73361c421a78e15d67ec8b300c333d9314d8b00fce79c87e069c44dc18b795d0668030263967fcf1046c423f300f149a3897d497612c65b65a6702f3d610141c SHA512 700b1d571e87d215af979ae4c4b4b073e991063c06574f85839d486c60b2aa1ef108f4158723f5b8d298916afe452cbb82d75a9df8c451ba7d45c1a7aeb2d0b1
-EBUILD kubeadm-1.29.1.ebuild 982 BLAKE2B 73361c421a78e15d67ec8b300c333d9314d8b00fce79c87e069c44dc18b795d0668030263967fcf1046c423f300f149a3897d497612c65b65a6702f3d610141c SHA512 700b1d571e87d215af979ae4c4b4b073e991063c06574f85839d486c60b2aa1ef108f4158723f5b8d298916afe452cbb82d75a9df8c451ba7d45c1a7aeb2d0b1
 EBUILD kubeadm-1.29.3.ebuild 982 BLAKE2B 73361c421a78e15d67ec8b300c333d9314d8b00fce79c87e069c44dc18b795d0668030263967fcf1046c423f300f149a3897d497612c65b65a6702f3d610141c SHA512 700b1d571e87d215af979ae4c4b4b073e991063c06574f85839d486c60b2aa1ef108f4158723f5b8d298916afe452cbb82d75a9df8c451ba7d45c1a7aeb2d0b1
 EBUILD kubeadm-1.29.6.ebuild 985 BLAKE2B c5583798d960f2a9bf3c6c389136e1302de48dd3125845c5da22bfe5fc5035730469a011cf7a1f1d40574d865fcd22f3308a0cf8a3d83a4782d6e66207d0b416 SHA512 ad67f70713bc62c4769789a2f2d236848cb071c9b5db50bada364abc20fdefe60989cf42813203432cf4f05031fc7354895b6684309cf79283910cc0fb99a4a3
 EBUILD kubeadm-1.30.2.ebuild 985 BLAKE2B fd19277a768673336f5f86452487e1bfc8efaab4592992dc1a2f10cdc15b5d9aef62225317e9b5888e3f282cf4b1231a3fcb8b30d699a788cbae2af835f56a63 SHA512 bccd64b12bce02d5bb0967c96b5c010f98795c428dd41e0b852d6eec84f8d449cee971c7c4481bf005476c1b0b83cf91ee9226c2f466eb03c73489956b9d18ea
diff --git a/sys-cluster/kubeadm/kubeadm-1.28.6.ebuild b/sys-cluster/kubeadm/kubeadm-1.28.6.ebuild
deleted file mode 100644
index b9fa1efd4738..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.28.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.20"
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.29.1.ebuild b/sys-cluster/kubeadm/kubeadm-1.29.1.ebuild
deleted file mode 100644
index b9fa1efd4738..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.29.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.20"
-RDEPEND="app-containers/cri-tools
-	selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 4efa05bf674a..9cae98d9b643 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,18 +1,14 @@
 DIST kubernetes-1.27.10.tar.gz 39183865 BLAKE2B 948197dbca1fd7d12d7d1947faa82b983189b9dc8f8af26f9b0ccf26629b7daa609b85c492dc977adc9a6e095f30bb38cafea9e1feb06aabba1847a364277af0 SHA512 cb0e2c9186d2d504c28a02b4a3e222b766fdc942226853b4669a505313abc2fef76ebdc36677ca8bf55bfbe5aaeafdc2e6fa053dbd85779eb824395bffa08060
 DIST kubernetes-1.27.12.tar.gz 39200862 BLAKE2B ce4112403399121bfd71ec61fe4c434a6a0b6a732f8abb965c213a2675a7ebf94b3fe8c4293917aaaaadadc1fecf98f0fb290a6c9758c27478a52efc52a426c8 SHA512 524138b1294e845d2bfd4e4f488abcf4aa9606df11c03019b09fe60bc35816c268251cadab4b657e129fddd795383b7b84ce181814780d6861dfdf1c51c59923
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
-DIST kubernetes-1.28.6.tar.gz 39955920 BLAKE2B d492139efad8328ee1024445e568e4b446af3ba7f9c39b748eb005198b6ad448eca71cd5ad698ba5dd1fcaef727b6b3884e7bfbad0cc8ae7b7cdfc858f8a712c SHA512 bdb20da05001c67418e9e9c6d2640b974a1690bbdad7d0ede6ab1577d9bca0e998802737ceccc023fd34fd2f0e63cc7b1b9c2a90ee7d24429f8109b9393d7551
 DIST kubernetes-1.28.8.tar.gz 39978242 BLAKE2B 3e2aaa7e79ccb5f9f71be0e6c33b58237d297b79cd4f5d5bb4b09e7196d933dcb2aa8cafb9e74360e204116c8684a7263ac4db6dc257adc77a98d31c22a502e8 SHA512 2bbc48394784b34712c6b419cd07971780410223e7015c5fe6ed2c25c4e9499e81c9ea1f4269d399fd7e908971f5b8e873595d2b67332f7b49f61a5411a2aed1
-DIST kubernetes-1.29.1.tar.gz 41130463 BLAKE2B d75807ec1b0ee92f7f91f985b10c37ebd352286d12a25b08fa2ad71e54f45e51aba49967a268b996932f421fd4163bd8815b4abef1aeb3776576ca76f2dc1779 SHA512 aee9da0fb1da355cbcdc9db584d99969c13cf8c4fce669f209b6e309cf059556f2820e66a90e8ea09dd56d7c289c6a9cb2bf817e2d260220c77d0a9cd2a4850a
 DIST kubernetes-1.29.3.tar.gz 41151982 BLAKE2B 6eec9ee21caa2da737185f64a1fa49fda6ad914e9f1cb0c9fd8f0e43d6eaec1e2efaa23bcbbf06c116d554ace1eaef98ff2e9db409487b2317f631768d79b54f SHA512 853b7d38c850780a5e39fcb817012b35eea91b62d055f6611aba8f14cd7f6c176a047dc7e79ecc11d3bd7815f3ececb26b8e5d419124c03c4aecf6f0670ca603
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 EBUILD kubectl-1.27.10.ebuild 891 BLAKE2B eccd2f8e962a21134df465495ca9161f6245b6897d38e7d4ffa161b0c2a901de552c8ec9c0b43690542e32c222a56173e714ba4f2ccc3fb074d26a398d6d93c7 SHA512 8f9402f318a5f30f8ecbdc478450353a368e794778e3fe8c661cdc9d14675e3c7810cdd41b4e0233bfe91beffa9eb0cce22abb17179d36ef69d9e06e1ff441e6
 EBUILD kubectl-1.27.12.ebuild 891 BLAKE2B eccd2f8e962a21134df465495ca9161f6245b6897d38e7d4ffa161b0c2a901de552c8ec9c0b43690542e32c222a56173e714ba4f2ccc3fb074d26a398d6d93c7 SHA512 8f9402f318a5f30f8ecbdc478450353a368e794778e3fe8c661cdc9d14675e3c7810cdd41b4e0233bfe91beffa9eb0cce22abb17179d36ef69d9e06e1ff441e6
 EBUILD kubectl-1.28.11.ebuild 898 BLAKE2B 1c2d57e41b717fb82b0a9766d309dde5e3a077e4b213c4f8f66d1b57b62cdedfdfae86520210b7e881c3e9ea94ea7ed3037cfa2f257866e7fa9a1c19e0e2abfa SHA512 570a8fa6badc2366d9f6bc2fdc8024fe8ac83901aabb975bdd1d52c70bd817f24dfca27c46e205d1e2563da6691b6f6f4e2e1b1aef03da7e1e65751bb6a230ad
-EBUILD kubectl-1.28.6.ebuild 895 BLAKE2B 21db70c2001fdd509c929cbbb08e1081573c4292537dd94fae8588dc4be3c2eae7fc3874e946a2d6bd1b749052d8b1a34d2c19de1ed943d02a284196e0866021 SHA512 eba7bc5505ba14961afebe91eb66e244cc71dab4d8f65764b6cb52ee7c5fdf8ce9a20b143e5778a12bf0cb882e7f142720baa8487cde6cc20e417f9c3d48af5f
 EBUILD kubectl-1.28.8.ebuild 895 BLAKE2B 21db70c2001fdd509c929cbbb08e1081573c4292537dd94fae8588dc4be3c2eae7fc3874e946a2d6bd1b749052d8b1a34d2c19de1ed943d02a284196e0866021 SHA512 eba7bc5505ba14961afebe91eb66e244cc71dab4d8f65764b6cb52ee7c5fdf8ce9a20b143e5778a12bf0cb882e7f142720baa8487cde6cc20e417f9c3d48af5f
-EBUILD kubectl-1.29.1.ebuild 895 BLAKE2B 21db70c2001fdd509c929cbbb08e1081573c4292537dd94fae8588dc4be3c2eae7fc3874e946a2d6bd1b749052d8b1a34d2c19de1ed943d02a284196e0866021 SHA512 eba7bc5505ba14961afebe91eb66e244cc71dab4d8f65764b6cb52ee7c5fdf8ce9a20b143e5778a12bf0cb882e7f142720baa8487cde6cc20e417f9c3d48af5f
 EBUILD kubectl-1.29.3.ebuild 895 BLAKE2B 21db70c2001fdd509c929cbbb08e1081573c4292537dd94fae8588dc4be3c2eae7fc3874e946a2d6bd1b749052d8b1a34d2c19de1ed943d02a284196e0866021 SHA512 eba7bc5505ba14961afebe91eb66e244cc71dab4d8f65764b6cb52ee7c5fdf8ce9a20b143e5778a12bf0cb882e7f142720baa8487cde6cc20e417f9c3d48af5f
 EBUILD kubectl-1.29.6.ebuild 898 BLAKE2B 1c2d57e41b717fb82b0a9766d309dde5e3a077e4b213c4f8f66d1b57b62cdedfdfae86520210b7e881c3e9ea94ea7ed3037cfa2f257866e7fa9a1c19e0e2abfa SHA512 570a8fa6badc2366d9f6bc2fdc8024fe8ac83901aabb975bdd1d52c70bd817f24dfca27c46e205d1e2563da6691b6f6f4e2e1b1aef03da7e1e65751bb6a230ad
 EBUILD kubectl-1.30.2.ebuild 898 BLAKE2B fea0b23545fa35a7fab59fa471d091f762e5ea7a29aefe99bf876c84e388b9bcdf88d9691bdfba55ab63800a4f449ac0cf692032df3d0f409f94a2bb4eea78d6 SHA512 bb377848511b76dfeceb6e06d7e9ee206efea54f774cc0bd0658cfab1d6834e689d440c86722ff31bd38e467a10a51754bfde1b7a0a5e44bb54bbc3e3676cfbc
diff --git a/sys-cluster/kubectl/kubectl-1.28.6.ebuild b/sys-cluster/kubectl/kubectl-1.28.6.ebuild
deleted file mode 100644
index 45e1e83a34ba..000000000000
--- a/sys-cluster/kubectl/kubectl-1.28.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.20"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubectl/kubectl-1.29.1.ebuild b/sys-cluster/kubectl/kubectl-1.29.1.ebuild
deleted file mode 100644
index 45e1e83a34ba..000000000000
--- a/sys-cluster/kubectl/kubectl-1.29.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened"
-
-BDEPEND=">=dev-lang/go-1.20"
-
-RESTRICT+=" test"
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-		WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index b3a4a9b4de1b..c70af88dc1db 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -6,18 +6,14 @@ AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c1
 DIST kubernetes-1.27.10.tar.gz 39183865 BLAKE2B 948197dbca1fd7d12d7d1947faa82b983189b9dc8f8af26f9b0ccf26629b7daa609b85c492dc977adc9a6e095f30bb38cafea9e1feb06aabba1847a364277af0 SHA512 cb0e2c9186d2d504c28a02b4a3e222b766fdc942226853b4669a505313abc2fef76ebdc36677ca8bf55bfbe5aaeafdc2e6fa053dbd85779eb824395bffa08060
 DIST kubernetes-1.27.12.tar.gz 39200862 BLAKE2B ce4112403399121bfd71ec61fe4c434a6a0b6a732f8abb965c213a2675a7ebf94b3fe8c4293917aaaaadadc1fecf98f0fb290a6c9758c27478a52efc52a426c8 SHA512 524138b1294e845d2bfd4e4f488abcf4aa9606df11c03019b09fe60bc35816c268251cadab4b657e129fddd795383b7b84ce181814780d6861dfdf1c51c59923
 DIST kubernetes-1.28.11.tar.gz 40007157 BLAKE2B 93afb8552627861c0d49cfc343cceaeb961939b8748cd125cc65b01f27b35c877007e3a1bfe416f2abcc5aa2bf5ee82673dad4a7276c1f4aaaf0a6b9abd9df19 SHA512 31c721b9fa5f73fd216587073e3308249bdb9a28b8534415e99d2630529f1a85fb7a6b18eb91f1b6bbd3f21dfdc6aa1ad0fe6ce257263e34b7fe7bd5cbbd584b
-DIST kubernetes-1.28.6.tar.gz 39955920 BLAKE2B d492139efad8328ee1024445e568e4b446af3ba7f9c39b748eb005198b6ad448eca71cd5ad698ba5dd1fcaef727b6b3884e7bfbad0cc8ae7b7cdfc858f8a712c SHA512 bdb20da05001c67418e9e9c6d2640b974a1690bbdad7d0ede6ab1577d9bca0e998802737ceccc023fd34fd2f0e63cc7b1b9c2a90ee7d24429f8109b9393d7551
 DIST kubernetes-1.28.8.tar.gz 39978242 BLAKE2B 3e2aaa7e79ccb5f9f71be0e6c33b58237d297b79cd4f5d5bb4b09e7196d933dcb2aa8cafb9e74360e204116c8684a7263ac4db6dc257adc77a98d31c22a502e8 SHA512 2bbc48394784b34712c6b419cd07971780410223e7015c5fe6ed2c25c4e9499e81c9ea1f4269d399fd7e908971f5b8e873595d2b67332f7b49f61a5411a2aed1
-DIST kubernetes-1.29.1.tar.gz 41130463 BLAKE2B d75807ec1b0ee92f7f91f985b10c37ebd352286d12a25b08fa2ad71e54f45e51aba49967a268b996932f421fd4163bd8815b4abef1aeb3776576ca76f2dc1779 SHA512 aee9da0fb1da355cbcdc9db584d99969c13cf8c4fce669f209b6e309cf059556f2820e66a90e8ea09dd56d7c289c6a9cb2bf817e2d260220c77d0a9cd2a4850a
 DIST kubernetes-1.29.3.tar.gz 41151982 BLAKE2B 6eec9ee21caa2da737185f64a1fa49fda6ad914e9f1cb0c9fd8f0e43d6eaec1e2efaa23bcbbf06c116d554ace1eaef98ff2e9db409487b2317f631768d79b54f SHA512 853b7d38c850780a5e39fcb817012b35eea91b62d055f6611aba8f14cd7f6c176a047dc7e79ecc11d3bd7815f3ececb26b8e5d419124c03c4aecf6f0670ca603
 DIST kubernetes-1.29.6.tar.gz 41177485 BLAKE2B c02b17fe4cb2314a005180ba6813d056f49e980af9a96f392d9e46b7b436e062fbabf2f64b996e23c7a84db9f3970a1a24dc63d5ee0ac3029e375cfdec47f473 SHA512 d7b1401a6844c8e43a822b4f062ea4cc58f8fefd74c31a2936e9121220f30e9bcb9358683836d68f66cb28451cf3462a1c2c81f85f9ea53b4e919a370d3245e2
 DIST kubernetes-1.30.2.tar.gz 39581297 BLAKE2B 7d1f303d21b870ad29d2cac96626edc3a19addedd544624e5cd9f42beb368e0959e499e5fd88bc7ee491a01cd29573115d1e77dfb73098ea88204a2614f7b635 SHA512 73f87da96fae889805e3e8fe644228159746c139e907755ec8654dd2fe46bf4561c6c5bb015bd95a6a1f5ba9be2e193aea9bb43b37ce1d67fb4ba42a50b9dac8
 EBUILD kubelet-1.27.10.ebuild 1048 BLAKE2B d7a5d9d4cb8ad89160e4684552635da20f1ce2e7934e6326d4fa19e93ab396d8cd194e4a84e16808d849deee2b126c0d83a6b75b2e38e3d84114fc244e12be41 SHA512 0a39cea0c2ea76d04bbdc41768b57dfb947eaa5526e767e367bd2af7d029690acd32a4f67c9cc23a6d6495e73951a1b0c3acc17e66e2f4653468ae276fb5fb36
 EBUILD kubelet-1.27.12.ebuild 1048 BLAKE2B d7a5d9d4cb8ad89160e4684552635da20f1ce2e7934e6326d4fa19e93ab396d8cd194e4a84e16808d849deee2b126c0d83a6b75b2e38e3d84114fc244e12be41 SHA512 0a39cea0c2ea76d04bbdc41768b57dfb947eaa5526e767e367bd2af7d029690acd32a4f67c9cc23a6d6495e73951a1b0c3acc17e66e2f4653468ae276fb5fb36
 EBUILD kubelet-1.28.11.ebuild 1054 BLAKE2B 7590f1dcc39e59cbac0714ab63dfb8449baa0b7a3e959397860cbc1f8d6e08afe2b01afdbcfc98514efbaa10315df02aac39c0705ea8771f3313d116093e3ae4 SHA512 236367aca8f3cd2703105db18fdebb7331c87983d9e1f6b16508a3504344dad7478afbb2fa9ba224246dcf0f77745e057832e5cf33afddc7c4cafd0f92c7a149
-EBUILD kubelet-1.28.6.ebuild 1051 BLAKE2B 05370b13defba19ea12632de0a5cbd8d53310a20cee687ec0faf70d12c9e10154946efb063a66c445264de9fdc654a6c955c47c129dcefb4d8314b849481c5a4 SHA512 f52676f725a622369ba08b9cd73aeea0775ab2cf2aab170b7c60d62fa4b93cdf621dfaf92497653c8f729737ed3bded46c07268f7cdfb574ad37c6ecfd4dc0f5
 EBUILD kubelet-1.28.8.ebuild 1051 BLAKE2B 05370b13defba19ea12632de0a5cbd8d53310a20cee687ec0faf70d12c9e10154946efb063a66c445264de9fdc654a6c955c47c129dcefb4d8314b849481c5a4 SHA512 f52676f725a622369ba08b9cd73aeea0775ab2cf2aab170b7c60d62fa4b93cdf621dfaf92497653c8f729737ed3bded46c07268f7cdfb574ad37c6ecfd4dc0f5
-EBUILD kubelet-1.29.1.ebuild 1051 BLAKE2B 05370b13defba19ea12632de0a5cbd8d53310a20cee687ec0faf70d12c9e10154946efb063a66c445264de9fdc654a6c955c47c129dcefb4d8314b849481c5a4 SHA512 f52676f725a622369ba08b9cd73aeea0775ab2cf2aab170b7c60d62fa4b93cdf621dfaf92497653c8f729737ed3bded46c07268f7cdfb574ad37c6ecfd4dc0f5
 EBUILD kubelet-1.29.3.ebuild 1051 BLAKE2B 05370b13defba19ea12632de0a5cbd8d53310a20cee687ec0faf70d12c9e10154946efb063a66c445264de9fdc654a6c955c47c129dcefb4d8314b849481c5a4 SHA512 f52676f725a622369ba08b9cd73aeea0775ab2cf2aab170b7c60d62fa4b93cdf621dfaf92497653c8f729737ed3bded46c07268f7cdfb574ad37c6ecfd4dc0f5
 EBUILD kubelet-1.29.6.ebuild 1054 BLAKE2B 7590f1dcc39e59cbac0714ab63dfb8449baa0b7a3e959397860cbc1f8d6e08afe2b01afdbcfc98514efbaa10315df02aac39c0705ea8771f3313d116093e3ae4 SHA512 236367aca8f3cd2703105db18fdebb7331c87983d9e1f6b16508a3504344dad7478afbb2fa9ba224246dcf0f77745e057832e5cf33afddc7c4cafd0f92c7a149
 EBUILD kubelet-1.30.2.ebuild 1054 BLAKE2B d7abb078c146dfed8f8e9821e30c4c6213527b04d77bd905dc04acbaf5a5f3a239ebd4763c841daab612f746818877658954dd1e52e76b957f8eea1c3867b767 SHA512 0a2cd0b01673a5859a200225328b8022654bf26bf718a972f488986588a9b54e9774cea41baaa9a7a1bc6aeded186785a3b57ec977693473c9ddc3855537ea92
diff --git a/sys-cluster/kubelet/kubelet-1.28.6.ebuild b/sys-cluster/kubelet/kubelet-1.28.6.ebuild
deleted file mode 100644
index ca21a72a20d6..000000000000
--- a/sys-cluster/kubelet/kubelet-1.28.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.20"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-	WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.29.1.ebuild b/sys-cluster/kubelet/kubelet-1.29.1.ebuild
deleted file mode 100644
index ca21a72a20d6..000000000000
--- a/sys-cluster/kubelet/kubelet-1.29.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module systemd
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="hardened selinux"
-
-BDEPEND=">=dev-lang/go-1.20"
-RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
-
-RESTRICT+=" test "
-S="${WORKDIR}/kubernetes-${PV}"
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" FORCE_HOST_GO=yes \
-	WHAT=cmd/${PN}
-}
-
-src_install() {
-	dobin _output/bin/${PN}
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 7fcdbdeb11fa..27522cb6fd11 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 88729d1d137d..61a0b5f9b36a 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD clang-common-15.0.7-r8.ebuild 5482 BLAKE2B 20e8744166a852b4dbc233f128807e60bb204f14558d2cc1691b1a87777be2775d1a6c82a108945f795b02919bc47bf213b1a85e45f423c49a6009aed0fbbc3b SHA512 bf1f5cdf47c6772266117e9545994dcfb27cfd263a5e7749604106686d8e56b8b45ddab7073d6baf73e966304162f3aad755075c11dbb16bb42b88fa78e6face
 EBUILD clang-common-16.0.6-r4.ebuild 5726 BLAKE2B de26b88570bf487a2be2a59f4551c8e61b940fb84b0dc3cb5be1884252672782700b657fb63c0b7ac247ec2092b236a550b51273f73ec19fab7db6eeda0ff94e SHA512 9f2778fbb89d578e162b36c7a692219533437d9fbec407422e7aff1b11d942f09c8cf0edb5c5bd37bbf34523b1f947b418f954b632d769f836baa7d2493bc527
 EBUILD clang-common-17.0.6-r5.ebuild 9010 BLAKE2B cbb5c5094ca6e99fc9ce1734acf02e2e35b792173f84b71e19b25e687f7a93a6fca31e4461fc580d92c0eadabe1400359bec3938fc0cba2cac9bc28a4b8d66be SHA512 ea66877912d34f11a0b788a0d188caf03a5c06098507e7bbb3fa609f594d7b9397ac8fa21c7b502238e36b1ede7bf32dc173b9a6d74a3be1e5d3f25babac9165
-EBUILD clang-common-18.1.7.ebuild 9134 BLAKE2B ffad8a93bd8838dc8c22880e7cd195d777e960b4a4469ea6a3febb3507b324b582ed3109fc47685a759c9b06c6be98ecb04a56302b30ad723fe14b23989df9c8 SHA512 edddf1740383db3344500eada2484f2f1aa97bd8e3ad1142c23e4df43ee32df0cc21e085601294d4b0d02fd544e8983c1388c259af7e5d950f8fae44a1b093f6
 EBUILD clang-common-18.1.8.ebuild 9134 BLAKE2B ffad8a93bd8838dc8c22880e7cd195d777e960b4a4469ea6a3febb3507b324b582ed3109fc47685a759c9b06c6be98ecb04a56302b30ad723fe14b23989df9c8 SHA512 edddf1740383db3344500eada2484f2f1aa97bd8e3ad1142c23e4df43ee32df0cc21e085601294d4b0d02fd544e8983c1388c259af7e5d950f8fae44a1b093f6
 EBUILD clang-common-19.0.0.9999.ebuild 9018 BLAKE2B 5f055aeaec9b6ebdfbfe9b84aa65dc6de8ffac3003235d3aef66e48b2f0f4daff56f38a574de61f9abb0a12e4728b27f99f726f840528ba279e7334b85d5bee4 SHA512 5463729ed67144428d5a154a91083efa2006e0d449b31f8870650097dd0b1322f4bd5ec7a7b2884ffd906a976ffa310e36dacd3c9dba519c1d5c26b3879cbd85
-EBUILD clang-common-19.0.0_pre20240608.ebuild 9018 BLAKE2B 5f055aeaec9b6ebdfbfe9b84aa65dc6de8ffac3003235d3aef66e48b2f0f4daff56f38a574de61f9abb0a12e4728b27f99f726f840528ba279e7334b85d5bee4 SHA512 5463729ed67144428d5a154a91083efa2006e0d449b31f8870650097dd0b1322f4bd5ec7a7b2884ffd906a976ffa310e36dacd3c9dba519c1d5c26b3879cbd85
-EBUILD clang-common-19.0.0_pre20240615.ebuild 9018 BLAKE2B 5f055aeaec9b6ebdfbfe9b84aa65dc6de8ffac3003235d3aef66e48b2f0f4daff56f38a574de61f9abb0a12e4728b27f99f726f840528ba279e7334b85d5bee4 SHA512 5463729ed67144428d5a154a91083efa2006e0d449b31f8870650097dd0b1322f4bd5ec7a7b2884ffd906a976ffa310e36dacd3c9dba519c1d5c26b3879cbd85
 EBUILD clang-common-19.0.0_pre20240623.ebuild 9018 BLAKE2B 5f055aeaec9b6ebdfbfe9b84aa65dc6de8ffac3003235d3aef66e48b2f0f4daff56f38a574de61f9abb0a12e4728b27f99f726f840528ba279e7334b85d5bee4 SHA512 5463729ed67144428d5a154a91083efa2006e0d449b31f8870650097dd0b1322f4bd5ec7a7b2884ffd906a976ffa310e36dacd3c9dba519c1d5c26b3879cbd85
 MISC metadata.xml 1248 BLAKE2B d9c542ec74a08857a87a42927feef909c343b5b672145e471ebc69753a3f93432d2ae93ed2659a67d504e2c5ff4212640e4208b173d96e5a173a1043766b66f8 SHA512 eb6d4be1dfbdf6b70b774d42493f6b3015472d5e4bba9386254f6e4ae92307169fe1ac6f0f613d452a9c21c6d61ed57ab50efb54813146983f4d6809b32ddacb
diff --git a/sys-devel/clang-common/clang-common-18.1.7.ebuild b/sys-devel/clang-common/clang-common-18.1.7.ebuild
deleted file mode 100644
index b7d4720e0e22..000000000000
--- a/sys-devel/clang-common/clang-common-18.1.7.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org multilib
-
-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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
-IUSE="
-	default-compiler-rt default-libcxx default-lld
-	bootstrap-prefix cet hardened llvm-libunwind
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
-		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( >=sys-devel/lld-${PV} )
-	!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
-}
-
-_doclang_cfg() {
-	local triple="${1}"
-
-	local tool
-	for tool in ${triple}-clang{,++}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-			@gentoo-common-ld.cfg
-		EOF
-		if [[ ${triple} == x86_64* ]]; then
-			cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
-				@gentoo-cet.cfg
-			EOF
-		fi
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-			-lc++abi
-		EOF
-	fi
-
-	newins - "${triple}-clang-cpp.cfg" <<-EOF
-		# This configuration file is used by the ${triple}-clang-cpp driver.
-		@gentoo-common.cfg
-	EOF
-	if [[ ${triple} == x86_64* ]]; then
-		cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
-			@gentoo-cet.cfg
-		EOF
-	fi
-
-	# Install symlinks for triples with other vendor strings since some
-	# programs insist on mangling the triple.
-	local vendor
-	for vendor in gentoo pc unknown; do
-		local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-		for tool in clang{,++,-cpp}; do
-			if [[ ! -f "${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-				dosym "${triple}-${tool}.cfg" "/etc/clang/${vendor_triple}-${tool}.cfg"
-			fi
-		done
-	done
-}
-
-doclang_cfg() {
-	local triple="${1}"
-
-	_doclang_cfg ${triple}
-
-	# LLVM may have different arch names in some cases. For example in x86
-	# profiles the triple uses i686, but llvm will prefer i386 if invoked
-	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-	#
-	# To make sure the correct triples are installed,
-	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-	# and compare with CHOST values in profiles.
-
-	local abi=${triple%%-*}
-	case ${abi} in
-		armv4l|armv4t|armv5tel|armv6j|armv7a)
-			_doclang_cfg ${triple/${abi}/arm}
-			;;
-		i686)
-			_doclang_cfg ${triple/${abi}/i386}
-			;;
-		sparc)
-			_doclang_cfg ${triple/${abi}/sparcel}
-			;;
-		sparc64)
-			_doclang_cfg ${triple/${abi}/sparcv9}
-			;;
-	esac
-}
-
-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
-		# bug #870001
-		-include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-	EOF
-
-	# clang-cpp does not like link args being passed to it when directly
-	# invoked, so use a separate configuration file.
-	newins - gentoo-common-ld.cfg <<-EOF
-		# This file contains flags common to clang and clang++
-		@gentoo-hardened-ld.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.
-		-Xarch_host -fstack-clash-protection
-		-Xarch_host -fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	newins - gentoo-cet.cfg <<-EOF
-		-Xarch_host -fcf-protection=$(usex cet full none)
-	EOF
-
-	if use kernel_Darwin; then
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# There was -Wl,-z,relro here, but it's not supported on Mac
-			# TODO: investigate whether -bind_at_load or -read_only_stubs will do the job
-		EOF
-	else
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# Some of these options are added unconditionally, regardless of
-			# USE=hardened, for parity with sys-devel/gcc.
-			-Wl,-z,relro
-			-Wl,-z,now
-		EOF
-	fi
-
-	dodir /usr/include/gentoo
-
-	cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-	/* __has_include is an extension, but it's fine, because this is only
-	for Clang anyway. */
-	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
-	# include <stdc-predef.h>
-	#endif
-	EOF
-
-	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
-	#ifdef __clang__
-	# pragma clang system_header
-	#endif
-	#ifndef _FORTIFY_SOURCE
-	# if defined(__has_feature)
-	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-	# else
-	#  define __GENTOO_HAS_FEATURE(x) 0
-	# endif
-	#
-	# if defined(__STDC_HOSTED__) && __STDC_HOSTED__ == 1
-	#  define __GENTOO_NOT_FREESTANDING 1
-	# else
-	#  define __GENTOO_NOT_FREESTANDING 0
-	# endif
-	#
-	# if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && __GENTOO_NOT_FREESTANDING > 0
-	#  if !defined(__SANITIZE_ADDRESS__) && !__GENTOO_HAS_FEATURE(address_sanitizer) && !__GENTOO_HAS_FEATURE(memory_sanitizer)
-	#   define _FORTIFY_SOURCE ${fortify_level}
-	#  endif
-	# endif
-	# undef __GENTOO_HAS_FEATURE
-	# undef __GENTOO_NOT_FREESTANDING
-	#endif
-	EOF
-
-	# TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-	# non-hardened?
-	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
-			# https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-			-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-		EOF
-	fi
-
-	# We only install config files for supported ABIs because unprefixed tools
-	# might be used for crosscompilation where e.g. PIE may not be supported.
-	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
-	local abi
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		doclang_cfg "${abi_chost}"
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			# Gentoo Prefix on Darwin
-			-Wl,-search_paths_first
-			-Wl,-rpath,${EPREFIX}/usr/lib
-			-L ${EPREFIX}/usr/lib
-			-isystem ${EPREFIX}/usr/include
-			-isysroot ${EPREFIX}/MacOSX.sdk
-		EOF
-		if use bootstrap-prefix ; then
-			# bootstrap-prefix is only set during stage2 of bootstrapping
-			# Prefix, where EPREFIX is set to EPREFIX/tmp.
-			# Here we need to point it at the future lib dir of the stage3's
-			# EPREFIX.
-			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-				-Wl,-rpath,${EPREFIX}/../usr/lib
-			EOF
-		fi
-	fi
-}
-
-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-19.0.0_pre20240608.ebuild b/sys-devel/clang-common/clang-common-19.0.0_pre20240608.ebuild
deleted file mode 100644
index f260391ba4ab..000000000000
--- a/sys-devel/clang-common/clang-common-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="
-	default-compiler-rt default-libcxx default-lld
-	bootstrap-prefix cet hardened llvm-libunwind
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
-		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( >=sys-devel/lld-${PV} )
-	!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
-}
-
-_doclang_cfg() {
-	local triple="${1}"
-
-	local tool
-	for tool in ${triple}-clang{,++}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-			@gentoo-common-ld.cfg
-		EOF
-		if [[ ${triple} == x86_64* ]]; then
-			cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
-				@gentoo-cet.cfg
-			EOF
-		fi
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-			-lc++abi
-		EOF
-	fi
-
-	newins - "${triple}-clang-cpp.cfg" <<-EOF
-		# This configuration file is used by the ${triple}-clang-cpp driver.
-		@gentoo-common.cfg
-	EOF
-	if [[ ${triple} == x86_64* ]]; then
-		cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
-			@gentoo-cet.cfg
-		EOF
-	fi
-
-	# Install symlinks for triples with other vendor strings since some
-	# programs insist on mangling the triple.
-	local vendor
-	for vendor in gentoo pc unknown; do
-		local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-		for tool in clang{,++,-cpp}; do
-			if [[ ! -f "${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-				dosym "${triple}-${tool}.cfg" "/etc/clang/${vendor_triple}-${tool}.cfg"
-			fi
-		done
-	done
-}
-
-doclang_cfg() {
-	local triple="${1}"
-
-	_doclang_cfg ${triple}
-
-	# LLVM may have different arch names in some cases. For example in x86
-	# profiles the triple uses i686, but llvm will prefer i386 if invoked
-	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-	#
-	# To make sure the correct triples are installed,
-	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-	# and compare with CHOST values in profiles.
-
-	local abi=${triple%%-*}
-	case ${abi} in
-		armv4l|armv4t|armv5tel|armv6j|armv7a)
-			_doclang_cfg ${triple/${abi}/arm}
-			;;
-		i686)
-			_doclang_cfg ${triple/${abi}/i386}
-			;;
-		sparc)
-			_doclang_cfg ${triple/${abi}/sparcel}
-			;;
-		sparc64)
-			_doclang_cfg ${triple/${abi}/sparcv9}
-			;;
-	esac
-}
-
-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
-		# bug #870001
-		-include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-	EOF
-
-	# clang-cpp does not like link args being passed to it when directly
-	# invoked, so use a separate configuration file.
-	newins - gentoo-common-ld.cfg <<-EOF
-		# This file contains flags common to clang and clang++
-		@gentoo-hardened-ld.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.
-		-Xarch_host -fstack-clash-protection
-		-Xarch_host -fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	newins - gentoo-cet.cfg <<-EOF
-		-Xarch_host -fcf-protection=$(usex cet full none)
-	EOF
-
-	if use kernel_Darwin; then
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# There was -Wl,-z,relro here, but it's not supported on Mac
-			# TODO: investigate whether -bind_at_load or -read_only_stubs will do the job
-		EOF
-	else
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# Some of these options are added unconditionally, regardless of
-			# USE=hardened, for parity with sys-devel/gcc.
-			-Wl,-z,relro
-			-Wl,-z,now
-		EOF
-	fi
-
-	dodir /usr/include/gentoo
-
-	cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-	/* __has_include is an extension, but it's fine, because this is only
-	for Clang anyway. */
-	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
-	# include <stdc-predef.h>
-	#endif
-	EOF
-
-	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
-	#ifdef __clang__
-	# pragma clang system_header
-	#endif
-	#ifndef _FORTIFY_SOURCE
-	# if defined(__has_feature)
-	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-	# else
-	#  define __GENTOO_HAS_FEATURE(x) 0
-	# endif
-	#
-	# if defined(__STDC_HOSTED__) && __STDC_HOSTED__ == 1
-	#  define __GENTOO_NOT_FREESTANDING 1
-	# else
-	#  define __GENTOO_NOT_FREESTANDING 0
-	# endif
-	#
-	# if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && __GENTOO_NOT_FREESTANDING > 0
-	#  if !defined(__SANITIZE_ADDRESS__) && !__GENTOO_HAS_FEATURE(address_sanitizer) && !__GENTOO_HAS_FEATURE(memory_sanitizer)
-	#   define _FORTIFY_SOURCE ${fortify_level}
-	#  endif
-	# endif
-	# undef __GENTOO_HAS_FEATURE
-	# undef __GENTOO_NOT_FREESTANDING
-	#endif
-	EOF
-
-	# TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-	# non-hardened?
-	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
-			# https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-			-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-		EOF
-	fi
-
-	# We only install config files for supported ABIs because unprefixed tools
-	# might be used for crosscompilation where e.g. PIE may not be supported.
-	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
-	local abi
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		doclang_cfg "${abi_chost}"
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			# Gentoo Prefix on Darwin
-			-Wl,-search_paths_first
-			-Wl,-rpath,${EPREFIX}/usr/lib
-			-L ${EPREFIX}/usr/lib
-			-isystem ${EPREFIX}/usr/include
-			-isysroot ${EPREFIX}/MacOSX.sdk
-		EOF
-		if use bootstrap-prefix ; then
-			# bootstrap-prefix is only set during stage2 of bootstrapping
-			# Prefix, where EPREFIX is set to EPREFIX/tmp.
-			# Here we need to point it at the future lib dir of the stage3's
-			# EPREFIX.
-			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-				-Wl,-rpath,${EPREFIX}/../usr/lib
-			EOF
-		fi
-	fi
-}
-
-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-19.0.0_pre20240615.ebuild b/sys-devel/clang-common/clang-common-19.0.0_pre20240615.ebuild
deleted file mode 100644
index f260391ba4ab..000000000000
--- a/sys-devel/clang-common/clang-common-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org multilib
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="
-	default-compiler-rt default-libcxx default-lld
-	bootstrap-prefix cet hardened llvm-libunwind
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
-		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV}[static-libs] )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( >=sys-devel/lld-${PV} )
-	!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
-}
-
-_doclang_cfg() {
-	local triple="${1}"
-
-	local tool
-	for tool in ${triple}-clang{,++}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-			@gentoo-common-ld.cfg
-		EOF
-		if [[ ${triple} == x86_64* ]]; then
-			cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
-				@gentoo-cet.cfg
-			EOF
-		fi
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
-			-lc++abi
-		EOF
-	fi
-
-	newins - "${triple}-clang-cpp.cfg" <<-EOF
-		# This configuration file is used by the ${triple}-clang-cpp driver.
-		@gentoo-common.cfg
-	EOF
-	if [[ ${triple} == x86_64* ]]; then
-		cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
-			@gentoo-cet.cfg
-		EOF
-	fi
-
-	# Install symlinks for triples with other vendor strings since some
-	# programs insist on mangling the triple.
-	local vendor
-	for vendor in gentoo pc unknown; do
-		local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
-		for tool in clang{,++,-cpp}; do
-			if [[ ! -f "${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
-				dosym "${triple}-${tool}.cfg" "/etc/clang/${vendor_triple}-${tool}.cfg"
-			fi
-		done
-	done
-}
-
-doclang_cfg() {
-	local triple="${1}"
-
-	_doclang_cfg ${triple}
-
-	# LLVM may have different arch names in some cases. For example in x86
-	# profiles the triple uses i686, but llvm will prefer i386 if invoked
-	# with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
-	# be used if invoked through ${CHOST}-clang{,++,-cpp} though.
-	#
-	# To make sure the correct triples are installed,
-	# see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
-	# and compare with CHOST values in profiles.
-
-	local abi=${triple%%-*}
-	case ${abi} in
-		armv4l|armv4t|armv5tel|armv6j|armv7a)
-			_doclang_cfg ${triple/${abi}/arm}
-			;;
-		i686)
-			_doclang_cfg ${triple/${abi}/i386}
-			;;
-		sparc)
-			_doclang_cfg ${triple/${abi}/sparcel}
-			;;
-		sparc64)
-			_doclang_cfg ${triple/${abi}/sparcv9}
-			;;
-	esac
-}
-
-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
-		# bug #870001
-		-include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
-	EOF
-
-	# clang-cpp does not like link args being passed to it when directly
-	# invoked, so use a separate configuration file.
-	newins - gentoo-common-ld.cfg <<-EOF
-		# This file contains flags common to clang and clang++
-		@gentoo-hardened-ld.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.
-		-Xarch_host -fstack-clash-protection
-		-Xarch_host -fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	newins - gentoo-cet.cfg <<-EOF
-		-Xarch_host -fcf-protection=$(usex cet full none)
-	EOF
-
-	if use kernel_Darwin; then
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# There was -Wl,-z,relro here, but it's not supported on Mac
-			# TODO: investigate whether -bind_at_load or -read_only_stubs will do the job
-		EOF
-	else
-		newins - gentoo-hardened-ld.cfg <<-EOF
-			# Some of these options are added unconditionally, regardless of
-			# USE=hardened, for parity with sys-devel/gcc.
-			-Wl,-z,relro
-			-Wl,-z,now
-		EOF
-	fi
-
-	dodir /usr/include/gentoo
-
-	cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
-	/* __has_include is an extension, but it's fine, because this is only
-	for Clang anyway. */
-	#if defined __has_include && __has_include (<stdc-predef.h>) && !defined(__GLIBC__)
-	# include <stdc-predef.h>
-	#endif
-	EOF
-
-	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
-	#ifdef __clang__
-	# pragma clang system_header
-	#endif
-	#ifndef _FORTIFY_SOURCE
-	# if defined(__has_feature)
-	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
-	# else
-	#  define __GENTOO_HAS_FEATURE(x) 0
-	# endif
-	#
-	# if defined(__STDC_HOSTED__) && __STDC_HOSTED__ == 1
-	#  define __GENTOO_NOT_FREESTANDING 1
-	# else
-	#  define __GENTOO_NOT_FREESTANDING 0
-	# endif
-	#
-	# if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && __GENTOO_NOT_FREESTANDING > 0
-	#  if !defined(__SANITIZE_ADDRESS__) && !__GENTOO_HAS_FEATURE(address_sanitizer) && !__GENTOO_HAS_FEATURE(memory_sanitizer)
-	#   define _FORTIFY_SOURCE ${fortify_level}
-	#  endif
-	# endif
-	# undef __GENTOO_HAS_FEATURE
-	# undef __GENTOO_NOT_FREESTANDING
-	#endif
-	EOF
-
-	# TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
-	# non-hardened?
-	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
-			# https://libcxx.llvm.org/Hardening.html#using-hardened-mode
-			-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-		EOF
-	fi
-
-	# We only install config files for supported ABIs because unprefixed tools
-	# might be used for crosscompilation where e.g. PIE may not be supported.
-	# See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug #912685.
-	local abi
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		doclang_cfg "${abi_chost}"
-	done
-
-	if use kernel_Darwin; then
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			# Gentoo Prefix on Darwin
-			-Wl,-search_paths_first
-			-Wl,-rpath,${EPREFIX}/usr/lib
-			-L ${EPREFIX}/usr/lib
-			-isystem ${EPREFIX}/usr/include
-			-isysroot ${EPREFIX}/MacOSX.sdk
-		EOF
-		if use bootstrap-prefix ; then
-			# bootstrap-prefix is only set during stage2 of bootstrapping
-			# Prefix, where EPREFIX is set to EPREFIX/tmp.
-			# Here we need to point it at the future lib dir of the stage3's
-			# EPREFIX.
-			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-				-Wl,-rpath,${EPREFIX}/../usr/lib
-			EOF
-		fi
-	fi
-}
-
-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 7ac99ab5d4aa..d176dc2896c6 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,10 +1,7 @@
 EBUILD clang-runtime-15.0.7.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f
 EBUILD clang-runtime-16.0.6.ebuild 1448 BLAKE2B be376aab09a0268444784d1a0bcb590222c9c8a118e260b15939e574687334eb476d6f66ab0f1f4fb0841a226c7b7f690666c33bec2d9c14f27a4f30f986b859 SHA512 b0b7a2f5c69890cb2fc0a9c2c8a1910669a4eae16826c0702a2ef508f91b6ec3b5607beab5b24f02951cf9b377f1d09395bd97c27f476137ef6cdf2571330578
 EBUILD clang-runtime-17.0.6.ebuild 1448 BLAKE2B be376aab09a0268444784d1a0bcb590222c9c8a118e260b15939e574687334eb476d6f66ab0f1f4fb0841a226c7b7f690666c33bec2d9c14f27a4f30f986b859 SHA512 b0b7a2f5c69890cb2fc0a9c2c8a1910669a4eae16826c0702a2ef508f91b6ec3b5607beab5b24f02951cf9b377f1d09395bd97c27f476137ef6cdf2571330578
-EBUILD clang-runtime-18.1.7.ebuild 1455 BLAKE2B 09d026673062eaf3251bc0ac3665217f834c0bb8b57945a138839d86bec58ef7c979a627fb2054a5166c35894e4063bd1972402516d7304c6423639f556ff29a SHA512 aefd613ab3ec054a6829b0f3471384726a05ce410a1f98ab53cca1857bbb19f3b76526ed867a93092fe29acf95078823b2ff8e6b9941705c791c9a42b6eff68c
 EBUILD clang-runtime-18.1.8.ebuild 1455 BLAKE2B 09d026673062eaf3251bc0ac3665217f834c0bb8b57945a138839d86bec58ef7c979a627fb2054a5166c35894e4063bd1972402516d7304c6423639f556ff29a SHA512 aefd613ab3ec054a6829b0f3471384726a05ce410a1f98ab53cca1857bbb19f3b76526ed867a93092fe29acf95078823b2ff8e6b9941705c791c9a42b6eff68c
 EBUILD clang-runtime-19.0.0.9999.ebuild 1339 BLAKE2B 4a5ee8a332faf2da21256df048867b1458a5ccb2d733d00ee3788bfbc28b3daf4ce2ae2455ab03c9ebb192d964feae2cd5806b5fef23eaa9401d57b35386aa57 SHA512 fac3e259b5a7b5e105b3d5fd2f8e9a9b6236642867e4c4a67106ec999dfaf0a30a97a3905685043a0ab9f38b15b7b8a5a814a97921e37029b9d0beac7ba7085a
-EBUILD clang-runtime-19.0.0_pre20240608.ebuild 1339 BLAKE2B 4a5ee8a332faf2da21256df048867b1458a5ccb2d733d00ee3788bfbc28b3daf4ce2ae2455ab03c9ebb192d964feae2cd5806b5fef23eaa9401d57b35386aa57 SHA512 fac3e259b5a7b5e105b3d5fd2f8e9a9b6236642867e4c4a67106ec999dfaf0a30a97a3905685043a0ab9f38b15b7b8a5a814a97921e37029b9d0beac7ba7085a
-EBUILD clang-runtime-19.0.0_pre20240615.ebuild 1339 BLAKE2B 4a5ee8a332faf2da21256df048867b1458a5ccb2d733d00ee3788bfbc28b3daf4ce2ae2455ab03c9ebb192d964feae2cd5806b5fef23eaa9401d57b35386aa57 SHA512 fac3e259b5a7b5e105b3d5fd2f8e9a9b6236642867e4c4a67106ec999dfaf0a30a97a3905685043a0ab9f38b15b7b8a5a814a97921e37029b9d0beac7ba7085a
 EBUILD clang-runtime-19.0.0_pre20240623.ebuild 1339 BLAKE2B 4a5ee8a332faf2da21256df048867b1458a5ccb2d733d00ee3788bfbc28b3daf4ce2ae2455ab03c9ebb192d964feae2cd5806b5fef23eaa9401d57b35386aa57 SHA512 fac3e259b5a7b5e105b3d5fd2f8e9a9b6236642867e4c4a67106ec999dfaf0a30a97a3905685043a0ab9f38b15b7b8a5a814a97921e37029b9d0beac7ba7085a
 MISC metadata.xml 661 BLAKE2B 24688c511713ea102b83c71d226d519981b3aee0e05ef7a56d6a80be829efd843194e45cb4fd801f0bb976b6f1976386d6a2b05d2bc907fe2aa42b22b85b7d1f SHA512 2b5ab8783c90795f2e7d1673d876048ed9745f4911fb7a860df56deac13a6dfeba4581a84562eae54eff757c45042ca3fab75c7800313ae61df9ce69780a9294
diff --git a/sys-devel/clang-runtime/clang-runtime-18.1.7.ebuild b/sys-devel/clang-runtime/clang-runtime-18.1.7.ebuild
deleted file mode 100644
index 38042f073a24..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-18.1.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~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}] )
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240608.ebuild b/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240608.ebuild
deleted file mode 100644
index 323c0b62c062..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="${PV%%.*}"
-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}] )
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240615.ebuild b/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240615.ebuild
deleted file mode 100644
index 323c0b62c062..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="${PV%%.*}"
-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}] )
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 2e259c027307..b91ca3d943e7 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -11,20 +11,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD clang-15.0.7-r3.ebuild 12523 BLAKE2B d2f9e112d8c8d782b9d19913332445b234870dbff770bfd520b646347d8d804258e5043a155bb5e15f40ecdb41b2c0d70ee72dbe908b5621c2349d37f181d236 SHA512 c4abe3701012b4f9da97ac182680dbaceed802e95be06ae065debea943fa4635e60f4a0f31b6f23e3f7818f2d30dfb1e2c28f1a85dc0175c158b4e5c68b5a23e
 EBUILD clang-16.0.6.ebuild 12452 BLAKE2B 446a354b58fc0535b81596a9a3785a4cd5d7b7ad52a461baa3b6b7beacdc12161f62da588cd837b8b9c8f35307b1a2c885b9d01bf8edc4af1b551efaab09ebe8 SHA512 58b5694a7d28a03edd4a71e3a99b0b2678285e616cdaab82bb196f092a8726e9cd3787ab07d724680113b4f6683e89103cab2478e49a85e7b5c75a633fb1ca51
 EBUILD clang-17.0.6.ebuild 12151 BLAKE2B 665280844db218824bec2add033e13e14b958ac510fb1b0b7193130a55041a5c802c57aa022a35d65a689c611ca9ed119eaf39c47f581d24f38d9c8655c5f062 SHA512 482ae07e36fb3c593d2051b2034f501fc0c94bdcaeb2a6a0701473d00f16f691c8a1584d4b1773dfd236297a12a42cb4f9443eb5c381dcb10d36f749a432ff1d
-EBUILD clang-18.1.7.ebuild 12225 BLAKE2B 1909258abbc403a0cd3b9f0ecb6ad5584f6d32eec2efbf518df5e79e513848a1c13e558554fbad126bd23b1236715d641ea7fd1d4c90b6eec0766784e2aa913c SHA512 8fc2935fc58673ac8f0b59a81014be335d2e6798e0787fb81910f8d3844ff4d9f6b6c749ca47bf02b0b24c4423884872df7284fd83efc7d18f015c95b561565a
 EBUILD clang-18.1.8.ebuild 12225 BLAKE2B 1909258abbc403a0cd3b9f0ecb6ad5584f6d32eec2efbf518df5e79e513848a1c13e558554fbad126bd23b1236715d641ea7fd1d4c90b6eec0766784e2aa913c SHA512 8fc2935fc58673ac8f0b59a81014be335d2e6798e0787fb81910f8d3844ff4d9f6b6c749ca47bf02b0b24c4423884872df7284fd83efc7d18f015c95b561565a
 EBUILD clang-19.0.0.9999.ebuild 11875 BLAKE2B 7521378bd8f31602184272cc6240c133c8f110ad9ffb7a922e8d2b67c53724cda8217416d5a16269cb9bd55ad8a40bd61a465d3451285223480392afdd733712 SHA512 c1c0834b083008ac6fd51adfffb770b4242e37dd2cbc51c7e9fc58e5e38faf81a737e5a586276f60672223332f011e46ef973a44e0dbcb9fa40ae47b5bba37f8
-EBUILD clang-19.0.0_pre20240608.ebuild 12141 BLAKE2B 81dfb104fdbd499b5dd79780171d42b83f0e3da164c7a20a74d81589c7708c50a7900b8bded93a0e889269eab50a5a9e37fe4c135a3c05edad96cc5f33dfd431 SHA512 40f6bd91e1095a230a02f8b3a133d9a667feef5d1ef82dcb78b33e65dab75d240957bf954479fec2a73a1420497c339f93c23942b252e0fd90a74363fd922ef1
-EBUILD clang-19.0.0_pre20240615.ebuild 12141 BLAKE2B 81dfb104fdbd499b5dd79780171d42b83f0e3da164c7a20a74d81589c7708c50a7900b8bded93a0e889269eab50a5a9e37fe4c135a3c05edad96cc5f33dfd431 SHA512 40f6bd91e1095a230a02f8b3a133d9a667feef5d1ef82dcb78b33e65dab75d240957bf954479fec2a73a1420497c339f93c23942b252e0fd90a74363fd922ef1
 EBUILD clang-19.0.0_pre20240623.ebuild 11875 BLAKE2B 7521378bd8f31602184272cc6240c133c8f110ad9ffb7a922e8d2b67c53724cda8217416d5a16269cb9bd55ad8a40bd61a465d3451285223480392afdd733712 SHA512 c1c0834b083008ac6fd51adfffb770b4242e37dd2cbc51c7e9fc58e5e38faf81a737e5a586276f60672223332f011e46ef973a44e0dbcb9fa40ae47b5bba37f8
 MISC metadata.xml 1318 BLAKE2B 704c1a64297b25da1b2e0eec23cbdf4791273da1babf23292160b6163d43438e62fe214df7afa09232893599951918440954c17a9bfa0c6f829a7d706f564192 SHA512 4677ad146739dd41e025a2335eec353a3d35ac8db7482948fee611566d84b41c4e6bdd75bc3d78f8933d4d9818a36bf222e1aa89e52f945501ff918479fea3b6
diff --git a/sys-devel/clang/clang-18.1.7.ebuild b/sys-devel/clang/clang-18.1.7.ebuild
deleted file mode 100644
index daf8ded03599..000000000000
--- a/sys-devel/clang/clang-18.1.7.ebuild
+++ /dev/null
@@ -1,476 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake llvm.org llvm-utils multilib multilib-minimal
-inherit 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~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}
-	test? ( ~sys-devel/lld-${PV} )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/utils
-)
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_cond_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-# 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).
-
-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
-
-	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-	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
-					# 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
-			amdgpu-arch
-			c-index-test
-			clang
-			clang-format
-			clang-linker-wrapper
-			clang-offload-bundler
-			clang-offload-packager
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-			nvptx-arch
-
-			# needed for cross-compiling Clang
-			clang-tblgen
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-cleaner
-				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() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local mycmakeargs=(
-		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-		-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_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		-DCLANG_INCLUDE_TESTS=$(usex test)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		# 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_CUDAToolkit=ON
-		# disable linking to HSA to avoid automagic dep,
-		# load it dynamically instead
-		-DCMAKE_DISABLE_FIND_PACKAGE_hsa-runtime64=ON
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_LIBXML2=$(usex xml)
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-		# TODO: CLANG_ENABLE_HLSL?
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-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
-		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
-			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
-		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-			-DCLANG_TABLEGEN="${tools_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
-}
-
-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/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/clang/clang-19.0.0_pre20240608.ebuild b/sys-devel/clang/clang-19.0.0_pre20240608.ebuild
deleted file mode 100644
index a4e4e458149e..000000000000
--- a/sys-devel/clang/clang-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,476 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake llvm.org llvm-utils multilib multilib-minimal
-inherit 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}"
-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}
-	test? ( ~sys-devel/lld-${PV} )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/utils
-)
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_cond_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-# 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).
-
-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
-
-	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-	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
-					# 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
-			amdgpu-arch
-			c-index-test
-			clang
-			clang-format
-			clang-installapi
-			clang-linker-wrapper
-			clang-offload-bundler
-			clang-offload-packager
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-			nvptx-arch
-
-			# needed for cross-compiling Clang
-			clang-tblgen
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-cleaner
-				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() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local mycmakeargs=(
-		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-		-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_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		-DCLANG_INCLUDE_TESTS=$(usex test)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		# 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_CUDAToolkit=ON
-		# disable linking to HSA to avoid automagic dep,
-		# load it dynamically instead
-		-DCMAKE_DISABLE_FIND_PACKAGE_hsa-runtime64=ON
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_LIBXML2=$(usex xml)
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-		# TODO: CLANG_ENABLE_HLSL?
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-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
-		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
-			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
-		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-			-DCLANG_TABLEGEN="${tools_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
-}
-
-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/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/clang/clang-19.0.0_pre20240615.ebuild b/sys-devel/clang/clang-19.0.0_pre20240615.ebuild
deleted file mode 100644
index a4e4e458149e..000000000000
--- a/sys-devel/clang/clang-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,476 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake llvm.org llvm-utils multilib multilib-minimal
-inherit 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}"
-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}
-	test? ( ~sys-devel/lld-${PV} )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/utils
-)
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_cond_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-# 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).
-
-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
-
-	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-	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
-					# 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
-			amdgpu-arch
-			c-index-test
-			clang
-			clang-format
-			clang-installapi
-			clang-linker-wrapper
-			clang-offload-bundler
-			clang-offload-packager
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-			nvptx-arch
-
-			# needed for cross-compiling Clang
-			clang-tblgen
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-cleaner
-				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() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local mycmakeargs=(
-		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-		-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_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		-DCLANG_INCLUDE_TESTS=$(usex test)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		# 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_CUDAToolkit=ON
-		# disable linking to HSA to avoid automagic dep,
-		# load it dynamically instead
-		-DCMAKE_DISABLE_FIND_PACKAGE_hsa-runtime64=ON
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_LIBXML2=$(usex xml)
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-		# TODO: CLANG_ENABLE_HLSL?
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-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
-		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
-			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
-		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-			-DCLANG_TABLEGEN="${tools_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
-}
-
-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/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/lld/Manifest b/sys-devel/lld/Manifest
index 1247e93d8781..b230e287ce6d 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -5,20 +5,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD lld-15.0.7.ebuild 2269 BLAKE2B 322d5608e3acfb87bfb720646404ed405a3113c4faf1059428663a50d5566d7842fcff57ccf3aeb5e97b1a9acd4efd862db2368f130e088944ef4f0faf3c90f8 SHA512 e50d1d99fe18b6aba57c06eb6853f3212be1f7b7f2f3c70dcd226a69a4defc753eafcce77eb74f30eaa31b010fa094738718c1cdb23e584ef6e33eb72e536719
 EBUILD lld-16.0.6.ebuild 2324 BLAKE2B 9b849aea16a8188e4da4cfcf0c85fb3e997007e1287ec062aee182c7955c7bc78132e761c2611198c7207283fbe930fbee6bdc9a39b922d6d5387bedadaf1b76 SHA512 a7c3d4c1508e5435ba9f6250c6b2fd3157fb4f2c205a6888736f79fa739c59eec3e901927b53af81de3a3c6d4fa5d576be3eaa6ad45c60e5d952ed4ad9706c2f
 EBUILD lld-17.0.6.ebuild 2363 BLAKE2B 8ebe513b67f3fb8efd981b97c1f77fe5de2065c363c2b9e99b8836983539fe5637b231e8be2a87713d47b48a49bfde77471ad65fa5166b606df476eca6f94fc1 SHA512 fd63e8600e393ecd95a05a28c8ac0d71b12f5aedcf273f432bea1904165b874ee913afff4aab91c2049aa1eb95c239bca217b84150133b2060f95ea66ce1944e
-EBUILD lld-18.1.7.ebuild 2373 BLAKE2B 35b65cd90474db95b394ef3b041c017bf78b6650e27e7fc302e010a17c6a3ec88a6e0031842a73622bb06c3cea771193d9dc42b5f00bfd773fbf16d4dc422be0 SHA512 b7eb6f7c287ac006d80426ab160d801792f74c6b7aef02b5244763351adc96efd3e06e50aca1cd04f797d7e2aa1dfa92f4f9aea3d34c7a01c9e6c79dfe58ec8a
 EBUILD lld-18.1.8.ebuild 2373 BLAKE2B 35b65cd90474db95b394ef3b041c017bf78b6650e27e7fc302e010a17c6a3ec88a6e0031842a73622bb06c3cea771193d9dc42b5f00bfd773fbf16d4dc422be0 SHA512 b7eb6f7c287ac006d80426ab160d801792f74c6b7aef02b5244763351adc96efd3e06e50aca1cd04f797d7e2aa1dfa92f4f9aea3d34c7a01c9e6c79dfe58ec8a
 EBUILD lld-19.0.0.9999.ebuild 2293 BLAKE2B 5825f0a471a50ec1d9e7775a82736f6369fa1e99904b30cf068f0092dce44d4e0c2e76fcb21d70b9ecb1756d19e8482a5ac940bdc25c5a1d58c9aee0c21b5d7b SHA512 86226e5f9aea8a87b022b2def7cef707fc7db0f1e026f4965ec64390708f7e2355c3e1ee991487bd0c6f9f17dc2f129a6b7a2b8abbf1e14fe48dd0e4cd73b1fa
-EBUILD lld-19.0.0_pre20240608.ebuild 2293 BLAKE2B 5825f0a471a50ec1d9e7775a82736f6369fa1e99904b30cf068f0092dce44d4e0c2e76fcb21d70b9ecb1756d19e8482a5ac940bdc25c5a1d58c9aee0c21b5d7b SHA512 86226e5f9aea8a87b022b2def7cef707fc7db0f1e026f4965ec64390708f7e2355c3e1ee991487bd0c6f9f17dc2f129a6b7a2b8abbf1e14fe48dd0e4cd73b1fa
-EBUILD lld-19.0.0_pre20240615.ebuild 2293 BLAKE2B 5825f0a471a50ec1d9e7775a82736f6369fa1e99904b30cf068f0092dce44d4e0c2e76fcb21d70b9ecb1756d19e8482a5ac940bdc25c5a1d58c9aee0c21b5d7b SHA512 86226e5f9aea8a87b022b2def7cef707fc7db0f1e026f4965ec64390708f7e2355c3e1ee991487bd0c6f9f17dc2f129a6b7a2b8abbf1e14fe48dd0e4cd73b1fa
 EBUILD lld-19.0.0_pre20240623.ebuild 2293 BLAKE2B 5825f0a471a50ec1d9e7775a82736f6369fa1e99904b30cf068f0092dce44d4e0c2e76fcb21d70b9ecb1756d19e8482a5ac940bdc25c5a1d58c9aee0c21b5d7b SHA512 86226e5f9aea8a87b022b2def7cef707fc7db0f1e026f4965ec64390708f7e2355c3e1ee991487bd0c6f9f17dc2f129a6b7a2b8abbf1e14fe48dd0e4cd73b1fa
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-18.1.7.ebuild b/sys-devel/lld/lld-18.1.7.ebuild
deleted file mode 100644
index 7052d857f918..000000000000
--- a/sys-devel/lld/lld-18.1.7.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-
-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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos"
-IUSE="debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}[debug=,zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-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_prepend_path "${LLVM_MAJOR}"
-
-	# ODR violations (https://github.com/llvm/llvm-project/issues/83529, bug #922353)
-	filter-lto
-
-	# 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_ENABLE_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	tc-is-cross-compiler &&	mycmakeargs+=(
-		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/lld/lld-19.0.0_pre20240608.ebuild b/sys-devel/lld/lld-19.0.0_pre20240608.ebuild
deleted file mode 100644
index 79558afa1abe..000000000000
--- a/sys-devel/lld/lld-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="+debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}[debug=,zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-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_prepend_path "${LLVM_MAJOR}"
-
-	# ODR violations (https://github.com/llvm/llvm-project/issues/83529, bug #922353)
-	filter-lto
-
-	# 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_ENABLE_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	tc-is-cross-compiler &&	mycmakeargs+=(
-		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/lld/lld-19.0.0_pre20240615.ebuild b/sys-devel/lld/lld-19.0.0_pre20240615.ebuild
deleted file mode 100644
index 79558afa1abe..000000000000
--- a/sys-devel/lld/lld-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="+debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}[debug=,zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-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_prepend_path "${LLVM_MAJOR}"
-
-	# ODR violations (https://github.com/llvm/llvm-project/issues/83529, bug #922353)
-	filter-lto
-
-	# 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_ENABLE_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	tc-is-cross-compiler &&	mycmakeargs+=(
-		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-	)
-
-	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 1befd5a239a8..a8e292409d72 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD llvm-common-15.0.7.ebuild 1014 BLAKE2B da3b7ec6cd3c1e57758312fb9ea25e693305e1ef72b350eea85fbde5a1e636269d84bd491b6f528aee8a9cb8229f6304b371f99e6ac416c661c6519706b83b61 SHA512 68b9d672372fe71e39f2b8f9d80eb1dcb5138b8b9b961f56a4eeb81b3fc4054448a51a46b3a62547ebb6262425512f39bc146e5f2c3703de10ab520f1594e7a4
 EBUILD llvm-common-16.0.6.ebuild 1034 BLAKE2B 1e0a0b6cbb746a7eb45e3f553bc949b69314afc3d913cda004d395e7b322c17f976496eed074cf08718dc2d9efa7f3db81dec4f38394fe6ea2b77793b74f4371 SHA512 8fbb211a6b05d24409642fcb00a4fb798499721cc30c4c5fa2df120ed74d9da7286916cf3788ea26f2cb21e334876417b05a4336fedff99e95d1ebe358f8b311
 EBUILD llvm-common-17.0.6.ebuild 1034 BLAKE2B 1e0a0b6cbb746a7eb45e3f553bc949b69314afc3d913cda004d395e7b322c17f976496eed074cf08718dc2d9efa7f3db81dec4f38394fe6ea2b77793b74f4371 SHA512 8fbb211a6b05d24409642fcb00a4fb798499721cc30c4c5fa2df120ed74d9da7286916cf3788ea26f2cb21e334876417b05a4336fedff99e95d1ebe358f8b311
-EBUILD llvm-common-18.1.7.ebuild 1047 BLAKE2B 195324cff3d34038012504238dfbbdb44fc9a8ff2dc7d2af7165006f0b7a10dfe28439631c601d89e02a304477509ee268653a98a956936c234e3d7520574691 SHA512 00c0448fa43e250ce7a3f1c4fb20312eba3ab860387f33399eb66e50bea5029bc72c1c1f733acaf24f729a6f7b5ee6e6a6308b4532ed1ec135b99c9541c49173
 EBUILD llvm-common-18.1.8.ebuild 1047 BLAKE2B 195324cff3d34038012504238dfbbdb44fc9a8ff2dc7d2af7165006f0b7a10dfe28439631c601d89e02a304477509ee268653a98a956936c234e3d7520574691 SHA512 00c0448fa43e250ce7a3f1c4fb20312eba3ab860387f33399eb66e50bea5029bc72c1c1f733acaf24f729a6f7b5ee6e6a6308b4532ed1ec135b99c9541c49173
 EBUILD llvm-common-19.0.0.9999.ebuild 925 BLAKE2B 18510f8adb0e892eb63bdbf8a6154f56e23ed026ee6f0bf05bbccbafea843beb228bf57e14b01525fb0b067fdfa897faadbfd61179844a7c397c7f1d3b6fca64 SHA512 0cff75fcbabf14ba1526201d65b79486aefaf559accf5bd479a3643c4351ac997f6d55b2323328fabc4009e887e1cfe70681df5593c62a5b5bbfffb8312ea22d
-EBUILD llvm-common-19.0.0_pre20240608.ebuild 925 BLAKE2B 18510f8adb0e892eb63bdbf8a6154f56e23ed026ee6f0bf05bbccbafea843beb228bf57e14b01525fb0b067fdfa897faadbfd61179844a7c397c7f1d3b6fca64 SHA512 0cff75fcbabf14ba1526201d65b79486aefaf559accf5bd479a3643c4351ac997f6d55b2323328fabc4009e887e1cfe70681df5593c62a5b5bbfffb8312ea22d
-EBUILD llvm-common-19.0.0_pre20240615.ebuild 925 BLAKE2B 18510f8adb0e892eb63bdbf8a6154f56e23ed026ee6f0bf05bbccbafea843beb228bf57e14b01525fb0b067fdfa897faadbfd61179844a7c397c7f1d3b6fca64 SHA512 0cff75fcbabf14ba1526201d65b79486aefaf559accf5bd479a3643c4351ac997f6d55b2323328fabc4009e887e1cfe70681df5593c62a5b5bbfffb8312ea22d
 EBUILD llvm-common-19.0.0_pre20240623.ebuild 925 BLAKE2B 18510f8adb0e892eb63bdbf8a6154f56e23ed026ee6f0bf05bbccbafea843beb228bf57e14b01525fb0b067fdfa897faadbfd61179844a7c397c7f1d3b6fca64 SHA512 0cff75fcbabf14ba1526201d65b79486aefaf559accf5bd479a3643c4351ac997f6d55b2323328fabc4009e887e1cfe70681df5593c62a5b5bbfffb8312ea22d
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvm-common/llvm-common-18.1.7.ebuild b/sys-devel/llvm-common/llvm-common-18.1.7.ebuild
deleted file mode 100644
index 7a852f871e36..000000000000
--- a/sys-devel/llvm-common/llvm-common-18.1.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
-IUSE="emacs"
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-BDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-
-LLVM_COMPONENTS=( llvm/utils )
-llvm.org_set_globals
-
-SITEFILE="50llvm-gentoo.el"
-BYTECOMPFLAGS="-L emacs"
-
-src_compile() {
-	default
-
-	use emacs && elisp-compile emacs/*.el
-}
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r vim/*/
-	# some users may find it useful
-	newdoc vim/README README.vim
-	dodoc vim/vimrc
-
-	if use emacs ; then
-		elisp-install llvm emacs/*.{el,elc}
-		elisp-make-site-file "${SITEFILE}" llvm
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-devel/llvm-common/llvm-common-19.0.0_pre20240608.ebuild b/sys-devel/llvm-common/llvm-common-19.0.0_pre20240608.ebuild
deleted file mode 100644
index 2d8f35a84179..000000000000
--- a/sys-devel/llvm-common/llvm-common-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common 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"
-IUSE="emacs"
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-BDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-
-LLVM_COMPONENTS=( llvm/utils )
-llvm.org_set_globals
-
-SITEFILE="50llvm-gentoo.el"
-BYTECOMPFLAGS="-L emacs"
-
-src_compile() {
-	default
-
-	use emacs && elisp-compile emacs/*.el
-}
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r vim/*/
-	# some users may find it useful
-	newdoc vim/README README.vim
-	dodoc vim/vimrc
-
-	if use emacs ; then
-		elisp-install llvm emacs/*.{el,elc}
-		elisp-make-site-file "${SITEFILE}" llvm
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-devel/llvm-common/llvm-common-19.0.0_pre20240615.ebuild b/sys-devel/llvm-common/llvm-common-19.0.0_pre20240615.ebuild
deleted file mode 100644
index 2d8f35a84179..000000000000
--- a/sys-devel/llvm-common/llvm-common-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common 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"
-IUSE="emacs"
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-BDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-
-LLVM_COMPONENTS=( llvm/utils )
-llvm.org_set_globals
-
-SITEFILE="50llvm-gentoo.el"
-BYTECOMPFLAGS="-L emacs"
-
-src_compile() {
-	default
-
-	use emacs && elisp-compile emacs/*.el
-}
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r vim/*/
-	# some users may find it useful
-	newdoc vim/README README.vim
-	dodoc vim/vimrc
-
-	if use emacs ; then
-		elisp-install llvm emacs/*.{el,elc}
-		elisp-make-site-file "${SITEFILE}" llvm
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 71e7eb5a888f..900bf2d339d4 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -11,20 +11,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD llvm-15.0.7-r3.ebuild 12592 BLAKE2B 81cd473990810203c4e8a47ceb0189ed399c869b85fab3181724dbd1429063cdaad1f6b6cb1ab5b392f531b0b4907cc61f266558b873b236f9a3ff439045aa37 SHA512 2321f9e6da93af22d5f074175a6a92b7dcd271e2b9b92128d268dd777a9c3bdd876010740153734e2593b90d26a58d4f784b2256a6b1e18160d13b3c10441fb3
 EBUILD llvm-16.0.6.ebuild 12822 BLAKE2B fe0a8bca0506827f09ea9edc18e8574443af644540cec84126fa3668ca8fa538a103c76315ee7c61b0af67a1391168ae7b04201e7825958a46fe8642a327e93b SHA512 a1a861d11791cb583dc33b9c71a86bd50690ffb8b743a6bccf8b4600976f48e96a2b4171cc9b449c17c8b0516ef440cee89df8cff97a3c691968b3431a149612
 EBUILD llvm-17.0.6.ebuild 13293 BLAKE2B 50e4212c63f1561f4fc8397a831f83bd3ea370349fa3b6239dfe2f9212757f6e8d5bb1921b8714680fe94d0f02ca523d289447b1396124aa94f91b539aabb17a SHA512 5b2b1d2293cf00d0c547a06111a0af706b2cad1f7cb5f2cc421f54a129c165560adbba4342d9bea486d5b2474a1eed066f1ae955a89133cd94b61a62313980bb
-EBUILD llvm-18.1.7.ebuild 13359 BLAKE2B 0baff2537134709ae351f867b40e9f0a7bcb540540d9b8ef49398163efcacccc0e02791121c06752ac17d1ad961ad0d639f8d5df08d36c34f060b00bf65e3ebb SHA512 25a83a7e365d6ec933196f8356c3b1805220ac88e6e342c87b041597a67f21de479670db6d78157e0899f31f9158a6e17f730c279df1883c687f174ec9c496fa
 EBUILD llvm-18.1.8.ebuild 13359 BLAKE2B 0baff2537134709ae351f867b40e9f0a7bcb540540d9b8ef49398163efcacccc0e02791121c06752ac17d1ad961ad0d639f8d5df08d36c34f060b00bf65e3ebb SHA512 25a83a7e365d6ec933196f8356c3b1805220ac88e6e342c87b041597a67f21de479670db6d78157e0899f31f9158a6e17f730c279df1883c687f174ec9c496fa
 EBUILD llvm-19.0.0.9999.ebuild 12883 BLAKE2B 7cdb711526347c7a2c378c0e52e006429021daf3d637187eb9439d70a35ab94b59b028e9dd0d832e83ca2a522a2dd701268f5dc942ef53b3bba8d9bc1942e5f0 SHA512 43b7a87422810949d8c59d97e21be87311f755f2565828dacb988e64510c4f7c16202aa50f047ddddafd0c9cec14618cfc65c38a0016a9e8aa2055f18510dc59
-EBUILD llvm-19.0.0_pre20240608.ebuild 12883 BLAKE2B 7cdb711526347c7a2c378c0e52e006429021daf3d637187eb9439d70a35ab94b59b028e9dd0d832e83ca2a522a2dd701268f5dc942ef53b3bba8d9bc1942e5f0 SHA512 43b7a87422810949d8c59d97e21be87311f755f2565828dacb988e64510c4f7c16202aa50f047ddddafd0c9cec14618cfc65c38a0016a9e8aa2055f18510dc59
-EBUILD llvm-19.0.0_pre20240615.ebuild 12883 BLAKE2B 7cdb711526347c7a2c378c0e52e006429021daf3d637187eb9439d70a35ab94b59b028e9dd0d832e83ca2a522a2dd701268f5dc942ef53b3bba8d9bc1942e5f0 SHA512 43b7a87422810949d8c59d97e21be87311f755f2565828dacb988e64510c4f7c16202aa50f047ddddafd0c9cec14618cfc65c38a0016a9e8aa2055f18510dc59
 EBUILD llvm-19.0.0_pre20240623.ebuild 12883 BLAKE2B 7cdb711526347c7a2c378c0e52e006429021daf3d637187eb9439d70a35ab94b59b028e9dd0d832e83ca2a522a2dd701268f5dc942ef53b3bba8d9bc1942e5f0 SHA512 43b7a87422810949d8c59d97e21be87311f755f2565828dacb988e64510c4f7c16202aa50f047ddddafd0c9cec14618cfc65c38a0016a9e8aa2055f18510dc59
 MISC metadata.xml 2835 BLAKE2B 07816d714509d62c0e0a443cc4af1f1f049497de75431f80a981f662b4f2281a16655be3e733a26099d0d814d5ce26d80cee13aa7a4e8d079168846a8e02670f SHA512 292ccb0a05a0239b5b00c6a84be11b4b385900d6467a6a139af03588c61aff9ac0e4bbcd23e89b2a7d7947f7d8cf8ba9323f2539a6c563a338b73f5ac6ffd00f
diff --git a/sys-devel/llvm/llvm-18.1.7.ebuild b/sys-devel/llvm/llvm-18.1.7.ebuild
deleted file mode 100644
index 8b9fe8989341..000000000000
--- a/sys-devel/llvm/llvm-18.1.7.ebuild
+++ /dev/null
@@ -1,548 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1
-inherit 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
-IUSE="
-	+binutils-plugin debug debuginfod doc exegesis libedit +libffi
-	ncurses test xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	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}] )
-	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
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-	)
-	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_USE_TARGETS=provide
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_any_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-python_check_deps() {
-	llvm_are_manpages_built || return 0
-
-	python_has_version -b "dev-python/myst-parser[${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)
-						;;
-					# used by lldb
-					LLVMDebuginfod)
-						;;
-					# testing libraries
-					LLVMTestingAnnotations|LLVMTestingSupport)
-						;;
-					# 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
-
-		# testing libraries
-		llvm_gtest
-		llvm_gtest_main
-		LLVMTestingAnnotations
-		LLVMTestingSupport
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# library used by lldb
-			LLVMDebuginfod
-
-			# 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-debuginfo-analyzer
-			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-readtapi
-			llvm-reduce
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			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
-		)
-		use debuginfod && out+=(
-			llvm-debuginfod
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	if use ppc && tc-is-gcc && [[ $(gcc-major-version) -lt 14 ]]; then
-		# Workaround for bug #880677
-		append-flags $(test-flags-CXX -fno-ipa-sra -fno-ipa-modref -fno-ipa-icf)
-	fi
-
-	# ODR violations (bug #917536, bug #926529). Just do it for GCC for now
-	# to avoid people grumbling. GCC is, anecdotally, more likely to miscompile
-	# LLVM with LTO anyway (which is not necessarily its fault).
-	tc-is-gcc && filter-lto
-
-	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_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=ON
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_INSTALL_GTEST=ON
-
-		-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_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-		-DLLVM_ENABLE_CURL=$(usex debuginfod)
-		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	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.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	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
-
-	use kernel_Darwin && mycmakeargs+=(
-		# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
-		# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
-		# using libtinfo (actually, libncurses.dylib) from system instead of prefix
-		-DTerminfo_LIBRARIES=-lncurses
-		# Use our libtool instead of looking it up with xcrun
-		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-	)
-
-	# 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_MAIN_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/llvm/llvm-19.0.0_pre20240608.ebuild b/sys-devel/llvm/llvm-19.0.0_pre20240608.ebuild
deleted file mode 100644
index c4930d262794..000000000000
--- a/sys-devel/llvm/llvm-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,542 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1
-inherit 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}"
-IUSE="
-	+binutils-plugin +debug debuginfod doc exegesis libedit +libffi
-	test xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	exegesis? ( dev-libs/libpfm:= )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	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
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-	)
-	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_USE_TARGETS=provide
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_any_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-python_check_deps() {
-	llvm_are_manpages_built || return 0
-
-	python_has_version -b "dev-python/myst-parser[${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)
-						;;
-					# used by lldb
-					LLVMDebuginfod)
-						;;
-					# testing libraries
-					LLVMTestingAnnotations|LLVMTestingSupport)
-						;;
-					# 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
-
-		# testing libraries
-		llvm_gtest
-		llvm_gtest_main
-		LLVMTestingAnnotations
-		LLVMTestingSupport
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# library used by lldb
-			LLVMDebuginfod
-
-			# 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-debuginfo-analyzer
-			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-readtapi
-			llvm-reduce
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			reduce-chunk-list
-			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
-		)
-		use debuginfod && out+=(
-			llvm-debuginfod
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	if use ppc && tc-is-gcc && [[ $(gcc-major-version) -lt 14 ]]; then
-		# Workaround for bug #880677
-		append-flags $(test-flags-CXX -fno-ipa-sra -fno-ipa-modref -fno-ipa-icf)
-	fi
-
-	# ODR violations (bug #917536, bug #926529). Just do it for GCC for now
-	# to avoid people grumbling. GCC is, anecdotally, more likely to miscompile
-	# LLVM with LTO anyway (which is not necessarily its fault).
-	tc-is-gcc && filter-lto
-
-	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_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=ON
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_INSTALL_GTEST=ON
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-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_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-		-DLLVM_ENABLE_CURL=$(usex debuginfod)
-		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	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.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	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
-
-	use kernel_Darwin && mycmakeargs+=(
-		# Use our libtool instead of looking it up with xcrun
-		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-	)
-
-	# 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_MAIN_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/llvm/llvm-19.0.0_pre20240615.ebuild b/sys-devel/llvm/llvm-19.0.0_pre20240615.ebuild
deleted file mode 100644
index c4930d262794..000000000000
--- a/sys-devel/llvm/llvm-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,542 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake flag-o-matic llvm.org multilib-minimal pax-utils python-any-r1
-inherit 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}"
-IUSE="
-	+binutils-plugin +debug debuginfod doc exegesis libedit +libffi
-	test xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	debuginfod? (
-		net-misc/curl:=
-		dev-cpp/cpp-httplib:=
-	)
-	exegesis? ( dev-libs/libpfm:= )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	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
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-	)
-	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_USE_TARGETS=provide
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-	$(python_gen_any_dep '
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-python_check_deps() {
-	llvm_are_manpages_built || return 0
-
-	python_has_version -b "dev-python/myst-parser[${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)
-						;;
-					# used by lldb
-					LLVMDebuginfod)
-						;;
-					# testing libraries
-					LLVMTestingAnnotations|LLVMTestingSupport)
-						;;
-					# 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
-
-		# testing libraries
-		llvm_gtest
-		llvm_gtest_main
-		LLVMTestingAnnotations
-		LLVMTestingSupport
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# library used by lldb
-			LLVMDebuginfod
-
-			# 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-debuginfo-analyzer
-			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-readtapi
-			llvm-reduce
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			reduce-chunk-list
-			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
-		)
-		use debuginfod && out+=(
-			llvm-debuginfod
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	if use ppc && tc-is-gcc && [[ $(gcc-major-version) -lt 14 ]]; then
-		# Workaround for bug #880677
-		append-flags $(test-flags-CXX -fno-ipa-sra -fno-ipa-modref -fno-ipa-icf)
-	fi
-
-	# ODR violations (bug #917536, bug #926529). Just do it for GCC for now
-	# to avoid people grumbling. GCC is, anecdotally, more likely to miscompile
-	# LLVM with LTO anyway (which is not necessarily its fault).
-	tc-is-gcc && filter-lto
-
-	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_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=ON
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_INSTALL_GTEST=ON
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-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_ZLIB=FORCE_ON
-		-DLLVM_ENABLE_ZSTD=$(usex zstd FORCE_ON OFF)
-		-DLLVM_ENABLE_CURL=$(usex debuginfod)
-		-DLLVM_ENABLE_HTTPLIB=$(usex debuginfod)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	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.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	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
-
-	use kernel_Darwin && mycmakeargs+=(
-		# Use our libtool instead of looking it up with xcrun
-		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-	)
-
-	# 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_MAIN_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-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index d3ccdd26a025..22c3d87c8a41 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 32fa624ab262..c489f5346d82 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -6,6 +6,6 @@ DIST microcode-20240312.tar.gz 12825665 BLAKE2B 43c771becef0f6dbfd41bf78a9a3cc8f
 DIST microcode-20240514.tar.gz 12870457 BLAKE2B 2a3a357ecf8d9f17fd20cd651386e5687fbbca8a3a323caf846e7c84d440241c3c99cadd00016642c8d11f297c1d2ab63c54ea062644839b74f84d66b04c703e SHA512 1c0f1707bf7db70d04e94a0728c0f61a1f9c25fead8c2c3716cafd20c976973cf636e411d12f81b34bf0076d7c7601c11b1bcd92a2e1be35d98003bb61ace569
 DIST microcode-20240531.tar.gz 12870497 BLAKE2B 6a2c5ee6b6f3543b28f3753b30812e360bad50776b4f81e32a832e2169f38c11f8d5108ce0a81ddcdf1ecf7557baf1fd62c053a365f39a33ded5fd5018580b1f SHA512 fb9d772491f279ebb691248e4a665da45c986ca7b4668ecf311c5fcb91a42400f7a5b35e8bfc31ceb1c9d598e753c817359900e3fa316d825f8ecec21ec63cfe
 EBUILD intel-microcode-20240312_p20240312.ebuild 11405 BLAKE2B de40dc4ba660dbbcf048054f545ae411b7fb24f6280383fd4dbd855558f7695d2e8709d9d78d55d0669f0d48cbdbcab8a61b929ad60c30c6c635aa3a23f6e06e SHA512 962174d9ebe3c15f020e89577e85f1230f76c13a0c910aec25b15f7b73d025cdfe21873da621a35fff7580caaac504c57ab9501f543167c9b9e7740e556a2bf7
-EBUILD intel-microcode-20240514_p20240514.ebuild 11407 BLAKE2B 206a08021e04cbc1c9de7d5a225df5868e9ac356d33fcdd3430b20c52461feed12bdbf016a7da4bb92310b4b93f5fa757459d780997b9dd829c85bdb31d164fb SHA512 f298e2a764f26e7cfef07257868413ddf6422eec2c8170f4220c407445b747f2d7f2e875f7a8da4c5698752b2add8ca4fe307db38e4c695ec4e8ff9f075e3ebd
+EBUILD intel-microcode-20240514_p20240514.ebuild 11405 BLAKE2B de40dc4ba660dbbcf048054f545ae411b7fb24f6280383fd4dbd855558f7695d2e8709d9d78d55d0669f0d48cbdbcab8a61b929ad60c30c6c635aa3a23f6e06e SHA512 962174d9ebe3c15f020e89577e85f1230f76c13a0c910aec25b15f7b73d025cdfe21873da621a35fff7580caaac504c57ab9501f543167c9b9e7740e556a2bf7
 EBUILD intel-microcode-20240531_p20240526.ebuild 11407 BLAKE2B 206a08021e04cbc1c9de7d5a225df5868e9ac356d33fcdd3430b20c52461feed12bdbf016a7da4bb92310b4b93f5fa757459d780997b9dd829c85bdb31d164fb SHA512 f298e2a764f26e7cfef07257868413ddf6422eec2c8170f4220c407445b747f2d7f2e875f7a8da4c5698752b2add8ca4fe307db38e4c695ec4e8ff9f075e3ebd
 MISC metadata.xml 853 BLAKE2B b9103bc6c00cd36211b33060a28dc72159fa1309644f6dc8005c415c8eb435217f1e39ba70a289bf9f93a3edac7e73f2227bfe711e745f8743ae455e2d1caa4a SHA512 c425c341725210af9693ed50ae9b9f91cd4c44539f1abe5fff9f59c3441eed39aee6746c881f7a812aec1bab1a8c4974e111980211cf4cfb55e1bdb12e394631
diff --git a/sys-firmware/intel-microcode/intel-microcode-20240514_p20240514.ebuild b/sys-firmware/intel-microcode/intel-microcode-20240514_p20240514.ebuild
index c33321a94497..957da662f92e 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20240514_p20240514.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20240514_p20240514.ebuild
@@ -43,7 +43,7 @@ S="${WORKDIR}"
 
 LICENSE="intel-ucode"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="dist-kernel hostonly +initramfs +split-ucode vanilla"
 REQUIRED_USE="!dist-kernel? ( || ( initramfs split-ucode ) )"
 RESTRICT="binchecks strip"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 0d3015146768..ca9e9440845e 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index baad9f1df1e0..a845bfb0921a 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -6,6 +6,9 @@ DIST lxcfs-5.0.4.tar.gz 104249 BLAKE2B 83a7b861136c34da8a24dd525fd0767193f2bbd92
 DIST lxcfs-5.0.4.tar.gz.asc 833 BLAKE2B aff883d24b374b296ea3678670e5e82c723fd0e35cfd7fed555aabbd811a104becc0b741331b4aa4a5129c9fff4dc88c6a86e7d64a89fe86aea81718f5d432dd SHA512 56b639597dbaf3008fe030147ea37192bd465c467a79e11ce139bcaa6bca1625b4bb9c4eda6ea1877446769f0fad9b4c5a3513d4f4415b841db96d5da8325ddc
 DIST lxcfs-6.0.0.tar.gz 103369 BLAKE2B 9261ab7d932d315117361a548372930c37129d3c1b3d5aa00bbce6bac923a94e69b0fa223632b1ef22938b047e6ebec7416cf187e76c72680e4d86db173d199a SHA512 fab5569da66a742a51c9f249c3f0256d1ea17dc0a1e7c2d5563d993cd0d236ae664a53809e65fbec2467f5d255dfd867327a28d9465ffe180d240ca131331c59
 DIST lxcfs-6.0.0.tar.gz.asc 833 BLAKE2B cfc6a8e574aeb1c9e3fec322df5254c431878f0109ea43ee1069e8213467ed16fedbe137befa47a2557d8c055591a9f00c99f221d482f715d5cdc678d79c5fa5 SHA512 019178b37045c3c2c4d8be7c417abb4ed8b7ce011bce805b220f6213d7940f164c45632a5ce02ea29451c8148f782d6b7ece7699da7f3ef7306bd437d40fe537
+DIST lxcfs-6.0.1.tar.gz 105761 BLAKE2B 87255711eccc9833cd321c5d606920edcbf87a2a380cb2993efeb08040e22ab6bda408429fe02b731e60b293da946c1c44f6aad6f82db871e49b2bfeb2c34172 SHA512 3e5ab8af0fd81b1b0ac83ce781b20a55c1c1277a01edbca07106534043a0070291331775b7fa4e1c005b54d24d690ad9abe9b208de749a70dcff853741d02fd4
+DIST lxcfs-6.0.1.tar.gz.asc 833 BLAKE2B b9a6655650f5720fce4bb2e9dcace2b1c3ec7f0b14b2b23014142a1fce2cd55b3ae7361e7ead9385893068ca9f18cef4151bfb223d005a4c810c5efc40b8fb7a SHA512 d795a18170027d33f94c2bf88d5ad4c6162e066f9a51d7eab79699cc3b04c058e8f1bf00a8242a233727dfae8888050b17cd96a3abb05d02e0da05298b6eb4c4
 EBUILD lxcfs-5.0.4-r1.ebuild 1982 BLAKE2B 1f7461b6b9329fe6cadec26c2daf039137df581028fda6941efaf10b18ddef912413e1e6f0d4fa267c1cbf5ef27a8abe5d500640b1d037096d1902c037ebbb8b SHA512 510a79f224d15176e2399e8dfabe759e8ee38308b2ac9f0685fb84c88f8dc433981d9eb5b86694dbcdd06c33ef6b7e3d73632d1112f9199f7acbeb1d85f95060
 EBUILD lxcfs-6.0.0.ebuild 1900 BLAKE2B 9bfa072be657bb06aba52a3c43a518038da2086586824a08ba33e98f3a7f4179dde215f3a0c21a13efca33651b24d86feb8c2fa7bfb51191d0323c8321753b68 SHA512 60b06c9936bc1000d6f58eea1e9a684247aa4c33fcfec417c458931d87e1af8f22c43bb1bf5d41565f48c1c35187dae362c9e8ef5911c0052d532e262f5f404b
+EBUILD lxcfs-6.0.1.ebuild 1901 BLAKE2B 5cade5e15ed8b8dd5f6dbe9d67e0b377cb20c628910698c0da71a5425892a0cb742003dad9fe308b4063598b733640df5d7814cd48dbcb2801045285365da101 SHA512 35f3af9220b25f0605ab6d3e3fdf846201dfd9d8363cdd84dac4d63854ff9d1ff1d145861e79f739937f275aa457afde89fb38c1e8a057912c4d505af160a368
 MISC metadata.xml 769 BLAKE2B 2e11677f002a9ac8d0524d2cf280e4a39871bcddf095b37c6a9c6bcbdbbc346a397b9b6e64cecd40539cf96f4155a83d451a3a0e462a5cf0696fd5523b08f430 SHA512 364780d6ed12d98ca62183f90b12363ac581cdb4495bbfde4983321858d3f2d29343e7ac6a8b36c24a3518c868b67e38d5d28f7dee4a6e13aad65fcd9b9b4170
diff --git a/sys-fs/lxcfs/lxcfs-6.0.1.ebuild b/sys-fs/lxcfs/lxcfs-6.0.1.ebuild
new file mode 100644
index 000000000000..c0e7a84ec0f5
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-6.0.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake meson python-any-r1 systemd verify-sig
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
+
+LICENSE="Apache-2.0 LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc test"
+
+DEPEND="sys-fs/fuse:3"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+	')
+	doc? ( sys-apps/help2man )
+	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+# Needs some black magic to work inside container/chroot.
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
+
+python_check_deps() {
+	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Fix python shebangs for python-exec[-native-symlinks], #851480
+	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+	python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir "${EPREFIX}/var"
+
+		$(meson_use doc docs)
+		$(meson_use test tests)
+
+		-Dfuse-version=3
+		-Dinit-script=""
+		-Dwith-init-script=""
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory."
+	./main.sh || die
+}
+
+src_install() {
+	meson_src_install
+
+	newconfd "${FILESDIR}"/lxcfs-5.0.2.confd lxcfs
+	newinitd "${FILESDIR}"/lxcfs-5.0.2.initd lxcfs
+
+	# Provide our own service file (copy of upstream) due to paths being different from upstream,
+	# #728470
+	systemd_newunit "${FILESDIR}"/lxcfs-5.0.2.service lxcfs.service
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 9f25f0d25f2e..e6026a4bd550 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 de330e5f9a1b..f13a1758ec84 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -5,20 +5,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD compiler-rt-sanitizers-15.0.7.ebuild 6648 BLAKE2B 89d90e750bc9c3c35e8a42a259fd84bc147ed9b7ed66168435f0010ef8adaf35e04e2cd43c1acc144668e04f5c229ca3cfd99aeb01b4ba2e46f10dd4615e131d SHA512 4f290993d65b7a17280c5ea9a9d19e13cefdde3aebc2236271e02bb1517655895e8eb3adc2047a849ce11dbacf8d7eddec715ab14523122089d856c21ae123a0
 EBUILD compiler-rt-sanitizers-16.0.6.ebuild 6615 BLAKE2B 3ca63eefd87ce02510afa912e809895da7356a8e248f402f3fca1583048feebf80cba20f076e1b28fa4ad7f7c06781910948fc49d980b03276a900dc75114e06 SHA512 7f34e0416b520c75457f8267f28630f7a665f05e22d3f5c2d96ea631fcda79a584b6c0e75cba8b7fba7bf28b87a6b19b49be3b4b8770393caabc5ebc83831ebe
 EBUILD compiler-rt-sanitizers-17.0.6.ebuild 6447 BLAKE2B 553a762d6dd06dafca05953f4d60e5e3dd215d813da29053d5c4c44750554e3ed90c187390196eeee3bc85bb1e3fbdac7aa2e100b623271898478003792a1302 SHA512 6beaa92bf1ba5213dc9c73395ecdae737f1a84119da6e3f8f008f9f21cf7d7b08b3634ad8768af6b19992fd49d964344c7d37e19b7c7bfec02af644bdc730bbd
-EBUILD compiler-rt-sanitizers-18.1.7.ebuild 6358 BLAKE2B 1a191c1e493b3a596a68314c4c930d12e900869bbd2a7488d9edfef723ad2f154e577758cd523465a65c3aa64da3ac79c0582eb812f45079442557837d988c8d SHA512 923d388eb43f27a0bd28bda7b405cf74bbd6810faa17272ee0889b89e2f832be71fb32e7b721cdedb7e7d4717af1eca69c9054bfcabf7d56fd2375cb7458d4cb
 EBUILD compiler-rt-sanitizers-18.1.8.ebuild 6358 BLAKE2B 1a191c1e493b3a596a68314c4c930d12e900869bbd2a7488d9edfef723ad2f154e577758cd523465a65c3aa64da3ac79c0582eb812f45079442557837d988c8d SHA512 923d388eb43f27a0bd28bda7b405cf74bbd6810faa17272ee0889b89e2f832be71fb32e7b721cdedb7e7d4717af1eca69c9054bfcabf7d56fd2375cb7458d4cb
 EBUILD compiler-rt-sanitizers-19.0.0.9999.ebuild 6366 BLAKE2B 4e6459ee51444413b05b661deedbe0f3543f71f6e05349a3a7f4a6352897ee7ea8a62a8ec4a26c5c31a4ba21e68b045b3e37d9e2530ad51519a9f7d2a455342c SHA512 c7ec9377a079c30b3460a7201482b5183ab35755824a7d1c81d90dc2c519a6e2410c0f51fdb4719b8239ee841c162b20ad1cf191068a27a8f13664cad4aa1ca9
-EBUILD compiler-rt-sanitizers-19.0.0_pre20240608.ebuild 6366 BLAKE2B 4e6459ee51444413b05b661deedbe0f3543f71f6e05349a3a7f4a6352897ee7ea8a62a8ec4a26c5c31a4ba21e68b045b3e37d9e2530ad51519a9f7d2a455342c SHA512 c7ec9377a079c30b3460a7201482b5183ab35755824a7d1c81d90dc2c519a6e2410c0f51fdb4719b8239ee841c162b20ad1cf191068a27a8f13664cad4aa1ca9
-EBUILD compiler-rt-sanitizers-19.0.0_pre20240615.ebuild 6366 BLAKE2B 4e6459ee51444413b05b661deedbe0f3543f71f6e05349a3a7f4a6352897ee7ea8a62a8ec4a26c5c31a4ba21e68b045b3e37d9e2530ad51519a9f7d2a455342c SHA512 c7ec9377a079c30b3460a7201482b5183ab35755824a7d1c81d90dc2c519a6e2410c0f51fdb4719b8239ee841c162b20ad1cf191068a27a8f13664cad4aa1ca9
 EBUILD compiler-rt-sanitizers-19.0.0_pre20240623.ebuild 6366 BLAKE2B 4e6459ee51444413b05b661deedbe0f3543f71f6e05349a3a7f4a6352897ee7ea8a62a8ec4a26c5c31a4ba21e68b045b3e37d9e2530ad51519a9f7d2a455342c SHA512 c7ec9377a079c30b3460a7201482b5183ab35755824a7d1c81d90dc2c519a6e2410c0f51fdb4719b8239ee841c162b20ad1cf191068a27a8f13664cad4aa1ca9
 MISC metadata.xml 1475 BLAKE2B f7ea99e3103e42a2c79fe6c86ad174297e56bcffa7b164ac3ab0a239ba5adf2265b7fc458ce8b22c9c3bd647bb03d674abf842443cb32bf8d88c683746650a19 SHA512 8e52479d3b040718a3fdaa811030bc45ef33ce74daae3e365281074cdf6d586ba11ae5f14d87dbb456f00fe4b9ae6057f3bf30eb0973cc16cbdcc3eba01ff9f8
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.7.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.7.ebuild
deleted file mode 100644
index 6fb017c151f5..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-18.1.7.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils 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_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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="
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-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
-	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
-	# hangs, sigh
-	rm test/tsan/getline_nohang.cpp || die
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# 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_MAJOR}"
-		# 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_MAJOR}"
-
-		-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_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_MAJOR}/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_MAJOR}/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_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/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-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240608.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240608.ebuild
deleted file mode 100644
index d395b7fd5a11..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils 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_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-# base targets
-IUSE+=" +ctx-profile +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="
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=(
-	llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
-)
-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
-	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
-	# hangs, sigh
-	rm test/tsan/getline_nohang.cpp || die
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# 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_MAJOR}"
-		# 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_MAJOR}"
-
-		-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_CTX_PROFILE=$(usex ctx-profile)
-		-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_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_MAJOR}/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_MAJOR}/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_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/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-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240615.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240615.ebuild
deleted file mode 100644
index d395b7fd5a11..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit check-reqs cmake flag-o-matic llvm.org llvm-utils 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_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-# base targets
-IUSE+=" +ctx-profile +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="
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=(
-	llvm/include/llvm/ProfileData llvm/lib/Testing/Support third-party
-)
-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
-	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
-	# hangs, sigh
-	rm test/tsan/getline_nohang.cpp || die
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# 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_MAJOR}"
-		# 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_MAJOR}"
-
-		-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_CTX_PROFILE=$(usex ctx-profile)
-		-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_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_MAJOR}/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_MAJOR}/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_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/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 5f719174b5d6..118ef7f044cb 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -7,21 +7,14 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD compiler-rt-15.0.7.ebuild 4238 BLAKE2B 22d56dbe24c92400bf58942390b06af70fddba89d8fecc9b85162dd7a41c6ee592eaaf883f5ad483f65f74fabccc28f94528688410ee36e2d5279efcc6066de0 SHA512 ca49d23def580d4dcfc4058768eeb9deb6e59ea44575da272d1c142fffe0bf4e3d3c7c9fa6182ab348a3aab11879af116a549cb1a3a03b27b4bf4151cf892aaa
 EBUILD compiler-rt-16.0.6-r4.ebuild 5226 BLAKE2B 7d2d76d79ce49f3d175de87fa982439ceade80787a4f4f96cbda9a0e7c161e89fc49646908e32fd35ed3629956ed0ff79ff2f74754a705264f2d6e2f02f831cb SHA512 14ba6b2644e4b0bcab31e686d395b859eab9ee8ba7adb2242e4fd80d07290cff1243cd644ee8fec53f536dd13d150a16761255ff938ed0c6e717f26165e93945
 EBUILD compiler-rt-16.0.6.ebuild 5198 BLAKE2B 2fe2310703d44d330d97b1fa1b407d99898070604037be31ca762fe65043e1d3d1e046298dc74f3d0cbb3493f985661e362b217170cbe1bf74a47dddfe8987ca SHA512 cc9aabc22f689bfc677ceb74793441674aeca2586a28ff96b812af4822d1b8b5a4147484e41f0bf95ae995488d3e8ee77684fd684b9dab8ade4f1fa57e80c709
 EBUILD compiler-rt-17.0.6.ebuild 5218 BLAKE2B 3f488320228fd2a3d1caed790e8e21c7c363769c4d8b912fd5a964b4e802e1b58b297336c527b451edb74ff42c4bdd236795210c4f225ca98a6980fed95d6771 SHA512 abbe2f679a1af7c012ecae32b57b244f7ad84a5d44151a4b7ad799524061f8b65504bd6aa169a91d1a16b878845f40b47e4a1f0253a3ff9ccbe8dbb736db1fb1
-EBUILD compiler-rt-18.1.7.ebuild 4972 BLAKE2B 3bd56ca93ddb3f21007b16c794140281e9fd27cd6fb80e5f00f49ec5e8c46dff56b1a94ba467f6b89c359c8638d9f2d8b9ba67a88268454e0accd79d0a36d768 SHA512 3072e5cc1e5dbea1ca3af15e6ffe29d1f2f664654a493eb509f4fa7b615d7f9e286ffff49dddc9835e928d7895e39239559a65768c6678e8344a73a136070704
 EBUILD compiler-rt-18.1.8.ebuild 4972 BLAKE2B 3bd56ca93ddb3f21007b16c794140281e9fd27cd6fb80e5f00f49ec5e8c46dff56b1a94ba467f6b89c359c8638d9f2d8b9ba67a88268454e0accd79d0a36d768 SHA512 3072e5cc1e5dbea1ca3af15e6ffe29d1f2f664654a493eb509f4fa7b615d7f9e286ffff49dddc9835e928d7895e39239559a65768c6678e8344a73a136070704
 EBUILD compiler-rt-19.0.0.9999.ebuild 4907 BLAKE2B 0fa9438438d1c499cf382315f9da67ab920037c22e6413180f50f509347aa82e76d2f8223cf725902523f8358a8b95bd063f184aac70951192029c857de5260a SHA512 c5782efd4cc5239a9c40339338128e3122df12319857c46ab0fb4a869e81438d84daedd934aae446b0156695ce1ee5779d20f12ff9b63fd79a5d22f67ae72bb9
-EBUILD compiler-rt-19.0.0_pre20240608.ebuild 4907 BLAKE2B 0fa9438438d1c499cf382315f9da67ab920037c22e6413180f50f509347aa82e76d2f8223cf725902523f8358a8b95bd063f184aac70951192029c857de5260a SHA512 c5782efd4cc5239a9c40339338128e3122df12319857c46ab0fb4a869e81438d84daedd934aae446b0156695ce1ee5779d20f12ff9b63fd79a5d22f67ae72bb9
-EBUILD compiler-rt-19.0.0_pre20240615.ebuild 4907 BLAKE2B 0fa9438438d1c499cf382315f9da67ab920037c22e6413180f50f509347aa82e76d2f8223cf725902523f8358a8b95bd063f184aac70951192029c857de5260a SHA512 c5782efd4cc5239a9c40339338128e3122df12319857c46ab0fb4a869e81438d84daedd934aae446b0156695ce1ee5779d20f12ff9b63fd79a5d22f67ae72bb9
 EBUILD compiler-rt-19.0.0_pre20240623.ebuild 4907 BLAKE2B 0fa9438438d1c499cf382315f9da67ab920037c22e6413180f50f509347aa82e76d2f8223cf725902523f8358a8b95bd063f184aac70951192029c857de5260a SHA512 c5782efd4cc5239a9c40339338128e3122df12319857c46ab0fb4a869e81438d84daedd934aae446b0156695ce1ee5779d20f12ff9b63fd79a5d22f67ae72bb9
 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48
diff --git a/sys-libs/compiler-rt/compiler-rt-18.1.7.ebuild b/sys-libs/compiler-rt/compiler-rt-18.1.7.ebuild
deleted file mode 100644
index d2473ff8d59c..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-18.1.7.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
-inherit 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_MAJOR}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~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="
-	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.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() {
-	if target_is_not_host || tc-is-cross-compiler ; then
-		# strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures
-		CHOST=${CTARGET} strip-unsupported-flags
-		# overrides host docs otherwise
-		DOCS=()
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	target_is_not_host && return
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# 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 && ! is_crosspkg; 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 ! is_crosspkg && ! 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 -e main )
-
-			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_MAJOR}"
-
-		-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 && ! target_is_not_host; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if is_crosspkg; then
-		# Needed to target built libc headers
-		export CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		mycmakeargs+=(
-			# Without this, the compiler will compile a test program
-			# and fail due to no builtins.
-			-DCMAKE_C_COMPILER_WORKS=1
-			-DCMAKE_CXX_COMPILER_WORKS=1
-
-			# Without this, compiler-rt install location is not unique
-			# to target triples, only to architecture.
-			# Needed if you want to target multiple libcs for one arch.
-			-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
-
-			-DCMAKE_ASM_COMPILER_TARGET="${CTARGET}"
-			-DCMAKE_C_COMPILER_TARGET="${CTARGET}"
-			-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
-		)
-	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/compiler-rt/compiler-rt-19.0.0_pre20240608.ebuild b/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240608.ebuild
deleted file mode 100644
index 4679822780fc..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
-inherit 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_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	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.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() {
-	if target_is_not_host || tc-is-cross-compiler ; then
-		# strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures
-		CHOST=${CTARGET} strip-unsupported-flags
-		# overrides host docs otherwise
-		DOCS=()
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	target_is_not_host && return
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# 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 && ! is_crosspkg; 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 ! is_crosspkg && ! 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 -e main )
-
-			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_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF
-		-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 && ! target_is_not_host; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if is_crosspkg; then
-		# Needed to target built libc headers
-		export CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		mycmakeargs+=(
-			# Without this, the compiler will compile a test program
-			# and fail due to no builtins.
-			-DCMAKE_C_COMPILER_WORKS=1
-			-DCMAKE_CXX_COMPILER_WORKS=1
-
-			# Without this, compiler-rt install location is not unique
-			# to target triples, only to architecture.
-			# Needed if you want to target multiple libcs for one arch.
-			-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
-
-			-DCMAKE_ASM_COMPILER_TARGET="${CTARGET}"
-			-DCMAKE_C_COMPILER_TARGET="${CTARGET}"
-			-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
-		)
-	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/compiler-rt/compiler-rt-19.0.0_pre20240615.ebuild b/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240615.ebuild
deleted file mode 100644
index 4679822780fc..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
-inherit 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_MAJOR}"
-IUSE="+abi_x86_32 abi_x86_64 +clang +debug test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	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.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() {
-	if target_is_not_host || tc-is-cross-compiler ; then
-		# strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures
-		CHOST=${CTARGET} strip-unsupported-flags
-		# overrides host docs otherwise
-		DOCS=()
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	target_is_not_host && return
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# 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 && ! is_crosspkg; 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 ! is_crosspkg && ! 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 -e main )
-
-			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_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF
-		-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 && ! target_is_not_host; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if is_crosspkg; then
-		# Needed to target built libc headers
-		export CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		mycmakeargs+=(
-			# Without this, the compiler will compile a test program
-			# and fail due to no builtins.
-			-DCMAKE_C_COMPILER_WORKS=1
-			-DCMAKE_CXX_COMPILER_WORKS=1
-
-			# Without this, compiler-rt install location is not unique
-			# to target triples, only to architecture.
-			# Needed if you want to target multiple libcs for one arch.
-			-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
-
-			-DCMAKE_ASM_COMPILER_TARGET="${CTARGET}"
-			-DCMAKE_C_COMPILER_TARGET="${CTARGET}"
-			-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
-		)
-	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/glibc/Manifest b/sys-libs/glibc/Manifest
index ed9a321722d5..d7eddbc8086d 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -42,17 +42,17 @@ DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb7
 DIST locale-gen-2.10.tar.gz 7747 BLAKE2B 49f569c5ae5260fca128503bc6f22d6f6f1cda817920c41fdadadf1527bbb4f3eb161f79fa729830666a4673e9092f99f4685ec8fcac8ddea0b8242bca9c1f4f SHA512 e350e60d458d67638e3090711fca05af6fafac06c51b97648244549f8a0621dab7543f09dc7ad4c62392f13bdae8e5875dc6d0b6c3d83efc29d116bc2eef92db
 DIST locale-gen-2.22.tar.gz 7971 BLAKE2B 2dc66fa69bf51799d0c34459b654fba6998b80a7e322e9b670036c967e269ad921f50195e6e34c4a83c1f0bad191fd5aa3f37defb82271b73acbca07b7e49d08 SHA512 9798b10dbbc792345a7b7a121dec5f4bba9839a8aec010f01a09f3402fd5bf2376f79e03a6a19bc357010db780037a8811c381136ce19be1f1370374906dff38
 DIST locale-gen-2.23.tar.gz 7977 BLAKE2B bf2cc1fa05828a9133789133ce2d910662f1b5979269869cd76dac45831c45917700fc81357441fc7691af23196c6a6c3a28bb4440ceb6a5a3b17dbdc55c2bcc SHA512 f6b3daf3e2f10bc2f68626d8e7edc0f27eb0fe16bfe8840904a1b13d8fc76318d9f83277ee7fcb7a6db177413ba8a2cda94493e56d01df3a20ca37fed64e469c
-EBUILD glibc-2.19-r3.ebuild 38603 BLAKE2B 279300b875da362375ee97c0cc2695010c16364de464036d428575698abb29721a627584e2df74b6f5eafb574274d8aef0cc892211ea6c65e61d0b09c133ab1e SHA512 521cff08cd41072d5bebe85473a72b047de0c8884eb499a541646beddcde1fdd7a667dc1d65256c05da3fadfdca95adf2cd6c92362fa015ea0876733e4af7192
-EBUILD glibc-2.31-r7.ebuild 44544 BLAKE2B c83058ac77d10f70f75498fcc970fa607dd3c5882a4fe66b64294759361ce578eda01f97bd134bdbea9a879789319e7d265536e212ffd3d490e30a65af416033 SHA512 6a7835964662a8ec17b31998f246df87a1b425ca9186bedf34beb2f822b50766a3ac3bf9bd85ec823838bffcfab90b8646d70c0c071dcdd342acd6ad7948c51d
-EBUILD glibc-2.32-r8.ebuild 44902 BLAKE2B af327dd4cdfe104e3d74e9cd5b2b04df4588537a81a238f627ae7e06acabaf3c03efff0788e8daf8bdc5d44bcd25619b079f76c5a9a90a3d234aeb8f5a5c469c SHA512 34be9a3308f2157c0608a1eb396dcc30c72472d09196c0125542d9879356d45c44cc6c4b08f2b08433780cfa1f12880a22806ee76251c0db5b04fdf529cc7b19
-EBUILD glibc-2.33-r14.ebuild 48438 BLAKE2B 23ede2168d245fc1380744fe729036b4e926b4aba5265c8d0161da1d9f0789daa7949197b94cf89e3df3387f7bfbce374364812879c8a0d4c0c727817754039a SHA512 f87dd4daa941d3e1b149f62928b66647feee2ed5bb6efff14d1eeaa681734affdbf2f150217115f915dcf715c28b94874800ccd53d50c105c2100e5f1018b4eb
-EBUILD glibc-2.34-r14.ebuild 49653 BLAKE2B ed23d0c7ba543544bee2888ec6538e4777b5dd745a9cc93becb9f7f3d91cbe6bff3a63834f6b1ac6802635540f5497332457f8c23facaa2f98866758d9ca42ba SHA512 b50e4478c8ee4d3d49f0771ff8a10bea1d49a56483c32c438b7ae9949d35db36b9c2003a2ea166b627ac4b4e15c38382af83762c84a73357be2110fba970f4ea
-EBUILD glibc-2.35-r11.ebuild 50194 BLAKE2B d1fb2a06d6dc89505c23d79bfb2af4eba67d87483ef059400229f42d6e8343a03ff63821ea3ebd7f65345823392003f18be1641e16ae4ab6960dc0a126b04a31 SHA512 82e8a52f1b870977ac00f440a3b3d64e4df776dd8bc866c5074abfd6c7424ea85b871d9a46ca726f1539b96a14dd92fb7aa949b42619e58a974481785a94cd06
-EBUILD glibc-2.36-r8.ebuild 52472 BLAKE2B aabb6ac48125f43726e4aa68ca9f82f73e348ec1341dc16dce2fa7c27c1565daf96ec9ca5be64ced1668543698d3870e9dc0f08d1eb45f6f7923e13a8e29c429 SHA512 40bd2c57454756bc4187f45b81eb15adf2f6e831147d324e5efa47e64c33133a35bd0a0fabbe2d379c64d715ec4cc6b3e32ee76a6975fb0d0914831cbf0a2cf1
-EBUILD glibc-2.37-r10.ebuild 53001 BLAKE2B cd9831be3a13f887777a31604d2f07182f1059ad20604c71dde40b312e665ed9e356b1196e6a0b3d12e30b4a4d8769281b273e3f465449d99d6648256acfebcf SHA512 dab7115f2249248d43003bfdd107bc1231315f14a2f1180bb6fafcb862e3558c75d13a3702fc38d57b87bb58f51c794aa8093fb29a529105b8e87c3a4ee5d71c
-EBUILD glibc-2.38-r13.ebuild 54707 BLAKE2B f1418b6bb2a438c65520cdd3e48723a1f3d0e9845b379e54368a98a0b907a9b2a061b2796e4f98430a477632646d3eab05c673397e1d28bb2c4501c43e249371 SHA512 6506084a6b51d6dbfb485dce760018ddd45f91957f502a12f60d683f4da050685f8c9ac0441a4267767972a8a891cf790a1f3838109e99b87052a965b6a786e3
-EBUILD glibc-2.39-r6.ebuild 54692 BLAKE2B c6295250c58c5d52fe83ddb17bff5209008396e846da10c1ce7f5ed141e07ce2d0dbb0f526cde3fca36d8c9f8e6173dfff3f2fd602df0fef7a8f37865cca1687 SHA512 6d9012d4b0aad9634d88fb82b7e5e5b5c6aab4fd2a02db770b19a75531b7581dca6c402c3c39c877c25ab8352655a3930eb853cef9c11c41bfb08dba10d8a1e1
-EBUILD glibc-2.39-r7.ebuild 54699 BLAKE2B ad449414d7097e235f52e56dff22cbb9a89d9888c38d206ff9f7b037407cde387f5fe74ac7e2c7f02603df3c8e3b3a7af6840880e9ff8d8afb0eb932731e9c52 SHA512 04687c75d2d9f6137df674d7ddbdb37bbfbcb2c7abe097cb35485a86af6f2b905da342f5af2d55a9203e36b7c51c4f9c19009a08406b5a276e1839ca563cd41b
-EBUILD glibc-2.39-r9.ebuild 54293 BLAKE2B bdf978ee6d6422a43f0be4bb9cc71af8909c81fb689c9a7b68bafb8f4082fbaeee0c1494c97c396ed2eb263c2a53669ce1c647c4fa87c46c43888717f7310483 SHA512 7397e61ea25619d4774eeb1b6a2c54b002c71c909d21a0b91943c9c5573f2d751c3270a224ea8136208c48191314cf09c1a7e3b20c0ae9f65c0fe1dfa1d7c9ad
-EBUILD glibc-9999.ebuild 54296 BLAKE2B 0ec7bdb666e64908fc37e638000ced8ccc841382bb350091e81101cddea03e611eefa4bb0a64d30ee42d3c3a3d8121350406995d32bc6fbeae0806eae8d24df1 SHA512 23afaac7e3b6b50aef10ec5055dcea51adecdaf81a71deeb3473fb52f66f20b48660ca5a438e3fe2990f7673aebc15d48e6c018574bb8bef5905309fe6cbd597
+EBUILD glibc-2.19-r3.ebuild 38671 BLAKE2B 41b7e3b67dcb71c6a0e48277d9987778c7dd56cfc29c5fee7d825a2e160a2ce2ba9cc1dae0d05e98adf28239d839b3d79680fe2014efcac9356f5d4fdb0e0f67 SHA512 7294a19e2204d7d5f881864a35198a62821abce5949f30ec99cae422576ae61b4193350cd4c6aae4bde56a683d4087947dcbf148f6745602b4e5d33cf5119227
+EBUILD glibc-2.31-r7.ebuild 44612 BLAKE2B 57bf608e30337d95d5c8c3002b3dc795052a9fcf0cddd89ca1a6c560d0e120db775ea6d3269b392fc611da77256b36e33f977e3c37dd8ef65c5a1a4c3cf4731f SHA512 d55db06fe7190d592b2fb3c99a194ef0b5da0b64409a9a7d69eeb8942c8d3dfe6af58a9559f4b34c4d0985580ef34347532ecda15a5c8d0b2bed4de7874a17e0
+EBUILD glibc-2.32-r8.ebuild 44970 BLAKE2B d39fb2901adee5b32ef87c09e06f821b06d7bc673315eb37f53b8a0c9cf5dff244c6812f96ead96095634f4605a7345b27507f846c098b3e0f1d2d028a28ce0a SHA512 a3bc29194010f5a2ee766805decc705a3491bd5eed1ac3bc5915f4973851a41288fca0eff7cc9feaa58856c0e9b3299ada711dd979e97a107edac08057eff0a6
+EBUILD glibc-2.33-r14.ebuild 48506 BLAKE2B 1c59cc020ccdf520e08a952868617b0087fb0b9d74c2c06d298bfb919fce68a0eb5fae6d54948c5c6f705cf0dc5350516c35a0e365458a27155c544aa6a36f13 SHA512 0e04638d31e273ffd5c6712f58caedd4e96a9e6d237b0209d38d246f47e17254696f4acf692d6a36b6744baa7fd4171ccf6b0fe6bc4e2812f4f7bf12397b806f
+EBUILD glibc-2.34-r14.ebuild 49721 BLAKE2B 9bc0ee7c5192724aa8b7ac8d71b7ffe385aeb8d71e86a06679a777730333d9e646d434bb341bef79eb311df021064b23a54f9ebde7566a45328da54eac6587df SHA512 9757f27bc3b47b9e2c44756a63fbdb70362f26b8f5febe817551addf8ac625fdf6d364e34bf02854e93874b8599cd27ed462a44fe1ec447c0efe0ee4982f9012
+EBUILD glibc-2.35-r11.ebuild 50262 BLAKE2B 562ce109d44d9551c6c645f8ae77c072b3274889221dda8dadbbc770cd229fb1fa7e6000f21f7825be3b1cb4967e1610e63da775a4c9615725ee3c2ada37d4c7 SHA512 31765915f3f15ff1787f531a42bee573c909a4a32ac7fa8eaf7c3d9e1684714fc50551f7ca589d983dfa06c61f4d6caf716ab2acd2113e5ecabe16b631725eda
+EBUILD glibc-2.36-r8.ebuild 52540 BLAKE2B 0a255ca8c5d466bbeb58d1863fbfa586d448a2cbc341cafd875a8233f728c9e9333cde8299e4ecfa15f5fa406bace90a6af0fef057dc0d354458338059a658b1 SHA512 9775e390ac3b55ac251d4a7c49c21b718f76795a8c62510fff00017b7c69997fceee2f406e45437364cece146d6fee4d0c2f2fdca1018a461e5d8741540c26fd
+EBUILD glibc-2.37-r10.ebuild 53069 BLAKE2B c6cdba8fd225be0d3d235124f51c97a019a682be475bd2d6085efb4921723d1de361db4976c658d682ac96e722bda1f964d23ec69db3ee0fc3004816892a78ca SHA512 365f95593fcff9b0eb783876893c63c4f4c3ba06c8f2146487d5155fc0b6ae63086df8a72ab4a6b292ea9e81b651d058cf27cf6676d6d03d60ba301eec01fb6d
+EBUILD glibc-2.38-r13.ebuild 54775 BLAKE2B c3291ddd788036be52f941eab728f344a91c8c7df16ccc9586cf809f1290ac8c4b670e7b75676d12e089ebb455a2692fdf9b075f25793398a676d821deb98968 SHA512 574fe46f49a81ecfdc06518d32d09565f02c0a6eb24b5ba950bfbbf0d513116715a68178afe7fc9f6802e9b70e27ff7f9aecbfe6e662e545be22e4967529b222
+EBUILD glibc-2.39-r6.ebuild 54760 BLAKE2B abd8e3e3c516d8b8652705bd49598d3dfc4977dd2e1280ee23eb92944533cf3333b0a80961cdf1fbdac398e34f72f12cd5749dbfc213acdd5f88085c6efa11e8 SHA512 b5f5d814b0b6a824ee1b6d4e39ba6eabf257555338c6f43ce5453b0b3733617d3838ba8edd48cd8e2302c82a217520fab9f507a645b3016578462dfb96ae8117
+EBUILD glibc-2.39-r7.ebuild 54767 BLAKE2B 6626c0110d6ff3eeca21ecb5f0a5c40b29f84827c7bf5fb93a928b959a780d7f5b6eb3de6c3c643e7209c0b81981f464935395a4523cd727a8d3a17a2a2734e5 SHA512 19b1ab909458aafee204aa2b5c24c4438b7ea1f51d69f65968b23ff8f7db2c572467f67ea2c50cdd125725c83c520a813f02c675bc28fcf3e6df7c2d9b6c8c4b
+EBUILD glibc-2.39-r9.ebuild 54361 BLAKE2B 19d389f3b8cee21dcc330cb6b6fb7a3c152a805ce7e89508461cd935d5393b5d7a29237ee6e09f78d5065e13753ab55b4c7f015f6a944a3cec11aed32add3bf0 SHA512 8e4667fb9890f3e9b83283a044ddf35a392ac2a0c2e4d2f2a2a42a65b3cba485a4f77a889538dbf83984179356f7693a790946a10a26d4e194da3438d9ac35b1
+EBUILD glibc-9999.ebuild 54364 BLAKE2B 770b39bdd40a18b9abee1fa1ba025dc3c17f72ffce4481986cddd636e6ccdbb0dd4ead07e576b6d85b2075e006a46cf601181729554daecc61924bd4a20ae3d2 SHA512 cecb09dfb348a412a6e707062a597dd728e8fa2d0c6e6b834656f4fe5ec7269d2969982c0e0f09f3d4f0161f9016b2b4b4d71d68373de8e5148a11f4c2248e9c
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.19-r3.ebuild b/sys-libs/glibc/glibc-2.19-r3.ebuild
index 4098211ce0aa..06c7071e8efb 100644
--- a/sys-libs/glibc/glibc-2.19-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r3.ebuild
@@ -612,7 +612,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -626,7 +626,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/glibc/glibc-2.31-r7.ebuild b/sys-libs/glibc/glibc-2.31-r7.ebuild
index 2625a376cfa0..e531ada0b011 100644
--- a/sys-libs/glibc/glibc-2.31-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.31-r7.ebuild
@@ -649,7 +649,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -663,7 +663,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/glibc/glibc-2.32-r8.ebuild b/sys-libs/glibc/glibc-2.32-r8.ebuild
index 977997ef0840..65aa84f364aa 100644
--- a/sys-libs/glibc/glibc-2.32-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r8.ebuild
@@ -666,7 +666,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -680,7 +680,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/glibc/glibc-2.33-r14.ebuild b/sys-libs/glibc/glibc-2.33-r14.ebuild
index a9012e350120..9119534902f5 100644
--- a/sys-libs/glibc/glibc-2.33-r14.ebuild
+++ b/sys-libs/glibc/glibc-2.33-r14.ebuild
@@ -733,7 +733,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -747,7 +747,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/glibc/glibc-2.34-r14.ebuild b/sys-libs/glibc/glibc-2.34-r14.ebuild
index 9d92b5e3783f..1affa01b9a4d 100644
--- a/sys-libs/glibc/glibc-2.34-r14.ebuild
+++ b/sys-libs/glibc/glibc-2.34-r14.ebuild
@@ -742,7 +742,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -756,7 +756,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/glibc/glibc-2.35-r11.ebuild b/sys-libs/glibc/glibc-2.35-r11.ebuild
index 86a7d2673b22..0c63dac54d10 100644
--- a/sys-libs/glibc/glibc-2.35-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.35-r11.ebuild
@@ -761,7 +761,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -775,7 +775,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/glibc/glibc-2.36-r8.ebuild b/sys-libs/glibc/glibc-2.36-r8.ebuild
index caac3e58f9b6..b8bf8d174f36 100644
--- a/sys-libs/glibc/glibc-2.36-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r8.ebuild
@@ -792,7 +792,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -806,7 +806,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/glibc/glibc-2.37-r10.ebuild b/sys-libs/glibc/glibc-2.37-r10.ebuild
index 53335dbbd2f7..84368cf8f50f 100644
--- a/sys-libs/glibc/glibc-2.37-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.37-r10.ebuild
@@ -801,7 +801,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -815,7 +815,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/glibc/glibc-2.38-r13.ebuild b/sys-libs/glibc/glibc-2.38-r13.ebuild
index 1de5a90ac29b..3ff40e502358 100644
--- a/sys-libs/glibc/glibc-2.38-r13.ebuild
+++ b/sys-libs/glibc/glibc-2.38-r13.ebuild
@@ -812,7 +812,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -826,7 +826,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/glibc/glibc-2.39-r6.ebuild b/sys-libs/glibc/glibc-2.39-r6.ebuild
index d4820cc75723..25ea3a7768f3 100644
--- a/sys-libs/glibc/glibc-2.39-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.39-r6.ebuild
@@ -837,7 +837,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -851,7 +851,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/glibc/glibc-2.39-r7.ebuild b/sys-libs/glibc/glibc-2.39-r7.ebuild
index 90f211bebf68..3e175b82b580 100644
--- a/sys-libs/glibc/glibc-2.39-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.39-r7.ebuild
@@ -837,7 +837,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -851,7 +851,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/glibc/glibc-2.39-r9.ebuild b/sys-libs/glibc/glibc-2.39-r9.ebuild
index da579ed2837b..d15adef9b01f 100644
--- a/sys-libs/glibc/glibc-2.39-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.39-r9.ebuild
@@ -830,7 +830,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -844,7 +844,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index a1512de95b17..f6b2e565a6a6 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -830,7 +830,7 @@ sanity_prechecks() {
 	# we test for...
 	if ! is_crosscompile ; then
 		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			ebegin "Checking if the system can execute 32-bit binaries"
 			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
 			local STAT
 			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
@@ -844,7 +844,11 @@ sanity_prechecks() {
 			fi
 			rm -f "${T}/check-ia32-emulation.elf32"
 			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+			if [[ $STAT -ne 0 ]]; then
+				eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel."
+				eerror "Seek support otherwise."
+				die "Unable to execute 32-bit binaries"
+			fi
 		fi
 
 	fi
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 140807f856db..70ef0ba9b6a8 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -6,20 +6,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD libcxx-15.0.7-r1.ebuild 5283 BLAKE2B 4380fc5b851054a5ec226ee4c92a2b79511d73ac9b3f8bccc977211601eca36113fc0ae605854da53898507021f24a8b319197605c556244d84253bede7b84f4 SHA512 0a5859269422e794deb43ed960651a1dea830af28b5e395f32e28de8e67a1f399507340230af1c84248853f554e751709a60a9a78aeb0eb42804cb41907dbfce
 EBUILD libcxx-16.0.6.ebuild 5300 BLAKE2B 4714e22ad2fdcb07c62ead4cfa47fb4734e45dc055700b63a0f24cd6e93dde960c638fa16f55f4c04c6130fc2a7fa5729814c4aee12e9953f603ea5ccb706cc1 SHA512 3eab779107b5c737d971abe29b7bd9f44a73570957bd7d54d6aaa98ec78a6045d7d69272d611f7f09c60e1aa30bbad46b4bd1358b0b2c69e5bc686ab21444857
 EBUILD libcxx-17.0.6.ebuild 5280 BLAKE2B a882313471af07942a0772efa642800ba85545227f7dfe281cd7fcdc686ecda82692d273550b28cca2de47b1b9fda87717c98c52ffafdf1155d5269a3733f48a SHA512 d9a2932d7b9e26dea0e62dfd3aeac08ad0206a242d3d42d83e55b93cc767195a67bc0eb3da38cb8d51930175f94bac6496184d6d4be516014e0208c3f852d427
-EBUILD libcxx-18.1.7.ebuild 5447 BLAKE2B 262f4dd0ccb046dcdf7f6970350381a9a48530f7db546f1b6cef5493b5e2a657a403bb0b5fda0d2d100420c6f8f1bac82f635efa8ad6c70d4476ad101c35eb13 SHA512 74ddb2227a2c8cd3d106861dc8155720f757011933835a36b8a5c133de68db80c14d93ad0cd8c3fa62232ce1e0871889b6db15c4bd53d2c1ea34762d93addc0c
 EBUILD libcxx-18.1.8.ebuild 5447 BLAKE2B 262f4dd0ccb046dcdf7f6970350381a9a48530f7db546f1b6cef5493b5e2a657a403bb0b5fda0d2d100420c6f8f1bac82f635efa8ad6c70d4476ad101c35eb13 SHA512 74ddb2227a2c8cd3d106861dc8155720f757011933835a36b8a5c133de68db80c14d93ad0cd8c3fa62232ce1e0871889b6db15c4bd53d2c1ea34762d93addc0c
 EBUILD libcxx-19.0.0.9999.ebuild 5101 BLAKE2B 4fb27fae1b4b3230de9b645416cba17ceb584260faf4c640d743b482cf333116ee00138ce206a62fbdb2811cd6e59dba2d8463949a17545a74f50837c274f355 SHA512 b88b738fad3d0f2aba6736ef9361250165a25a9f6011c8a8f61f035475d84f7bc8d9f3da95ab549d3eebeee338301dd734eed3c85365015134765ef003daa341
-EBUILD libcxx-19.0.0_pre20240608.ebuild 5397 BLAKE2B 21d3fc915eaa8b5f3d9821b527aeaf79a70e1037e556e7cf39c8dc8c8df6bd6e115510c0a89436edcd9a7aefacc698f7043abeb330402a60f591af68c8fb0a33 SHA512 4b5467000c57558e191d26ba94aad76b56b1d502a552727e148a82859977f47471d16a19dbdd1327cf915c8151339dac9af96d0d06d8e0ab0c021717ecb931ea
-EBUILD libcxx-19.0.0_pre20240615.ebuild 5360 BLAKE2B ef6ea8f9d98420da812497805b6f953b509111ed65dacdca09f5c60ab11b617c4570e4ed8dba7ec3f1bd4bbc8a5193c2e6e7f9f4e83ad4f22fd590af36ac1fcc SHA512 044bace747db1ee968841521b56ae10e7d77d065bfdcbc0d8f4af018a99cdfc8e997d68de83c5ce9086011c271b4ae00f8bf65dccfe1480fba86803df3a3c786
 EBUILD libcxx-19.0.0_pre20240623.ebuild 5101 BLAKE2B 4fb27fae1b4b3230de9b645416cba17ceb584260faf4c640d743b482cf333116ee00138ce206a62fbdb2811cd6e59dba2d8463949a17545a74f50837c274f355 SHA512 b88b738fad3d0f2aba6736ef9361250165a25a9f6011c8a8f61f035475d84f7bc8d9f3da95ab549d3eebeee338301dd734eed3c85365015134765ef003daa341
 MISC metadata.xml 598 BLAKE2B b7a60449e0d8e4e7605ec203dfaa45b17a265b024e21a3bcfe05a3aeb6c3d19a1d2a218cb1f9ac9ed52296f0d6e723fed251f364341fb70cbd91b747962db580 SHA512 a23f912efff52c4687767023da826ace8c6e5dcd5e69ece86aabbea99da89e48ba81cdc292f03193e2e8a05743e62ebf4d4735d038e0cc4b42714fa277569335
diff --git a/sys-libs/libcxx/libcxx-18.1.7.ebuild b/sys-libs/libcxx/libcxx-18.1.7.ebuild
deleted file mode 100644
index a6fca47e6c29..000000000000
--- a/sys-libs/libcxx/libcxx-18.1.7.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit 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 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~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-debug/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() {
-	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
-}
-
-src_prepare() {
-	# hanging tests
-	# https://github.com/llvm/llvm-project/issues/73791
-	rm ../libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/fetch_* || die
-	rm ../libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/operator.*_equals* || die
-
-	cmake_src_prepare
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# 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}
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=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_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-19.0.0_pre20240608.ebuild b/sys-libs/libcxx/libcxx-19.0.0_pre20240608.ebuild
deleted file mode 100644
index 8713b12c69fb..000000000000
--- a/sys-libs/libcxx/libcxx-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit 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"
-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-debug/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() {
-	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
-}
-
-src_prepare() {
-	# hanging tests
-	# https://github.com/llvm/llvm-project/issues/73791
-	rm ../libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/fetch_* || die
-	rm ../libcxx/test/std/atomics/atomics.types.generic/atomics.types.float/operator.*_equals* || die
-
-	cmake_src_prepare
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# 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_INSTALL_MODULES=ON
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=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_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-19.0.0_pre20240615.ebuild b/sys-libs/libcxx/libcxx-19.0.0_pre20240615.ebuild
deleted file mode 100644
index 931ffd630243..000000000000
--- a/sys-libs/libcxx/libcxx-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit 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"
-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-debug/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() {
-	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
-}
-
-src_prepare() {
-	# broken test, apparently doesn't like our timezone-data
-	# https://github.com/llvm/llvm-project/pull/89537
-	rm ../libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.local_time.pass.cpp || die
-
-	cmake_src_prepare
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	# 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_INSTALL_MODULES=ON
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=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_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/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 64109d4dd040..fdc1f1553913 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD libcxxabi-15.0.7.ebuild 2911 BLAKE2B 5f2004d2f68fe4eddb0b22be82d28fcca7954d0e3ad9a5510744adc4d0dfd7a1ab9fd928404adcd3eeecc58703f51117d0a80e5895b53e0ae7b71621ad5a435c SHA512 5b8e2c6abdec785649aa41b7f05ab86ecab30ff0631d6078c9b1052b406c320c5847b8f16ffa6d9e62ba4a6bca5959b18770810924d6e6da264fb08d6ff738d0
 EBUILD libcxxabi-16.0.6.ebuild 2932 BLAKE2B 837ab88ee88d5497b8bddb9f001d4b4ddd44ed982ef47114c965174135ed136abd0e3a6f3848a4aba53d0ca3748c54674cb28de8d46fda3bb7a90f326d41c7c6 SHA512 e4ebf7f35d2cad3bf3ba02754c85fee1cd1c4e52887770698ebaa3ef2fe66873f468677d307ea2d6956c2f6d3ac9b61943461193a5315f1e8a2846f2463b0581
 EBUILD libcxxabi-17.0.6.ebuild 2932 BLAKE2B 837ab88ee88d5497b8bddb9f001d4b4ddd44ed982ef47114c965174135ed136abd0e3a6f3848a4aba53d0ca3748c54674cb28de8d46fda3bb7a90f326d41c7c6 SHA512 e4ebf7f35d2cad3bf3ba02754c85fee1cd1c4e52887770698ebaa3ef2fe66873f468677d307ea2d6956c2f6d3ac9b61943461193a5315f1e8a2846f2463b0581
-EBUILD libcxxabi-18.1.7.ebuild 2764 BLAKE2B 1d716983ec2cf1f3ad73b9a3947feb5deddd91750495d7fe5eb9d3ecea9545c7dd4bde00a348272e92aec46845286f9a844077ece2b91a80222bae44c22a514b SHA512 7d94d2fe04acbbc8651c1b7588f9b94603de10aaefc949aaa408d7e7f8d53ccca9b411a2a7f3af7edc2a4f05008977dddd039c7ac1cf17968ba59c7484b3bb68
 EBUILD libcxxabi-18.1.8.ebuild 2764 BLAKE2B 1d716983ec2cf1f3ad73b9a3947feb5deddd91750495d7fe5eb9d3ecea9545c7dd4bde00a348272e92aec46845286f9a844077ece2b91a80222bae44c22a514b SHA512 7d94d2fe04acbbc8651c1b7588f9b94603de10aaefc949aaa408d7e7f8d53ccca9b411a2a7f3af7edc2a4f05008977dddd039c7ac1cf17968ba59c7484b3bb68
 EBUILD libcxxabi-19.0.0.9999.ebuild 2684 BLAKE2B db3cdfc7962bc9b9a40f6783b813bb64a26a2d9cff7bcab99fb2b8ff6221789a8799c077837492280b543cd32bf6853638e0a9b3f07b36d0f9683e7b41601c8b SHA512 b0eb6cbd9ff0ccb5f08fefeb7c00e2eb08574137a0f38b52e4df9ea462b2c1c521d4fa8628f407bcbb26aedb77406b4eabbe1ef9c7939fed2b9be5fc0ce1ca34
-EBUILD libcxxabi-19.0.0_pre20240608.ebuild 2684 BLAKE2B db3cdfc7962bc9b9a40f6783b813bb64a26a2d9cff7bcab99fb2b8ff6221789a8799c077837492280b543cd32bf6853638e0a9b3f07b36d0f9683e7b41601c8b SHA512 b0eb6cbd9ff0ccb5f08fefeb7c00e2eb08574137a0f38b52e4df9ea462b2c1c521d4fa8628f407bcbb26aedb77406b4eabbe1ef9c7939fed2b9be5fc0ce1ca34
-EBUILD libcxxabi-19.0.0_pre20240615.ebuild 2684 BLAKE2B db3cdfc7962bc9b9a40f6783b813bb64a26a2d9cff7bcab99fb2b8ff6221789a8799c077837492280b543cd32bf6853638e0a9b3f07b36d0f9683e7b41601c8b SHA512 b0eb6cbd9ff0ccb5f08fefeb7c00e2eb08574137a0f38b52e4df9ea462b2c1c521d4fa8628f407bcbb26aedb77406b4eabbe1ef9c7939fed2b9be5fc0ce1ca34
 EBUILD libcxxabi-19.0.0_pre20240623.ebuild 2684 BLAKE2B db3cdfc7962bc9b9a40f6783b813bb64a26a2d9cff7bcab99fb2b8ff6221789a8799c077837492280b543cd32bf6853638e0a9b3f07b36d0f9683e7b41601c8b SHA512 b0eb6cbd9ff0ccb5f08fefeb7c00e2eb08574137a0f38b52e4df9ea462b2c1c521d4fa8628f407bcbb26aedb77406b4eabbe1ef9c7939fed2b9be5fc0ce1ca34
 MISC metadata.xml 438 BLAKE2B 0a830a06a53a6cdaf138ad7620fe366fae05c1c1451267d6a58caf7da5ce8f5a26d302fab53b9460920074ab5a65991d3bd24fde087809e8dc12188dd94c7676 SHA512 d53e13c497569636fb453a159c5ca5ddfabf8e5debd5f92e5149c52d54c876753842ab73293d6d08e2d9b279363b4f0c743eed3a5027a61246c6b60496be8e87
diff --git a/sys-libs/libcxxabi/libcxxabi-18.1.7.ebuild b/sys-libs/libcxxabi/libcxxabi-18.1.7.ebuild
deleted file mode 100644
index 8865a2ce4c2c..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-18.1.7.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit 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 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~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}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	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
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-
-		-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/libcxxabi/libcxxabi-19.0.0_pre20240608.ebuild b/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240608.ebuild
deleted file mode 100644
index 903f8e866cb6..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit 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"
-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}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	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
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-
-		-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/libcxxabi/libcxxabi-19.0.0_pre20240615.ebuild b/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240615.ebuild
deleted file mode 100644
index 903f8e866cb6..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit 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"
-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}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	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
-		# this is broken with standalone builds, and also meaningless
-		-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-
-		-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 9c95151db267..1acd9776853e 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -5,20 +5,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD libomp-15.0.7-r6.ebuild 3470 BLAKE2B 9f76ca5b080ccf01617d7dcbfe3eb424c525adbcf72f2b5f09dc7bead1e28df1a0ffdf5ef47bcc7f8cac130f1d22e804e29938cda6df0ee58359ac5ff88aea86 SHA512 1a0a4b10f9a67634ea265e6df3c3f9993ed5ee3818eba2cbb6b65d8f5c3a0d2d266134f3e276985e87eca18b47a44d6de61e4c9c3496fd36c6c338dcf79b9850
 EBUILD libomp-16.0.6.ebuild 3984 BLAKE2B 8302d2776c0d8c50dcc7cac2dde8523f1abdf391d48594fdd26ebe17a089efdfee93825bdec07569878d06873b571e469411f108564df6c7eb50dc425615c255 SHA512 714da170fba4b62f3267e2530a82c583d299e8dc6c6f4037417c216c1239cc0fadc1aebf823608df37a932a7722144e67a148b58079e50560450b94c93f3e415
 EBUILD libomp-17.0.6.ebuild 4052 BLAKE2B 8a05a46719120eac5495417fb6ea54b7a6a3d93aa7cc0917ca9e8f3cb2238f23348ecaefebd4c2064eac4adfbd4ef7f86b70c051cbcc009692ec790159d8883d SHA512 80b48f5a3af351ee14296aa76ba28b964eb85d84a1827af8acd35076895342a5dd743362c988e042c57f11dc9e8bbca1a9003a6752562758249062e460c73247
-EBUILD libomp-18.1.7.ebuild 4287 BLAKE2B 65c6e04062bbf04d9655f226a97ecb10af4f2496295a770112059ab5ad3c74738e356c93a531abf20a171e8c89e8d8fdbcbdf6f8d15d6da5bfabce0147e1cbd3 SHA512 6abaa6531de18562248222d6393f48f88bde950a84051747a66b9c2f9c907315e403b050437d7263f227d564ca550f54db5ae5605a738fb8cd63bc2557814137
 EBUILD libomp-18.1.8.ebuild 4287 BLAKE2B 65c6e04062bbf04d9655f226a97ecb10af4f2496295a770112059ab5ad3c74738e356c93a531abf20a171e8c89e8d8fdbcbdf6f8d15d6da5bfabce0147e1cbd3 SHA512 6abaa6531de18562248222d6393f48f88bde950a84051747a66b9c2f9c907315e403b050437d7263f227d564ca550f54db5ae5605a738fb8cd63bc2557814137
 EBUILD libomp-19.0.0.9999.ebuild 2163 BLAKE2B 522f4f9099cf7ca69f3bd2d93f1bfa0f80fd1937d8147b0464d3bcb143b161cf5b17b8e2fc80a981188a1962a3dc1396979dd726028f546ccb10b56265405415 SHA512 5ae5744e3addc95f790c15e1d89d3da4080ea0216518ece8097ac21a71432892d920722618ea3589f7bf4f70c505b5be37fa9b8c49683fd2307988b4425e7bea
-EBUILD libomp-19.0.0_pre20240608.ebuild 2163 BLAKE2B 522f4f9099cf7ca69f3bd2d93f1bfa0f80fd1937d8147b0464d3bcb143b161cf5b17b8e2fc80a981188a1962a3dc1396979dd726028f546ccb10b56265405415 SHA512 5ae5744e3addc95f790c15e1d89d3da4080ea0216518ece8097ac21a71432892d920722618ea3589f7bf4f70c505b5be37fa9b8c49683fd2307988b4425e7bea
-EBUILD libomp-19.0.0_pre20240615.ebuild 2163 BLAKE2B 522f4f9099cf7ca69f3bd2d93f1bfa0f80fd1937d8147b0464d3bcb143b161cf5b17b8e2fc80a981188a1962a3dc1396979dd726028f546ccb10b56265405415 SHA512 5ae5744e3addc95f790c15e1d89d3da4080ea0216518ece8097ac21a71432892d920722618ea3589f7bf4f70c505b5be37fa9b8c49683fd2307988b4425e7bea
 EBUILD libomp-19.0.0_pre20240623.ebuild 2163 BLAKE2B 522f4f9099cf7ca69f3bd2d93f1bfa0f80fd1937d8147b0464d3bcb143b161cf5b17b8e2fc80a981188a1962a3dc1396979dd726028f546ccb10b56265405415 SHA512 5ae5744e3addc95f790c15e1d89d3da4080ea0216518ece8097ac21a71432892d920722618ea3589f7bf4f70c505b5be37fa9b8c49683fd2307988b4425e7bea
 MISC metadata.xml 883 BLAKE2B 127e896b82a49633a6866b33ca776ebe2dd149a5d04da4484a53186f219a85db0ab9d826bc1cc61d4df9fa54c9bcc546be070a0b28985174925fd947aa09cca2 SHA512 dc32cae01401feb93eede6506b3955c766ff19b44976fcc67277559b23ac151993377daeed9ba83b2dd71dbdeea330cd1208dcb0c9c5f56be270883b31f9b15f
diff --git a/sys-libs/libomp/libomp-18.1.7.ebuild b/sys-libs/libomp/libomp-18.1.7.ebuild
deleted file mode 100644
index b3b6281fa7d0..000000000000
--- a/sys-libs/libomp/libomp-18.1.7.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit flag-o-matic cmake-multilib linux-info llvm.org llvm-utils
-inherit python-single-r1 toolchain-funcs
-
-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 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
-IUSE="
-	debug gdb-plugin hwloc offload ompt test
-	llvm_targets_AMDGPU llvm_targets_NVPTX
-"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
-	)
-"
-# 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_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-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() {
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	use offload && llvm_prepend_path "${LLVM_MAJOR}"
-
-	# 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 build_omptarget=OFF
-	# upstream disallows building libomptarget when sizeof(void*) != 8
-	if use offload &&
-		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
-		<<-EOF &>/dev/null
-			int test[sizeof(void *) == 8 ? 1 : -1];
-		EOF
-	then
-		build_omptarget=ON
-	fi
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
-
-		# 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 [[ ${build_omptarget} == ON ]]; then
-		local ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		local ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-		mycmakeargs+=(
-			-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-			-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		)
-
-		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)
-
-				# prevent trying to access the GPU
-				-DLIBOMPTARGET_AMDGPU_ARCH=LIBOMPTARGET_AMDGPU_ARCH-NOTFOUND
-				-DLIBOMPTARGET_NVPTX_ARCH=LIBOMPTARGET_NVPTX_ARCH-NOTFOUND
-			)
-		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/libomp/libomp-19.0.0_pre20240608.ebuild b/sys-libs/libomp/libomp-19.0.0_pre20240608.ebuild
deleted file mode 100644
index 32b91b3699c4..000000000000
--- a/sys-libs/libomp/libomp-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit flag-o-matic cmake-multilib linux-info llvm.org python-single-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}"
-IUSE="+debug gdb-plugin hwloc ompt test"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${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
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-pkg_setup() {
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-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_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-
-	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++")"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/libomp/libomp-19.0.0_pre20240615.ebuild b/sys-libs/libomp/libomp-19.0.0_pre20240615.ebuild
deleted file mode 100644
index 32b91b3699c4..000000000000
--- a/sys-libs/libomp/libomp-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit flag-o-matic cmake-multilib linux-info llvm.org python-single-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}"
-IUSE="+debug gdb-plugin hwloc ompt test"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${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
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-pkg_setup() {
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-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_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-
-	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++")"
-	)
-	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 2b256be21428..bcd9e5066b17 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD llvm-libunwind-15.0.7.ebuild 3032 BLAKE2B 9b47e894db1a764f3eca3135f4caba68261953f4433af017b7bb53181e345ad26c570733f997022c53c9ef49a0a3b823188d92cfcc16a2113825d767b1ffab2a SHA512 0b68480fb2a8e5a351574e81fbcff824cd324754ed40378f06fec12fedbba94a921043d72db6ecc37f8b0680b7f518bbbd8d63f69ce8d84f86ca522653d293fb
 EBUILD llvm-libunwind-16.0.6-r1.ebuild 3440 BLAKE2B eafe21a3de172043ca0039ba27c80c64d32b02cc86bdb5a6d108ded35770e0352216337cbf24ee4fde43b699a68a85c8145be2d17510d525452bfd5a02674998 SHA512 164fdc1c62405e02c035af7997b8522b51f5b9337d2bb66d7fc9b1f45df74ec70d31b26dc5324c59792d32c543fe18abf74ed3b07a64c131e3c1bb4f9f733c5d
 EBUILD llvm-libunwind-17.0.6.ebuild 3440 BLAKE2B eafe21a3de172043ca0039ba27c80c64d32b02cc86bdb5a6d108ded35770e0352216337cbf24ee4fde43b699a68a85c8145be2d17510d525452bfd5a02674998 SHA512 164fdc1c62405e02c035af7997b8522b51f5b9337d2bb66d7fc9b1f45df74ec70d31b26dc5324c59792d32c543fe18abf74ed3b07a64c131e3c1bb4f9f733c5d
-EBUILD llvm-libunwind-18.1.7.ebuild 3413 BLAKE2B 9a59c656e7ee118568d2c81e4af2e2cbf8b668c7e9b4d65c65ec0f0e49f31aad9d20b8780dbaf78f9bf57b7e2943a8b1284bdf9a2c6b75b4f8cc1cfa18e15a59 SHA512 b597048d6be09a9151a7dcbc00e8348c738072d156500d5f63e2d1ba7df488ad4b7e4847a634310569da1ec04b6e1bbb9e88ba004618f58266448d44c4cbf451
 EBUILD llvm-libunwind-18.1.8.ebuild 3413 BLAKE2B 9a59c656e7ee118568d2c81e4af2e2cbf8b668c7e9b4d65c65ec0f0e49f31aad9d20b8780dbaf78f9bf57b7e2943a8b1284bdf9a2c6b75b4f8cc1cfa18e15a59 SHA512 b597048d6be09a9151a7dcbc00e8348c738072d156500d5f63e2d1ba7df488ad4b7e4847a634310569da1ec04b6e1bbb9e88ba004618f58266448d44c4cbf451
 EBUILD llvm-libunwind-19.0.0.9999.ebuild 3316 BLAKE2B bd35bebb24f85df1df172da2753279735077353c2a2b06df35700ad58b32fecdb29f6045be9d3c51316e764bda2a75295fb879fd635da71747ad0ab11dc5649d SHA512 8211878d4fde53625702b27cce8bf7a09cf97238c52e1078f6895b58675f76c78aa60f8a886a2f25d0cf71becdcefd94e8666b9c8915fecbe5b47accdc9b988a
-EBUILD llvm-libunwind-19.0.0_pre20240608.ebuild 3316 BLAKE2B bd35bebb24f85df1df172da2753279735077353c2a2b06df35700ad58b32fecdb29f6045be9d3c51316e764bda2a75295fb879fd635da71747ad0ab11dc5649d SHA512 8211878d4fde53625702b27cce8bf7a09cf97238c52e1078f6895b58675f76c78aa60f8a886a2f25d0cf71becdcefd94e8666b9c8915fecbe5b47accdc9b988a
-EBUILD llvm-libunwind-19.0.0_pre20240615.ebuild 3316 BLAKE2B bd35bebb24f85df1df172da2753279735077353c2a2b06df35700ad58b32fecdb29f6045be9d3c51316e764bda2a75295fb879fd635da71747ad0ab11dc5649d SHA512 8211878d4fde53625702b27cce8bf7a09cf97238c52e1078f6895b58675f76c78aa60f8a886a2f25d0cf71becdcefd94e8666b9c8915fecbe5b47accdc9b988a
 EBUILD llvm-libunwind-19.0.0_pre20240623.ebuild 3316 BLAKE2B bd35bebb24f85df1df172da2753279735077353c2a2b06df35700ad58b32fecdb29f6045be9d3c51316e764bda2a75295fb879fd635da71747ad0ab11dc5649d SHA512 8211878d4fde53625702b27cce8bf7a09cf97238c52e1078f6895b58675f76c78aa60f8a886a2f25d0cf71becdcefd94e8666b9c8915fecbe5b47accdc9b988a
 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-18.1.7.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-18.1.7.ebuild
deleted file mode 100644
index b6a7c9822310..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-18.1.7.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~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}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	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
-
-	# Respect upstream build type assumptions (bug #910436) where they do:
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=ON =>
-	#       -DCMAKE_BUILD_TYPE=DEBUG  => -UNDEBUG
-	#       -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=OFF =>
-	#       -UNDEBUG
-	# See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826.
-	use debug || append-cppflags -DNDEBUG
-
-	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/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240608.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240608.ebuild
deleted file mode 100644
index e4c76c15ebc8..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit 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"
-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}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	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
-
-	# Respect upstream build type assumptions (bug #910436) where they do:
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=ON =>
-	#       -DCMAKE_BUILD_TYPE=DEBUG  => -UNDEBUG
-	#       -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=OFF =>
-	#       -UNDEBUG
-	# See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826.
-	use debug || append-cppflags -DNDEBUG
-
-	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/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240615.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240615.ebuild
deleted file mode 100644
index e4c76c15ebc8..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1
-inherit 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"
-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}]"
-}
-
-multilib_src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	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
-
-	# Respect upstream build type assumptions (bug #910436) where they do:
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=ON =>
-	#       -DCMAKE_BUILD_TYPE=DEBUG  => -UNDEBUG
-	#       -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG
-	# -DLIBUNWIND_ENABLE_ASSERTIONS=OFF =>
-	#       -UNDEBUG
-	# See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826.
-	use debug || append-cppflags -DNDEBUG
-
-	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/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index c1feb52bb030..38cc420afd96 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -2,6 +2,6 @@ DIST talloc-2.4.0.tar.gz 676054 BLAKE2B 71b3f21fa7cd114579e1dc064aadda447c0d196b
 DIST talloc-2.4.1.tar.gz 679160 BLAKE2B a7913b25930c77da53c17c2e0d71386402b1059f93c751084037c5068a035bd543c2d7e24a2d8dc989bb4eea13fa1a3c7a362e4d6c14af0b2030fbfb2f513801 SHA512 4de3b66d7cd1ff3f53e28e86bf9e89528635465c67868e1262aab6946106c228b2c184e988561361c3194fb260d83e016477254c9dbea7abff40c4dc0d31c76c
 DIST talloc-2.4.2.tar.gz 679750 BLAKE2B 1f836d6b11e096e399ad7b99ad4abd3c140e75ee307695659c35b89eca600de247e5432bce523a299334f20ca2dad4c726b783a94c546b67fe25b2b7199b2915 SHA512 fb91665ffbe0cce96b1359940ff3ed21330c81c5331140788a26aa94f82b50492176e6000ff54b31d1a434bb1cb53a6a2c7894153545252a1fd91bda7c05a213
 EBUILD talloc-2.4.0.ebuild 3592 BLAKE2B 3d8b4568d1cbda2cdaf252f76c674e6fb7aca55f447da413b81b33b1a7efe709d91cdd5f356af3c5f2ffceb38b5b6d4c80595ed2e7b18270c48ac3992e70e0b7 SHA512 12a10afe731405a613b7309a4b43475fa679b28b21b98910a4c90ce4a061b92f964ee2b17dbc59077e77eaf3865afb3f2c7563ba1df68855396585e4ed8b04e1
-EBUILD talloc-2.4.1.ebuild 3666 BLAKE2B be7217020b04e6dfa4852201957a5a9a1edd86a6958db7ea096d55014165b17bfadbed63a53e13cf9d2ff2cfd99a561aa7ebc94c4cf42dfea7a48ff04e504f6a SHA512 6938b058df9050ead3002c8627eeff39a82931705aa8076ab8d4d687802a3d6ff0d4d46baee19674140f800bc2a683f2daf3201e9bcb133b9001d98ad20da80b
+EBUILD talloc-2.4.1.ebuild 3665 BLAKE2B 8ff04d698910a1b421a56904ca1a606afe2e9454399a1bd6471812cdba504447efdd7fed099c8e43d180e3d77d1770e3b0919893ed5c14043787d22787d964cb SHA512 f776a4a81b93f89a0b3bd381d45f5e721d851bdfe35a5db08d7cf25b48e84b1dc0e20ad946dd2bf954bc09a98ba9918426d1fbed38b1b534f9849f6889f96891
 EBUILD talloc-2.4.2.ebuild 3671 BLAKE2B 28e22e77183d6ca8b6a1eba26c71ac32a2c14bd5e73262ac927e6fb11b6e0da167fe2dd681673632a3387f16b3eb336825562ed546f48facf0bbde659a2ba00e SHA512 08ff57f85b92245dfe79f8f5c202fd250e8ca670786676a6d0f04cf097a56a8a11018b41b774001806c699338c5f5039c0436d54c80274f06d15cee9168897e3
 MISC metadata.xml 326 BLAKE2B 4788d8b536b43840fc3a6d6ef36d860589ebb1137cd07d11ce75c54869b8b65027f9332901c1882ce8fd97f446d90973cec03332b4e693283162f3c731b7627e SHA512 e700e6f5810ad2d6618f52ff3607a2dc3254751dc8172744512c956f001045accfa28d8aa79be67935c02aead13c2c22c54aa4e221f487ba3cb25ebe9273d57f
diff --git a/sys-libs/talloc/talloc-2.4.1.ebuild b/sys-libs/talloc/talloc-2.4.1.ebuild
index 664fea62ad76..1bfdb7ae94f5 100644
--- a/sys-libs/talloc/talloc-2.4.1.ebuild
+++ b/sys-libs/talloc/talloc-2.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="compat +python test valgrind"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index 13a96bebc517..19d4e72f3d3c 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -3,6 +3,6 @@ DIST tevent-0.14.1.tar.gz 881979 BLAKE2B 272b7d0029061dfd172a39135d806b937ee6f5b
 DIST tevent-0.15.0.tar.gz 884634 BLAKE2B 071906dc0cc199a9b550e74ca7fcd3555e54a1c48a9be2c107c498ccf2157521336c3ec63fd776e3551064e9baf1ebcf9c7ff5eb0f04375b7d714056331476aa SHA512 470cc4489255a4f122ba1d680669589ba375d4081ff46631dd56f5104202d175bfb13356820eb9108a6b768b3837b2f5d26cc7b0acc3071c4787fb070df3cbab
 DIST tevent-0.16.1.tar.gz 890010 BLAKE2B 34639cf0e63193eebdb9c3f845390685d66916c6a687f22fbe25dbe175d3279752dfea1e3567fdb2eed3bea17108b9b226039cb1218c0536fc1eb7f4e0a025ab SHA512 cda001d91728b2f28dd081e9c5f6d8ede345dcd9ce1dca04394860cd83090c15aa8dfef1c53b73e120bd17f0d95551fa9301eb4927963314556d016fe5420a39
 EBUILD tevent-0.14.1.ebuild 2435 BLAKE2B 69af2d6270b9fd290db1ca9c76540a9abf3a3589e63715b9d234c7fb1cf353b9373f2ceed13884e2e2ad8ef6bffb9471d74e9811eca9d7e9cc6285ed707fbf94 SHA512 b01fe20d1b4087ab31b214f69d68a4309e88c153291fe8662efefaacc119b8e2392aca973eb61cf8659a0a5ebbdfe32be5a904c673d6be89973ef6e7c1791cf4
-EBUILD tevent-0.15.0.ebuild 2587 BLAKE2B d85341a7d3f7862e2478b5991df0ec93cc907a1c5430f2b91cf07ecd60eaa8235210aeee0077affc4fc49abd86ada81d41bd8dc300128c4bf1db329e9a6a38d5 SHA512 47baa89239c63df48323d3ef541841021c65fd5bf6da74fcad69a78818284fb9a4c199f7e24d656beeab203a4b7be12dfa6bb7c93889f1933b5250e6a1674014
+EBUILD tevent-0.15.0.ebuild 2586 BLAKE2B c0fb2a813f76f0370afc1cba5762574d4ff5945520c0d46b0b1f3e9fce7db379973314506db3e0437e2c1271eae9e15c52b8fc778bceb7a9f34a4e7a28697f1c SHA512 685e6c9c753f621d831a156a0d055d9fb5c82db9d2181b70ea8e329b98def9c9560e5fa4d9acdb10ff2835a7b17737c10bbacf9adc0b388a79e3a84caec725b0
 EBUILD tevent-0.16.1.ebuild 2542 BLAKE2B 4a0906aac09f150fce9fc33857a7bf67207a24bfad5f18533a3b6a8119109073099e2b1f738debf7d1cc32bd36ca199b6c7fc126d7df49f7254aaf62f57339eb SHA512 ce77cb95dafe29d4d9e205f87125d85304eeb61ec9b68a39391ee0d9dd236c58ac23e309ec4610e0277b6cf886a9e3b68f3e3189bb340b19b568aa3d36d50f06
 MISC metadata.xml 239 BLAKE2B 7127a2a67e79dc98a78fcaca706fd348389c7f08465112215855afe5978d2932ecbee93944efb1df528fbb6d09e884b277cb1d55a8b3926487b6ca07f9330b8a SHA512 4ea42efe4d083d013b85796ca25a132678bcefe6e3687fd6dd371814fd307118fbc8da8c15ce7f4d956e5f824cd0202f49d3469406c88008e84ff9f4d360f424
diff --git a/sys-libs/tevent/tevent-0.15.0.ebuild b/sys-libs/tevent/tevent-0.15.0.ebuild
index 59947e7769d9..3df775d6d566 100644
--- a/sys-libs/tevent/tevent-0.15.0.ebuild
+++ b/sys-libs/tevent/tevent-0.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
 IUSE="python test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 24f19fc69f2a..768239b7d311 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 4e919394b476..7fac8bd8adf2 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,3 @@
-DIST chromedriver-bin-126.0.6478.114.linux64.zip 8766870 BLAKE2B ef548892eb147cbf6a266ec821988ad509c51735c8b1136459c6fb768bc57fb22ed5ca6bb235b2c43dfb5b8c1d0b99278c6722a79f890c04a916decb1688aa06 SHA512 705b89804f6b1ec41a3f3e89c882c140db2be064dc1606f0ca68e2fcccb645b4632402d413931c271c6268998bd93c80cec2398fc509a7c926dcf17d2fcac7fc
-EBUILD chromedriver-bin-126.0.6478.114.ebuild 723 BLAKE2B 03683d52be41beb713d96fe5b459de4807cd8be267a6559ed0fc8a6539095acfefe8c32e8774790f30c6eb7ad842f8cc5f261699938dd528e8a669454b313c9d SHA512 691bfcc0c4827b0e29ddda34293d247547e181365ee2cda16a8dc860a1359621ecefcf0a286d90ab6bc0c86d1a9a57aafb95809ff02aec673e6b414f711a09d1
+DIST chromedriver-bin-126.0.6478.126.linux64.zip 8767006 BLAKE2B a976633561b58c3356e4f760e034c6fe87d492f598f4c0899d552d68f406b5632a3683e44b39882e07b5682f70dde81b0d7435c9d9f28a4531a6ac08b21a11b0 SHA512 5b59053fbd2b1b8b02fb093e11d03201e302adb5fd901b2adc8cf1715f06c8a2064666de966dd4dbe8c40c5eb419f051fd5a9407f54f032e411e5e089bf9ce34
+EBUILD chromedriver-bin-126.0.6478.126.ebuild 723 BLAKE2B 03683d52be41beb713d96fe5b459de4807cd8be267a6559ed0fc8a6539095acfefe8c32e8774790f30c6eb7ad842f8cc5f261699938dd528e8a669454b313c9d SHA512 691bfcc0c4827b0e29ddda34293d247547e181365ee2cda16a8dc860a1359621ecefcf0a286d90ab6bc0c86d1a9a57aafb95809ff02aec673e6b414f711a09d1
 MISC metadata.xml 461 BLAKE2B 4e6e0fd9bf732be9040a4defe4dc1ca63ba7e1ba860abfc97ad487d6220f7bc5cb1e304d001409cb866408fdf393ca42f3b95eb9b8dc258a0627aaa978f66e6e SHA512 3c9217fe5af26ee8ddc705edad8a32604d542ad60c3e78ed8aba9e08a5bd2b3508234e42710d4524149f8b7626bba08f83cb96f7f942fe5ccdfbd8bd98908bec
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-126.0.6478.114.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-126.0.6478.126.ebuild
index ff9ba50fc766..ff9ba50fc766 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-126.0.6478.114.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-126.0.6478.126.ebuild
diff --git a/www-apps/sonarr-bin/Manifest b/www-apps/sonarr-bin/Manifest
index 7900e7d4e273..2db9148fb44d 100644
--- a/www-apps/sonarr-bin/Manifest
+++ b/www-apps/sonarr-bin/Manifest
@@ -1,10 +1,10 @@
 AUX sonarr.init-r2 148 BLAKE2B ec52d371fe94038459978619cb51e1a5394d48178af12eaf8e48758af2476edad621866261454a33fc4d1fdf985463c5036442627ded3733531549c00bf7d980 SHA512 769e844e962df9880d5aa6d6030af792e14d6ca7c375f687cb0a62921b784037f45bc7e2d0da2803400f6de5a2a32b5903e3cfa910bc06bfca5a2f90b042ea65
 AUX sonarr.logrotate 185 BLAKE2B 177e0158baba22056af33f59656a734541be16a9e5dbbd09758ba6ed23b3262979c9b1ca6072bfaca8567ca3165af35f2911838c903a9c75da37cc9aa259858e SHA512 9fddf238caa123801462158debf2296ac04ba2e2d42f1566b50b4823b10e8c84dfdb5f1649ae1a6c3bebce19e639289b5c9a491d7ba20a37e19980673a32a5cb
 AUX sonarr.service-r1 568 BLAKE2B 7ccc2f3def560fd07713e433a657f2664c153acbf316442e516f9591a918dc042bcc8302877e1456af2dc4ae30d44157ffc1b11e6844ea9cbea9990aecd62c24 SHA512 d99f6312ffe8dff2c0d938a3c0e5801355e1323261b7e8752f409ddab5885ebacd9c6237060cd4153bd91e1f1c8c3e70dd69285002956cc45a8259798268bfcb
-DIST Sonarr.develop.4.0.5.1760.linux-arm.tar.gz 94950450 BLAKE2B f44fadcf33509827699c818984ea38ef92ec7ddb32123306e45bbfae7aa0ea08c21363c90ea8bb78bb5257998f9284b1f5fa512df9987a7780c9afbebfdd044e SHA512 5cf265c9fed3723b6e405660729466a73d9fab4887e98940a33f281d2aee554add3634722b328ad31aced752c2b90859a521a7ceb8a1cc65dd10385512e7b623
-DIST Sonarr.develop.4.0.5.1760.linux-arm64.tar.gz 94676046 BLAKE2B a8428f71b0ac370253fb34a69b250bde29c913ee0b9b6033e82af5a3ddd5c14e686900d352ab842eae08b74ea3ca5b6062ecb5eb43c04d8e78fbddfd75eae927 SHA512 3a239e16d42ff5475ff74bbfbf9512b544aa06f69b0e9579eb54c513b01473ae00c2c36b5351add47972cd00151f8636ce414222bdfd9d15f6ca6dd6220e6a18
-DIST Sonarr.develop.4.0.5.1760.linux-musl-arm64.tar.gz 94742233 BLAKE2B 75b8904e5c5a7e287602aac65757e86d78e4bb766d25c4237fb5dcc385fdfcd9725de55834a8c25c4d11af655bb4f8f2e18f560b44afe373281101219169c347 SHA512 72a6c3ddf5ad904e9ed1406aa34dd03922e2a1d15af9da9073dceb8c3f033afd2751f3ab932757760a661c411bd257bf6d887ed2c67d6aaac6a4c8668ad2bafd
-DIST Sonarr.develop.4.0.5.1760.linux-musl-x64.tar.gz 99682590 BLAKE2B 37478c1ea650decdabe8526c8140ddbdd40cf4b510a251754c733bc0ed9c6d36a497b5b78e03a63a5a17c2e262a3424d25c6fd1d9f53041d16d7213df80e7398 SHA512 89d58b4ba2fa4ddbcd1cbc37e214f5ae842fd42be83d7e38e2220bad97b9dd012d0a479697a038acf75cc8017fb6cce54dd31ca419ea949ccc7344da0a3717b8
-DIST Sonarr.develop.4.0.5.1760.linux-x64.tar.gz 100610075 BLAKE2B 624416ed0c34d938f465deac9e801f800f74ab99774778f9261e37523e9b1c21031128140e63358fd01a0d2100e1e67eba28024024f61d87849d4cc5fb0bc8b9 SHA512 93df0b6fb22e06c44224d0d43aca75c9f1764e094031d8bd086eb5f0df571daf06dbfff5753b148b22751d829d7ceeb1536014a3b0da8d7f61e12cc1069e1b3d
-EBUILD sonarr-bin-4.0.5.1760.ebuild 1749 BLAKE2B 2e42b6b35dbfda7b42504b8b89ae91f39c4e9a665f51b9cee0cf0daf4fb2ea3460c2e3f8c6733302a55d23b0794208d82c77528baa3719e28001af8c4526323b SHA512 719e9316fc0a72b7f86fc54a27a97f81f204a18bf3cdc3360f0732d565b363d9f956bce157aa42600e4b9afcaf6ced5bb05305abca892875495ccf2e68db5b4c
+DIST Sonarr.develop.4.0.5.1782.linux-arm.tar.gz 94932298 BLAKE2B ef3db7cfe90c7ba898021b0a54dcdcbe274641d25c579ca1d83725588636b6395305a601b6925cdfc56bfc0904542fea425905a54b909b9a7603ffd7aa1f9f2b SHA512 b55ee185cc9e98eefe91e0110f36c35f6200dcea7199aac8902e7e4feb2a2ea57f11010550fab5f1c3fcfd95f088a9ace36ea9aa930ae92c69009f2fcb4101a7
+DIST Sonarr.develop.4.0.5.1782.linux-arm64.tar.gz 94634240 BLAKE2B 0f4227cc6b766ece502656930aa6df13a5b52ef6f041b2c0ffab8b0c511a29bff049c6e833cd87534295082a225e98c9f120bb7fa5b17abaf6045bf845dd4609 SHA512 b26d36c40b45a0c342b99a023032c085bc12ad7a5420058f25834bcd747992f03a9a97532f9f610340f26f4fd11e7c63ca53f4800a7d15460da09ad6d5a29cef
+DIST Sonarr.develop.4.0.5.1782.linux-musl-arm64.tar.gz 94687005 BLAKE2B 20163055cf767725ab3ce561ec5517c5c663747a0849fc39edc505f1814a14a4980b1eea09faca6856d945d27a085222b1618c445bd7ef713046c9871a80ea21 SHA512 cd252df49f7c38a20f241802ef51b2a1b4a5d684b47ad79224e23a93aaecc7fb30545929a7e2690431c60fc55a4f1d60515f5b4d0c8ef9d36669448fc08442f4
+DIST Sonarr.develop.4.0.5.1782.linux-musl-x64.tar.gz 99662493 BLAKE2B fc1c3c10e32f2a96fcb2e841e98254359561b72ff333c512215c1b9a8f57658be56c7dae358f9e4a6ab867c9d410991d33e73088e8dea3679046c289b0f1f69b SHA512 b3d50981df791a0295eedcd841f1308e1d745405d278325bbf3f495c9c017e451bbbf9cf8277ff9ae54b35f7ab075fe1c511bfceb0cf78b85fe2483efe322693
+DIST Sonarr.develop.4.0.5.1782.linux-x64.tar.gz 100597860 BLAKE2B 3e6eece1312a4d6ea7fa027132c4e93155ab3b66a28093d8eafbe0ff85ad818cfd5628d6e304d5c8df692162db02b1a3a618a3025f7dcb776058430d94ea5334 SHA512 660e2a6f4ab7e5d341924ee53347ab673f3a8f06e48e1fe8142b04020fde2bc0e4fbd466a66bb71d58292e5772398fe86db521dfb1958190c826277eddee728a
+EBUILD sonarr-bin-4.0.5.1782.ebuild 1749 BLAKE2B 2e42b6b35dbfda7b42504b8b89ae91f39c4e9a665f51b9cee0cf0daf4fb2ea3460c2e3f8c6733302a55d23b0794208d82c77528baa3719e28001af8c4526323b SHA512 719e9316fc0a72b7f86fc54a27a97f81f204a18bf3cdc3360f0732d565b363d9f956bce157aa42600e4b9afcaf6ced5bb05305abca892875495ccf2e68db5b4c
 MISC metadata.xml 675 BLAKE2B 5ac9fb421e127c8552ee273b784205059a59245d3783efa5c69225dcc34a65cdf00e39de3dc47013807923766110992f557cb3247f9866ec6d0c836b42ab4cd5 SHA512 1c347d1e422a2653fe8c403169cc1f16f7d5c668831d60a67d67a2df8ca90c696fb28fde70cd4a3c9336f983c39fbba30ec570ab7c14caee946cdd983aa6ba58
diff --git a/www-apps/sonarr-bin/sonarr-bin-4.0.5.1760.ebuild b/www-apps/sonarr-bin/sonarr-bin-4.0.5.1782.ebuild
index f10489599d33..f10489599d33 100644
--- a/www-apps/sonarr-bin/sonarr-bin-4.0.5.1760.ebuild
+++ b/www-apps/sonarr-bin/sonarr-bin-4.0.5.1782.ebuild
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index d92575996c7f..d0e5d70feb23 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index bec92e76a800..168091d45140 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -12,12 +12,15 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-126-clang.tar.xz 50615992 BLAKE2B 293709399ddf343ba195cec452974178228ebb72921931ad58136351956b881f8dc0bc8ca740252bcd4971701c9ee8ccc0a33648aee25a5b1cece56e0af6b83f SHA512 7bb2938b1df452585d0ee93da3bcf9c3e64e88e39059a713fe21758df670190b12ca002ef2764dc99efdb4284b4c4b7cde861e2e495d99956c21120a51b8c3dc
 DIST chromium-126-rust.tar.xz 150643432 BLAKE2B d9c827008a2fae07977628beccdf3cf4e5d9bf3c9728e4b2839c8bc86ee2f87844921064e30c067a1b620a3d53cbf54a74053172b1436239332fc668f772924d SHA512 431c0305a81e59da231d56f1b119226b661d7f5a93d0da92afbfc384b0e5be28f282c2911137983298a5369c93b60184d41875ec63b47048a782ee2b1301fc77
 DIST chromium-126.0.6478.114.tar.xz 4167281776 BLAKE2B 4ca720b0280dc6f0aafb5da5d31f97d8d55faec9ac187fc7f3e16e447d147a6912b2b8f26247503390755146e42b32458e4c71a80e6a132cc456f414454ecf53 SHA512 49ca506eb7ac52cdfb5b491bff10deec46d62686feeb3392803eecd61a570ce6c9e6c97d61c79907aaaee39b6d32a4da399c92b8078dbdf2df097f37c757d286
+DIST chromium-126.0.6478.126.tar.xz 4166142564 BLAKE2B 4c709c3a02a01f6bef46309b4a2f3d8cd688007e6b69152a5119a098c98aa272e10ea1ebf418c75387d08e1b9dde75ad53eabc12cf860b288e732c9b974e6066 SHA512 4a86edb82ec530299f8298b7604a18efb5ccf6a6cde37950d7821a73b005b9e83805a0b7f36f2fa5b4f71e237bf70ec628c1864e4f81caa4333a5dc904fb3aab
 DIST chromium-126.0.6478.57.tar.xz 4162722444 BLAKE2B cc41d74916a81a1162aad8ae785e08423ca1c4a49b7b8cdfe0873efab3b67e90da4e240c8c564c77cb67466af6d7c6a61ca3acfa8aae227838060565c0fbb3a5 SHA512 e350cf34ddc7c010e6f2d87c3f8dbaa17f5dd448b10f07b6dd319e494f7d70c6caf3ef7e676de33ee1e05d602edfbae9bcf3807887ae74c32bc49a6db7aa79a7
 DIST chromium-patches-126.tar.bz2 4538 BLAKE2B c1f224015618ec908ef09d0c04a2243923371e2caeccd60d93747599fd1434b284291a5b4326008db21749cf78827d5a4b50d22fc805dcd3c1fd86303dc82729 SHA512 6692075adac0379b5f27d1023de1a051cf7f7f7138efd32dfc3af0d501b714142a16daf18022bb46d92218587f364f4dafe9f4aea24f6826e88b0e7cc2be7d0b
 DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
 DIST chromium_124.0.6367.207-1raptor0~deb12u1.debian.tar.xz 587248 BLAKE2B 4c5a12b3e70be85b31d60d35d160281cbf8b93422169243f743fff25805bc7006ffeed5f95b415fb49e9cf4c3bf2c0a2d5ed10642d8f772df24cab1fe738125a SHA512 025ac185f27c66438a5eaf482120fded42d37403706fd012fbde1b6acf5c2e360bb2fb7723183d4883f66f36afe10167a2d919cde11735186a1a87b28ffaf9c6
+DIST chromium_126.0.6478.114-1raptor0~deb12u1.debian.tar.xz 613488 BLAKE2B ecdf33e0ced01d540b7f1e599df6655055afd8f72b22a92c600205d1b02176be76140a5bfa550e62e4a0e4f03c68992eb480d9ba4a256b3f8b48b525a8ce7400 SHA512 53ea7f89dac5c42ca991f40f2a5515393cb74334a27df72b944552d5a557f6c53b0dac9c89cfb99918fd502396bc80a677a87533f48552af9f7fd440b7b8b2cc
 DIST chromium_126.0.6478.56-1raptor0~deb12u2.debian.tar.xz 613448 BLAKE2B 35af65461a5132ac7a28e004f3b8a5e1afc10924726154dd47a23371ebe5508765e0bfd3c1b1d56ff5671039b522536fa21ec22dcb9f14426929a5905976e8a0 SHA512 870b864620e48e6aefa2b36026553b06dde0afc8e8de6cbaf0e4db2333d02164a95fa5f243066e026aa3dff4b3a7366853f49c02f607dec36cec77e4b4683736
 EBUILD chromium-126.0.6478.114.ebuild 48105 BLAKE2B cdda84bcb09d113845dd934e3dd50b3896458c6cbc626883a34314458d56466674a2f4c909f16509d266743ca32e9290859e1691e02d3a4d4c75caf1c30022bb SHA512 73670ee1eff48818d8df3b0c225062be8e046806285482c56d72b0f74326aa99152fe2c7bbc3aaf25851a5ea0538c3e36745b345d8be15ba5c3014af04a03ca5
+EBUILD chromium-126.0.6478.126.ebuild 48106 BLAKE2B 73e77d9a79b2e3302f1a3cc90617aca29908bc710c62a257f64a71cb14da2b711e795f5a5582cdde32fabdb3ee97ecf110e47cd60e2ea568a02feefb7a81fb97 SHA512 d7d0d77a9c0775ba5ad67a1a4dfa8d1ff599c9347bd997c32a37f4d276a9676428cdf2b1265588a4603cc9cac1685fb001bea84e58825d1da9e4f84f8a9723df
 EBUILD chromium-126.0.6478.57.ebuild 48097 BLAKE2B 36a39aa09ed0fd6c60a5f361c671466a4e69b4bfc212b7e456bcedacc718c9441195b59e8dd26cd0e9e2cc8f5dcd16ff54eadca06f46b53204eb5deaf79667cd SHA512 b83cb6452b2b40e66de1182952ebc0a859de749a75a296b51998144d57b2b48f6082e29ab29ce138554e467e2e838f4955042a11de5ff03d04a2b6300484e7d3
 MISC metadata.xml 2249 BLAKE2B 42e914e06d12ce6ebff4251fa81c28970676bb6cad7e9b1591dbbf79e45a8805fad6ee3bfb7c1b81f47e91e101091fbfcd565a0cc47f8280b9f169559ca61f2c SHA512 a30553dc4878fdb70546a1dbcb8c38ac42b0bddd500e1d09ba5a8414f681b3304e9a6a02e734c1e7eb58e782f30f6390be97b4a22996788e7639e8a9feb01ee9
diff --git a/www-client/chromium/chromium-126.0.6478.126.ebuild b/www-client/chromium/chromium-126.0.6478.126.ebuild
new file mode 100644
index 000000000000..4d4905180fe6
--- /dev/null
+++ b/www-client/chromium/chromium-126.0.6478.126.ebuild
@@ -0,0 +1,1452 @@
+# Copyright 2009-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="xml(+)"
+
+# PACKAGING NOTES
+
+# Google roll their bundled Clang every two weeks, and the bundled Rust
+# is rolled regularly and depends on that. While we do our best to build
+# with system Clang, we will eventually hit the point where we need to use
+# the bundled Clang due to the use of prerelease features. We've been lucky
+# enough so far that this hasn't been an issue.
+
+# We try and avoid forcing the use of the custom/bundled libcxx, but sometimes
+# it is unavoidable. Remember to force the use of Clang when this is forced.
+
+# GCC is _not_ supported upstream, though patches are welcome. We do our
+# best to enable builds with GCC but reserve the right to force Clang
+# builds if we can't keep up with upstream's changes. Please comment
+# when forcing Clang builds so we can track the need for it.
+
+# GN is bundled with Chromium, but we always use the system version. Remember to
+# check for upstream changes to GN and update ebuild (and version below) as required.
+
+# For binhost users, if USE=bindist is set, we configure Chromium in a way that it is able
+# to use proprietary codecs, and so that ffmpeg is an external component (libffmpeg.so),
+# then we remove ffmpeg from the image to ensure that the built package is distributable
+# (i.e. we don't owe royalties). A suitable libffmpeg.so is symlinked in its place;
+# as a result of this, ffmpeg[chromium] or ffmpeg-chromium must be installed on the system.
+
+# For non-binhost builds, we build the bundled ffmpeg and enable proprietary codecs because there's
+# no reason not to. Todo: Re-enable USE=system-ffmpeg.
+
+# These variables let us easily bound supported major dependency versions in one place.
+GCC_MIN_VER=12
+GN_MIN_VER=0.2165
+# Since Google use prerelease llvm we can let any adventurous users try to build with prerelease
+# ebuilds; try to keep this up to date with the latest version in the tree.
+LLVM_MAX_SLOT=19
+LLVM_MIN_SLOT=17
+RUST_MIN_VER=1.72.0
+# chromium-tools/get-chromium-toolchain-strings.sh
+GOOGLE_CLANG_VER=llvmorg-19-init-9433-g76ea5feb-1
+GOOGLE_RUST_VER=31e6e8c6c5b6ce62656c922c7384d3376018c980-2
+
+# https://bugs.chromium.org/p/v8/issues/detail?id=14449 - V8 used in 120 can't build with GCC
+# Resolved upstream, requires testing and some backporting I'm sure
+: ${CHROMIUM_FORCE_CLANG=yes}
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227 - Chromium 120:
+#    webrtc -  no matching member function for call to 'emplace'
+: ${CHROMIUM_FORCE_LIBCXX=yes}
+# 121's 'gcc_link_wrapper.py' currently fails if not using lld due to the addition of rust
+: ${CHROMIUM_FORCE_LLD=yes}
+
+: ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no}
+
+VIRTUALX_REQUIRED="pgo"
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils
+inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://www.chromium.org/"
+PATCHSET_PPC64="126.0.6478.114-1raptor0~deb12u1"
+PATCH_V="${PV%%\.*}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	system-toolchain? (
+		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
+	)
+	!system-toolchain? (
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${GOOGLE_CLANG_VER}.tar.xz
+			-> chromium-${PV%%\.*}-clang.tar.xz
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%??}.tar.xz
+			-> chromium-${PV%%\.*}-rust.tar.xz
+	)
+	ppc64? (
+		https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_${PATCHSET_PPC64}.debian.tar.xz
+		https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz
+	)
+	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
+
+LICENSE="BSD"
+SLOT="0/stable"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
+IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos libcxx +lto +official pax-kernel pgo +proprietary-codecs pulseaudio"
+IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="
+	!headless? ( || ( X wayland ) )
+	pgo? ( X !wayland )
+	qt6? ( qt5 )
+	screencast? ( wayland )
+	!system-toolchain? ( libcxx )
+	ffmpeg-chromium? ( bindist proprietary-codecs )
+"
+
+COMMON_X_DEPEND="
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxshmfence:=
+"
+
+COMMON_SNAPSHOT_DEPEND="
+	system-icu? ( >=dev-libs/icu-71.1:= )
+	>=dev-libs/libxml2-2.12.4:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	dev-libs/libxslt:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
+	media-libs/libjpeg-turbo:=
+	system-png? ( media-libs/libpng:=[-apng(-)] )
+	system-zstd? ( >=app-arch/zstd-1.5.5:= )
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/mesa:=[gbm(+)]
+	>=media-libs/openh264-1.6.0:=
+	sys-libs/zlib:=
+	x11-libs/libdrm:=
+	!headless? (
+		dev-libs/glib:2
+		>=media-libs/alsa-lib-1.0.19:=
+		pulseaudio? ( media-libs/libpulse:= )
+		sys-apps/pciutils:=
+		kerberos? ( virtual/krb5 )
+		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
+		X? (
+			x11-libs/libX11:=
+			x11-libs/libXext:=
+			x11-libs/libxcb:=
+		)
+		x11-libs/libxkbcommon:=
+		wayland? (
+			dev-libs/libffi:=
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:= )
+		)
+	)
+"
+
+COMMON_DEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	app-arch/bzip2:=
+	dev-libs/expat:=
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	media-libs/flac:=
+	sys-libs/zlib:=[minizip]
+	!headless? (
+		X? ( ${COMMON_X_DEPEND} )
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		media-libs/mesa:=[X?,wayland?]
+		cups? ( >=net-print/cups-1.3.11:= )
+		virtual/udev
+		x11-libs/cairo:=
+		x11-libs/gdk-pixbuf:2
+		x11-libs/pango:=
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!headless? (
+		|| (
+			x11-libs/gtk+:3[X?,wayland?]
+			gui-libs/gtk:4[X?,wayland?]
+		)
+		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
+		qt6? ( dev-qt/qtbase:6[X?,wayland?] )
+	)
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	bindist? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	!headless? (
+		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
+		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
+	)
+"
+
+depend_clang_llvm_version() {
+	echo "sys-devel/clang:$1"
+	echo "sys-devel/llvm:$1"
+	echo "=sys-devel/lld-$1*"
+}
+
+# When passed multiple arguments we assume that
+# we want a range of versions, inclusive.
+depend_clang_llvm_versions() {
+	local _v
+	if [[ $# -eq 1 ]]; then
+		depend_clang_llvm_version "$1"
+	elif [[ $# -eq 2 ]]; then
+		if [[ $1 -eq $2 ]]; then
+			depend_clang_llvm_version "$1"
+		fi
+		echo "|| ("
+		for ((i=$1; i<=$2; i++)); do
+			echo "("
+			depend_clang_llvm_version "${i}"
+			echo ")"
+		done
+		echo ")"
+	else
+		die "depend_clang_llvm_versions() requires 1 or 2 arguments"
+	fi
+}
+
+BDEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	!headless? (
+		qt5? ( dev-qt/qtcore:5 )
+		qt6? ( dev-qt/qtbase:6 )
+	)
+	system-toolchain? (
+		libcxx? ( >=sys-devel/clang-${LLVM_MIN_SLOT} )
+		lto? ( $(depend_clang_llvm_versions ${LLVM_MIN_SLOT} ${LLVM_MAX_SLOT}) )
+		pgo? (
+			>=dev-python/selenium-3.141.0
+			>=dev-util/web_page_replay_go-20220314
+			$(depend_clang_llvm_versions ${LLVM_MIN_SLOT} ${LLVM_MAX_SLOT})
+		)
+		>=virtual/rust-${RUST_MIN_VER}[profiler(-)]
+	)
+	>=dev-build/gn-${GN_MIN_VER}
+	dev-build/ninja
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	dev-vcs/git
+	>=net-libs/nodejs-7.6.0[inspector]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+="system-toolchain? ( >=sys-devel/clang-${LLVM_MIN_SLOT} ) "
+fi
+
+if [[ ${CHROMIUM_FORCE_LLD} == yes ]]; then
+	BDEPEND+="system-toolchain? ( >=sys-devel/lld-${LLVM_MIN_SLOT} ) "
+else
+	# #918897: Hack for arm64
+	BDEPEND+=" arm64? ( >=sys-devel/lld-${LLVM_MIN_SLOT} )"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+needs_clang() {
+	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
+}
+
+needs_lld() {
+	# #641556: Force lld for lto and pgo builds, otherwise disable
+	# #918897: Temporary hack w/ use arm64
+	[[ ${CHROMIUM_FORCE_LLD} == yes ]] || use lto || use pgo || use arm64
+}
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+pre_build_checks() {
+	# Check build requirements: bugs #471810, #541816, #914220
+	# We're going to start doing maths here on the size of an unpacked source tarball,
+	# this should make updates easier as chromium continues to balloon in size.
+	local BASE_DISK=22
+	local EXTRA_DISK=1
+	local CHECKREQS_MEMORY="4G"
+	tc-is-cross-compiler && EXTRA_DISK=2
+	if use lto || use pgo; then
+		CHECKREQS_MEMORY="9G"
+		tc-is-cross-compiler && EXTRA_DISK=4
+		use pgo && EXTRA_DISK=8
+	fi
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		if use custom-cflags; then
+			EXTRA_DISK=13
+		fi
+		CHECKREQS_MEMORY="16G"
+	fi
+	CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G"
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
+		pre_build_checks
+	fi
+
+	if use headless; then
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
+		for myiuse in ${headless_unused_flags[@]}; do
+			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
+		done
+	fi
+
+	if ! use bindist && use ffmpeg-chromium; then
+		ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set."
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
+		pre_build_checks
+
+		if use system-toolchain; then
+			local -x CPP="$(tc-getCXX) -E"
+			if tc-is-gcc && ! ver_test "$(gcc-version)" -ge ${GCC_MIN_VER}; then
+				die "At least gcc ${GCC_MIN_VER} is required"
+			fi
+			if use pgo && tc-is-cross-compiler; then
+				die "The pgo USE flag cannot be used when cross-compiling"
+			fi
+			if needs_clang && ! tc-is-clang; then
+				if tc-is-cross-compiler; then
+					CPP="${CBUILD}-clang++ -E"
+				else
+					CPP="${CHOST}-clang++ -E"
+				fi
+			fi
+			if needs_clang || tc-is-clang; then
+				if ver_test "$(clang-major-version)" -lt ${LLVM_MIN_SLOT}; then
+					die "At least Clang ${LLVM_MIN_SLOT} is required"
+				fi
+				# Ideally we never see this, but it should help prevent bugs like 927154
+				if ver_test "$(clang-major-version)" -gt ${LLVM_MAX_SLOT}; then
+					die "Clang $(clang-major-version) is too new; ${LLVM_MAX_SLOT} is the highest supported version"
+				fi
+			fi
+		fi
+		# Users should never hit this, it's purely a development convenience
+		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
+			die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium"
+		fi
+	fi
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# disable global media controls, crashes with libstdc++
+	sed -i -e \
+		"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
+		"chrome/browser/media/router/media_router_feature.cc" || die
+
+	local PATCHES=(
+		"${FILESDIR}/chromium-109-system-zlib.patch"
+		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-125-system-zstd.patch"
+		"${FILESDIR}/chromium-126-oauth2-client-switches.patch"
+		"${FILESDIR}/chromium-cross-compile.patch"
+	)
+
+	if use system-toolchain; then
+		# The patchset is really only required if we're using the system-toolchain
+		PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
+		# We can't use the bundled compiler builtins
+		sed -i -e \
+			"/if (is_clang && toolchain_has_rust) {/,+2d" \
+			build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
+	else
+		mkdir -p third_party/llvm-build/Release+Asserts || die "Failed to bundle llvm"
+		ln -s "${WORKDIR}"/bin third_party/llvm-build/Release+Asserts/bin || die "Failed to symlink llvm bin"
+		ln -s "${WORKDIR}"/lib third_party/llvm-build/Release+Asserts/lib || die "Failed to symlink llvm lib"
+		echo "${GOOGLE_CLANG_VER}" > third_party/llvm-build/Release+Asserts/cr_build_revision || \
+			die "Failed to set clang version"
+		ln -s "${WORKDIR}"/rust-toolchain third_party/rust-toolchain || die "Failed to bundle rust"
+		cp "${WORKDIR}"/rust-toolchain/VERSION \
+			"${WORKDIR}"/rust-toolchain/INSTALLED_VERSION || die "Failed to set rust version"
+	fi
+
+	if use ppc64 ; then
+		local p
+		for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
+			if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
+				eapply "${WORKDIR}/debian/patches/${p}"
+			fi
+		done
+		PATCHES+=( "${WORKDIR}/ppc64le" )
+		PATCHES+=( "${WORKDIR}/debian/patches/fixes/rust-clanglib.patch" )
+	fi
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/ceval
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/volk
+		third_party/anonymous_tokens
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/bidimapper
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/content_analysis_sdk
+		third_party/cpuinfo
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/d3
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/gn/webgpu-cts
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/csp_evaluator
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
+		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/third_party
+		third_party/distributed_point_functions
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/ffmpeg
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/fp16
+		third_party/freetype
+		third_party/fusejs
+		third_party/fxdiv
+		third_party/highway
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/lit
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/ipcz
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/lens_server_proto
+		third_party/leveldatabase
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/SVT-AV1
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libevent
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/maldoca
+		third_party/maldoca/src/third_party/tensorflow_protos
+		third_party/maldoca/src/third_party/zlibwrapper
+		third_party/markupsafe
+		third_party/material_color_utilities
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/omnibox_proto
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/opus
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg
+		third_party/pdfium/third_party/libtiff
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/pthreadpool
+		third_party/puffin
+		third_party/pyjson5
+		third_party/pyyaml
+		third_party/qcms
+		third_party/re2
+		third_party/rnnoise
+		third_party/rust
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/selenium-atoms
+		third_party/sentencepiece
+		third_party/sentencepiece/src/third_party/darts_clone
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/snappy
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
+		third_party/swiftshader/third_party/SPIRV-Tools
+		third_party/tensorflow_models
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/tflite/src/third_party/xla/third_party/tsl
+		third_party/tflite/src/third_party/xla/xla/tsl/util
+		third_party/ruy
+		third_party/six
+		third_party/ukey2
+		third_party/unrar
+		third_party/utf
+		third_party/vulkan
+		third_party/wayland
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/xnnpack
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/glibc
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+
+	# USE=system-*
+	if ! use system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng )
+	fi
+
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+
+	if ! use system-png; then
+		keeplibs+=( third_party/libpng )
+	fi
+
+	if ! use system-zstd; then
+		keeplibs+=( third_party/zstd )
+	fi
+
+	if use libcxx || [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libc++ )
+	fi
+
+	if ! use system-toolchain || [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == yes ]]; then
+			keeplibs+=( third_party/llvm )
+	fi
+
+	# Arch-specific
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		# requires git and clang, bug #832803
+		# Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh
+		# and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh
+		# since we're not in a git repo
+		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \
+			generate_gni.sh || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+
+		pushd third_party/ffmpeg >/dev/null || die
+		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
+		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
+		popd >/dev/null || die
+	fi
+
+	einfo "Unbundling third-party libraries ..."
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+chromium_rust_version_check() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
+
+	echo $rustc_version
+}
+
+chromium_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	if use system-toolchain && [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == no ]]; then
+		# Make sure the build system will use the right tools, bug #340795.
+		tc-export AR CC CXX NM
+
+		if needs_clang && ! tc-is-clang; then
+			# Force clang since gcc is either broken or build is using libcxx.
+			if tc-is-cross-compiler; then
+				CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
+				CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
+				BUILD_CC=${CBUILD}-clang
+				BUILD_CXX=${CBUILD}-clang++
+			else
+				CC=${CHOST}-clang
+				CXX=${CHOST}-clang++
+			fi
+			strip-unsupported-flags
+		fi
+
+		if tc-is-clang; then
+			myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+			# Workaround for build failure with clang-18 and -march=native without
+			# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+			use amd64 && is-flagq -march=native &&
+				[[ $(clang-major-version) -eq 18 ]] && [[ $(clang-minor-version) -lt 6 ]] &&
+				tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
+				append-flags -mevex512
+		else
+			myconf_gn+=" is_clang=false"
+		fi
+
+		if needs_lld ; then
+			# https://bugs.gentoo.org/918897#c32
+			append-ldflags -Wl,--undefined-version
+			myconf_gn+=" use_lld=true"
+		else
+			# This doesn't prevent lld from being used, but rather prevents gn from forcing it
+			myconf_gn+=" use_lld=false"
+		fi
+
+		if use lto; then
+			AR=llvm-ar
+			NM=llvm-nm
+			if tc-is-cross-compiler; then
+				BUILD_AR=llvm-ar
+				BUILD_NM=llvm-nm
+			fi
+		fi
+
+		myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+		if tc-is-cross-compiler; then
+			tc-export BUILD_{AR,CC,CXX,NM}
+			myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+			myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+			myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
+			myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
+
+			# setup cups-config, build system only uses --libs option
+			if use cups; then
+				mkdir "${T}/cups-config" || die
+				cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
+				export PATH="${PATH}:${T}/cups-config"
+			fi
+
+			# Don't inherit PKG_CONFIG_PATH from environment
+			local -x PKG_CONFIG_PATH=
+		else
+			myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+		fi
+
+		local rustc_ver
+		rustc_ver=$(chromium_rust_version_check)
+		if ver_test "${rustc_ver}" -lt "${RUST_MIN_VER}"; then
+				eerror "Rust >=${RUST_MIN_VER} is required"
+				eerror "Please run 'eselect rust' and select the correct rust version"
+				die "Selected rust version is too old"
+		else
+				einfo "Using rust ${rustc_ver} to build"
+		fi
+		if [[ "$(eselect --brief rust show 2>/dev/null)" == *"bin"* ]]; then
+				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/opt/rust-bin-${rustc_ver}/\""
+		else
+				myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/usr/lib/rust/${rustc_ver}/\""
+		fi
+		myconf_gn+=" rustc_version=\"${rustc_ver}\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=false"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libwebp
+		libxml
+		libxslt
+		openh264
+		zlib
+	)
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-png; then
+		gn_system_libraries+=( libpng )
+	fi
+	if use system-zstd; then
+		gn_system_libraries+=( zstd )
+	fi
+
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+
+	if use headless; then
+		myconf_gn+=" use_cups=false"
+		myconf_gn+=" use_kerberos=false"
+		myconf_gn+=" use_pulseaudio=false"
+		myconf_gn+=" use_vaapi=false"
+		myconf_gn+=" rtc_use_pipewire=false"
+	else
+		myconf_gn+=" use_cups=$(usex cups true false)"
+		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
+		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
+	fi
+
+	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
+	# using dlopen. This helps with automated detection of ABI mismatches and
+	# prevents silent errors.
+	if use pulseaudio; then
+		myconf_gn+=" link_pulseaudio=true"
+	fi
+
+	# Non-developer builds of Chromium (for example, non-Chrome browsers, or
+	# Chromium builds provided by Linux distros) should disable the testing config
+	myconf_gn+=" disable_fieldtrial_testing_config=true"
+
+	if use system-toolchain; then
+		myconf_gn+=" use_gold=false"
+	fi
+
+	# The sysroot is the oldest debian image that chromium supports, we don't need it
+	myconf_gn+=" use_sysroot=false"
+
+	# This determines whether or not GN uses the bundled libcxx
+	# default: true
+	if use libcxx || [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		myconf_gn+=" use_custom_libcxx=true"
+	else
+		myconf_gn+=" use_custom_libcxx=false"
+	fi
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	if use bindist ; then
+		# proprietary_codecs just forces Chromium to say that it can use h264/aac,
+		# the work is still done by ffmpeg. If this is set to no Chromium
+		# won't be able to load the codec even if the library can handle it
+		myconf_gn+=" proprietary_codecs=true"
+		myconf_gn+=" ffmpeg_branding=\"Chrome\""
+		# build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute
+		myconf_gn+=" is_component_ffmpeg=true"
+	else
+		ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+		myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+		myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+	fi
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		filter-flags "-g*"
+
+		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
+		if [[ ${myarch} == amd64 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
+		fi
+
+		if tc-is-gcc; then
+			# https://bugs.gentoo.org/904455
+			local -x CPP="$(tc-getCXX) -E"
+			# https://bugs.gentoo.org/912381
+			filter-lto
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Disable external code space for V8 for ppc64. It is disabled for ppc64
+	# by default, but cross-compiling on amd64 enables it again.
+	if tc-is-cross-compiler; then
+		if ! use amd64 && ! use arm64; then
+			myconf_gn+=" v8_enable_external_code_space=false"
+		fi
+	fi
+
+	# Only enabled for clang, but gcc has endian macros too
+	myconf_gn+=" v8_use_libm_trig_functions=true"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	# Disable unknown warning message from clang.
+	if tc-is-clang; then
+		append-flags -Wno-unknown-warning-option
+		if tc-is-cross-compiler; then
+			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
+			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
+		fi
+	fi
+
+	# Explicitly disable ICU data file support for system-icu/headless builds.
+	if use system-icu || use headless; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Don't need nocompile checks and GN crashes with our config
+	myconf_gn+=" enable_nocompile_tests=false"
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use headless; then
+		myconf_gn+=" ozone_platform=\"headless\""
+		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
+		myconf_gn+=" use_glib=false use_gio=false"
+		myconf_gn+=" use_pangocairo=false use_alsa=false"
+		myconf_gn+=" use_libpci=false use_udev=false"
+		myconf_gn+=" enable_print_preview=false"
+		myconf_gn+=" enable_remoting=false"
+	else
+		myconf_gn+=" use_system_libdrm=true"
+		myconf_gn+=" use_system_minigbm=true"
+		myconf_gn+=" use_xkbcommon=true"
+		if use qt5 || use qt6; then
+			local cbuild_libdir=$(get_libdir)
+			if tc-is-cross-compiler; then
+				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
+				cbuild_libdir=${cbuild_libdir:2}
+				cbuild_libdir=${cbuild_libdir/% }
+			fi
+			if use qt5; then
+				if tc-is-cross-compiler; then
+					myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
+				else
+					myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
+				fi
+			fi
+			if use qt6; then
+				myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
+			fi
+
+			myconf_gn+=" use_qt=true"
+			myconf_gn+=" use_qt6=$(usex qt6 true false)"
+		else
+			myconf_gn+=" use_qt=false"
+		fi
+		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
+		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
+		use wayland && myconf_gn+=" use_system_libffi=true"
+	fi
+
+	# Results in undefined references in chrome linking, may require CFI to work
+	if use arm64; then
+		myconf_gn+=" arm_control_flow_integrity=\"none\""
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=$(usex lto true false)"
+	myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Don't add symbols to build
+		myconf_gn+=" symbol_level=0"
+	fi
+
+	if use pgo; then
+		myconf_gn+=" chrome_pgo_phase=${1}"
+		if [[ "$1" == "2" ]]; then
+			myconf_gn+=" pgo_data_path=\"${2}\""
+		fi
+	else
+		# Disable PGO
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	# user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
+	if use arm64 && tc-is-gcc; then
+		sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
+			third_party/crc32c/src/src/crc32c_arm64.cc || die
+	fi
+
+	# skipping typecheck is only supported on amd64, bug #876157
+	if ! use amd64; then
+		myconf_gn+=" devtools_skip_typecheck=false"
+	fi
+
+	einfo "Configuring Chromium ..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	chromium_configure $(usex pgo 1 0)
+}
+
+chromium_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	# Build mksnapshot and pax-mark it.
+	if use pax-kernel; then
+		local x
+		for x in mksnapshot v8_context_snapshot_generator; do
+			if tc-is-cross-compiler; then
+				eninja -C out/Release "host/${x}"
+				pax-mark m "out/Release/host/${x}"
+			else
+				eninja -C out/Release "${x}"
+				pax-mark m "out/Release/${x}"
+			fi
+		done
+	fi
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	if ! use system-toolchain; then
+		QA_FLAGS_IGNORED="
+			usr/lib64/chromium-browser/chrome
+			usr/lib64/chromium-browser/chrome-sandbox
+			usr/lib64/chromium-browser/chromedriver
+			usr/lib64/chromium-browser/chrome_crashpad_handler
+			usr/lib64/chromium-browser/libEGL.so
+			usr/lib64/chromium-browser/libGLESv2.so
+			usr/lib64/chromium-browser/libVkICD_mock_icd.so
+			usr/lib64/chromium-browser/libVkLayer_khronos_validation.so
+			usr/lib64/chromium-browser/libqt5_shim.so
+			usr/lib64/chromium-browser/libvk_swiftshader.so
+			usr/lib64/chromium-browser/libvulkan.so.1
+		"
+	fi
+}
+
+# This function is called from virtx, and must always return so that Xvfb
+# session isn't left running. If we return 1, virtx will call die().
+chromium_profile() {
+	einfo "Profiling for PGO"
+
+	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
+
+	# Remove old profdata in case profiling was interrupted.
+	rm -rf "${1}" || return 1
+
+	if ! "${EPYTHON}" ./chromium_profiler.py \
+		--chrome-executable "${S}/out/Release/chrome" \
+		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
+		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
+		--profile-output "${1}"; then
+		eerror "Profiling failed"
+		return 1
+	fi
+
+	popd >/dev/null || return 1
+}
+
+src_compile() {
+	if use pgo; then
+		local profdata
+
+		profdata="${WORKDIR}/chromium.profdata"
+
+		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
+			chromium_compile
+			virtx chromium_profile "$profdata"
+
+			touch "${WORKDIR}/.pgo-profiled" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
+			# Remove phase 1 output
+			rm -r out/Release || die
+
+			chromium_configure 2 "$profdata"
+
+			touch "${WORKDIR}/.pgo-phase-2-configured" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
+			chromium_compile
+			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
+		fi
+	else
+		chromium_compile
+	fi
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	rm -f out/Release/locales/*.pak.info || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+
+	# Build vk_swiftshader_icd.json; bug #827861
+	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
+		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
+		out/Release/vk_swiftshader_icd.json || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	newexe out/Release/chrome_sandbox chrome-sandbox
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver
+	doexe out/Release/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use X && use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+
+	if use bindist; then
+		# We built libffmpeg as a component library, but we can't distribute it
+		# with proprietary codec support. Remove it and make a symlink to the requested
+		# system library.
+		rm -f out/Release/libffmpeg.so \
+			|| die "Failed to remove bundled libffmpeg.so (with proprietary codecs)"
+		# symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium].
+		einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..."
+		dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \
+			/usr/$(get_libdir)/chromium-browser/libffmpeg.so
+	fi
+
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
+	doins out/Release/xdg-{settings,mime}
+
+	if ! use system-icu && ! use headless; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/MEIPreload
+
+	# Install vk_swiftshader_icd.json; bug #827861
+	doins out/Release/vk_swiftshader_icd.json
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if ! use headless; then
+		if use vaapi; then
+			elog "VA-API is disabled by default at runtime. You have to enable it"
+			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+			elog "in /etc/chromium/default."
+		fi
+		if use screencast; then
+			elog "Screencast is disabled by default at runtime. Either enable it"
+			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use gtk4; then
+			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
+			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use qt5 && use qt6; then
+			elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
+			elog "environment. To override you need to pass --qt-version=5 or"
+			elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
+			elog "/etc/chromium/default."
+		fi
+	fi
+
+	if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
+		ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
+		ewarn "indicates that the Gentoo handbook was not followed to completion."
+		ewarn ""
+		ewarn "Chromium is known to behave unpredictably with this system configuration;"
+		ewarn "please complete the configuration of this system before logging any bugs."
+	fi
+}
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 0c9ed6fa067c..7610f047e783 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -196,10 +196,109 @@ DIST firefox-127.0.1-vi.xpi 650521 BLAKE2B 379020a893c74c423422de15d73b67234a9ba
 DIST firefox-127.0.1-xh.xpi 415013 BLAKE2B b91113b53ae38fa5a85ce322f1afaa6188f41a582208453ab41814a4e98cf947602304691e1e30cbd66d44bf09defa5f8c8b16b6e9f79c32528b74a1c224422c SHA512 7383a1c85ee100522bc5705b97d911e08d547ecdadf5607f685a3c6ee7212b83f933f75b38cf746bd641cf5fec29283bebef7ea251a7ebf7d49bdd7bb52d95ea
 DIST firefox-127.0.1-zh-CN.xpi 650827 BLAKE2B c19b8ce5a69d58a4da1dd002cc841f2bf6823cec3dcf4ad3eee04c6f5547f95d6491c579565ca59e82c850a0cc6df60a7b18996af80538750f3f2fb25baec3ea SHA512 769a3eef576f9d78461c8bf900ca974dcf3d5043a6769297a0c3d2309d38e62214428f24eaecc2f2213dc08c7c50a1ee70de7ffef4b8997f51ed9080c76fe7f2
 DIST firefox-127.0.1-zh-TW.xpi 653082 BLAKE2B e031aaf61fff9b0adc7749c78333d464a076b59ac5afdf8a9289d62c82aaff2d7ee4c4a6b6c828e0db0a6e23be98ad32e81defd57cb879be9d16022060fb9147 SHA512 0a1358e57daaad039f164ff9f00376c8023287bfb8dc8abbd4b908a47fba619028ecfb39e2864be22d34141a3d4aea1e21249706180a6a3a582104105a2f7ac4
+DIST firefox-127.0.2-ach.xpi 461920 BLAKE2B 8978e6f06bf46bb473a5989cfeb9089863e9c92c3b93a0883ed2d0c577d24c717a49f5d35c1dd848c66076be3f0361ac917364716ea900156869ce3e21b92825 SHA512 f08f93f0b9c9704a77a00f1b9a83b867f82b144adb39d64ec0d4a3a5f78cf55b67b7eb3ce19c34eaf09357f8bdd7845a610937f70a2f856081ad468c446910c7
+DIST firefox-127.0.2-af.xpi 415365 BLAKE2B 383de6f37f70b7dd8791df80de220ad2b8db64f5c76bec9b5e8cf7064139acd08d4ae7000a28dfe14f648c8e8c20dd1bb8ac1c254ea9cfcf84c9850278aa6238 SHA512 84eb2d15fc2b1de6cff3dd7498277863734e60e29e013e72207b32fc230e80d9b417d2a0e0f5a1e5f2a43c2a98b90a47535bfc0f25a1e7966634c258927611d9
+DIST firefox-127.0.2-an.xpi 503728 BLAKE2B af62fb2c3862a9348d5ada2f21072d24b0800337a462c94d080a8ce112a01f28eaff40cd12a2b683ca44ffb4ed1de8b6bc9d0967774baf8b9bcc899b420e8134 SHA512 291e2c34b964f0d8986d2c568eac364e4d2a8e1218e2db71019ccf281b2f03474ebd90e3702fc7212be2fb435126eb635eec4b8871cb9f772f95e7c6c46df2b1
+DIST firefox-127.0.2-ar.xpi 607962 BLAKE2B 2777e90135a5b542688887b434838a5f9f123e626becaec6f274aeca78ff071c85501663115f99eab24e3ddfff04ba05d3332e6632600b97ec4366793cc290b7 SHA512 8dbcbed17479ad293d3e5c4d7f91e02fc95f121dc2be0b4e5f1532a270c3a45522774f85ea31454ca3e5fdb8456b230e0fa314a186134355503954ecfed0a1db
+DIST firefox-127.0.2-ast.xpi 494030 BLAKE2B 907feaecdfca0d282314669243bf12562ea45469b1fc9fee715461d3f698f0cb394dd9d8c35a90e5e3ed4d20a3629e74e14a05027c72205e3ec47d5f6b67178f SHA512 ad22d806c4584cc8769c21a04fff2457c7d2443d1a8fc7339876c1e10ec8e548d1dd898c017b2eff4759243930d6b1c6f1268166a6802e1faf6b6f67fe654db1
+DIST firefox-127.0.2-az.xpi 488590 BLAKE2B e2f329f8c5f15efc4b1cdeeb2fd99710707c97b77c00172b5fc985f80fe65ddaea26ac92dfae264ba50e9b22c3ef87c294c7c76ed2b44e98f75db03174ad3872 SHA512 b6c82f95b8fdb9b7e393fedebc04528c36b19fcb74452a12812a408d6c9f4ef53facc71d3fd9c55aae960f98b3c831be4b52b7c6d9679f6bd0a61501e00889ab
+DIST firefox-127.0.2-be.xpi 708721 BLAKE2B 9131e7cdbe4f9d087da31b4513cab3aaaff521983cdd89fd22704dd4006d6b3f2615cc9a70f594b432f7102ecc84420ab944b9f61b28af52769ab6a8ceed91d2 SHA512 b2521ae6f1c354b88c7ddde11e6f45927c40c374713f07466e649833045b5231b24861000eee27176c1dc043d2209f274a8cd788094acfbdafcbad96a9806f01
+DIST firefox-127.0.2-bg.xpi 601649 BLAKE2B e1f797b9a6b2d8b694384216b06b980fed8bbd379c5e13a4a29162ae1f517f5ac18227c705d32baddd883cd3246e8aa182d51599d924e4d48fa40d777dfc21d3 SHA512 f77319e46f237f208c566c186c0b8d4a70dea15c0c487ab77c41bb22e2459e59a8b1528bc93be36fc93c80781015626bd9a56a2d3964c38d08569612cf480469
+DIST firefox-127.0.2-bn.xpi 579342 BLAKE2B ae74def080fc4879d840cd7526bc199e66e27666bd7a1ba6a3b6d8dec2b151a52b10df5853812af8af7bed90a04b215f4dce3fe42d5103e47bcdfa3f5c05d605 SHA512 cb3b2110e3ac9f072d78aa72a4f2a987d1ee744a45b1fb1844ad50439667d97b78adb3c383a5e80b6dd1ed63abea51d429c08ce6144901228f062d33b3ecd0ec
+DIST firefox-127.0.2-br.xpi 585933 BLAKE2B be13e03b5ea66573f97b015acdbfc08e05c304338256ed9b6aceb540a76e5d257f6e9ac8108fb2449498298ed680bbe46d8225f6928e4830486ffbefd2e9daf3 SHA512 657254a8e018082bd18ea9afdf761f11ac4dcb4d6dbc84f92bbf00045f814d139f4884386546fb78ded8c971719775e2cb0030435bec6ea2c14520013dabf4e2
+DIST firefox-127.0.2-bs.xpi 499342 BLAKE2B 1d3bacbb74164370b0a9c4ad9b952942fcddc3a4bea7c18414d0e31e8afd0c7d0f0f316d3d35bd3cf535cd5db1b335d336bcf27ddd18a4111386c6751b52f812 SHA512 40a0d7502e1b61959d9145e9533098e6a2395938fb55679f7e67fe6d376f2e962be6c6fc0630a40a3cdaec7bc5a50e8193df885bf40e4ab68e488e19d30a4f85
+DIST firefox-127.0.2-ca-valencia.xpi 544016 BLAKE2B 313eef4d5fb691323a099405567eb1d0da4336c573f8f2fcaab33fc82161b30bc7c18e2ac8de89253ee47cc9589a67f889c5dda0dddca6b1be9113aad5fbf234 SHA512 5bf2930525505fa3906897bf8072ed2a13bbdc6de2df82350918d3bc94175113fdf2c1ee4da975d26cfaeffc3eb9c464cc1aafdb20eb0b29ffe022209427bac5
+DIST firefox-127.0.2-ca.xpi 582808 BLAKE2B ecfb3ef2af0ee94ca901730b9e9750515c66c0890ea28b1b0ae46e4e385e948590825ddb9607d9748a9f7f6c695f0887f4786ff3dcaa99c2be14d5a5b2d3d117 SHA512 6a29cd06569120205a13a389a4087520f803df5e459c293c4b7b61d6cdc19735491fc13382333ff96904e54da1a0b3d5b06c59792d53b877fb909e55d730486a
+DIST firefox-127.0.2-cak.xpi 590482 BLAKE2B 9f2dd6c56f78f7f64834c9fd12f14493ba1a30f0c1a283d286b4c0f0881b321029c54487cc7b644a2b9c7b547db65e76104b47404c0f50e4eab2d3bf936ef024 SHA512 510c272b05dfc16659fb27186aa1f64ae1e70a39dca93aa32d1dd79d8896c29c93322de9bdf388c8a0974632329e0798daea9b4a8d63e185d85f8a8377bb373e
+DIST firefox-127.0.2-cs.xpi 653270 BLAKE2B b98bfa2e3fbf724ced45b357c7c3ae6a5b074488b1b2426df327267232eb30b3866f836a433f00ef92c6943f5ceb2ded4ef5e0d86785ee88859cf88b47cc7c0d SHA512 3057bf1be5369af6f1572e14c8a07efb7250bb2f9e9a5f5d3e72eac6ca4764970ab47530e76399e39222fa8cff4c06df216f00acd338fc254473580cc42b9ed0
+DIST firefox-127.0.2-cy.xpi 618428 BLAKE2B c0be3dfcafd923a39cd0bd2c54e2c413509a0f1b7ca17cecd6e5c968930e5516f41bdb1b247002abbd7ac84f6855983eab2fbc3e9ebf03fd95d2aea2dc44c398 SHA512 0b217fb7c14a43830b7b48418a759185ec568100c600519a796a336059eb76239e4b58243903bd180a21327f177085900c007da8e31922bc279dcef90be2755c
+DIST firefox-127.0.2-da.xpi 606847 BLAKE2B aae984f6cce0f493a54ca2fb9f89ea916d25468d91aadae207f38a1771901dc6bad2d1761051a145ae0c197f049d10d662d0f78e64ab0ad7b7745fd41b312f53 SHA512 aa511bfc36695ce3a2a82ad759eb31b1396dc455703e605ca95ee96d72e19f768eff254645362da9c776d609b4d108d24f0ce8759c27d625a3f65eb2f249847e
+DIST firefox-127.0.2-de.xpi 628178 BLAKE2B 3a5ecbb47276320290acc9643c2396d3409c803dd7e35d767f3b43d9782d688e872981a66f8608b531e694b5779264472fee5d1b0ce7705cd590aee524cb4263 SHA512 d5346f45b6cd2f6f934d07e8445ea7ff1bc97540da57490a132d4125532b388ae911731f3a723d596f519d0325dc2ccbd287d529ce4f1e22a9e40b14b5a9045d
+DIST firefox-127.0.2-dsb.xpi 644572 BLAKE2B 72ce2b28b566e68ae48e9d2ae6db439583e3eb9bc7f08adf1e53fe53f943e49c18b53898dd649f7ddf0c1bd76cd1da00880f62cbbe7a9d897087d75cca16de48 SHA512 24b48a4e2cf9034249c5ad5b81ed25f727fe64ce8382be42d0ec418547672c7fb3d69aad0047e3085032086084921c2a51fbc29469cae0b75d3fa1b39807858b
+DIST firefox-127.0.2-el.xpi 726241 BLAKE2B 59b90ec280c4094451e4390ec990c3c5b87b22eb93217252962765220cf78539ace962abe8d4e5c581b146ec04cb5617499afe55657d951334103607d57d15a8 SHA512 bd29df99eeb56ed84d76183a09f48191b283d9d9ed3f3c0c6f33b5cdd6d6bff42a6e5e93644e91ff59ca3132155f3163b49a95c36b94eb7445f4133c6624fd7f
+DIST firefox-127.0.2-en-CA.xpi 579152 BLAKE2B 3b125758423e52dcc5ddab42c402eb311209845cee2c1e155c546b4cf8ac3e3e635fb01456ba67b52ba89d18443c833a42c5b072c24216ffeb7c51893b078396 SHA512 25d89707c67a70a807ff05c6665f03aae6effe58c9fb7a43cd427c70ee46ae7c8feda51319958cc91778ddb74031d6d471892f8b49f8a03ffd63ef30b8739c1e
+DIST firefox-127.0.2-en-GB.xpi 579706 BLAKE2B bf4151dc3504096dd96013119905cba19b8d1417da25a2f4c5dbf7e14e9ed2c20a3b4442d6eea29ee37a6a648d3aadf58f6164978921b84be1763c5dc2f99c86 SHA512 247a412c5ed93799f6a453ff8cb6a2e7629781238ffbceabb5a10c5de01cd0409cd37371b4e4511df38612397688fdeb1d4e3791d138115d733f7a14b34e2a95
+DIST firefox-127.0.2-eo.xpi 608810 BLAKE2B c85e1b71424db3764eac98af32cf943b1daeb3d64d5348cf5842862d81bdccc5afaa7f477a1ac4827087872762d3eb4969c427b3a2b5893210f9aa158c33b409 SHA512 06f3c6aff4316c7bb4ee1e2e7814267a86b5392cf2c78a39f5f4a104d48bc7bd85365ac6a1d1804b8c171548d71f8e4c571e85ca4d7fea81302160f159b0f31e
+DIST firefox-127.0.2-es-AR.xpi 622106 BLAKE2B 828e573af5e7499850fb5bc3d6a5c9b09ee4a31147a6a4dfc17665784a4f32d6a39eb94246b09c28160d927a939047807c3faa3a2b853da092de32feeea1d146 SHA512 6a8efb62c2364e344ca51dab0a3f1fb373b990e308ecd6887ed2fe3fc2f826949d676ac55068fbcd3460ee163dc9a41f7ab52d7063e27ce5624424238bf13d8a
+DIST firefox-127.0.2-es-CL.xpi 621302 BLAKE2B ed638109216a61bdbb0f1a91ffdea17321936bef0fd2c57fd8bb29e56b6103be24ced5d62c41ea114b37e962c5df496aecfb9a06227a2e3662e6fcf2793f3915 SHA512 217183e515a9fd83535795731a9f7124a3716e5f68c028ae2137057bdff261d1e7744acfe64212ff003fa7782108c261aa3dc7dcf2184f3c77462fd65a374e05
+DIST firefox-127.0.2-es-ES.xpi 616136 BLAKE2B 2c25d895c6752f5a196bc80eef656f691fdcef3d5991dd3940eb4457e36f4010d7a78f6293904b8c8bd7d2d41ad993425847cfc791b0f45688616d1a3b003d34 SHA512 1780160b8378a87790a7d06eaeb099ade3b18e80469386a886d119a811f1216dd6db0d10dc162f4eef209cc2e45d260ec83b7a61ff67312df9c2a97ad73f98c2
+DIST firefox-127.0.2-es-MX.xpi 589239 BLAKE2B 74ea13596d227087bd314822f4353e17ca47067bfdb9dfe31adceff013eb10947f9c51f21ae9ba65773af8f64c20211d753c7cd09af72645ad5ced25d7eec77e SHA512 c684248938f8e48f13943564bd98766043d2ab14777617128b62cf6983d616bcf75f4448bc9609c9b253172f0753d3904611bd5f79f89e63f43f8d5915e8affc
+DIST firefox-127.0.2-et.xpi 537278 BLAKE2B 9720007a3b7a1899eaa9ca12f72bbcc362600d23115c971c5d791878cceb3c23bdf9954fd127ca9bbeff5f55be71ab03d7ffdbd3ca26407773355874799b7da2 SHA512 6d3a8d15024a6c18bc0e8feca09280bc6c44d88b47aaf9c09fbf48776e9656357308a9e0c45ab42f5a387c69fa52db46e8b51143556ca7f6cf433b81df06a6b4
+DIST firefox-127.0.2-eu.xpi 593779 BLAKE2B 276eb7fd5ba095fc2ed9c1c89e91d92d9d78160d00bf79ff157bd53d5cb1b68290424b2959b69ef40d072fc33345a928dd66231dc2a8d922b4f65c773c0d5286 SHA512 05f754d2a01bd7c597d805cae6775ca05640bab6478c3c8c0a807aa08f41a63e86e0d5f85d7b020d805955cbdc8e0deccebc7f95b46f75dc31521da416d7cb3d
+DIST firefox-127.0.2-fa.xpi 587838 BLAKE2B 03c99132883000ed03489cd26d5a220bc5c3bb30323dc7c956a1c8ffd55e6a63a20c3a18413b151158a559c208751ed4afc352b5fd130ddbf4e7af83e2a2e933 SHA512 369cdea6c059bda8304fe4075ace929c5023359df27c5f5ec9b930aed2b57590b59309b993259c77b9a66f02d683cde1f1f8c6a930f129889df1239a3ca30bd3
+DIST firefox-127.0.2-ff.xpi 473942 BLAKE2B 020c910141a001fff646585b848ce7a0e62ae50ee5b790f25a3c35e24e302c3ee074ecd52ac987a3b91804d672a46b17fbbd503cf864faeada80d0773cda1eeb SHA512 c4c577ee23c99f26cd0c37553013f3cfc657e5c90b594f60ec6db66f5560069dfab175bea6b65ff8bba0e9a16697cdb7e30f773343612554b868bddb607d689e
+DIST firefox-127.0.2-fi.xpi 601836 BLAKE2B d7d757970504b3ae569f661d58c929c8128d8dd2786c0448dd88c65f97277f02cafde9d4fc8037241640a88899cd9f8c9aece17134f20d48ea6749e79ec12d2a SHA512 5fc511b7495fd7d92597ff3fdaa8b01d76e2325112d3b48d01ae38d624e0017dffd9e7316b21dd0bae6ecc95505993dd44c1f682bfd3b0086924695337da2f13
+DIST firefox-127.0.2-fr.xpi 635004 BLAKE2B 04d7c575d53527b098a1c1387b9331182d197cf4ffe157183e074e2129dd5709b490c056af819d596ab203072a048bbc8c6cec79a7b014f3d80c79428f6e3106 SHA512 7d456172b78fe2ab7708eaab0d1f197e95ef30b04265813557c12b138c284be76a6e78f11901024a7c0412831bde2f4fa9df66a44d0774c2d47bc97d47970a27
+DIST firefox-127.0.2-fy-NL.xpi 617744 BLAKE2B a2c9177611b12d11cbe87bb2cc3099be5a0b339938048d9058047085e64c6b426cfb668d2f9bc51aba951d1f6d1f09aa572b082e87d8d403d9ee31bbcc0ad4d2 SHA512 ffb266eac4df02de1269307e42042db41f950ac5757ef4a4b79f05069efb84bcfc00f6b7605abbbdccfe39ef4962316494aa630d37098db6e237a4136884a598
+DIST firefox-127.0.2-ga-IE.xpi 468832 BLAKE2B 7696d21ac2419875770f0050ba22cdb77303a5062f4dc71a82ec6dbfd50cc9ee25eaa06ebc6dc5785953e42f120fbb316df81b6b596ed3c72dbb69b450bc4177 SHA512 8d19d9494feb2acb3c310adb1860b9988ff91a1cf691f4491394e9472535787045b6b0dcffe97f00aa56371a7f15b4baa357b11e63bd26a0b773b340f68f4ead
+DIST firefox-127.0.2-gd.xpi 594383 BLAKE2B bf678fe36233ac642d21a381b2dd819bf3e9a22bbcdf17b7404221657e9ff0a81a07d9d7f3fa134265ff471667f1428819756c13646f1c9be8c29e5d216fc722 SHA512 23cfa8484e7e97f4e88acb29c75cea3cef8cc96687b21d7ffb6b818222a12249fd3faf41c7ec7349f2e22860c062dff7eebffde40711d2e241ac36721daee6ba
+DIST firefox-127.0.2-gl.xpi 601871 BLAKE2B 165fd9574a2404154032709d56ce98dc636fea53233fdee6446f1ecc3be90f2da8d3bb958aa6bc552e44e838c4aebe3da2853b824ddc12f1d85847351a9d4454 SHA512 66a0845743bdc272827e0b8ccd2b47d8bc15cfe69a6f13a41027d80589e1833cca0a7aba81e4c4b1395804b3fb9a5c70859de0ce0c721397750e39b69223474a
+DIST firefox-127.0.2-gn.xpi 633216 BLAKE2B c720023594d1642a96cddc60c645cc9da55543269db9cb8a885585fb62dd4d88f9f56cacdde8a10bd08f370bd691ce3d2528df6a9f9987a8cd6ad06c943d4499 SHA512 68ac786265b14eff979bdeaa3cd54cbaf523d22013ce5d8e6e025dc84aa6bcc8f80d3f5437e63078569f950276d388a438e18d7c69cdd97a993af1b172624538
+DIST firefox-127.0.2-gu-IN.xpi 525159 BLAKE2B f5d800531dcd64701015bf2ad782c882bfc19f190292e453f650358a9d54eb1656ae1a85c4e26c7bcb9703890938dbd2da7a7d96f4af280aa6788ff76c55c0f3 SHA512 960762d09c38620010f179401de7aa648efaa7dab84ed6aab572c3c42f3fec40c456bd9bb1bf14545f34ad5b8cd018b00401096613d4610877ac4b9a2447efa3
+DIST firefox-127.0.2-he.xpi 626712 BLAKE2B afffff975a94d3cbd24bf8c548d2fbb3c72ffcae74eea9705b07512a9a6a751d372c031f7f7d395bf4c937f5a2d180afb942141e528ce74fcacdec0065c3a1c6 SHA512 92af5bf179af0aaa5a8fdd58a96e73ad815d9f7ec7442d09a15d918f3ed193d44a66ee2614d44fe09c332c09d70b647e555434633c9e5d33b0e6d30a7a08cfc8
+DIST firefox-127.0.2-hi-IN.xpi 563353 BLAKE2B 9ff065cbd37bbcad8394beb5b424c1389000da238f8483fc78970b32b6a3d766070fd2aa70e181079461b8871afd0e0fafd1283939a118d4c894deca44d12323 SHA512 0678fab31a20c98d64158a0501824c7371bc22279cbe4b195a376bb045712451eafbbf8bc123fcd117917d36dc4958bf6656b26ba4785e05b7bc940a169a860f
+DIST firefox-127.0.2-hr.xpi 554576 BLAKE2B fb13353b6b0deee986fbc5629252b56e7e6b2aea0fd3d2eb45f10488973a164df989c60ce1651626b5e0ae827b7b724be16c3ddc043413d7307a70d403c90175 SHA512 58fad028af2d8b9c17c2aed96703a07fff45e797d7e1a7cfd10ded7b61eaa0c04b36fdab44e154e7920c7e30e79bec96a1702512f033b557f64cc34f43824281
+DIST firefox-127.0.2-hsb.xpi 640687 BLAKE2B 4a4fec20af37db4bf1d1e945088619c11ae98bac270d659bd96d39000a14ef1ee843a45f55786d86dd41d768984de4f173f3a3e4eb0c648aa18203117d94fbec SHA512 10ac939b71b611d6ff052df9288b7e0348d741cb528d06c927523f46413499aef43726f8327bfbbde423ce33309d31a34dbc5c05d3d835e385b461cd5df7007b
+DIST firefox-127.0.2-hu.xpi 644724 BLAKE2B bcd603197ee1966a9ce15d39d7e9cbcc7885a7c90e000482d969e88773cea66d80cccf49f35bcee4ccf215f160562b0afd4bd04fe48260f6cb9f059405a171f5 SHA512 baff1ec2c87952299cd8d7780c19ff738ba730cd33e623c8c479dc07bcc2fe5e853e18f3c1ca697e743dddf4ab5e21d14a1cdaf7c5c5d91319b80b2f8cb3ed2e
+DIST firefox-127.0.2-hy-AM.xpi 648986 BLAKE2B 83014678273ef12ab46165594c525277187776562d71c0e04e32776649e4b30d0b2dd8f01e940de2fd6be256137ba982c6a2ea8c4368b45f4d0c5ea75775e0dd SHA512 2f25a4a190eca19c750e2fb2632bc227e3511b46e8338fd692e54104e866b8d0e97c57d814116a3220469f9f9a510e51f1a3357a4dd0a84798129be8b51863f9
+DIST firefox-127.0.2-ia.xpi 605289 BLAKE2B 543e1ef07007cda243c6c7921f657e407082ebd4e85f55944b64c221ccd65c85e80ce2c017a076d4e569cb5700d14b254289853df474561e7e446ee7d8c85968 SHA512 1886ebe21c2c3b3a0edaa12aea403eaa6a85fa25f6561f06d8b6aa250a8e010c4bfcc743d5fe304fffd63916dc8855a5ec85fed61c2b0c663f8020fd9626bb0d
+DIST firefox-127.0.2-id.xpi 572107 BLAKE2B be501c12b2410cd01e4c7c036aecab49a013dde75c0329dbd546f79e4f7acf2ddc37cf662fa374346bbf925777e968c76d0007d014b95dc922589c07bfcd9bcc SHA512 640b4cc656d7e816bc995418bdbd4680aac11192af29f923c669fbe6d8ee852ea8eefdd255251d83a02c873e5bf50766d0b94ce4f674d1f1b5cd14eb559b2f64
+DIST firefox-127.0.2-is.xpi 611945 BLAKE2B 589f70e6ad040719b901c9a6c74acd675438c6e2d1d43cff4761c9eecabd471cd7a3c93565b2afa635f76e84a2da87e06dc639a983ad2f7dc240bccc4f94d51d SHA512 1c8e31729d54e5a06e244dadcfaa686396776b90797d1f311c98ed779a8a730ab2b5f9ed3c41e89bc4a385e32d3af38df8e54feef1ba0feba6a8de304661330c
+DIST firefox-127.0.2-it.xpi 561886 BLAKE2B ff4d47130ee0480b736e929ac3d8dbf3888fe8b084c6fdb977584fd873fb00064458c72cbc6e2014080ed2f92aee91524449dfdbab0023ecc9d2d2eb71d4957d SHA512 412d49cc1cd92a3c50c9e1e517afbf70afa1d1457b41d2065fc0dee19e48c4bdaa4d68b462fff0c09cd102b5548aa815dfc3eb96a44ac6ce7fe4c92a63e19831
+DIST firefox-127.0.2-ja.xpi 673185 BLAKE2B 616faee17face89955ebcbca3fd0c38074eb9c8cb8ae5ac6f0ec298b55a71a781740537d31a55b09f2d3176d886f9dc94b516a277f7d3dad601d279b7b44581c SHA512 e4a1dce545675f2ff979d9ce04675229307ddf06302f4686e31dbf9b9e952a6e6681b9b73835a3e86d21ad0957eeb0a57af41a0f00fbf067a5e311f0aaa533d4
+DIST firefox-127.0.2-ka.xpi 658460 BLAKE2B 1e1cbf2ffd7edb05636b0894840b7729bc5ed07c54aa97730ccf30abb07391d90dc61f03aba68ab1b3cd2258d25195e10a15016ccde628fd207df3a2c8a43328 SHA512 282d5bc341eaca423c0d6f4f503d4e82aa7346d4db54ab64d63efec3985e52b6b3ec2b648265ae6861b96e505aa22b27bc8eab81d036e6f3f1831a30d720e84f
+DIST firefox-127.0.2-kab.xpi 602171 BLAKE2B d598af0433beef72504c005532b43511831b62437e62af54fb37af665e79f6aeefeac943a774bc3482ac058441ad25834531a43091a70e66387dbc90f0caa089 SHA512 93aab5f309d1ea6527029dcc414b2c335261605801cdbf6060699abe7fc11a533c67e391b64477b744c87815a4d9e8217dcf78950c707b12c05bb5f9353e27ee
+DIST firefox-127.0.2-kk.xpi 701249 BLAKE2B c012acbee6861d3f439912f4b7c1aeea5db6e1c667b716233b8b2941749679e88ec27587ba06810e5c242cf44e1dc71b0cbef73b791b7f1b6f270f0d13829d27 SHA512 933239b89d0008d7e9152be4167d44d3486a99bb1369932cf0c2cb627328fc0f810d5f153373fec7f783668cb93feb2735840962502a291cde0c76d067dc1c72
+DIST firefox-127.0.2-km.xpi 523616 BLAKE2B adc95ed4f61ac2a24e23d5a77050385640ae1ffb6d0ad8719de85aaf6c667d35cfba28ada2a688827ee9973520a01dc23182330a5a0ee505a414745915e21111 SHA512 5f6165b1059a226fc240afee289113f627b2e0d447d80e2c1231236365fa643a37744436b373fb2e62c27f3aac1427e1061901e02223bfdd505e9a93ec038a63
+DIST firefox-127.0.2-kn.xpi 489100 BLAKE2B 252088f2756606cb8eec9b5702b250f490f97367a5b26d7a3c35adcb95977d12494a7518e8a494d7d123fae55c6ff5ab50f79b8102daf734e6463817eaf6fb23 SHA512 333266766c09e952cd7b5a7761a824956da983bbf55cead5f14583f49d4099255101b4b20a0573eacbf97ff075124ed6e15394b8508d7a2c494829c95452d375
+DIST firefox-127.0.2-ko.xpi 655332 BLAKE2B b174ef3b71ccd98705f0099a9d8a9daf2df4d315a9a8400452f6f255e4ae6fa9dba0edb46fcbb129bcb3bd11ec2ae3b4cd415ba3210de1ba62e666e3520499e3 SHA512 0b1c672782c15a3b44e764b5954abd83ffd6c778d3c7105de326861feb14ca65446c16411c9fe13c25d34a4613ce35013c1346dfae14ef18f9b70dd27f7b5003
+DIST firefox-127.0.2-lij.xpi 481948 BLAKE2B 9d2d797dda09480e0bf45d9129f15fdd94c81395597bfdb37c524ea24ef476ed51fb7d298fbef8cd5a2bff8b0a38d052cdeb33c3dab696a3b35e5983d9bdfb99 SHA512 6853cd544af90e32fa06613f59a27b580caa48646a69a274fe53697fb807c3b1d576b84e20585bc1349c8c0d03e9c9f86136e8ad7f7ee255d5b5307e23dc8296
+DIST firefox-127.0.2-lt.xpi 570444 BLAKE2B 6524068e5e2c936a6d82fb55c3387665cc842847b01448bdac5e634a48074fb7d63de55534dcef765c0819b9bac33f2ac527160194716bb6c6fe9846147f3609 SHA512 c714f1d403de3243b7c126c1944178d8244c4ebacff9f65833c6da7e4f426fe9f6fe167027eb54436616801b44b6bcfffb813a9e6fe02b122330938572692f90
+DIST firefox-127.0.2-lv.xpi 571665 BLAKE2B 7e447f4538e60fa05dc4c4d19ac40367f5f34a0b9d90901b07b450a94f0257492b00715200e3b6b85cc7972e4b007fc3d8331f8d3f652ed445954cbe40b335cc SHA512 61289ce06d7b40f3cc64c05c98aa1a3cf79f21f42c08f3dda07716b1448e8a8a0c005f59cfa808bc8c7f362c1399fea50e6130fb028627a3210463bf8b72cc18
+DIST firefox-127.0.2-mk.xpi 491109 BLAKE2B bc1c1db4419ad47e9ac9730b439424688c883e475f927c5671268cb81de37a8a3bf2771dfa80dfa67c6f109faa5ed2974cf410ebfb0f59d586052cc27f319401 SHA512 8fcae32a324e336d9966b63b29455a7d44bee75b2147433d7a63c4ca4a12a7546d1b40ad433114ec95bb006c4f0aef51305fee2a133e24875d78e07da2c6d798
+DIST firefox-127.0.2-mr.xpi 529928 BLAKE2B 5b22c69c09b104fb06864d1ec3698db42a6ec4514f125928d538189a4609f2c9453625ea0300a32d4cbf95205e50a39a544f72f4164d7f4a154f7e867f4d1169 SHA512 8c46bf44f606968f14d0fd62542d2115aad9c8221a7179c56a39fb716416094adf14f8e714c9a765058057cd25b9d8e5150ca4f91d04ba29a6e98285c62a1b77
+DIST firefox-127.0.2-ms.xpi 447570 BLAKE2B eb532ec99408b57058afa89095b9b83a5b8276fb2717794326d4e6a199ed656ae6f6a0244e30e4a29e6b4133cae40e609c9badd1bde18483e21f1f0a55bc5d7e SHA512 f4ee3966274156890c6c87d316f8eef628a78cf3fa4f37f12a74ccfa84e8ab5390c6da758df45ef90e985a069f139256eaf557b050e93e832b398ed38228596f
+DIST firefox-127.0.2-my.xpi 516482 BLAKE2B 79892f75c81b973593e2fa5126fa861702d8612623b331c1c05856c86c8b5041ccb9587a1a7f6f6acc3d26269d5f39f8617f4b3a28e0a44662da543210b75084 SHA512 324244e8208859813d64ee578075a48cc4c9823154501ef1a3589f0c166be757dd470c563aa1ae7d8b46769a6d62c634c7b377859404d7c3e8b40a1cde596216
+DIST firefox-127.0.2-nb-NO.xpi 602855 BLAKE2B b385c75dd70ad2de9bca8cd9ca7f7a12e2519c5a3a8f52436cc4c74abb69176b9f1d353e951416bd72f6bb1bde9891cebb928dbd60b84db48d06c3a497f8b1dc SHA512 818598d7378d97f9cbff4b885660e950024c215bc9f6a669c5c8e7893fb3393e1bf6cb41d8e3feac142251d66796dd3174a4dfe968c7f80358c6cec63f231651
+DIST firefox-127.0.2-ne-NP.xpi 508759 BLAKE2B 8ebb4db29607220a96f7e81d539510830cf317936aae99c289ea35bdb77ef2aa493ab364c8ced059f5598186e68d6d6f069e41456c5131d06d0857c7d64df006 SHA512 5cf6ea3dbb0d82365beab3dfa6718014162b2901eb1ba8183106a99703004d0448b69fb49f6b140c8747b5ae00ff55b5b40fb15dbb60a89332f093d39c955898
+DIST firefox-127.0.2-nl.xpi 611454 BLAKE2B c9a18433a9f584b202cc5d3f1ac31ab77123b8682477f9874bee120ef5d5b34835fece3bab2eb9440860dfba1a925dc05dd295af1f14c851dbf54b0d0c075a88 SHA512 149f5c2d52fa2722b6f0d8f39796bc376d8ac0d65c07c61be43bdabfe135dc3056072bc3ffed433eae48ea9cc81ab8ea88759f8d2c4984a0ba337279d384b5e4
+DIST firefox-127.0.2-nn-NO.xpi 603355 BLAKE2B 67ac7a6dcaba44ec0190b7c8608b6edbae49fb9f6c61bda8dd9d1d55dc27e2e3cdbe57de79137bedc70dfe1f310dd192668be6166adb242e01ec8a72ce6ad623 SHA512 c22d95313aa51f705ad32255af4a43aefe645c6fd972b5d2e2f73e3369b1379c3ddb961823333323862b3eb8c5f2f12ebb16d9fdd82f39f8a992f955601f7b42
+DIST firefox-127.0.2-oc.xpi 608807 BLAKE2B 9df8419070a18ffe73e76b467e0b82fef9480e3d43fc5592376a96cf1a7c46a24fc7c59f0a7d99a1f291bb98548e3a55891daf32994e52f9f60fc407cfd1f62b SHA512 ee2cc4489784c7b26493a476730bc596b44cb6ec8703fa4e8c8066ed67e271ad23e720517b2577cced60e53031bb8db6fe2cc056f28f3956811216be0656df8a
+DIST firefox-127.0.2-pa-IN.xpi 687023 BLAKE2B 773a89ac237620167b1475c980669f050d8bf1b70c7bddb6bd2198c1266d14fa8e4b966e19a66e6201c0f52f6e6767432279395a5baf72d4ad7a8ce9c69398ac SHA512 f21c8ab2a7bb86a3ae57a2552bfc16ea3842d6ac4b4773161c15f15512a2ef2dcc57a54544b36bd1ac1ecb550f86cf7ec092beae1b3fa261d541cbc9f2112a52
+DIST firefox-127.0.2-pl.xpi 631922 BLAKE2B 1f490bf716751765f37e947065c79e40bded9ba716bd0189bb59c25f36a0be83b6d9879a2ca1dbd873d9438eb0cb4189cd15f72d19a6d7afe2158c92f0fe5746 SHA512 c25788444c441b0ad0ba573a194fabe8922cc611586ee19a9c7854307fb609552152e05cb624c1d17cf9bcec1662ed9a463b102ecd4aa9265840a48f56f858f9
+DIST firefox-127.0.2-pt-BR.xpi 616113 BLAKE2B df9bfd077412f11ecc945ce17155f01a812ca3f4b5915231625fc8c2a85e6a2a73439c32dfdf5137fec208fc44608b3a4528dc2a38e59250c5834542df943b01 SHA512 d80533c25e2f6fb8e4ce428332ffabc24db70cba180fa8f99948f94c5fa018b51466049f27ef4b45c68d50b4e2fbc2a510c651433b84d24c0af5de2d7e2922bb
+DIST firefox-127.0.2-pt-PT.xpi 622365 BLAKE2B 3a58c60a55ecb97079443c8b8f11c74e11b316e4cadd202b49c4a67d8c1ecca543295638e292bb843b9d53a8ae0f11746a507ccc13bc29e23a655b72962ca8b3 SHA512 6b3f52b3f597256263d6a31a9db4fe504405df80c77e33d4203438b31c1e4b5f0ea6b55bcfd088608b65efdf333d255dd51a6c62f6a6920542009d48d49a9277
+DIST firefox-127.0.2-rm.xpi 612109 BLAKE2B 037339854f561f18dad9b3f71ff29c93c62389a09bde63d038dc5432806d6793f89836a0b7a2b539fc1abc3e5da938841f4f56271c146507eeaaf1213076b6bf SHA512 b5e5ef4614f3c85eca0d95fc076ed6371ded5ee48186c58b209ae3d0386e4ec540c6fbbd479f7a4ac939e5687f51246d2d98c63ded1c791e3d429456e6743cef
+DIST firefox-127.0.2-ro.xpi 547541 BLAKE2B 05bc2ce40ad88755d62e001e5fbfc2ecc3f8de44d4c9a66b05d2aa1f5f9bf9fa47942a070234a4bc17be222e50d9ac57a876b3c935edaf868116738cb2ce513c SHA512 69a69804d9e9555971e997c9c1a9979343b9e6d92d250f6056fb1a43cf9f319675bd8f9534f2b195d2b17aa896ec2f48bd0f4fece1cf9a953b80b89a242ea494
+DIST firefox-127.0.2-ru.xpi 713587 BLAKE2B d7e43eb431e9ccd825c369a5ae03da01d8cd3e75a75ec3976b6c077b8017f1399bd8f6898fff6dcd763b471b85d1e045734d2c87be3f5479ef71be25b2a820fd SHA512 9bc67383511f4e3772a8d0387bc6356c1bc6279378cf92459b3fed84027c063180f27565fd207ca87aba43b23d89b88985566041d54fa87b796dd72ff5f8c3b8
+DIST firefox-127.0.2-sco.xpi 509002 BLAKE2B 51c464944fb8b7bf1253d5283ac373b66a225936cc10d041f1a1afa7aa2945ad355ac76f4c7e0d486af5376f5a6168ab4fd7127adba7650d8beb48a64e2c290b SHA512 7f3f1f329b03011fd5e92ca83819878e52bcaa558d27fa8245fd97ba6a74263472dbc9e9e3b27a3d21243df7e97fa393cdabe5c3b7ec797dfea2365ef72caa1e
+DIST firefox-127.0.2-si.xpi 603740 BLAKE2B f4e030dfa2a86adcbbcb5a012fd3b94ef771dd4ef04c84d7d92e9d0076444db69d82362836438179161cc76f30ea1fe28ff208d9eba9601ec36f0cc2e294da8d SHA512 052ed58c249b438855f0eec798bcd7168e2a4cea40f4cafc20c71d1420416dd4bffaeefab07e1468d2db138c0c8995512baa392f58fe650ff0292d2ddba4d205
+DIST firefox-127.0.2-sk.xpi 646183 BLAKE2B 066ee127bde4f408f04ece718dfdaa9e9787a9d531f172edbc645423375e122e86667c149225ef865463ed6506f861347229781d66a746706914f9400543a29d SHA512 c010b5ec4d21f751acc65fd11909a2d11204558c2ff3c599678dde58cf64525776905d1cd0ead10103e1a4ddaf8bf1e74a2bd187be79e661efdcfb8e76c78cb5
+DIST firefox-127.0.2-sl.xpi 612536 BLAKE2B 154f285a2c34c47ad645562c0739d7167d09dae0cc3310dea11c66531d01cd760328d487fc4e287660f6b8abd83ec5280eb496cef2d5ca55ed9a4a730f61a8c6 SHA512 74a722e53c9d79b7d6ac71bea7d20b178e8ae0444f4c237f9038ba984c9f1f83b4f1b413469f43f56b2dce04b5dd96c07717cb13f1cea15ae61548e9d14c1c81
+DIST firefox-127.0.2-son.xpi 414287 BLAKE2B ef3c9c5cbb49b995d4031173daa9b2671d31f8c1607454d728fbc9a48337584b507d39a5c3f763d471d0069d7d03c04a20156f849976dd1e3f1bc1ec060a48fb SHA512 a127c147748f1829537707bafd0803ba0be05500eac44a310a035c3600e59b354249f82d03e1414f72c943b682deddbaccf38741791809c6e6fcb6a2535a1e88
+DIST firefox-127.0.2-sq.xpi 632514 BLAKE2B 57ed4165eb1c50706d4daa426b9561bf55114323c57f252a5cb10f24d12cae7929a663431ec815ab70bec7271e2c99ce42b1d33503d00f4335ad829bdf072a10 SHA512 b26dbcb8ffb1f7b346f5afe1b2a96bef700b0274c9423fccce3a6f9a72870740b422e60ca153a42fdd5dd550ea21348be457bafe11e16702e9013c71ad76b12c
+DIST firefox-127.0.2-sr.xpi 637089 BLAKE2B 0906ed4130759f223f0c9197ccefee7ee1a18e97adb2e3f95a37dd68e324f965571b2d465a6540241f094f713775528316cc9e20e92a16c6c0b3b93b58046163 SHA512 7f2ba2683e858264729389e1f87db5cc2facd712155cfba0b742e71977e40bd92aec35e85ba97cc089da1533d2a95aec727eee059db2b4e23cc7dc2085ca0ea9
+DIST firefox-127.0.2-sv-SE.xpi 613192 BLAKE2B 62fe88ce76e60a37d5d17d41aae8115fbd58f5e19f12a391dd12504d78b748d5f656eb72f2457ed0d2b4c5a423710333230a5cac7b811efc3b9bbf9425fc0e23 SHA512 0a3fc99b45702c4ecc38657c557681edaa5941d43cd2946310ebdc997306ba5d0566742c7bbdda44f1d52e9ea2b2d7d378a2e2ceb26cf5927d4f36b8cb5afeea
+DIST firefox-127.0.2-ta.xpi 505373 BLAKE2B 6e14af1ef396c63bc689033c1b89dd00019338c6b065f6e858a337ba0e38f5d08802fd8c85d1abc8da5ad95d970a9ff96f05076b029f482e246ab48ffbdf00ea SHA512 6f6096e2a0ca3e82649c97240052235d480456f32d38a810b0d5d7ac8fe4f5cd2406e44b4d92797154940213200024a1f6eb971b7dce12617f180f16998ecac6
+DIST firefox-127.0.2-te.xpi 558857 BLAKE2B 8492c705d927f9bfa27a41097f46b8f2bbe6532940360ce4e878fa117643bc6d5e82616fbd401a083810ab99325f821fdc670185181f2a88f9b03dd425d0ef08 SHA512 d5269e7b39125d492e13f4588037e970a39838d527483fa3e043f8087772cebbbd788f5242ea66db6825995c028bf1db2abe4abc28cabf42362cba5fe813ae41
+DIST firefox-127.0.2-th.xpi 689043 BLAKE2B d6175e8a39280a990dd5e2f598ccf7c920b9abf770ba68c7f87cd1c129b0e426d91155f7939c87716bd1921a58f3f411d0ed051e210cca19be9c275945fbf61c SHA512 1535857c7c226c8fcbe4b0d168953ee79868ddc590b0e52b70806e69aa0e9e9dca975062cea8f7028d49c1d6168ba0e4e0e4312e008c7813ffa3055ede341a06
+DIST firefox-127.0.2-tl.xpi 532003 BLAKE2B 9cc051e3025efe3b0a21bfa77cf9897ec5348a88be2481ad275c0ee1ee9756ff2d42bbd73aa5050ab0c5b540ccbb1f9242e1d38168098be8d139bf03475209dd SHA512 43611d4e87c7b5e5a5d4fe7ed505b08e5f768e340a01f0aa83e923f07d2bac9e8563981d8e5c28a3d52187a74f517a3d49c29aea57c6c9981f9943e54c940b0a
+DIST firefox-127.0.2-tr.xpi 626623 BLAKE2B d52a002ea0eb3dcd6097470ea7aef86c75cbaa7a98c0ff123ced4aa9dcbd7cbe6173f83350d48311d3f3f25eb921f64362fa2a9cb178010ee7d92e162bd1ba0a SHA512 96fd86f48fda7cdd5f6f438ae5541d4a500169ff9957a47102ceb751fc2d89ad885c9fd0648a3e0fc9c46cfe1763763822e11ee4932726f3c2ef0690fed1be7f
+DIST firefox-127.0.2-trs.xpi 501856 BLAKE2B 558bab47c71966a918c263834477838901ffd7650ad4af63731b44631f26b8f84cb5f26c16ffdb040657dfc39a7704453d66d93532a8ce546556379c30df8849 SHA512 5ad75696118ff20e7089ed1ba109c04307898533e3105529535e7243a53642b4b5ae9407b0ca0ddb2e64d5b9be871a20d740a7be58012ec0f6693194c5d95c8d
+DIST firefox-127.0.2-uk.xpi 705155 BLAKE2B 11287c54554accce94129cbbf30f987ec3f3dfa3430eea7efeb36b79a92d849aa548bb97cb2db80b9ac91c76761a0c1b906dff856b69be514d408ba81391565c SHA512 0f5c9a05e82a765e7f36fdc3d99dc2c37593efce24ecfa2e5f31c69500b4c8fdb80629bd1f3b504437ca961a49a111a5dc404a8ef076420dc92036b9dbd47c17
+DIST firefox-127.0.2-ur.xpi 558321 BLAKE2B 0993ac2acdba4798d3f32ab68b52a57151d3ae34db7e77ae792ed4adb3717b5d816116b3718348434a4023b862a5fa31cf351902cb7537e0e00183f6fa848e86 SHA512 2c131c6220f62655c33f7b6831c4dea66ba1dae0a4602761ae2ff5284559093aeaadcc40030d996c995ac8150735fa8166bf39c238d98b675fb3560766d266a0
+DIST firefox-127.0.2-uz.xpi 476583 BLAKE2B ec8571499e1813b37030cff7b4b06ce4cc2180f65a3dd6fb6b1936b85eff56dc5a9396cdff034fcd96dc351763ef02ce2b3e03a1a7711606281c3fdcb6e7b4c5 SHA512 de62f38157aa6ecdd75659f2fc660c3466980ca633fb45705b92830cc4951a5d24e68dd50e06b15a99610dc0d00e05dc0b59fd44befdb0a636107b93f5de68b0
+DIST firefox-127.0.2-vi.xpi 650522 BLAKE2B b203152c7803a4d87465a3bad14a4a7a2b6e6c5745fae6e514fcc7467223a165bda3f5f0568600fce1ea38c650bbf9191b77aa8831a997127d945f50a169897c SHA512 45fcf4ca1e02495f6fec520d0dc095fce55e208e9805c641b80e600092a7b117be965e73990042ac7a8fffc421c43309f0d8875389d6a281321f0aece608f53a
+DIST firefox-127.0.2-xh.xpi 415023 BLAKE2B 09ad510ea9a674f6f0aad08fcdd50dbe5196ec119d7a51fc8fcc02cd2358ce1df12dd46b4b23dc3a927a99a3727ee9159c44815e4ce074ba83a82bf2a0421b41 SHA512 a226b56517a49d29d74da8dba3d8e7edef132b970bc7f41f489973b26ba63961e2defc5e6d765b1f69dca05e07729ac49e953aeb195a5887fbd32fcf1d053b73
+DIST firefox-127.0.2-zh-CN.xpi 650833 BLAKE2B 28df31392be1acb5a73af40b1dd8744056cd9f5a179a5f95c31a16ec9f0c2a97deb52a927b1322ee1118691cfec05e35105953938a0c1ae527994805f4401f24 SHA512 61bc371d4d0e343f19a48a2ed473575176bdbd2b084ee464253e2958eb08673af9fefe3709dbad127254e8991a813d63de6156f60b773a0f6546a82728401595
+DIST firefox-127.0.2-zh-TW.xpi 653089 BLAKE2B f7d6c661cc6f7bdc068cb9b00991f164e3b6b123cef5af553c6749de3ce3eb6609a71115627532093f7450b08f6df5b5726903e70f61279b6292004918f9e5cf SHA512 3a8a3c3979db17b3a56fdb2049fb1a437b8c881dc6587affac0a24f936ab53845672da3cdb452e4831acd2ec080f08dd4fdb6f40bb8edbffbb2d2ff688eee96b
 DIST firefox-bin_i686-115.12.0.tar.bz2 84276723 BLAKE2B acf07a4d6d6fc258d343932a1a4751aebc071c2d74e1db197d7678ded8806565a80c9a7df3d5c0d125445db8f1044d8d5c0e3c4b5cee2b3e4ccf1236a5c54d80 SHA512 9198bb399c16de5f50c363ad52d09ce378faef4d93662b1cd3307d2e43b1714277aef3a89c5ce7264982048dc2e5aba0033bbe5d85b21fceb309960c5ab94ba9
 DIST firefox-bin_i686-127.0.1.tar.bz2 89184908 BLAKE2B ef03efa9b10eb38b82731f4a05d209587abd5fc6a50fe4797c1c1a8d3b7b154d2cd18d31ea5a4d3ea454821b6ffa375db90c1bf4ce41ec1acf04bb407e2796d3 SHA512 4167eccf804cbf9a95bde647c8e5adc4e6deae95467f14489d3330259868bf6b6af5ba6c24d9b2f4831fd5dd4065e93711fd2527e52e5298fee1a0376581b6d9
+DIST firefox-bin_i686-127.0.2.tar.bz2 89237658 BLAKE2B 7a39a4c57701171153da3283ece3ed40b50f1a6fa56ef4e687add895fa048769a658f5dd0bfe08251d9499b1fcf77488d882d2f451dbcbfdefcc7d39964ade88 SHA512 cbfa58a33986143ce473681241af3c55c646f259b830755961e68d2257b83d53a9a1c6747cbcbba123782085aec800090681daaca6bb886b1e3087a7cf8377a9
 DIST firefox-bin_x86_64-115.12.0.tar.bz2 80371587 BLAKE2B b856f11b53084a53f35eddf25626fca45b5ce5636ebfc8fbf91289bc790402b8276333dc6778057900f7e38603330c358ce3df597b1af6f26229bdef0ced37be SHA512 cc76734016ca82fe0b20375bc9a82ced38f0498aeeaeb5a35202595260eb6bc6f7dfbc08bd4dbb985c68c61d1a4ce3aeeeaf58d6b6cd796b9e2f3db7b5691ca1
 DIST firefox-bin_x86_64-127.0.1.tar.bz2 87375090 BLAKE2B e427d52a71733c9ec816e4e984035931b5176cf2042fc3dcf5e2dffab2639e1c6484181bd0cbbd4310701603b574262abd66b2ca9ac9cee09ef101ab5222ebf7 SHA512 8f802b9171008ef15eab0c334f884deb3552727be97f15d4ec52cd3e0281a2fc006f169157dcc7e6b28c513dfdd0d5c8fe58e10bf6523ebcd8d22fe867e2a67e
+DIST firefox-bin_x86_64-127.0.2.tar.bz2 87388109 BLAKE2B 3364abe5c9ac191e18a0cdbd5283593220a0576fd8f9abb9908af0962bf904b5ae06327e6947357a00022de4044eabfe1a56b969c0d71b01290480032b1e3b52 SHA512 cfbb5c628ba676a37592125f3f94b80b42b75a6adf4b4c905b01598466c218a1d9c04b894ad1aa0452bea5d1a8ebc62151545c1048d79eba67d9df26414958da
 EBUILD firefox-bin-115.12.0.ebuild 10934 BLAKE2B ba31c56b7abf9e2089563a33054a5ca6caf1e9cc92a7837600f0af25f8768a773ae2e2cbd2049964847ec2d5c93cedfeeed7e3a8f93704d9e8f8c8360ca581d1 SHA512 41e2a60e4a0bf1bef6f591bd0ff34a9ccadf7c85c94a23d0605230dd2ed35d01b54ea25534fde940766c7f52be5444d493bc7280dfdaaf2a7bc7f3d214d554c4
 EBUILD firefox-bin-127.0.1.ebuild 10770 BLAKE2B c1cfb3d7e0810c354897e6c89612c3ba36d710f894211e89bccb91beb929c322a98e073be4c3d897da5d257214eee05bf3b5b1a7f3837440522fc21db5f94fce SHA512 abfa565783903bd65a3399098a6d5082e1d9a5535008ecc00f2f4656a1eda01430e98922d98b242cd42357458341a22056dd5e7b00fcc8e0afc3bc2958aa0dd2
+EBUILD firefox-bin-127.0.2.ebuild 10770 BLAKE2B c1cfb3d7e0810c354897e6c89612c3ba36d710f894211e89bccb91beb929c322a98e073be4c3d897da5d257214eee05bf3b5b1a7f3837440522fc21db5f94fce SHA512 abfa565783903bd65a3399098a6d5082e1d9a5535008ecc00f2f4656a1eda01430e98922d98b242cd42357458341a22056dd5e7b00fcc8e0afc3bc2958aa0dd2
 MISC metadata.xml 520 BLAKE2B 4b540dd2d9ac3840061de8a73117f2859db156944826d22c1f74cbc0c35f6d305aa10ff45708eab016df725cfc741c99dec46f0078a29162982431892e86e477 SHA512 0c7183e35a4b0ca2ddd092786ebdeb5b41a431adf918f0c2e541a5ef1c235066586a46a50fa29c25e5a522930824f8662fa2fa7eed8c3895f74d85bef93cecb4
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-115.12.1.ebuild b/www-client/firefox-bin/firefox-bin-127.0.2.ebuild
index 0ddec45f3444..91c94d7a296d 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-115.12.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-127.0.2.ebuild
@@ -26,37 +26,28 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
 MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
 MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
 
-inherit desktop optfeature pax-utils xdg
+inherit desktop linux-info optfeature pax-utils xdg
 
 MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
 
 SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
 	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
 
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
 
 KEYWORDS="-* amd64 x86"
-SLOT="0/$(ver_cut 1)"
+SLOT="rapid"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+alsa +ffmpeg +pulseaudio selinux wayland"
+IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
 
 RESTRICT="strip"
 
-BDEPEND="app-arch/unzip
-	alsa? (
-		!pulseaudio? (
-			dev-util/patchelf
-		)
-	)"
-DEPEND="alsa? (
-		!pulseaudio? (
-			media-sound/apulse
-		)
-	)"
+BDEPEND="app-arch/unzip"
 RDEPEND="${DEPEND}
+	!www-client/firefox-bin:0
+	!www-client/firefox-bin:esr
 	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/dbus-glib
 	>=dev-libs/glib-2.26:2
 	media-libs/alsa-lib
 	media-libs/fontconfig
@@ -65,7 +56,7 @@ RDEPEND="${DEPEND}
 	virtual/freedesktop-icon-theme
 	>=x11-libs/cairo-1.10[X]
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.11:3[wayland?]
+	>=x11-libs/gtk+-3.11:3[X,wayland?]
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
@@ -75,23 +66,32 @@ RDEPEND="${DEPEND}
 	x11-libs/libXi
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	x11-libs/libXtst
 	x11-libs/libxcb
 	>=x11-libs/pango-1.22.0
+	alsa? (
+		!pulseaudio? ( media-sound/apulse )
+	)
 	ffmpeg? ( media-video/ffmpeg )
 	pulseaudio? ( media-libs/libpulse )
-	selinux? ( sec-policy/selinux-thunderbird )
+	selinux? ( sec-policy/selinux-mozilla )
 "
 
 QA_PREBUILT="opt/${MOZ_PN}/*"
 
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
 MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES es-MX et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
 )
 
 mozilla_set_globals() {
@@ -158,6 +158,13 @@ moz_install_xpi() {
 	done
 }
 
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
 src_unpack() {
 	local _lp_dir="${WORKDIR}/language_packs"
 	local _src_file
@@ -191,23 +198,26 @@ src_install() {
 		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
 		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
 
-	# Patch alsa support
-	local apulselib=
-	if use alsa && ! use pulseaudio ; then
-		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
-		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
-	fi
-
 	# Install policy (currently only used to disable application updates)
 	insinto "${MOZILLA_FIVE_HOME}/distribution"
 	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
 
 	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
 	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
 
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
 
 	# Install language packs
 	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
@@ -216,7 +226,11 @@ src_install() {
 	fi
 
 	# Install icons
-	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/chrome/icons/default"
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
 
 	local icon size
 	for icon in "${icon_srcdir}"/default*.png ; do
@@ -232,7 +246,7 @@ src_install() {
 
 	# Install menu
 	local app_name="Mozilla ${MOZ_PN^} (bin)"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local desktop_file="${FILESDIR}/${PN}-r3.desktop"
 	local desktop_filename="${PN}.desktop"
 	local exec_command="${PN}"
 	local icon="${PN}"
@@ -244,6 +258,13 @@ src_install() {
 
 	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
 
+	# Add apulse support through our wrapper shell launcher, patchelf-method broken since 119.0.
+	# See bgo#916230
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+	fi
+
 	sed -i \
 		-e "s:@NAME@:${app_name}:" \
 		-e "s:@EXEC@:${exec_command}:" \
@@ -272,23 +293,24 @@ src_install() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-
-	local HAS_AUDIO=0
-	if use alsa || use pulseaudio; then
-		HAS_AUDIO=1
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
 	fi
 
-	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
-		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
-	fi
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
 
-	local show_doh_information
-	local show_shortcut_information
+	local show_doh_information show_normandy_information show_shortcut_information
 
 	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
 		# New install; Tell user that DoH is disabled by default
 		show_doh_information=yes
+		show_normandy_information=yes
 		show_shortcut_information=no
 	else
 		local replacing_version
@@ -311,17 +333,34 @@ pkg_postinst() {
 		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
 	fi
 
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
 	if [[ -n "${show_shortcut_information}" ]] ; then
 		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
+		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
 		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
+		elog "one generic Mozilla Firefox shortcut."
+		elog "If you still want to be able to select between running Mozilla Firefox"
 		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
 	fi
 
 	optfeature_header "Optional programs for extra features:"
-	optfeature "desktop notifications" x11-libs/libnotify
-	optfeature "encrypted chat support" net-libs/libotr
+	optfeature "speech syntesis (text-to-speech) support" app-accessibility/speech-dispatcher
 	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "desktop notifications" x11-libs/libnotify
 }
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 105d3643f7e3..7d8b58cc4bfd 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -510,10 +510,111 @@ DIST firefox-127.0.1-xh.xpi 415013 BLAKE2B b91113b53ae38fa5a85ce322f1afaa6188f41
 DIST firefox-127.0.1-zh-CN.xpi 650827 BLAKE2B c19b8ce5a69d58a4da1dd002cc841f2bf6823cec3dcf4ad3eee04c6f5547f95d6491c579565ca59e82c850a0cc6df60a7b18996af80538750f3f2fb25baec3ea SHA512 769a3eef576f9d78461c8bf900ca974dcf3d5043a6769297a0c3d2309d38e62214428f24eaecc2f2213dc08c7c50a1ee70de7ffef4b8997f51ed9080c76fe7f2
 DIST firefox-127.0.1-zh-TW.xpi 653082 BLAKE2B e031aaf61fff9b0adc7749c78333d464a076b59ac5afdf8a9289d62c82aaff2d7ee4c4a6b6c828e0db0a6e23be98ad32e81defd57cb879be9d16022060fb9147 SHA512 0a1358e57daaad039f164ff9f00376c8023287bfb8dc8abbd4b908a47fba619028ecfb39e2864be22d34141a3d4aea1e21249706180a6a3a582104105a2f7ac4
 DIST firefox-127.0.1.source.tar.xz 568595988 BLAKE2B 1399d5e7a364aba0a2c998fb12a5b52807426d265a8dc39fea910483319b3530f257e48aeac0daab930d79cedb40a1ca6a1211a7ae7e78a3d9bfe90dfdf01144 SHA512 13df770a89b703033601cab56892a2fc62427521936b366893008e68cd1f48d7b18917a3cede23764d024208819037ad0d28c2d4b73b99fdc204cbd53bb1297e
+DIST firefox-127.0.2-ach.xpi 461920 BLAKE2B 8978e6f06bf46bb473a5989cfeb9089863e9c92c3b93a0883ed2d0c577d24c717a49f5d35c1dd848c66076be3f0361ac917364716ea900156869ce3e21b92825 SHA512 f08f93f0b9c9704a77a00f1b9a83b867f82b144adb39d64ec0d4a3a5f78cf55b67b7eb3ce19c34eaf09357f8bdd7845a610937f70a2f856081ad468c446910c7
+DIST firefox-127.0.2-af.xpi 415365 BLAKE2B 383de6f37f70b7dd8791df80de220ad2b8db64f5c76bec9b5e8cf7064139acd08d4ae7000a28dfe14f648c8e8c20dd1bb8ac1c254ea9cfcf84c9850278aa6238 SHA512 84eb2d15fc2b1de6cff3dd7498277863734e60e29e013e72207b32fc230e80d9b417d2a0e0f5a1e5f2a43c2a98b90a47535bfc0f25a1e7966634c258927611d9
+DIST firefox-127.0.2-an.xpi 503728 BLAKE2B af62fb2c3862a9348d5ada2f21072d24b0800337a462c94d080a8ce112a01f28eaff40cd12a2b683ca44ffb4ed1de8b6bc9d0967774baf8b9bcc899b420e8134 SHA512 291e2c34b964f0d8986d2c568eac364e4d2a8e1218e2db71019ccf281b2f03474ebd90e3702fc7212be2fb435126eb635eec4b8871cb9f772f95e7c6c46df2b1
+DIST firefox-127.0.2-ar.xpi 607962 BLAKE2B 2777e90135a5b542688887b434838a5f9f123e626becaec6f274aeca78ff071c85501663115f99eab24e3ddfff04ba05d3332e6632600b97ec4366793cc290b7 SHA512 8dbcbed17479ad293d3e5c4d7f91e02fc95f121dc2be0b4e5f1532a270c3a45522774f85ea31454ca3e5fdb8456b230e0fa314a186134355503954ecfed0a1db
+DIST firefox-127.0.2-ast.xpi 494030 BLAKE2B 907feaecdfca0d282314669243bf12562ea45469b1fc9fee715461d3f698f0cb394dd9d8c35a90e5e3ed4d20a3629e74e14a05027c72205e3ec47d5f6b67178f SHA512 ad22d806c4584cc8769c21a04fff2457c7d2443d1a8fc7339876c1e10ec8e548d1dd898c017b2eff4759243930d6b1c6f1268166a6802e1faf6b6f67fe654db1
+DIST firefox-127.0.2-az.xpi 488590 BLAKE2B e2f329f8c5f15efc4b1cdeeb2fd99710707c97b77c00172b5fc985f80fe65ddaea26ac92dfae264ba50e9b22c3ef87c294c7c76ed2b44e98f75db03174ad3872 SHA512 b6c82f95b8fdb9b7e393fedebc04528c36b19fcb74452a12812a408d6c9f4ef53facc71d3fd9c55aae960f98b3c831be4b52b7c6d9679f6bd0a61501e00889ab
+DIST firefox-127.0.2-be.xpi 708721 BLAKE2B 9131e7cdbe4f9d087da31b4513cab3aaaff521983cdd89fd22704dd4006d6b3f2615cc9a70f594b432f7102ecc84420ab944b9f61b28af52769ab6a8ceed91d2 SHA512 b2521ae6f1c354b88c7ddde11e6f45927c40c374713f07466e649833045b5231b24861000eee27176c1dc043d2209f274a8cd788094acfbdafcbad96a9806f01
+DIST firefox-127.0.2-bg.xpi 601649 BLAKE2B e1f797b9a6b2d8b694384216b06b980fed8bbd379c5e13a4a29162ae1f517f5ac18227c705d32baddd883cd3246e8aa182d51599d924e4d48fa40d777dfc21d3 SHA512 f77319e46f237f208c566c186c0b8d4a70dea15c0c487ab77c41bb22e2459e59a8b1528bc93be36fc93c80781015626bd9a56a2d3964c38d08569612cf480469
+DIST firefox-127.0.2-bn.xpi 579342 BLAKE2B ae74def080fc4879d840cd7526bc199e66e27666bd7a1ba6a3b6d8dec2b151a52b10df5853812af8af7bed90a04b215f4dce3fe42d5103e47bcdfa3f5c05d605 SHA512 cb3b2110e3ac9f072d78aa72a4f2a987d1ee744a45b1fb1844ad50439667d97b78adb3c383a5e80b6dd1ed63abea51d429c08ce6144901228f062d33b3ecd0ec
+DIST firefox-127.0.2-br.xpi 585933 BLAKE2B be13e03b5ea66573f97b015acdbfc08e05c304338256ed9b6aceb540a76e5d257f6e9ac8108fb2449498298ed680bbe46d8225f6928e4830486ffbefd2e9daf3 SHA512 657254a8e018082bd18ea9afdf761f11ac4dcb4d6dbc84f92bbf00045f814d139f4884386546fb78ded8c971719775e2cb0030435bec6ea2c14520013dabf4e2
+DIST firefox-127.0.2-bs.xpi 499342 BLAKE2B 1d3bacbb74164370b0a9c4ad9b952942fcddc3a4bea7c18414d0e31e8afd0c7d0f0f316d3d35bd3cf535cd5db1b335d336bcf27ddd18a4111386c6751b52f812 SHA512 40a0d7502e1b61959d9145e9533098e6a2395938fb55679f7e67fe6d376f2e962be6c6fc0630a40a3cdaec7bc5a50e8193df885bf40e4ab68e488e19d30a4f85
+DIST firefox-127.0.2-ca-valencia.xpi 544016 BLAKE2B 313eef4d5fb691323a099405567eb1d0da4336c573f8f2fcaab33fc82161b30bc7c18e2ac8de89253ee47cc9589a67f889c5dda0dddca6b1be9113aad5fbf234 SHA512 5bf2930525505fa3906897bf8072ed2a13bbdc6de2df82350918d3bc94175113fdf2c1ee4da975d26cfaeffc3eb9c464cc1aafdb20eb0b29ffe022209427bac5
+DIST firefox-127.0.2-ca.xpi 582808 BLAKE2B ecfb3ef2af0ee94ca901730b9e9750515c66c0890ea28b1b0ae46e4e385e948590825ddb9607d9748a9f7f6c695f0887f4786ff3dcaa99c2be14d5a5b2d3d117 SHA512 6a29cd06569120205a13a389a4087520f803df5e459c293c4b7b61d6cdc19735491fc13382333ff96904e54da1a0b3d5b06c59792d53b877fb909e55d730486a
+DIST firefox-127.0.2-cak.xpi 590482 BLAKE2B 9f2dd6c56f78f7f64834c9fd12f14493ba1a30f0c1a283d286b4c0f0881b321029c54487cc7b644a2b9c7b547db65e76104b47404c0f50e4eab2d3bf936ef024 SHA512 510c272b05dfc16659fb27186aa1f64ae1e70a39dca93aa32d1dd79d8896c29c93322de9bdf388c8a0974632329e0798daea9b4a8d63e185d85f8a8377bb373e
+DIST firefox-127.0.2-cs.xpi 653270 BLAKE2B b98bfa2e3fbf724ced45b357c7c3ae6a5b074488b1b2426df327267232eb30b3866f836a433f00ef92c6943f5ceb2ded4ef5e0d86785ee88859cf88b47cc7c0d SHA512 3057bf1be5369af6f1572e14c8a07efb7250bb2f9e9a5f5d3e72eac6ca4764970ab47530e76399e39222fa8cff4c06df216f00acd338fc254473580cc42b9ed0
+DIST firefox-127.0.2-cy.xpi 618428 BLAKE2B c0be3dfcafd923a39cd0bd2c54e2c413509a0f1b7ca17cecd6e5c968930e5516f41bdb1b247002abbd7ac84f6855983eab2fbc3e9ebf03fd95d2aea2dc44c398 SHA512 0b217fb7c14a43830b7b48418a759185ec568100c600519a796a336059eb76239e4b58243903bd180a21327f177085900c007da8e31922bc279dcef90be2755c
+DIST firefox-127.0.2-da.xpi 606847 BLAKE2B aae984f6cce0f493a54ca2fb9f89ea916d25468d91aadae207f38a1771901dc6bad2d1761051a145ae0c197f049d10d662d0f78e64ab0ad7b7745fd41b312f53 SHA512 aa511bfc36695ce3a2a82ad759eb31b1396dc455703e605ca95ee96d72e19f768eff254645362da9c776d609b4d108d24f0ce8759c27d625a3f65eb2f249847e
+DIST firefox-127.0.2-de.xpi 628178 BLAKE2B 3a5ecbb47276320290acc9643c2396d3409c803dd7e35d767f3b43d9782d688e872981a66f8608b531e694b5779264472fee5d1b0ce7705cd590aee524cb4263 SHA512 d5346f45b6cd2f6f934d07e8445ea7ff1bc97540da57490a132d4125532b388ae911731f3a723d596f519d0325dc2ccbd287d529ce4f1e22a9e40b14b5a9045d
+DIST firefox-127.0.2-dsb.xpi 644572 BLAKE2B 72ce2b28b566e68ae48e9d2ae6db439583e3eb9bc7f08adf1e53fe53f943e49c18b53898dd649f7ddf0c1bd76cd1da00880f62cbbe7a9d897087d75cca16de48 SHA512 24b48a4e2cf9034249c5ad5b81ed25f727fe64ce8382be42d0ec418547672c7fb3d69aad0047e3085032086084921c2a51fbc29469cae0b75d3fa1b39807858b
+DIST firefox-127.0.2-el.xpi 726241 BLAKE2B 59b90ec280c4094451e4390ec990c3c5b87b22eb93217252962765220cf78539ace962abe8d4e5c581b146ec04cb5617499afe55657d951334103607d57d15a8 SHA512 bd29df99eeb56ed84d76183a09f48191b283d9d9ed3f3c0c6f33b5cdd6d6bff42a6e5e93644e91ff59ca3132155f3163b49a95c36b94eb7445f4133c6624fd7f
+DIST firefox-127.0.2-en-CA.xpi 579152 BLAKE2B 3b125758423e52dcc5ddab42c402eb311209845cee2c1e155c546b4cf8ac3e3e635fb01456ba67b52ba89d18443c833a42c5b072c24216ffeb7c51893b078396 SHA512 25d89707c67a70a807ff05c6665f03aae6effe58c9fb7a43cd427c70ee46ae7c8feda51319958cc91778ddb74031d6d471892f8b49f8a03ffd63ef30b8739c1e
+DIST firefox-127.0.2-en-GB.xpi 579706 BLAKE2B bf4151dc3504096dd96013119905cba19b8d1417da25a2f4c5dbf7e14e9ed2c20a3b4442d6eea29ee37a6a648d3aadf58f6164978921b84be1763c5dc2f99c86 SHA512 247a412c5ed93799f6a453ff8cb6a2e7629781238ffbceabb5a10c5de01cd0409cd37371b4e4511df38612397688fdeb1d4e3791d138115d733f7a14b34e2a95
+DIST firefox-127.0.2-eo.xpi 608810 BLAKE2B c85e1b71424db3764eac98af32cf943b1daeb3d64d5348cf5842862d81bdccc5afaa7f477a1ac4827087872762d3eb4969c427b3a2b5893210f9aa158c33b409 SHA512 06f3c6aff4316c7bb4ee1e2e7814267a86b5392cf2c78a39f5f4a104d48bc7bd85365ac6a1d1804b8c171548d71f8e4c571e85ca4d7fea81302160f159b0f31e
+DIST firefox-127.0.2-es-AR.xpi 622106 BLAKE2B 828e573af5e7499850fb5bc3d6a5c9b09ee4a31147a6a4dfc17665784a4f32d6a39eb94246b09c28160d927a939047807c3faa3a2b853da092de32feeea1d146 SHA512 6a8efb62c2364e344ca51dab0a3f1fb373b990e308ecd6887ed2fe3fc2f826949d676ac55068fbcd3460ee163dc9a41f7ab52d7063e27ce5624424238bf13d8a
+DIST firefox-127.0.2-es-CL.xpi 621302 BLAKE2B ed638109216a61bdbb0f1a91ffdea17321936bef0fd2c57fd8bb29e56b6103be24ced5d62c41ea114b37e962c5df496aecfb9a06227a2e3662e6fcf2793f3915 SHA512 217183e515a9fd83535795731a9f7124a3716e5f68c028ae2137057bdff261d1e7744acfe64212ff003fa7782108c261aa3dc7dcf2184f3c77462fd65a374e05
+DIST firefox-127.0.2-es-ES.xpi 616136 BLAKE2B 2c25d895c6752f5a196bc80eef656f691fdcef3d5991dd3940eb4457e36f4010d7a78f6293904b8c8bd7d2d41ad993425847cfc791b0f45688616d1a3b003d34 SHA512 1780160b8378a87790a7d06eaeb099ade3b18e80469386a886d119a811f1216dd6db0d10dc162f4eef209cc2e45d260ec83b7a61ff67312df9c2a97ad73f98c2
+DIST firefox-127.0.2-es-MX.xpi 589239 BLAKE2B 74ea13596d227087bd314822f4353e17ca47067bfdb9dfe31adceff013eb10947f9c51f21ae9ba65773af8f64c20211d753c7cd09af72645ad5ced25d7eec77e SHA512 c684248938f8e48f13943564bd98766043d2ab14777617128b62cf6983d616bcf75f4448bc9609c9b253172f0753d3904611bd5f79f89e63f43f8d5915e8affc
+DIST firefox-127.0.2-et.xpi 537278 BLAKE2B 9720007a3b7a1899eaa9ca12f72bbcc362600d23115c971c5d791878cceb3c23bdf9954fd127ca9bbeff5f55be71ab03d7ffdbd3ca26407773355874799b7da2 SHA512 6d3a8d15024a6c18bc0e8feca09280bc6c44d88b47aaf9c09fbf48776e9656357308a9e0c45ab42f5a387c69fa52db46e8b51143556ca7f6cf433b81df06a6b4
+DIST firefox-127.0.2-eu.xpi 593779 BLAKE2B 276eb7fd5ba095fc2ed9c1c89e91d92d9d78160d00bf79ff157bd53d5cb1b68290424b2959b69ef40d072fc33345a928dd66231dc2a8d922b4f65c773c0d5286 SHA512 05f754d2a01bd7c597d805cae6775ca05640bab6478c3c8c0a807aa08f41a63e86e0d5f85d7b020d805955cbdc8e0deccebc7f95b46f75dc31521da416d7cb3d
+DIST firefox-127.0.2-fa.xpi 587838 BLAKE2B 03c99132883000ed03489cd26d5a220bc5c3bb30323dc7c956a1c8ffd55e6a63a20c3a18413b151158a559c208751ed4afc352b5fd130ddbf4e7af83e2a2e933 SHA512 369cdea6c059bda8304fe4075ace929c5023359df27c5f5ec9b930aed2b57590b59309b993259c77b9a66f02d683cde1f1f8c6a930f129889df1239a3ca30bd3
+DIST firefox-127.0.2-ff.xpi 473942 BLAKE2B 020c910141a001fff646585b848ce7a0e62ae50ee5b790f25a3c35e24e302c3ee074ecd52ac987a3b91804d672a46b17fbbd503cf864faeada80d0773cda1eeb SHA512 c4c577ee23c99f26cd0c37553013f3cfc657e5c90b594f60ec6db66f5560069dfab175bea6b65ff8bba0e9a16697cdb7e30f773343612554b868bddb607d689e
+DIST firefox-127.0.2-fi.xpi 601836 BLAKE2B d7d757970504b3ae569f661d58c929c8128d8dd2786c0448dd88c65f97277f02cafde9d4fc8037241640a88899cd9f8c9aece17134f20d48ea6749e79ec12d2a SHA512 5fc511b7495fd7d92597ff3fdaa8b01d76e2325112d3b48d01ae38d624e0017dffd9e7316b21dd0bae6ecc95505993dd44c1f682bfd3b0086924695337da2f13
+DIST firefox-127.0.2-fr.xpi 635004 BLAKE2B 04d7c575d53527b098a1c1387b9331182d197cf4ffe157183e074e2129dd5709b490c056af819d596ab203072a048bbc8c6cec79a7b014f3d80c79428f6e3106 SHA512 7d456172b78fe2ab7708eaab0d1f197e95ef30b04265813557c12b138c284be76a6e78f11901024a7c0412831bde2f4fa9df66a44d0774c2d47bc97d47970a27
+DIST firefox-127.0.2-fur.xpi 627829 BLAKE2B be8d2157906aa341e712d2f741c8688f7d4a2a2ff40d8f46cf77c6afa13589b53f41a50618babb46e08a756952a6c6162ffd40e552b985fd9fa4184dd0b4ed41 SHA512 6f0216f8c6c0db651794515541340b45ef51d185d279910eb22d5941730dad462581cd36b849b87e878b67ffd16dd432289efc64d40423bfd684474a1f2fc3cc
+DIST firefox-127.0.2-fy-NL.xpi 617744 BLAKE2B a2c9177611b12d11cbe87bb2cc3099be5a0b339938048d9058047085e64c6b426cfb668d2f9bc51aba951d1f6d1f09aa572b082e87d8d403d9ee31bbcc0ad4d2 SHA512 ffb266eac4df02de1269307e42042db41f950ac5757ef4a4b79f05069efb84bcfc00f6b7605abbbdccfe39ef4962316494aa630d37098db6e237a4136884a598
+DIST firefox-127.0.2-ga-IE.xpi 468832 BLAKE2B 7696d21ac2419875770f0050ba22cdb77303a5062f4dc71a82ec6dbfd50cc9ee25eaa06ebc6dc5785953e42f120fbb316df81b6b596ed3c72dbb69b450bc4177 SHA512 8d19d9494feb2acb3c310adb1860b9988ff91a1cf691f4491394e9472535787045b6b0dcffe97f00aa56371a7f15b4baa357b11e63bd26a0b773b340f68f4ead
+DIST firefox-127.0.2-gd.xpi 594383 BLAKE2B bf678fe36233ac642d21a381b2dd819bf3e9a22bbcdf17b7404221657e9ff0a81a07d9d7f3fa134265ff471667f1428819756c13646f1c9be8c29e5d216fc722 SHA512 23cfa8484e7e97f4e88acb29c75cea3cef8cc96687b21d7ffb6b818222a12249fd3faf41c7ec7349f2e22860c062dff7eebffde40711d2e241ac36721daee6ba
+DIST firefox-127.0.2-gl.xpi 601871 BLAKE2B 165fd9574a2404154032709d56ce98dc636fea53233fdee6446f1ecc3be90f2da8d3bb958aa6bc552e44e838c4aebe3da2853b824ddc12f1d85847351a9d4454 SHA512 66a0845743bdc272827e0b8ccd2b47d8bc15cfe69a6f13a41027d80589e1833cca0a7aba81e4c4b1395804b3fb9a5c70859de0ce0c721397750e39b69223474a
+DIST firefox-127.0.2-gn.xpi 633216 BLAKE2B c720023594d1642a96cddc60c645cc9da55543269db9cb8a885585fb62dd4d88f9f56cacdde8a10bd08f370bd691ce3d2528df6a9f9987a8cd6ad06c943d4499 SHA512 68ac786265b14eff979bdeaa3cd54cbaf523d22013ce5d8e6e025dc84aa6bcc8f80d3f5437e63078569f950276d388a438e18d7c69cdd97a993af1b172624538
+DIST firefox-127.0.2-gu-IN.xpi 525159 BLAKE2B f5d800531dcd64701015bf2ad782c882bfc19f190292e453f650358a9d54eb1656ae1a85c4e26c7bcb9703890938dbd2da7a7d96f4af280aa6788ff76c55c0f3 SHA512 960762d09c38620010f179401de7aa648efaa7dab84ed6aab572c3c42f3fec40c456bd9bb1bf14545f34ad5b8cd018b00401096613d4610877ac4b9a2447efa3
+DIST firefox-127.0.2-he.xpi 626712 BLAKE2B afffff975a94d3cbd24bf8c548d2fbb3c72ffcae74eea9705b07512a9a6a751d372c031f7f7d395bf4c937f5a2d180afb942141e528ce74fcacdec0065c3a1c6 SHA512 92af5bf179af0aaa5a8fdd58a96e73ad815d9f7ec7442d09a15d918f3ed193d44a66ee2614d44fe09c332c09d70b647e555434633c9e5d33b0e6d30a7a08cfc8
+DIST firefox-127.0.2-hi-IN.xpi 563353 BLAKE2B 9ff065cbd37bbcad8394beb5b424c1389000da238f8483fc78970b32b6a3d766070fd2aa70e181079461b8871afd0e0fafd1283939a118d4c894deca44d12323 SHA512 0678fab31a20c98d64158a0501824c7371bc22279cbe4b195a376bb045712451eafbbf8bc123fcd117917d36dc4958bf6656b26ba4785e05b7bc940a169a860f
+DIST firefox-127.0.2-hr.xpi 554576 BLAKE2B fb13353b6b0deee986fbc5629252b56e7e6b2aea0fd3d2eb45f10488973a164df989c60ce1651626b5e0ae827b7b724be16c3ddc043413d7307a70d403c90175 SHA512 58fad028af2d8b9c17c2aed96703a07fff45e797d7e1a7cfd10ded7b61eaa0c04b36fdab44e154e7920c7e30e79bec96a1702512f033b557f64cc34f43824281
+DIST firefox-127.0.2-hsb.xpi 640687 BLAKE2B 4a4fec20af37db4bf1d1e945088619c11ae98bac270d659bd96d39000a14ef1ee843a45f55786d86dd41d768984de4f173f3a3e4eb0c648aa18203117d94fbec SHA512 10ac939b71b611d6ff052df9288b7e0348d741cb528d06c927523f46413499aef43726f8327bfbbde423ce33309d31a34dbc5c05d3d835e385b461cd5df7007b
+DIST firefox-127.0.2-hu.xpi 644724 BLAKE2B bcd603197ee1966a9ce15d39d7e9cbcc7885a7c90e000482d969e88773cea66d80cccf49f35bcee4ccf215f160562b0afd4bd04fe48260f6cb9f059405a171f5 SHA512 baff1ec2c87952299cd8d7780c19ff738ba730cd33e623c8c479dc07bcc2fe5e853e18f3c1ca697e743dddf4ab5e21d14a1cdaf7c5c5d91319b80b2f8cb3ed2e
+DIST firefox-127.0.2-hy-AM.xpi 648986 BLAKE2B 83014678273ef12ab46165594c525277187776562d71c0e04e32776649e4b30d0b2dd8f01e940de2fd6be256137ba982c6a2ea8c4368b45f4d0c5ea75775e0dd SHA512 2f25a4a190eca19c750e2fb2632bc227e3511b46e8338fd692e54104e866b8d0e97c57d814116a3220469f9f9a510e51f1a3357a4dd0a84798129be8b51863f9
+DIST firefox-127.0.2-ia.xpi 605289 BLAKE2B 543e1ef07007cda243c6c7921f657e407082ebd4e85f55944b64c221ccd65c85e80ce2c017a076d4e569cb5700d14b254289853df474561e7e446ee7d8c85968 SHA512 1886ebe21c2c3b3a0edaa12aea403eaa6a85fa25f6561f06d8b6aa250a8e010c4bfcc743d5fe304fffd63916dc8855a5ec85fed61c2b0c663f8020fd9626bb0d
+DIST firefox-127.0.2-id.xpi 572107 BLAKE2B be501c12b2410cd01e4c7c036aecab49a013dde75c0329dbd546f79e4f7acf2ddc37cf662fa374346bbf925777e968c76d0007d014b95dc922589c07bfcd9bcc SHA512 640b4cc656d7e816bc995418bdbd4680aac11192af29f923c669fbe6d8ee852ea8eefdd255251d83a02c873e5bf50766d0b94ce4f674d1f1b5cd14eb559b2f64
+DIST firefox-127.0.2-is.xpi 611945 BLAKE2B 589f70e6ad040719b901c9a6c74acd675438c6e2d1d43cff4761c9eecabd471cd7a3c93565b2afa635f76e84a2da87e06dc639a983ad2f7dc240bccc4f94d51d SHA512 1c8e31729d54e5a06e244dadcfaa686396776b90797d1f311c98ed779a8a730ab2b5f9ed3c41e89bc4a385e32d3af38df8e54feef1ba0feba6a8de304661330c
+DIST firefox-127.0.2-it.xpi 561886 BLAKE2B ff4d47130ee0480b736e929ac3d8dbf3888fe8b084c6fdb977584fd873fb00064458c72cbc6e2014080ed2f92aee91524449dfdbab0023ecc9d2d2eb71d4957d SHA512 412d49cc1cd92a3c50c9e1e517afbf70afa1d1457b41d2065fc0dee19e48c4bdaa4d68b462fff0c09cd102b5548aa815dfc3eb96a44ac6ce7fe4c92a63e19831
+DIST firefox-127.0.2-ja.xpi 673185 BLAKE2B 616faee17face89955ebcbca3fd0c38074eb9c8cb8ae5ac6f0ec298b55a71a781740537d31a55b09f2d3176d886f9dc94b516a277f7d3dad601d279b7b44581c SHA512 e4a1dce545675f2ff979d9ce04675229307ddf06302f4686e31dbf9b9e952a6e6681b9b73835a3e86d21ad0957eeb0a57af41a0f00fbf067a5e311f0aaa533d4
+DIST firefox-127.0.2-ka.xpi 658460 BLAKE2B 1e1cbf2ffd7edb05636b0894840b7729bc5ed07c54aa97730ccf30abb07391d90dc61f03aba68ab1b3cd2258d25195e10a15016ccde628fd207df3a2c8a43328 SHA512 282d5bc341eaca423c0d6f4f503d4e82aa7346d4db54ab64d63efec3985e52b6b3ec2b648265ae6861b96e505aa22b27bc8eab81d036e6f3f1831a30d720e84f
+DIST firefox-127.0.2-kab.xpi 602171 BLAKE2B d598af0433beef72504c005532b43511831b62437e62af54fb37af665e79f6aeefeac943a774bc3482ac058441ad25834531a43091a70e66387dbc90f0caa089 SHA512 93aab5f309d1ea6527029dcc414b2c335261605801cdbf6060699abe7fc11a533c67e391b64477b744c87815a4d9e8217dcf78950c707b12c05bb5f9353e27ee
+DIST firefox-127.0.2-kk.xpi 701249 BLAKE2B c012acbee6861d3f439912f4b7c1aeea5db6e1c667b716233b8b2941749679e88ec27587ba06810e5c242cf44e1dc71b0cbef73b791b7f1b6f270f0d13829d27 SHA512 933239b89d0008d7e9152be4167d44d3486a99bb1369932cf0c2cb627328fc0f810d5f153373fec7f783668cb93feb2735840962502a291cde0c76d067dc1c72
+DIST firefox-127.0.2-km.xpi 523616 BLAKE2B adc95ed4f61ac2a24e23d5a77050385640ae1ffb6d0ad8719de85aaf6c667d35cfba28ada2a688827ee9973520a01dc23182330a5a0ee505a414745915e21111 SHA512 5f6165b1059a226fc240afee289113f627b2e0d447d80e2c1231236365fa643a37744436b373fb2e62c27f3aac1427e1061901e02223bfdd505e9a93ec038a63
+DIST firefox-127.0.2-kn.xpi 489100 BLAKE2B 252088f2756606cb8eec9b5702b250f490f97367a5b26d7a3c35adcb95977d12494a7518e8a494d7d123fae55c6ff5ab50f79b8102daf734e6463817eaf6fb23 SHA512 333266766c09e952cd7b5a7761a824956da983bbf55cead5f14583f49d4099255101b4b20a0573eacbf97ff075124ed6e15394b8508d7a2c494829c95452d375
+DIST firefox-127.0.2-ko.xpi 655332 BLAKE2B b174ef3b71ccd98705f0099a9d8a9daf2df4d315a9a8400452f6f255e4ae6fa9dba0edb46fcbb129bcb3bd11ec2ae3b4cd415ba3210de1ba62e666e3520499e3 SHA512 0b1c672782c15a3b44e764b5954abd83ffd6c778d3c7105de326861feb14ca65446c16411c9fe13c25d34a4613ce35013c1346dfae14ef18f9b70dd27f7b5003
+DIST firefox-127.0.2-lij.xpi 481948 BLAKE2B 9d2d797dda09480e0bf45d9129f15fdd94c81395597bfdb37c524ea24ef476ed51fb7d298fbef8cd5a2bff8b0a38d052cdeb33c3dab696a3b35e5983d9bdfb99 SHA512 6853cd544af90e32fa06613f59a27b580caa48646a69a274fe53697fb807c3b1d576b84e20585bc1349c8c0d03e9c9f86136e8ad7f7ee255d5b5307e23dc8296
+DIST firefox-127.0.2-lt.xpi 570444 BLAKE2B 6524068e5e2c936a6d82fb55c3387665cc842847b01448bdac5e634a48074fb7d63de55534dcef765c0819b9bac33f2ac527160194716bb6c6fe9846147f3609 SHA512 c714f1d403de3243b7c126c1944178d8244c4ebacff9f65833c6da7e4f426fe9f6fe167027eb54436616801b44b6bcfffb813a9e6fe02b122330938572692f90
+DIST firefox-127.0.2-lv.xpi 571665 BLAKE2B 7e447f4538e60fa05dc4c4d19ac40367f5f34a0b9d90901b07b450a94f0257492b00715200e3b6b85cc7972e4b007fc3d8331f8d3f652ed445954cbe40b335cc SHA512 61289ce06d7b40f3cc64c05c98aa1a3cf79f21f42c08f3dda07716b1448e8a8a0c005f59cfa808bc8c7f362c1399fea50e6130fb028627a3210463bf8b72cc18
+DIST firefox-127.0.2-mk.xpi 491109 BLAKE2B bc1c1db4419ad47e9ac9730b439424688c883e475f927c5671268cb81de37a8a3bf2771dfa80dfa67c6f109faa5ed2974cf410ebfb0f59d586052cc27f319401 SHA512 8fcae32a324e336d9966b63b29455a7d44bee75b2147433d7a63c4ca4a12a7546d1b40ad433114ec95bb006c4f0aef51305fee2a133e24875d78e07da2c6d798
+DIST firefox-127.0.2-mr.xpi 529928 BLAKE2B 5b22c69c09b104fb06864d1ec3698db42a6ec4514f125928d538189a4609f2c9453625ea0300a32d4cbf95205e50a39a544f72f4164d7f4a154f7e867f4d1169 SHA512 8c46bf44f606968f14d0fd62542d2115aad9c8221a7179c56a39fb716416094adf14f8e714c9a765058057cd25b9d8e5150ca4f91d04ba29a6e98285c62a1b77
+DIST firefox-127.0.2-ms.xpi 447570 BLAKE2B eb532ec99408b57058afa89095b9b83a5b8276fb2717794326d4e6a199ed656ae6f6a0244e30e4a29e6b4133cae40e609c9badd1bde18483e21f1f0a55bc5d7e SHA512 f4ee3966274156890c6c87d316f8eef628a78cf3fa4f37f12a74ccfa84e8ab5390c6da758df45ef90e985a069f139256eaf557b050e93e832b398ed38228596f
+DIST firefox-127.0.2-my.xpi 516482 BLAKE2B 79892f75c81b973593e2fa5126fa861702d8612623b331c1c05856c86c8b5041ccb9587a1a7f6f6acc3d26269d5f39f8617f4b3a28e0a44662da543210b75084 SHA512 324244e8208859813d64ee578075a48cc4c9823154501ef1a3589f0c166be757dd470c563aa1ae7d8b46769a6d62c634c7b377859404d7c3e8b40a1cde596216
+DIST firefox-127.0.2-nb-NO.xpi 602855 BLAKE2B b385c75dd70ad2de9bca8cd9ca7f7a12e2519c5a3a8f52436cc4c74abb69176b9f1d353e951416bd72f6bb1bde9891cebb928dbd60b84db48d06c3a497f8b1dc SHA512 818598d7378d97f9cbff4b885660e950024c215bc9f6a669c5c8e7893fb3393e1bf6cb41d8e3feac142251d66796dd3174a4dfe968c7f80358c6cec63f231651
+DIST firefox-127.0.2-ne-NP.xpi 508759 BLAKE2B 8ebb4db29607220a96f7e81d539510830cf317936aae99c289ea35bdb77ef2aa493ab364c8ced059f5598186e68d6d6f069e41456c5131d06d0857c7d64df006 SHA512 5cf6ea3dbb0d82365beab3dfa6718014162b2901eb1ba8183106a99703004d0448b69fb49f6b140c8747b5ae00ff55b5b40fb15dbb60a89332f093d39c955898
+DIST firefox-127.0.2-nl.xpi 611454 BLAKE2B c9a18433a9f584b202cc5d3f1ac31ab77123b8682477f9874bee120ef5d5b34835fece3bab2eb9440860dfba1a925dc05dd295af1f14c851dbf54b0d0c075a88 SHA512 149f5c2d52fa2722b6f0d8f39796bc376d8ac0d65c07c61be43bdabfe135dc3056072bc3ffed433eae48ea9cc81ab8ea88759f8d2c4984a0ba337279d384b5e4
+DIST firefox-127.0.2-nn-NO.xpi 603355 BLAKE2B 67ac7a6dcaba44ec0190b7c8608b6edbae49fb9f6c61bda8dd9d1d55dc27e2e3cdbe57de79137bedc70dfe1f310dd192668be6166adb242e01ec8a72ce6ad623 SHA512 c22d95313aa51f705ad32255af4a43aefe645c6fd972b5d2e2f73e3369b1379c3ddb961823333323862b3eb8c5f2f12ebb16d9fdd82f39f8a992f955601f7b42
+DIST firefox-127.0.2-oc.xpi 608807 BLAKE2B 9df8419070a18ffe73e76b467e0b82fef9480e3d43fc5592376a96cf1a7c46a24fc7c59f0a7d99a1f291bb98548e3a55891daf32994e52f9f60fc407cfd1f62b SHA512 ee2cc4489784c7b26493a476730bc596b44cb6ec8703fa4e8c8066ed67e271ad23e720517b2577cced60e53031bb8db6fe2cc056f28f3956811216be0656df8a
+DIST firefox-127.0.2-pa-IN.xpi 687023 BLAKE2B 773a89ac237620167b1475c980669f050d8bf1b70c7bddb6bd2198c1266d14fa8e4b966e19a66e6201c0f52f6e6767432279395a5baf72d4ad7a8ce9c69398ac SHA512 f21c8ab2a7bb86a3ae57a2552bfc16ea3842d6ac4b4773161c15f15512a2ef2dcc57a54544b36bd1ac1ecb550f86cf7ec092beae1b3fa261d541cbc9f2112a52
+DIST firefox-127.0.2-pl.xpi 631922 BLAKE2B 1f490bf716751765f37e947065c79e40bded9ba716bd0189bb59c25f36a0be83b6d9879a2ca1dbd873d9438eb0cb4189cd15f72d19a6d7afe2158c92f0fe5746 SHA512 c25788444c441b0ad0ba573a194fabe8922cc611586ee19a9c7854307fb609552152e05cb624c1d17cf9bcec1662ed9a463b102ecd4aa9265840a48f56f858f9
+DIST firefox-127.0.2-pt-BR.xpi 616113 BLAKE2B df9bfd077412f11ecc945ce17155f01a812ca3f4b5915231625fc8c2a85e6a2a73439c32dfdf5137fec208fc44608b3a4528dc2a38e59250c5834542df943b01 SHA512 d80533c25e2f6fb8e4ce428332ffabc24db70cba180fa8f99948f94c5fa018b51466049f27ef4b45c68d50b4e2fbc2a510c651433b84d24c0af5de2d7e2922bb
+DIST firefox-127.0.2-pt-PT.xpi 622365 BLAKE2B 3a58c60a55ecb97079443c8b8f11c74e11b316e4cadd202b49c4a67d8c1ecca543295638e292bb843b9d53a8ae0f11746a507ccc13bc29e23a655b72962ca8b3 SHA512 6b3f52b3f597256263d6a31a9db4fe504405df80c77e33d4203438b31c1e4b5f0ea6b55bcfd088608b65efdf333d255dd51a6c62f6a6920542009d48d49a9277
+DIST firefox-127.0.2-rm.xpi 612109 BLAKE2B 037339854f561f18dad9b3f71ff29c93c62389a09bde63d038dc5432806d6793f89836a0b7a2b539fc1abc3e5da938841f4f56271c146507eeaaf1213076b6bf SHA512 b5e5ef4614f3c85eca0d95fc076ed6371ded5ee48186c58b209ae3d0386e4ec540c6fbbd479f7a4ac939e5687f51246d2d98c63ded1c791e3d429456e6743cef
+DIST firefox-127.0.2-ro.xpi 547541 BLAKE2B 05bc2ce40ad88755d62e001e5fbfc2ecc3f8de44d4c9a66b05d2aa1f5f9bf9fa47942a070234a4bc17be222e50d9ac57a876b3c935edaf868116738cb2ce513c SHA512 69a69804d9e9555971e997c9c1a9979343b9e6d92d250f6056fb1a43cf9f319675bd8f9534f2b195d2b17aa896ec2f48bd0f4fece1cf9a953b80b89a242ea494
+DIST firefox-127.0.2-ru.xpi 713587 BLAKE2B d7e43eb431e9ccd825c369a5ae03da01d8cd3e75a75ec3976b6c077b8017f1399bd8f6898fff6dcd763b471b85d1e045734d2c87be3f5479ef71be25b2a820fd SHA512 9bc67383511f4e3772a8d0387bc6356c1bc6279378cf92459b3fed84027c063180f27565fd207ca87aba43b23d89b88985566041d54fa87b796dd72ff5f8c3b8
+DIST firefox-127.0.2-sc.xpi 582650 BLAKE2B bc0a2823a0358c3369f09a4ae8f945ff24cb03f64cc364e492ea7cf4a2a75d0091e4c1156135ca240d2cad8cb64a7224b7435586d612a97718f3fa52e02573b5 SHA512 7d98df466fca23340be563faf94ced9be26938deffc5bee708ba1b9d0adf0041e4353973a447b153ed30dd7fa3d475e6479b7e2f99514e34c1b8b101e569387d
+DIST firefox-127.0.2-sco.xpi 509002 BLAKE2B 51c464944fb8b7bf1253d5283ac373b66a225936cc10d041f1a1afa7aa2945ad355ac76f4c7e0d486af5376f5a6168ab4fd7127adba7650d8beb48a64e2c290b SHA512 7f3f1f329b03011fd5e92ca83819878e52bcaa558d27fa8245fd97ba6a74263472dbc9e9e3b27a3d21243df7e97fa393cdabe5c3b7ec797dfea2365ef72caa1e
+DIST firefox-127.0.2-si.xpi 603740 BLAKE2B f4e030dfa2a86adcbbcb5a012fd3b94ef771dd4ef04c84d7d92e9d0076444db69d82362836438179161cc76f30ea1fe28ff208d9eba9601ec36f0cc2e294da8d SHA512 052ed58c249b438855f0eec798bcd7168e2a4cea40f4cafc20c71d1420416dd4bffaeefab07e1468d2db138c0c8995512baa392f58fe650ff0292d2ddba4d205
+DIST firefox-127.0.2-sk.xpi 646183 BLAKE2B 066ee127bde4f408f04ece718dfdaa9e9787a9d531f172edbc645423375e122e86667c149225ef865463ed6506f861347229781d66a746706914f9400543a29d SHA512 c010b5ec4d21f751acc65fd11909a2d11204558c2ff3c599678dde58cf64525776905d1cd0ead10103e1a4ddaf8bf1e74a2bd187be79e661efdcfb8e76c78cb5
+DIST firefox-127.0.2-sl.xpi 612536 BLAKE2B 154f285a2c34c47ad645562c0739d7167d09dae0cc3310dea11c66531d01cd760328d487fc4e287660f6b8abd83ec5280eb496cef2d5ca55ed9a4a730f61a8c6 SHA512 74a722e53c9d79b7d6ac71bea7d20b178e8ae0444f4c237f9038ba984c9f1f83b4f1b413469f43f56b2dce04b5dd96c07717cb13f1cea15ae61548e9d14c1c81
+DIST firefox-127.0.2-son.xpi 414287 BLAKE2B ef3c9c5cbb49b995d4031173daa9b2671d31f8c1607454d728fbc9a48337584b507d39a5c3f763d471d0069d7d03c04a20156f849976dd1e3f1bc1ec060a48fb SHA512 a127c147748f1829537707bafd0803ba0be05500eac44a310a035c3600e59b354249f82d03e1414f72c943b682deddbaccf38741791809c6e6fcb6a2535a1e88
+DIST firefox-127.0.2-sq.xpi 632514 BLAKE2B 57ed4165eb1c50706d4daa426b9561bf55114323c57f252a5cb10f24d12cae7929a663431ec815ab70bec7271e2c99ce42b1d33503d00f4335ad829bdf072a10 SHA512 b26dbcb8ffb1f7b346f5afe1b2a96bef700b0274c9423fccce3a6f9a72870740b422e60ca153a42fdd5dd550ea21348be457bafe11e16702e9013c71ad76b12c
+DIST firefox-127.0.2-sr.xpi 637089 BLAKE2B 0906ed4130759f223f0c9197ccefee7ee1a18e97adb2e3f95a37dd68e324f965571b2d465a6540241f094f713775528316cc9e20e92a16c6c0b3b93b58046163 SHA512 7f2ba2683e858264729389e1f87db5cc2facd712155cfba0b742e71977e40bd92aec35e85ba97cc089da1533d2a95aec727eee059db2b4e23cc7dc2085ca0ea9
+DIST firefox-127.0.2-sv-SE.xpi 613192 BLAKE2B 62fe88ce76e60a37d5d17d41aae8115fbd58f5e19f12a391dd12504d78b748d5f656eb72f2457ed0d2b4c5a423710333230a5cac7b811efc3b9bbf9425fc0e23 SHA512 0a3fc99b45702c4ecc38657c557681edaa5941d43cd2946310ebdc997306ba5d0566742c7bbdda44f1d52e9ea2b2d7d378a2e2ceb26cf5927d4f36b8cb5afeea
+DIST firefox-127.0.2-szl.xpi 524220 BLAKE2B f8519e76c38de1fce2d84dcae35155482688d9ac5273ae47c4fea0d86fcffddcc5313395019b6fcc9eff045cede9b2ed19cf4f030c92395aedb50aa6ffdd1670 SHA512 090353e034ad44199601012d9a99a8903ed6cb0868e25d0a5316cb0a34deb51a9a3f64d1c4f358d79702ad1a21ceb5d72eac08a325f875c4bb4d8a60a1a0ccdc
+DIST firefox-127.0.2-ta.xpi 505373 BLAKE2B 6e14af1ef396c63bc689033c1b89dd00019338c6b065f6e858a337ba0e38f5d08802fd8c85d1abc8da5ad95d970a9ff96f05076b029f482e246ab48ffbdf00ea SHA512 6f6096e2a0ca3e82649c97240052235d480456f32d38a810b0d5d7ac8fe4f5cd2406e44b4d92797154940213200024a1f6eb971b7dce12617f180f16998ecac6
+DIST firefox-127.0.2-te.xpi 558857 BLAKE2B 8492c705d927f9bfa27a41097f46b8f2bbe6532940360ce4e878fa117643bc6d5e82616fbd401a083810ab99325f821fdc670185181f2a88f9b03dd425d0ef08 SHA512 d5269e7b39125d492e13f4588037e970a39838d527483fa3e043f8087772cebbbd788f5242ea66db6825995c028bf1db2abe4abc28cabf42362cba5fe813ae41
+DIST firefox-127.0.2-th.xpi 689043 BLAKE2B d6175e8a39280a990dd5e2f598ccf7c920b9abf770ba68c7f87cd1c129b0e426d91155f7939c87716bd1921a58f3f411d0ed051e210cca19be9c275945fbf61c SHA512 1535857c7c226c8fcbe4b0d168953ee79868ddc590b0e52b70806e69aa0e9e9dca975062cea8f7028d49c1d6168ba0e4e0e4312e008c7813ffa3055ede341a06
+DIST firefox-127.0.2-tl.xpi 532003 BLAKE2B 9cc051e3025efe3b0a21bfa77cf9897ec5348a88be2481ad275c0ee1ee9756ff2d42bbd73aa5050ab0c5b540ccbb1f9242e1d38168098be8d139bf03475209dd SHA512 43611d4e87c7b5e5a5d4fe7ed505b08e5f768e340a01f0aa83e923f07d2bac9e8563981d8e5c28a3d52187a74f517a3d49c29aea57c6c9981f9943e54c940b0a
+DIST firefox-127.0.2-tr.xpi 626623 BLAKE2B d52a002ea0eb3dcd6097470ea7aef86c75cbaa7a98c0ff123ced4aa9dcbd7cbe6173f83350d48311d3f3f25eb921f64362fa2a9cb178010ee7d92e162bd1ba0a SHA512 96fd86f48fda7cdd5f6f438ae5541d4a500169ff9957a47102ceb751fc2d89ad885c9fd0648a3e0fc9c46cfe1763763822e11ee4932726f3c2ef0690fed1be7f
+DIST firefox-127.0.2-trs.xpi 501856 BLAKE2B 558bab47c71966a918c263834477838901ffd7650ad4af63731b44631f26b8f84cb5f26c16ffdb040657dfc39a7704453d66d93532a8ce546556379c30df8849 SHA512 5ad75696118ff20e7089ed1ba109c04307898533e3105529535e7243a53642b4b5ae9407b0ca0ddb2e64d5b9be871a20d740a7be58012ec0f6693194c5d95c8d
+DIST firefox-127.0.2-uk.xpi 705155 BLAKE2B 11287c54554accce94129cbbf30f987ec3f3dfa3430eea7efeb36b79a92d849aa548bb97cb2db80b9ac91c76761a0c1b906dff856b69be514d408ba81391565c SHA512 0f5c9a05e82a765e7f36fdc3d99dc2c37593efce24ecfa2e5f31c69500b4c8fdb80629bd1f3b504437ca961a49a111a5dc404a8ef076420dc92036b9dbd47c17
+DIST firefox-127.0.2-ur.xpi 558321 BLAKE2B 0993ac2acdba4798d3f32ab68b52a57151d3ae34db7e77ae792ed4adb3717b5d816116b3718348434a4023b862a5fa31cf351902cb7537e0e00183f6fa848e86 SHA512 2c131c6220f62655c33f7b6831c4dea66ba1dae0a4602761ae2ff5284559093aeaadcc40030d996c995ac8150735fa8166bf39c238d98b675fb3560766d266a0
+DIST firefox-127.0.2-uz.xpi 476583 BLAKE2B ec8571499e1813b37030cff7b4b06ce4cc2180f65a3dd6fb6b1936b85eff56dc5a9396cdff034fcd96dc351763ef02ce2b3e03a1a7711606281c3fdcb6e7b4c5 SHA512 de62f38157aa6ecdd75659f2fc660c3466980ca633fb45705b92830cc4951a5d24e68dd50e06b15a99610dc0d00e05dc0b59fd44befdb0a636107b93f5de68b0
+DIST firefox-127.0.2-vi.xpi 650522 BLAKE2B b203152c7803a4d87465a3bad14a4a7a2b6e6c5745fae6e514fcc7467223a165bda3f5f0568600fce1ea38c650bbf9191b77aa8831a997127d945f50a169897c SHA512 45fcf4ca1e02495f6fec520d0dc095fce55e208e9805c641b80e600092a7b117be965e73990042ac7a8fffc421c43309f0d8875389d6a281321f0aece608f53a
+DIST firefox-127.0.2-xh.xpi 415023 BLAKE2B 09ad510ea9a674f6f0aad08fcdd50dbe5196ec119d7a51fc8fcc02cd2358ce1df12dd46b4b23dc3a927a99a3727ee9159c44815e4ce074ba83a82bf2a0421b41 SHA512 a226b56517a49d29d74da8dba3d8e7edef132b970bc7f41f489973b26ba63961e2defc5e6d765b1f69dca05e07729ac49e953aeb195a5887fbd32fcf1d053b73
+DIST firefox-127.0.2-zh-CN.xpi 650833 BLAKE2B 28df31392be1acb5a73af40b1dd8744056cd9f5a179a5f95c31a16ec9f0c2a97deb52a927b1322ee1118691cfec05e35105953938a0c1ae527994805f4401f24 SHA512 61bc371d4d0e343f19a48a2ed473575176bdbd2b084ee464253e2958eb08673af9fefe3709dbad127254e8991a813d63de6156f60b773a0f6546a82728401595
+DIST firefox-127.0.2-zh-TW.xpi 653089 BLAKE2B f7d6c661cc6f7bdc068cb9b00991f164e3b6b123cef5af553c6749de3ce3eb6609a71115627532093f7450b08f6df5b5726903e70f61279b6292004918f9e5cf SHA512 3a8a3c3979db17b3a56fdb2049fb1a437b8c881dc6587affac0a24f936ab53845672da3cdb452e4831acd2ec080f08dd4fdb6f40bb8edbffbb2d2ff688eee96b
+DIST firefox-127.0.2.source.tar.xz 554998504 BLAKE2B 63221122b5d3ef57f47895fc3583ea4b6dd97a636934054572ac1fb1005777b2d76229124f4b8f293f34791720992489f9ded0e5707d930977fedb160dd0966c SHA512 d5a959a032309b8a42690b7f5afd5110c2e6ca7de426e1529d50f59cf065e67623ed98bf3aab39ce4d345ccfad2a273b24ce4f87c7ba7e6eccf2e9dfe3008d8b
 DIST firefox-127.0.source.tar.xz 558840124 BLAKE2B 78fe92863389763759ce6e25dccc8adb19b8c35b59e591f40982fe5cd3b5511fee8f809567fa5aade68fcf3b40c1860f5e63aabdef0421c94b803d30d32d4988 SHA512 5a17bce357e7f445c37540115f2c131ad5a055c0cf04f20bc2eaca18f8d241a99ac76739d172b38f2ad2681633f901a0a15893801082ac5db9e20e31fc8b8291
 EBUILD firefox-115.11.0.ebuild 40409 BLAKE2B 946cc9a9f1d5415932e8fa55d739370b1b2296588cbc97b95bea73c07efd9b51e12b5f55db269ece293e60697c764c7e635da36f2f6f40c2b25affab7f8d8f11 SHA512 fd6c57d8c113820d2fd2d20fd9c1dbb756585b5939168a3b9b96936284959f551359901e48f95a13d3b427210920a569a7f5aa8e999eecde84c42daea70e8bdd
 EBUILD firefox-115.12.0.ebuild 40410 BLAKE2B 902b584a455863f5f0842116038fa1d71841bd82fbd9e39fd835f58f93400f22d053574952b75c4b8fbf60f1b4bf6f6a0f33bbb66040156c6708386e1ecb6e01 SHA512 d1c1ecf8728174770221e973b5e9af74ce7643b9cc990544e0d7b8443940996fb5e685ec4d15410f8fa360a80be30766921078ec78153ef23e899ff0116828ec
 EBUILD firefox-126.0.1.ebuild 42514 BLAKE2B 789b5cebb2369a92cc314abbfee3b287b1b01a4402b635af4b6022d9d43ba2ef5b519205c994fc305672b45fd5f7673556176c3144ed1254a4849245906ff7d0 SHA512 66ef576f14b2a172633cfe41ce70a53051d13b3395909f7130237a4b93119b8331e68f6bd621d950234522e500f7ff09389f4e9d843e7c17f7d1607cfb525e74
 EBUILD firefox-127.0.1.ebuild 42488 BLAKE2B 850bdf64d677b89ec1df1fc4a337d2e6ce08baaf559e224c573ada1ce98195b8e240e04a3ec5a31a277434e919ad71ffa9354540eab5ea0173c01ac379f3e926 SHA512 a435584138d6784271edc5592d5e67d9f07f5eefabe88c0a2dd09bccf21a56a6777629332aa4ec25ac20848ba7bc3da984a800517b3a2b4e8db8d1272cf9789a
+EBUILD firefox-127.0.2.ebuild 42488 BLAKE2B 850bdf64d677b89ec1df1fc4a337d2e6ce08baaf559e224c573ada1ce98195b8e240e04a3ec5a31a277434e919ad71ffa9354540eab5ea0173c01ac379f3e926 SHA512 a435584138d6784271edc5592d5e67d9f07f5eefabe88c0a2dd09bccf21a56a6777629332aa4ec25ac20848ba7bc3da984a800517b3a2b4e8db8d1272cf9789a
 EBUILD firefox-127.0.ebuild 42488 BLAKE2B 850bdf64d677b89ec1df1fc4a337d2e6ce08baaf559e224c573ada1ce98195b8e240e04a3ec5a31a277434e919ad71ffa9354540eab5ea0173c01ac379f3e926 SHA512 a435584138d6784271edc5592d5e67d9f07f5eefabe88c0a2dd09bccf21a56a6777629332aa4ec25ac20848ba7bc3da984a800517b3a2b4e8db8d1272cf9789a
 MISC metadata.xml 2597 BLAKE2B b449997bc096ed8fb7bde41a5acb8d9f4c1c8cfc9663c06ff603cca756e8868d40049fd292a459a00d80b4e8c3a74e91e29fcb04abe87277640fe65d070f0bda SHA512 703c7f6a2b46748786145b0973a7b8439e530c96fd7c50d773efac7d5d9bf74ccb4f0c252f2701459944f2b3ced22d3e57ddf049b9aed0c8f0e094cabddda251
diff --git a/www-client/firefox/firefox-127.0.2.ebuild b/www-client/firefox/firefox-127.0.2.ebuild
new file mode 100644
index 000000000000..72aa3df83042
--- /dev/null
+++ b/www-client/firefox/firefox-127.0.2.ebuild
@@ -0,0 +1,1420 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-127-patches-02.tar.xz"
+
+LLVM_COMPAT=( 17 18 )
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="manual"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
+	optfeature pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+SLOT="rapid"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
+IUSE+=" jack +jumbo-build libproxy lto openh264 pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp"
+IUSE+=" +telemetry valgrind wayland wifi +X"
+
+# Firefox-only IUSE
+IUSE+=" geckodriver +gmp-autoupdate"
+
+REQUIRED_USE="|| ( X wayland )
+	debug? ( !system-av1 )
+	pgo? ( lto )
+	wifi? ( dbus )"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	!www-client/firefox:esr
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+		clang? (
+			sys-devel/lld:${LLVM_SLOT}
+			virtual/rust:0/llvm-${LLVM_SLOT}
+		)
+		pgo? ( sys-libs/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
+	')
+	app-alternatives/awk
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.26.0
+	net-libs/nodejs
+	virtual/pkgconfig
+	!clang? ( >=virtual/rust-1.76 )
+	!elibc_glibc? ( dev-lang/rust )
+	amd64? ( >=dev-lang/nasm-2.14 )
+	x86? ( >=dev-lang/nasm-2.14 )
+	pgo? (
+		X? (
+			sys-devel/gettext
+			x11-base/xorg-server[xvfb]
+			x11-apps/xhost
+		)
+		!X? (
+			|| (
+				gui-wm/tinywl
+				<gui-libs/wlroots-0.17.3[tinywl(-)]
+			)
+			x11-misc/xkeyboard-config
+		)
+	)"
+COMMON_DEPEND="${FF_ONLY_DEPEND}
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libffi:=
+	>=dev-libs/nss-3.100
+	>=dev-libs/nspr-4.35
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	sys-libs/zlib
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? (
+		sys-apps/dbus
+	)
+	jack? ( virtual/jack )
+	pulseaudio? (
+		|| (
+			media-libs/libpulse
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	libproxy? ( net-libs/libproxy )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.13
+		>=media-libs/harfbuzz-2.8.1:0=
+	)
+	system-icu? ( >=dev-libs/icu-73.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	valgrind? ( dev-debug/valgrind )
+	wayland? (
+		>=media-libs/libepoxy-1.5.10-r1
+		x11-libs/gtk+:3[wayland]
+		x11-libs/libxkbcommon[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			net-misc/networkmanager
+			sys-apps/dbus
+		)
+	)
+	X? (
+		virtual/opengl
+		x11-libs/cairo[X]
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libxkbcommon[X]
+		x11-libs/libXrandr
+		x11-libs/libXtst
+		x11-libs/libxcb:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	hwaccel? (
+		media-video/libva-utils
+		sys-apps/pciutils
+	)
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )"
+DEPEND="${COMMON_DEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && ! tc-ld-is-mold ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile]" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*[profile] is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+# Firefox-only LANGS
+MOZ_LANGS+=( ach )
+MOZ_LANGS+=( an )
+MOZ_LANGS+=( az )
+MOZ_LANGS+=( bn )
+MOZ_LANGS+=( bs )
+MOZ_LANGS+=( ca-valencia )
+MOZ_LANGS+=( eo )
+MOZ_LANGS+=( es-CL )
+MOZ_LANGS+=( es-MX )
+MOZ_LANGS+=( fa )
+MOZ_LANGS+=( ff )
+MOZ_LANGS+=( fur )
+MOZ_LANGS+=( gn )
+MOZ_LANGS+=( gu-IN )
+MOZ_LANGS+=( hi-IN )
+MOZ_LANGS+=( hy-AM )
+MOZ_LANGS+=( ia )
+MOZ_LANGS+=( km )
+MOZ_LANGS+=( kn )
+MOZ_LANGS+=( lij )
+MOZ_LANGS+=( mk )
+MOZ_LANGS+=( mr )
+MOZ_LANGS+=( my )
+MOZ_LANGS+=( ne-NP )
+MOZ_LANGS+=( oc )
+MOZ_LANGS+=( sc )
+MOZ_LANGS+=( sco )
+MOZ_LANGS+=( si )
+MOZ_LANGS+=( son )
+MOZ_LANGS+=( szl )
+MOZ_LANGS+=( ta )
+MOZ_LANGS+=( te )
+MOZ_LANGS+=( tl )
+MOZ_LANGS+=( trs )
+MOZ_LANGS+=( ur )
+MOZ_LANGS+=( xh )
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+# This is a straight copypaste from toolchain-funcs.eclass's 'tc-ld-is-lld', and is temporarily
+# placed here until toolchain-funcs.eclass gets an official support for mold linker.
+# Please see:
+# https://github.com/gentoo/gentoo/pull/28366 ||
+# https://github.com/gentoo/gentoo/pull/28355
+tc-ld-is-mold() {
+	local out
+
+	# Ensure ld output is in English.
+	local -x LC_ALL=C
+
+	# First check the linker directly.
+	out=$($(tc-getLD "$@") --version 2>&1)
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# Then see if they're selecting mold via compiler flags.
+	# Note: We're assuming they're using LDFLAGS to hold the
+	# options and not CFLAGS/CXXFLAGS.
+	local base="${T}/test-tc-linker"
+	cat <<-EOF > "${base}.c"
+	int main() { return 0; }
+	EOF
+	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
+	rm -f "${base}"*
+	if [[ ${out} == *"mold"* ]] ; then
+		return 0
+	fi
+
+	# No mold here!
+	return 1
+}
+
+virtwl() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+	[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
+	tinywl -h >/dev/null || die 'tinywl -h failed'
+
+	local VIRTWL VIRTWL_PID
+	coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
+	local -x WAYLAND_DISPLAY
+	read WAYLAND_DISPLAY <&${VIRTWL[0]}
+
+	debug-print "${FUNCNAME}: $@"
+	"$@"
+	local r=$?
+
+	[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
+	exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+	return $r
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm-r1_pkg_setup
+
+		if use clang && use lto && tc-ld-is-lld ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Update 105.0: "/proc/self/oom_score_adj" isn't enough anymore with pgo, but not sure
+			# whether that's due to better OOM handling by Firefox (bmo#1771712), or portage
+			# (PORTAGE_SCHEDULING_POLICY) update...
+			addpredict /proc
+
+			# Clear tons of conditions, since PGO is hardware-dependant.
+			addpredict /dev
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	if use lto; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	# Workaround for bgo#917599
+	if has_version ">=dev-libs/icu-74.1" && use system-icu ; then
+		eapply "${WORKDIR}"/firefox-patches/*-bmo-1862601-system-icu-74.patch
+	fi
+	rm -v "${WORKDIR}"/firefox-patches/*-bmo-1862601-system-icu-74.patch || die
+
+	# Workaround for bgo#915651 on musl
+	if use elibc_glibc ; then
+		rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
+	fi
+
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# Workaround for bgo#915651
+	if ! use elibc_glibc ; then
+		if use amd64 ; then
+			export RUST_TARGET="x86_64-unknown-linux-musl"
+		elif use x86 ; then
+			export RUST_TARGET="i686-unknown-linux-musl"
+		elif use arm64 ; then
+			export RUST_TARGET="aarch64-unknown-linux-musl"
+		else
+			die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651"
+		fi
+	fi
+
+	# Make LTO respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure || die "Failed sedding multiprocessing.cpu_count"
+
+	# Make ICU respect MAKEOPTS
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# Respect MAKEOPTS all around (maybe some find+sed is better)
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/python/mozbuild/mozbuild/base.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/libwebrtc/build/toolchain/get_cpu_count.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/libwebrtc/build/toolchain/get_concurrent_links.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/third_party/python/gyp/pylib/gyp/input.py || die "Failed sedding multiprocessing.cpu_count"
+
+	sed -i -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/python/mozbuild/mozbuild/code_analysis/mach_commands.py || die "Failed sedding multiprocessing.cpu_count"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clear checksums from cargo crates we've manually patched.
+	# moz_clear_vendor_checksums xyz
+	moz_clear_vendor_checksums proc-macro2
+
+	# Respect choice for "jumbo-build"
+	# Changing the value for FILES_PER_UNIFIED_FILE may not work, see #905431
+	if [[ -n ${FILES_PER_UNIFIED_FILE} ]] && use jumbo-build; then
+		local my_files_per_unified_file=${FILES_PER_UNIFIED_FILE:=16}
+		elog ""
+		elog "jumbo-build defaults modified to ${my_files_per_unified_file}."
+		elog "if you get a build failure, try undefining FILES_PER_UNIFIED_FILE,"
+		elog "if that fails try -jumbo-build before opening a bug report."
+		elog ""
+
+		sed -i -e "s/\"FILES_PER_UNIFIED_FILE\", 16/\"FILES_PER_UNIFIED_FILE\", "${my_files_per_unified_file}"/" python/mozbuild/mozbuild/frontend/data.py ||
+			die "Failed to adjust FILES_PER_UNIFIED_FILE in python/mozbuild/mozbuild/frontend/data.py"
+		sed -i -e "s/FILES_PER_UNIFIED_FILE = 6/FILES_PER_UNIFIED_FILE = "${my_files_per_unified_file}"/" js/src/moz.build ||
+			die "Failed to adjust FILES_PER_UNIFIED_FILE in js/src/moz.build"
+	fi
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+
+		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
+		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
+		[[ -z ${version_clang} ]] && die "Failed to read clang version!"
+
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+
+		AR=llvm-ar
+		CC=${CHOST}-clang-${version_clang}
+		CXX=${CHOST}-clang++-${version_clang}
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain,
+	# AS is used in a non-standard way by upstream, #bmo1654031
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+
+	# Configuration tests expect llvm-readelf output, bug 913130
+	READELF="llvm-readelf"
+
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB READELF PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+	mozconfig_add_options_ac '' --enable-project=browser
+
+	# Set Gentoo defaults
+	if use telemetry; then
+		export MOZILLA_OFFICIAL=1
+	fi
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-disk-remnant-avoidance \
+		--disable-gpsd \
+		--disable-install-strip \
+		--disable-legacy-profile-creation \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-tests \
+		--disable-updater \
+		--disable-wmf \
+		--enable-negotiateauth \
+		--enable-new-pass-manager \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--enable-system-policies \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--without-wasm-sandboxed-libraries \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${ESYSROOT}/usr/include" \
+		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	# bug 833001, bug 903411#c8
+	if use ppc64 || use riscv; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	elif use valgrind; then
+		mozconfig_add_options_ac 'valgrind requirement' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	fi
+
+	# Enable JIT on riscv64 explicitly
+	# Can be removed once upstream enable it by default in the future.
+	use riscv && mozconfig_add_options_ac 'Enable JIT for RISC-V 64' --enable-jit
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+	mozconfig_use_enable valgrind
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+
+		# Increase the FORTIFY_SOURCE value, #910071.
+		sed -i -e '/-D_FORTIFY_SOURCE=/s:2:3:' "${S}"/build/moz.configure/toolchain.configure || die
+	fi
+
+	local myaudiobackends=""
+	use jack && myaudiobackends+="jack,"
+	use sndio && myaudiobackends+="sndio,"
+	use pulseaudio && myaudiobackends+="pulseaudio,"
+	! use pulseaudio && myaudiobackends+="alsa,"
+
+	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	! use jumbo-build && mozconfig_add_options_ac '--disable-unified-build' --disable-unified-build
+
+	if use X && use wayland ; then
+		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
+	elif ! use X && use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
+	else
+		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3-x11-only
+	fi
+
+	# LTO is handled via configure
+	filter-lto
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld or mold when using clang.
+			if tc-ld-is-mold ; then
+				# mold expects the -flto line from *FLAGS configuration, bgo#923119
+				append-ldflags "-flto=thin"
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+			fi
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			# ThinLTO is currently broken, see bmo#1644409.
+			# mold does not support gcc+lto combination.
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# lld is upstream's default
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+			fi
+
+		else
+			if tc-ld-is-mold ; then
+				mozconfig_add_options_ac "using ld=mold due to system selection" --enable-linker=mold
+			else
+				mozconfig_add_options_ac "linker is set to bfd due to USE=-clang" --enable-linker=bfd
+			fi
+		fi
+	fi
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+		mozconfig_add_options_ac '+debug' --enable-real-time-tracing
+	else
+		mozconfig_add_options_ac 'Gentoo defaults' --disable-real-time-tracing
+
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	# elf-hack
+	# Filter "-z,pack-relative-relocs" and let the build system handle it instead.
+	if use amd64 || use x86 ; then
+		filter-flags "-z,pack-relative-relocs"
+
+		if tc-ld-is-mold ; then
+			# relr-elf-hack is currently broken with mold, bgo#916259
+			mozconfig_add_options_ac 'disable elf-hack with mold linker' --disable-elf-hack
+		else
+			mozconfig_add_options_ac 'relr elf-hack' --enable-elf-hack=relr
+		fi
+	elif use ppc64 || use riscv ; then
+		# '--disable-elf-hack' is not recognized on ppc64/riscv,
+		# see bgo #917049, #930046
+		:;
+	else
+		mozconfig_add_options_ac 'disable elf-hack on non-supported arches' --disable-elf-hack
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	if use valgrind; then
+		mozconfig_add_options_ac 'valgrind requirement' --disable-jemalloc
+	fi
+
+	# System-av1 fix
+	use system-av1 && append-ldflags "-Wl,--undefined-version"
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+
+	if ! use telemetry; then
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_CRASHREPORTER=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_DATA_REPORTING=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_SERVICES_HEALTHREPORT=0"
+		mozconfig_add_options_mk '-telemetry setting' "MOZ_TELEMETRY_REPORTING=0"
+	fi
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	if use valgrind; then
+		sed -i -e 's/--enable-optimize=-O[0-9s]/--enable-optimize="-g -O2"/' .mozconfig || die
+	fi
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if tc-ld-is-mold && use lto; then
+		# increase ulimit with mold+lto, bugs #892641, #907485
+		if ! ulimit -n 16384 1>/dev/null 2>&1 ; then
+			ewarn "Unable to modify ulimits - building with mold+lto might fail due to low ulimit -n resources."
+			ewarn "Please see bugs #892641 & #907485."
+		else
+			ulimit -n 16384
+		fi
+	fi
+
+	if use pgo; then
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+
+		if ! use X; then
+			virtx_cmd=virtwl
+		else
+			virtx_cmd=virtx
+		fi
+	fi
+
+	if ! use X; then
+		local -x GDK_BACKEND=wayland
+	else
+		local -x GDK_BACKEND=x11
+	fi
+
+	${virtx_cmd} ./mach build --verbose || die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+
+		if use wayland; then
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
+			pref("gfx.x11-egl.force-enabled",          false);
+			EOF
+		else
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
+			pref("gfx.x11-egl.force-enabled",          true);
+			EOF
+		fi
+
+		# Install the vaapitest binary on supported arches (122.0 supports all platforms, bmo#1865969)
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/vaapitest
+
+		# Install the v4l2test on supported arches (+ arm, + riscv64 when keyworded)
+		if use arm64 ; then
+			exeinto "${MOZILLA_FIVE_HOME}"
+			doexe "${BUILD_DIR}"/dist/bin/v4l2test
+		fi
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
+	local desktop_filename="${PN}.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	# bug 835078
+	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
+		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
+		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
+		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
+		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
+	fi
+
+	readme.gentoo_print_elog
+
+	optfeature_header "Optional programs for extra features:"
+	optfeature "desktop notifications" x11-libs/libnotify
+	optfeature "fallback mouse cursor theme e.g. on WMs" gnome-base/gsettings-desktop-schemas
+	optfeature "screencasting with pipewire" sys-apps/xdg-desktop-portal
+	if use hwaccel && has_version "x11-drivers/nvidia-drivers"; then
+		optfeature "hardware acceleration with NVIDIA cards" media-libs/nvidia-vaapi-driver
+	fi
+
+	if ! has_version "sys-libs/glibc"; then
+		elog
+		elog "glibc not found! You won't be able to play DRM content."
+		elog "See Gentoo bug #910309 or upstream bug #1843683."
+		elog
+	fi
+
+	if use geckodriver ; then
+		ewarn "You have enabled the 'geckodriver' USE flag. Geckodriver is now"
+		ewarn "packaged separately as net-misc/geckodriver and the use flag will be"
+		ewarn "dropped from main Firefox package by Firefox 128.0 release."
+	fi
+}
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 7380d926aab0..89bf8ab06a35 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_128.0.6535.2-1_amd64.deb 109248816 BLAKE2B c270ea7c8bee8112e4839e9a0bbfcee5dfc707c50a78d74e27104c1c2ffb3e339282f01eaec98264f06518a9b115e5ff15774490fbdc6557c2a1d56d0eb95d39 SHA512 a8cd325ffe48a46ae676a773b49b728c409fa6d31cb4029e090826b137d0e201a3325888e3b54a9b7a0f59f6590c9b9ce8abc7651477902b56dd3fd0dbcd7d2a
-EBUILD google-chrome-unstable-128.0.6535.2.ebuild 2983 BLAKE2B c0683d291bd6459daf64a35c34b4d56824b1c1119afe758af8bc18dc2a3625f16c5e94b4a137a8fd5b7673d36d3b6e559df17269ad3dce405643edb809137e10 SHA512 b00a89fbd7d0d9dd1a999ae2b01b7aec9ad2b6e7b9bde8727e22b9a35769da5ed7fe351fcca6681e02007380662b0688a2990f205b1dfed8effb91d991ab21d4
+DIST google-chrome-unstable_128.0.6555.2-1_amd64.deb 109871140 BLAKE2B 2bc6db0a021f8161ecdde53365b5bbe203eebd40e23886866b5e5e60f1dc98b3e1db481b20f97ee64a6cc5256df7fcb3c07d02905372ca927e2990e0b815b507 SHA512 219ba6ce068fb6311c4a423e64c35a96dc7944e63702d460ed9b47499abf62c3ee0218e16fbc93a8d36b735ea0242e2e32f43f07bac32480ddb14a25b37ab45e
+EBUILD google-chrome-unstable-128.0.6555.2.ebuild 2983 BLAKE2B c0683d291bd6459daf64a35c34b4d56824b1c1119afe758af8bc18dc2a3625f16c5e94b4a137a8fd5b7673d36d3b6e559df17269ad3dce405643edb809137e10 SHA512 b00a89fbd7d0d9dd1a999ae2b01b7aec9ad2b6e7b9bde8727e22b9a35769da5ed7fe351fcca6681e02007380662b0688a2990f205b1dfed8effb91d991ab21d4
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-128.0.6535.2.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-128.0.6555.2.ebuild
index dd9e9c497aea..dd9e9c497aea 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-128.0.6535.2.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-128.0.6555.2.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 36bad3383946..8218ccdf8501 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_126.0.6478.114-1_amd64.deb 108805872 BLAKE2B 456742a69f8fefba9a7bc55ec80a803f4450581967c43d7934ac30d94e0bba618273375d389bd495bb8ecf00d5f56d48007d8102356b0f7917238867b568f8c9 SHA512 e92ce15324969327f906195382993bafe73a7225c549b09b400afaae7953c5ccb31d3364a269f9e8050971621858bd9da9fde655dd36b8ad7d8ec116d245f37a
-EBUILD google-chrome-126.0.6478.114.ebuild 2982 BLAKE2B 94c28a910834b70ccfa642f6e5372dce9e534bf5b9c210516958e8cd96c4b8e042d360a9fa5c85d13cbe4b152a26b7751f5f87ab832002fe21e83f2cdf03f47e SHA512 23c9d78446da4b7ceef659dd659af367733abb766207e343fc991122d13744e3d67b0919d9d6371df5fc43815301c062087e1ce8d685e41ad0613e352b8c96ee
+DIST google-chrome-stable_126.0.6478.126-1_amd64.deb 108773084 BLAKE2B 4e59333e6073b2b7320b50551a6241fc402509398a404742e63ccde60dce3a9c8d5a490a0b9fb4a9a409562ee4ea078ac1a6d441b0ead94bd40792b16afa48f9 SHA512 cae09818d2032253e1d9a8e58dfde53d56bb4fd63de0b7ad89bc6558da66103220057dce331ae519fa79e7ec140f116bc8d3e10200eb9845bb278aeaf3cf5d95
+EBUILD google-chrome-126.0.6478.126.ebuild 2982 BLAKE2B 94c28a910834b70ccfa642f6e5372dce9e534bf5b9c210516958e8cd96c4b8e042d360a9fa5c85d13cbe4b152a26b7751f5f87ab832002fe21e83f2cdf03f47e SHA512 23c9d78446da4b7ceef659dd659af367733abb766207e343fc991122d13744e3d67b0919d9d6371df5fc43815301c062087e1ce8d685e41ad0613e352b8c96ee
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome/google-chrome-126.0.6478.114.ebuild b/www-client/google-chrome/google-chrome-126.0.6478.126.ebuild
index a6673ff33b80..a6673ff33b80 100644
--- a/www-client/google-chrome/google-chrome-126.0.6478.114.ebuild
+++ b/www-client/google-chrome/google-chrome-126.0.6478.126.ebuild
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 28fb0fe7274f..01c4014158bc 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_126.0.2592.56-1_amd64.deb 168025734 BLAKE2B 55f7984e882a1a2b394923bcf1301a3649e4f041ab6dfe390b7e29e4f203547f3ffe0e3cce4e36142b5de923a6eecd6d776a4472231a2ebfc9316ac4ee14ad02 SHA512 5596e0754c3f443366838104b99e60a4991d42875b59e02e494db0d65b241a2fb483be675fa862e52a3f67f4e9edd173dc1ce4489f942585faa916b9d5c814b8
-DIST microsoft-edge-beta_126.0.2592.61-1_amd64.deb 168052066 BLAKE2B 01030d90820b785bdbb141faaca9d11ac98ff94961704142f6512b214c152c26cd563b4ce73ce95c5d425b3d1f75661c2f1233c35a3a4d4cd6c6bf28fb6b91a7 SHA512 5d997eed31300965a14a2bd3829bed2f1446d181d3d9e4c2082417e4cca628073e01f4e767a4ac4724b67180de2aac6f8ee593ec05937a86d5033939145906af
 DIST microsoft-edge-beta_126.0.2592.68-1_amd64.deb 168093970 BLAKE2B 5a5d84c1fe5fab744c48941eeb3c61f1c5ec1c2fa88f61ece81c865879320b9e2b40dadef6f84b3b1f8228e14076e60134ceaf9cbd7d3db30aa05a9f43f31cb5 SHA512 e0b75ef6671a9cda080622464ccfc41b7377d4cc7556f416c065a4d49c6d3f6f6b8da81bc33c143b064aca3b9817562f199fdd28d4d55734eb54b0df5651d6a8
-EBUILD microsoft-edge-beta-126.0.2592.56.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
-EBUILD microsoft-edge-beta-126.0.2592.61.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
+DIST microsoft-edge-beta_127.0.2651.15-1_amd64.deb 166274998 BLAKE2B 68b5e24fb80c0b9069e13349b05a44f5b2e8cfa5aa41256b4c0bf35ccb8a32da6d1fbb52620f81a873afd63a816ecc3da9a146b83fd2e24f601240c4cbcf674c SHA512 6121ac0e214b10235317ca4909668c49ad39e8be37f023a753df4ea01f2c16e6e36f7852a692fc1181e182d938fb6a2b4ffd46453ec330fa3b29a93bd09d9e46
+DIST microsoft-edge-beta_127.0.2651.8-1_amd64.deb 166235390 BLAKE2B 7fc059f64479348bf03fef05c3690bfede9f9036057b1dc6c69d268af37c049622cb036143211754382c566ff41846fbd2bcf28472a93425965f8a8cdaaf9978 SHA512 3eb1b79a878837eddf6ae36d4366ada21c0ec922b55dc1538fee4a07537dc5b8a97f31b25959379df444a3cea47aecef677d9b2924fa9863eaed6a41af9ac5b4
 EBUILD microsoft-edge-beta-126.0.2592.68.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
+EBUILD microsoft-edge-beta-127.0.2651.15.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
+EBUILD microsoft-edge-beta-127.0.2651.8.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-126.0.2592.56.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-127.0.2651.15.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-126.0.2592.56.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-127.0.2651.15.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-126.0.2592.61.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-127.0.2651.8.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-126.0.2592.61.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-127.0.2651.8.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index b82d2111125a..fc639153c11e 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_127.0.2620.3-1_amd64.deb 168519466 BLAKE2B b6e7a80d4dd176704054d82823323ee4af6d5858dbbb11516e9919b980fecbc2c744292e80c31cb435c05889d073cc21d3595acf2158000b22b4385288fdc772 SHA512 a509b88aa4754c330792c430ce36cd504882b82776664eca228286c457d00c116b96bb290ae9ab39b4c114ce3380b9394c33b1c8ebc24cd44d5c26b563b73906
-DIST microsoft-edge-dev_127.0.2638.2-1_amd64.deb 168656286 BLAKE2B 242a4ec43d7c7b2f666190a52e28651caddb4f839d97b6fad29844cc0fde26f0bb520e06ef5aad573b5d2b5345e422bb9f7a70a83eeb9df5c4ef8a285fe663f4 SHA512 0cf7293b42db643afb340e2e437bd9a62ddb3501d3140f9d7716f938d69b4dd9e112e1aa002dcbdfdf1fd0b84e045aab95f200c6523856beed29b7bfc3e76b80
 DIST microsoft-edge-dev_127.0.2651.2-1_amd64.deb 166275802 BLAKE2B a1642320646c17148e0355a43983128de51c934cca26fe2c20fd852f726c0fe4bd93fda399800e26a86039dbb48288a0451ecc9fe106c19b4dde33391cb48840 SHA512 e17477338e695c2cf91603d62375b22356d68c00c1c07b0dce7dd90c202e53d6b8e94980183b44526117ceed4c0673d2e3d74006ec4828395dd6ea1c1c7a00d9
-EBUILD microsoft-edge-dev-127.0.2620.3.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
-EBUILD microsoft-edge-dev-127.0.2638.2.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
+DIST microsoft-edge-dev_127.0.2651.8-1_amd64.deb 166223282 BLAKE2B a45295f0a41c739eab3ff926a1f7250ec4285c423243018005f9ba3f2f720a90ad37d7278ba422664caff89c150498f9238afce8560e6c080e5315993e534188 SHA512 d333c6b9ee120c106757e8ca1bbd03ede0342900d517add720a57c21ecb07c7d0010ac4aed1ea8a00fa08412d1a76bc8f15a79516b5de100ba421018fb924b58
+DIST microsoft-edge-dev_128.0.2661.0-1_amd64.deb 166470038 BLAKE2B 2e0ba0688d6bb0759f5bd3311dadab16fe659a7f50c1b9786fe75f9f8304617fe5e3c6baf7526fbab6724866131729effbf6577513201f503bdeae7a504d544c SHA512 c88bf304dc552f68f49a07b3f8bbad28b96b593e18d161884c7898f67768361e01c653f3681512fb27fe0c8949f5211ed4fd70ce14c12c896452441be2ccc2d3
 EBUILD microsoft-edge-dev-127.0.2651.2.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
+EBUILD microsoft-edge-dev-127.0.2651.8.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
+EBUILD microsoft-edge-dev-128.0.2661.0.ebuild 2712 BLAKE2B e4c40954c5106692f7b454e32c79e47cdc99c09b2e1aa02a263951adcafb56ef2179235210e2c1c4a24b7571338c9329d46bf7c5fa8430284be2e1d2eb447148 SHA512 1d1a784a1b19db517d78db66fd8457b5dbfe803f852cf82d7137bd18f624618e91016f38f571e0d848542a17788d01685228863fb005cc8de4bbb96381e3044b
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-127.0.2620.3.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-127.0.2651.8.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-127.0.2620.3.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-127.0.2651.8.ebuild
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-127.0.2638.2.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-128.0.2661.0.ebuild
index 0ff710cc5ddc..0ff710cc5ddc 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-127.0.2638.2.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-128.0.2661.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 0229348c1bf3..da450fe892d6 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,3 +1,3 @@
-DIST opera-stable_111.0.5168.25_amd64.deb 110244468 BLAKE2B c6685634269272d6803c2232bddaf47a8c1d9ac3dd5131d432b0784bb38fae5c674d5543c8419bd5427ee2d58ce94a2c8106810e96476fbbb8dd0439e60edea3 SHA512 d7799f35d284d7a08abc4b6b02d83ce852916a9dc38fd6af6f600850fb7f27b9869d5e0e555c7a4d7ce252f7435596c96d25a7b47aa086e9aee23ea067152adf
-EBUILD opera-111.0.5168.25.ebuild 4222 BLAKE2B 1091bc144473a96cbc91da218fbf249d640c7dd37ff38a7796043c1cd20a670bc1342221af7d80369b0f0f7c2a65815547cc117f49436392f5490c76d98df9dc SHA512 ecf572caaf6133d3824f38555c1d9c1ac4045f23400bdf81f824735714e9e8d454ff81e6657f3e9654e4a61bd3e3e83458f3dee0f33f0bc7fa8ddbe4ac2e21bf
+DIST opera-stable_111.0.5168.43_amd64.deb 110234408 BLAKE2B 751b98f71b18c81824c3ed0dedf6dd0f5c36c6c6ca7ff1f1682bdf2ba2a76ca24c88229fabceaff337bdf9c70fd0e0ce473ada7ee0caaa47f5985175868a4a42 SHA512 819eff9c2ae927f03f713ff749b5a4f8457ad3db6bc8e09c21fb2533fcbd4aba175cab7f724696b286bc6d010221637139b17cc41709de77e747973ede5e1661
+EBUILD opera-111.0.5168.43.ebuild 4222 BLAKE2B 1091bc144473a96cbc91da218fbf249d640c7dd37ff38a7796043c1cd20a670bc1342221af7d80369b0f0f7c2a65815547cc117f49436392f5490c76d98df9dc SHA512 ecf572caaf6133d3824f38555c1d9c1ac4045f23400bdf81f824735714e9e8d454ff81e6657f3e9654e4a61bd3e3e83458f3dee0f33f0bc7fa8ddbe4ac2e21bf
 MISC metadata.xml 544 BLAKE2B 94b2f6807c021794769fc62b041c69bd08a0d307c51db96109bd45a1fff240d586c51daa91e894055e47291505750f07e9054b6b1b364a691c18f5711acbe9b4 SHA512 691c7b62fa7c8a46e4cc981a2f211a1609b1c57620aca668b001eeaa2cbcd2f38299680c4707a73a8f32ee19b054cd131a2b09600bac30b8530af35142694ff7
diff --git a/www-client/opera/opera-111.0.5168.25.ebuild b/www-client/opera/opera-111.0.5168.43.ebuild
index 0de1bebfcf29..0de1bebfcf29 100644
--- a/www-client/opera/opera-111.0.5168.25.ebuild
+++ b/www-client/opera/opera-111.0.5168.43.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 2a76a392e7c4..c4afec570e98 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index bb3c47636504..2443fff7f1a2 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
 DIST google-chrome-beta_127.0.6533.17-1_amd64.deb 109140664 BLAKE2B c521b25830a91fc156598b5b3ea9d1f26866917788c54a90674cde5494aa78880bfe3bcbefffa380440b22bdef041cf79f306f0305b7d65b7b00c668bd8f839c SHA512 ff1501bec2be4145e07ea696db0dec7f2c9d541c2decdafb3ff81ff6337147ad05c5d0c7e3f7626b860392fd331109435a0a809a25f46084748ae96cfebd3909
-DIST google-chrome-stable_126.0.6478.114-1_amd64.deb 108805872 BLAKE2B 456742a69f8fefba9a7bc55ec80a803f4450581967c43d7934ac30d94e0bba618273375d389bd495bb8ecf00d5f56d48007d8102356b0f7917238867b568f8c9 SHA512 e92ce15324969327f906195382993bafe73a7225c549b09b400afaae7953c5ccb31d3364a269f9e8050971621858bd9da9fde655dd36b8ad7d8ec116d245f37a
-DIST google-chrome-unstable_128.0.6535.2-1_amd64.deb 109248816 BLAKE2B c270ea7c8bee8112e4839e9a0bbfcee5dfc707c50a78d74e27104c1c2ffb3e339282f01eaec98264f06518a9b115e5ff15774490fbdc6557c2a1d56d0eb95d39 SHA512 a8cd325ffe48a46ae676a773b49b728c409fa6d31cb4029e090826b137d0e201a3325888e3b54a9b7a0f59f6590c9b9ce8abc7651477902b56dd3fd0dbcd7d2a
-EBUILD chrome-binary-plugins-126.0.6478.114.ebuild 1176 BLAKE2B e70956e4da5ba037adad441508cb54dca89e18425df805ccb84ccc47fb8aa4ae6540305481607711220658c4a16aff8df58233a1e1fb2eefaff66b443b87b7c7 SHA512 efb6d8caa86d8c52ee9a8d4dc1c9b9755b5f04efbbc2d4812793cdc9af6999a151b33840996d487a50422e9f6a8619e5a61d06523e2041653f659970b315887c
+DIST google-chrome-stable_126.0.6478.126-1_amd64.deb 108773084 BLAKE2B 4e59333e6073b2b7320b50551a6241fc402509398a404742e63ccde60dce3a9c8d5a490a0b9fb4a9a409562ee4ea078ac1a6d441b0ead94bd40792b16afa48f9 SHA512 cae09818d2032253e1d9a8e58dfde53d56bb4fd63de0b7ad89bc6558da66103220057dce331ae519fa79e7ec140f116bc8d3e10200eb9845bb278aeaf3cf5d95
+DIST google-chrome-unstable_128.0.6555.2-1_amd64.deb 109871140 BLAKE2B 2bc6db0a021f8161ecdde53365b5bbe203eebd40e23886866b5e5e60f1dc98b3e1db481b20f97ee64a6cc5256df7fcb3c07d02905372ca927e2990e0b815b507 SHA512 219ba6ce068fb6311c4a423e64c35a96dc7944e63702d460ed9b47499abf62c3ee0218e16fbc93a8d36b735ea0242e2e32f43f07bac32480ddb14a25b37ab45e
+EBUILD chrome-binary-plugins-126.0.6478.126.ebuild 1176 BLAKE2B e70956e4da5ba037adad441508cb54dca89e18425df805ccb84ccc47fb8aa4ae6540305481607711220658c4a16aff8df58233a1e1fb2eefaff66b443b87b7c7 SHA512 efb6d8caa86d8c52ee9a8d4dc1c9b9755b5f04efbbc2d4812793cdc9af6999a151b33840996d487a50422e9f6a8619e5a61d06523e2041653f659970b315887c
 EBUILD chrome-binary-plugins-127.0.6533.17_beta.ebuild 1177 BLAKE2B ff98afe435096c3c48545decc8299355d91dda1d1d3058529157b529b541d5e3cbeb18626ec6624ae4476a06c2867326a1849a1b71e5b5d37873b503f586db35 SHA512 1ae067b2582cb3995a9f362a88b1ab88d787d296486e99a9568d425b438af1556baa5b90317b278e5379501c7170d9de1408ead365529d6875fed441e2a11662
-EBUILD chrome-binary-plugins-128.0.6535.2_alpha.ebuild 1177 BLAKE2B ff98afe435096c3c48545decc8299355d91dda1d1d3058529157b529b541d5e3cbeb18626ec6624ae4476a06c2867326a1849a1b71e5b5d37873b503f586db35 SHA512 1ae067b2582cb3995a9f362a88b1ab88d787d296486e99a9568d425b438af1556baa5b90317b278e5379501c7170d9de1408ead365529d6875fed441e2a11662
+EBUILD chrome-binary-plugins-128.0.6555.2_alpha.ebuild 1177 BLAKE2B ff98afe435096c3c48545decc8299355d91dda1d1d3058529157b529b541d5e3cbeb18626ec6624ae4476a06c2867326a1849a1b71e5b5d37873b503f586db35 SHA512 1ae067b2582cb3995a9f362a88b1ab88d787d296486e99a9568d425b438af1556baa5b90317b278e5379501c7170d9de1408ead365529d6875fed441e2a11662
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-126.0.6478.114.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-126.0.6478.126.ebuild
index 01e48ea7c665..01e48ea7c665 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-126.0.6478.114.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-126.0.6478.126.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-128.0.6535.2_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-128.0.6555.2_alpha.ebuild
index 3dabec912ba2..3dabec912ba2 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-128.0.6535.2_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-128.0.6555.2_alpha.ebuild
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index b4a47dbe8873..e682072004fb 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 13235e6d1d32..a78a2127f2e9 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -2,6 +2,7 @@ AUX 95-nvidia-settings-r1 54 BLAKE2B 598067babb48bd0f5680300cf3cbb37ac804edb3131
 AUX nvidia-390.conf 797 BLAKE2B 7cb7dc58841d2e7cf28f677939031a20ff820e2d46f799177c6004d94e73c308d2a9ee81fca476ff7ab4846a275cce996f68a53a7a9f819c3d57b5dace1d40e2 SHA512 17cabfcaa4b7323c635d1491e46710624d13396c019591499993662a20df39c8e3fa843387594aeb66d70cf38ab9fde7bee85dd1ab37eaa637a315fd52328222
 AUX nvidia-470.conf 1219 BLAKE2B 334975e048d2cafbbf5fc9d0a74ce9cea4af82103be4d02539d91bb3da4fb39fbb24f64dd6240a526259306c5b971323c00104e2254893fd433f3ef56c9ba8f2 SHA512 6e218dd8da6cfd2d13a259a461348221b65d8475e018c0a6ef5856fd177748306569751545171237c84ccbe3ac526231184bcbe286507f18b32a3518c40bdcb7
 AUX nvidia-545.conf 1525 BLAKE2B d5b0cdae95a16c5f921a231c8411126dc77be49c75ca15dea8376b40884ce5ed36b156aa3cb9f4492bb2c00339e9c23482138859f107baf953b5d57431ab93f7 SHA512 01578e8199ff0c81f5f8ef5defe3b0098d1c1ca0209c8dae59412677be7f70bb99c766512cff62f170b93f1b449c4918be313326697f410c426fe4d9d24a6762
+AUX nvidia-555.conf 1831 BLAKE2B 80542b7ac03049a61f8927bf1dd71f20f7dcf03ec2eed50fa1fe31b8643de47c642d3df67e3d3c434d8815f723607d74c3b57a2f2d6f64ea4bf4f776618ab54f SHA512 368fe18ff7cefa766ec6d68cd2564b2a946c9ac655dec86f806a7c5314c0987675574d1b32813b0dc07040ed823338919344f30c9445005b5f0016538837e627
 AUX nvidia-drivers-390.154-clang15-x86.patch 1085 BLAKE2B 5bb221407b280f2dde69ef2b37317606bec1c108dbc56653898cfa9318de6e47df21e5b38943212caf13bc6412f2427fad7c534491d868d03399091e2146daaa SHA512 1349c1c715b2f09e64a5e91412aceabc80041d070a6bbacfdf7038872f1f4a798bbc63277d47a25d1a5b28b573b3d5bd6295dadbbdbf245f5cfb0241879a3bc4
 AUX nvidia-drivers-390.154-clang15.patch 2915 BLAKE2B e9799aee3c6b814ecdc40e83d2e495acad046f18c88fe8c1b5fead1c9cd0fab3d0a0a2924730dadec5eb8ea1e2d2132c495298d6ab108c015721bab911a4da79 SHA512 6e1c99ae8efb06aa4fc3accb4cee55f43a6498f94fca064fd4b9b007a3555913a5cef042d4e74b6f24a3eb6f14988f810d0c848d34ae81835fbae8ec32cf0cf0
 AUX nvidia-drivers-470.141.03-clang15.patch 3757 BLAKE2B 9cec15b57c82c8e24f89a025a73bf78e3d7ea5df681cf803888ca4ad8b96976b433717d01c9fdad5036cb06376345bef64dd05287791ed0ce7dc2a06c8a79aab SHA512 10ed0fa6b1fdf24fbc18432a9b94b1c1b9d7d6003926272d3c924d72a298c1d3a8875b43a42472d701864fe9dda35d75f9cf7c51ca841d20b989ed46ed994311
@@ -98,5 +99,5 @@ EBUILD nvidia-drivers-535.183.01.ebuild 17499 BLAKE2B e06cd90559e3af3ec6f6f38904
 EBUILD nvidia-drivers-550.40.63.ebuild 16637 BLAKE2B c2abf908a46b278823df2bc7e9d9360d7206503741662708bb6dddf83f91d7ece0efaad6b3aa806c5a15553e3ecf32a8b79d3f38539518e18d5b2abccd68fa27 SHA512 1501b2eead71186bade11d6efd8888b47944d4b77c437304efcb87ece9a8c433569bb0d8873029a44b6c8dabebf76cdbc474317183f69a67cf99fdcb73691d8a
 EBUILD nvidia-drivers-550.78.ebuild 16588 BLAKE2B 6cebe5de291b90b518e590bf29a7dded93cd57767d41c47899aec0f70251f7013c86e3b3291f3849bab943cac1e285454de6b1ef36e7d3bba91460aa16be3fa3 SHA512 515acafda6faadc2d1cddb891e00f50f9fa369389f672ebca8b256c4093ce0aa11d777aeb21f33a74acebd119f9aacf61cc7e9db4ebfb7a03ebcfe179ad37219
 EBUILD nvidia-drivers-550.90.07.ebuild 16588 BLAKE2B 6cebe5de291b90b518e590bf29a7dded93cd57767d41c47899aec0f70251f7013c86e3b3291f3849bab943cac1e285454de6b1ef36e7d3bba91460aa16be3fa3 SHA512 515acafda6faadc2d1cddb891e00f50f9fa369389f672ebca8b256c4093ce0aa11d777aeb21f33a74acebd119f9aacf61cc7e9db4ebfb7a03ebcfe179ad37219
-EBUILD nvidia-drivers-555.52.04.ebuild 16682 BLAKE2B 16a8cac4fb6d9e95cdf6088e7feb35015bebe14d4a553b37f9511c2b5865b3577e8019d30a5c0ab98fa54df9792e5d574934f92b66da8e0bf3985b1a79dafc24 SHA512 298a8bc2ef966392351019197ce01da49fbc9042784f976210f87a92a2f8039cb2ac51f143d8c6b10486948758cb197c6330ed71ec16b0cd3f79b551d3c7714d
+EBUILD nvidia-drivers-555.52.04.ebuild 17058 BLAKE2B 44e68dd3d71e0a1059bbc4e377e4e343a016fe8ec41f619a704f62ea443665825332b54c938f74c2e9e6be4f0347b75ad35a355dce04876325df49a2c23dcba2 SHA512 42025ab4dfe960d0139535304f81a80ceb95939fd9004cd8092db3a22448c93d00c923c2839ce19bf1821ce73770f17fd7d50a6ee4c7979e18ff402df1ebaab2
 MISC metadata.xml 1397 BLAKE2B b39a2ca7389d6086a5344ee5afe276387bbb784ad52504a3d1e36ab387e18174b8d1eabf6c97a94815ce24ef4daf31e64664da387b3148b455de1074131d783f SHA512 b6389b117ac27de432477d0ed0c9e29deb41a3f4d115266d547d4e2babe531251eedfc0a65e4bbf0089242b562c79ac9d1b3fafd72e571584ceb6fd2f8f28192
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-555.conf b/x11-drivers/nvidia-drivers/files/nvidia-555.conf
new file mode 100644
index 000000000000..e0c1b09808f8
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-555.conf
@@ -0,0 +1,43 @@
+# NVIDIA drivers options
+# See /usr/share/doc/nvidia-drivers-*/README.txt* for more information.
+
+# nvidia-drivers and nouveau cannot be used at same time.
+# Comment out the following line if you wish to allow nouveau.
+blacklist nouveau
+
+# Kernel Mode Setting (notably needed for fbdev and wayland).
+# Enabling may possibly cause issues with SLI and Reverse PRIME.
+#options nvidia-drm modeset=1
+
+# Enable experimental framebuffer console support (^ requires modeset=1).
+# Replaces efifb or similar once loaded. Note that unloading nvidia modules
+# to, e.g. load a new version, would result in losing console display
+# (emphasis on being experimental, mode switch could cause issues with X).
+#options nvidia-drm fbdev=1
+
+# Disable use of the GSP firmware which has newly been enabled by default
+# for GPUs that support it (Turing/Ampere+ GPUs, aka GTX 1650+). Not
+# recommended unless experience regressions for which disabling helps.
+# Cannot be disabled if using USE="kernel-open".
+#options nvidia NVreg_EnableGpuFirmware=0
+
+# Suspend options. Allocations=0 recommended over =1 unless enable nvidia's
+# systemd sleep services (nvidia-hibernate, nvidia-resume, nvidia-suspend).
+options nvidia \
+	NVreg_PreserveVideoMemoryAllocations=0 \
+	NVreg_TemporaryFilePath=/var/tmp
+
+# !!! Security Warning !!!
+# Do not change the DeviceFile options unless you know what you are doing.
+# Only add trusted users to the 'video' group, these users may be able to
+# crash, compromise, or irreparably damage the machine.
+options nvidia \
+	NVreg_DeviceFileGID=@VIDEOGID@ \
+	NVreg_DeviceFileMode=432 \
+	NVreg_DeviceFileUID=0 \
+	NVreg_ModifyDeviceFiles=1
+
+# Should be no need to touch anything below.
+alias char-major-195 nvidia
+alias /dev/nvidiactl char-major-195
+remove nvidia modprobe -r --ignore-remove nvidia-drm nvidia-modeset nvidia-uvm nvidia
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-555.52.04.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-555.52.04.ebuild
index bd5205a9ad26..3d3eb15c1661 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-555.52.04.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-555.52.04.ebuild
@@ -146,7 +146,7 @@ src_prepare() {
 	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
 
 	# enable nvidia-drm.modeset=1 by default with USE=wayland
-	cp "${FILESDIR}"/nvidia-545.conf "${T}"/nvidia.conf || die
+	cp "${FILESDIR}"/nvidia-555.conf "${T}"/nvidia.conf || die
 	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
 
 	# makefile attempts to install wayland library even if not built
@@ -499,4 +499,13 @@ pkg_postinst() {
 		elog "If you experience issues, either disable wayland or edit nvidia.conf."
 		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
 	fi
+
+	if use !kernel-open && [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 555
+	then
+		elog
+		elog "If using a Turing/Ampere+ GPU (aka GTX 1650+), note that >=nvidia-drivers-555"
+		elog "enables the use of the GSP firmware by default. *If* experience regressions,"
+		elog "please see '${EROOT}/etc/modprobe.d/nvidia.conf' to optionally disable."
+	fi
 }
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 7a2786980ab8..639fd28e0fe5 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index 079140799653..345db05dab33 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-clipman-plugin-1.6.6.tar.bz2 487832 BLAKE2B 4d27c06c71c978680a2785db67262196293f1692fd82ba9cfdc2810b021dc83d8778243801e0766741e8f194a5aaa0573d5548443f6c3bfc9f7b970d7f102446 SHA512 4f6bb8f56111903af576d06ce5883e8ada2cb3ea377e09a79d2c5fb6f37743dac621649465a573a8a29a1fb884e7608a53dd6486eada23c7f8ee6401237988af
-EBUILD xfce4-clipman-plugin-1.6.6.ebuild 1392 BLAKE2B 8901c23cbe000cafff2a6a1539df977b73cb11a3a754c0eb4408e285f90180ca912bbce27943ebf6f136faab39f8a8baf5082595601b282d85b6e737f6cc9ffa SHA512 69df8a6d0d66b660c26f0ac270d63df45a0c9d8d61f7a097109ea72d9413cec027ee43a2440e138e1f321d9d0d6f5898ac47a55c9f278ee0184573071f6bc3e4
+EBUILD xfce4-clipman-plugin-1.6.6.ebuild 1424 BLAKE2B a2318734fd6be09df138a6ae327d313b02098a11555dd695e0ea59d4eaefdfdd891d1835004c8980d008bd0510964d8f39b5ce4e45d5551d1419ac20105e4495 SHA512 2243bef88866c2d5d8934c7e23c000bb102149b7dc4705ed6a12c5790cfad809d8faf5bf6cb6b2eccaa3ed6d40795fce9b99abee7e70a34d39292cebe36f5958
 MISC metadata.xml 345 BLAKE2B 2a84642f72b32862062e911bc3d9495d77cde305206e3ba0d0bc82c792450506696d02e45b59d5035278bf53061016c72de278586e7669d53899c4d3c86585fe SHA512 0dbb04321b8dedc5bdfd3e7714cdbb3021ec1c866fcc61613081282c32316af6598e1516b629c6c6560a509abb0e6f378c0089dca1425b6c82ab796d5875a693
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.6.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.6.ebuild
index c63df7601ee1..47267542d0e1 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.6.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.6.ebuild
@@ -18,6 +18,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="X qrcode wayland"
+REQUIRED_USE="|| ( X wayland )"
 
 DEPEND="
 	>=dev-libs/glib-2.60.0