gentoo auto-resync : 18:10:2023 - 10:02:48

972 files changed, 5002 insertions, 922 deletions

diff --git a/Manifest b/Manifest
index 1cdb403bd6b0..535d88957c84 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29320 BLAKE2B 89146870f66e977407c7093e1f8fe9a13a1411346deface0a6cd0a0060a674c0fd11ab3fc2e11a8beb6adcc8f4f475b8139e6f633731e8f2745e0f29bd055113 SHA512 d9cca22ec59117ba7bff94d552392bdd7c7b9e04c4af3d15a4f89ccbea710974d31ae713851007406e88826461d90669eef6beb0af2da0089db855f5bae8f804
-TIMESTAMP 2023-10-18T02:40:01Z
+MANIFEST Manifest.files.gz 29326 BLAKE2B 72005bed2e8569370cb173e81084c2c51e98d4011fd5ea4f9d8a3aab7cb294530ee0f453e804a4d028f01ad8d81f97b8bed8746156c97ead22f540a1e0964f83 SHA512 d40cc75e90a959295710c24dd95dc323cbd1aa3d8951926f855968de7f1998051fc2f001d8ebaa91fc15c7cb8459dff00e9631aa06d7af5a5e9e6567d3b6942c
+TIMESTAMP 2023-10-18T08:40:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUvRYFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUvmeRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCqpBAAt1WwUi9U3QddDzpX8MMzfRW2iNbc901QQ/wAy/IDWGMiTGzHBRBExxo4
-xBkHfpQA1rivz7k1tcTrlzh3SK/MOavsq2D1qOeyqWrmZ5+Xr3Opzqe2yFCHEKq/
-kIskaoUszpjfSgfiT98fU675EWNBdKVsmWOzppQ/sNXi2kgwM3ODKeMqfGSgTsxd
-UvU52y2yvo2/lsQ7YPZlW4bGmgveuajns8SGEZePprNgtYpJ5hfoV6TKTDIAojLh
-umFWorIBTPQbMYhfC/u+b27DnAKXWzaDoQrRPKWtqthi+GfgnQSl8QUAXkRtet+t
-yLuDze+ZH0zO2luAqdSeQHcFJpc39lqycQRTLiNVCJFvgMhkueXZioiEn/ih0gHE
-rY+A8eWItsOTJ3at7KSuDY8aQmVY/n+DDGd+b+ulSwmHhzaJSGrmmzCAeV/YeWNb
-6ttTCai50oLq44pP1Yk0MCz3muKwaXi717WzdGXNLds72E2rGYeNwswkexYoZB0F
-rpc/U/Wx8tyD541qDNn+8IHXgGUUF3EvGfBlm3Qa2DXx4xtzV2uynBp1ZSGpxRQu
-JUoOfE+UfRYMeWO32dd9CfvyOJVzjv2dHFysAFiBlPOCCoj5USIjtS1dYhkewUoW
-qNQ8dOpd6mSgVsuVTp3eVp0lDankm8V+MqaIcbD+RrHDHP93GvQ=
-=Ku1y
+klCp8g/+IJpXXCVgpAyNbthz7vDfETi5RDSHTFZM+PyD7mBXYNIl628evJjljQG4
+bBhzVklcMx2XtiXBTol5V74fQ+kMYRo3917GgRroEanOB2aEWnMlw9vJEoODrWN6
+adXzkcqneQBfHNjcNali0K6fj/0+nL3u9tl4JuU33QC8rCNy/iCi/wQ0DUHw9pcO
+ELFqqJefWiyeELygpz8q1uSd+CEgh1pBeZjn0Qf2g7JxGY4ZbRbD/CZpd2v1+gQS
+bCp3ZcaMyYAgPqfpPQUW53TeLPiah/R6tL+cwTNVGtotn+keFLa8H/9fqi+VUPHP
+oN/fCRQZ2IEMVI7qu+majvekstDNp6P6Zv3yDfFBXpMHBG/UcHQZdE7NmAfEXcRG
+p7zHAqpK9kYxn8e/+CJEeGiV/ByhneDXDg/hj0OX0zYniB+TPmCk/AVoNIAI8bYk
+T9HWssb2ETaUjZVI74epZKILsrGh9TRLTwuiB7X0P4NpxD/FXg3OxJa2ehwL7wvc
+4K/N70O2PHSm0IjCd1QYLG8RgKDckIXAKVq3g71eEjZtMCWNH80GTWu8bIJcGMSs
+DIMHoH9eBbe59+NmYV6bYMRMWIZcEL464O69lgZIKEGONpQ+h1IkHq+X7hD6OMAJ
+QKc7C9oKHp9hP/LtqgVyxf6MQkvu4n055BHCV4u5ijD6FTmNGk8=
+=kGBf
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f3569f273396..78533a701b5c 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 07c829923be0..c27bd7edfdf9 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 668442f7eaa9..075153a5247f 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.29.61.gh.tar.gz 2559946 BLAKE2B cab7954d50a235051a11978f1ee4316a0
 DIST aws-cli-1.29.62.gh.tar.gz 2560151 BLAKE2B 0aa6dba4dcee72e0d3cbddb62ebcd9405682facfee4ad1348a53a5c09811a7583d7177814265158de0306518b62ae66eade301311c72cd7ddc380201d16ff30f SHA512 cda4bcc0ac535eb007b44e517d22b17cda6518d6db25162cdd0f7b506de449c72add8221d17c6cd145e0029f17c0e183928061e04b7b27274a58d157142ead7c
 DIST aws-cli-1.29.63.gh.tar.gz 2561207 BLAKE2B 83d1bf59c565ae5035eea0bfff91b2ac41e09cd250916db3bdb52b3cd336c869ca023acddf31418ca4ae81162d6cafb1cb915372d17988a4e616c018fceeb47b SHA512 2f6a699a8e1b3526adc49e88079cf19c7ddb18c6a3653ddb622ef5bc2d00dcbd4b490324e3d30f0911a236d692970072f999216876108fa6967450bc42cb1072
 DIST aws-cli-1.29.64.gh.tar.gz 2561807 BLAKE2B a4423549d6bd5789ebbd027febc411a7ab5be46bbcf1b407dc40fa95005c00bf413205c47099bb17e1f26f9d693a1af34479cbf29881dfa1544c42cc5193c0d6 SHA512 1238881d78483f7e5bd06c4653471406f7c5da8904bf5ef1a9fa3c4f8b44138313289ea626e411b2827b89a779bd1990a99a43b909b59ba022f95e38b3a025ff
+DIST aws-cli-1.29.65.gh.tar.gz 2562601 BLAKE2B 4c88ae2dcd37685f6908e027dc960d14e08f268f4f0784763b2e371f598d848c055847e27540c14d1ac745e4d87ce894e1e5a375c46ea522c384cb377146816a SHA512 b2bbcb989602be9b4f513cf8c0feddd2c680d005568d0f82a82206ebf13f2235fd0650d85502738bd0f2410e5a006d14fafa1873b7d9ba453843e8f055985a51
 EBUILD awscli-1.29.53.ebuild 2804 BLAKE2B f5472cbd2dedb555c4968eff148a3e63d0395304b3d02dbc59b56bb593b7fccd64022b69a94c5e4bc5e2b0965fdc75f32beb5151ef379f98ef65d94e109fd340 SHA512 1d1359b9f28290a17fc18b2b36ded73b09edf0f80c1a6757b4f87c7b7229700decf2adf660747303820fb4ef3978ed9ca9e34427bd67ceed6312c3c0ec07ef75
 EBUILD awscli-1.29.57.ebuild 2861 BLAKE2B 3ac893eb2acd11e495d7e47587d00a5202694121686bf8de22d12257e67732d40639e9eae491eb26decf1ed575f2fe4be2e9d9fae03985ef21aca2921fb8a4d6 SHA512 ce0a4719a8fefb6944f1cfa0e7f60791e3ff8518eb8c770942ec11d931f0e5da3ca39ae27b264ece301a422dc19b6fa7f97b914c91f4d5a767b5672ae11bfbbb
 EBUILD awscli-1.29.61.ebuild 2861 BLAKE2B b402d0b73740cce2ba9d44bc9b43de521795ce199aff4c95ce7935a76cbef1f6d4abd7dff8bda03f30b6b6f4dfb5c3e61522effcdd50b9fd96ab8bd430f7f5b7 SHA512 1be69189388b8d4627dc996829adb365ed0724f60ef9424d54b849857ae6649ab265c0d04d8ac6ff56f60fca5937f6b42c8c65b6effb07874f96b85585cad9f6
 EBUILD awscli-1.29.62.ebuild 2861 BLAKE2B b402d0b73740cce2ba9d44bc9b43de521795ce199aff4c95ce7935a76cbef1f6d4abd7dff8bda03f30b6b6f4dfb5c3e61522effcdd50b9fd96ab8bd430f7f5b7 SHA512 1be69189388b8d4627dc996829adb365ed0724f60ef9424d54b849857ae6649ab265c0d04d8ac6ff56f60fca5937f6b42c8c65b6effb07874f96b85585cad9f6
 EBUILD awscli-1.29.63.ebuild 2861 BLAKE2B b402d0b73740cce2ba9d44bc9b43de521795ce199aff4c95ce7935a76cbef1f6d4abd7dff8bda03f30b6b6f4dfb5c3e61522effcdd50b9fd96ab8bd430f7f5b7 SHA512 1be69189388b8d4627dc996829adb365ed0724f60ef9424d54b849857ae6649ab265c0d04d8ac6ff56f60fca5937f6b42c8c65b6effb07874f96b85585cad9f6
 EBUILD awscli-1.29.64.ebuild 2861 BLAKE2B b402d0b73740cce2ba9d44bc9b43de521795ce199aff4c95ce7935a76cbef1f6d4abd7dff8bda03f30b6b6f4dfb5c3e61522effcdd50b9fd96ab8bd430f7f5b7 SHA512 1be69189388b8d4627dc996829adb365ed0724f60ef9424d54b849857ae6649ab265c0d04d8ac6ff56f60fca5937f6b42c8c65b6effb07874f96b85585cad9f6
+EBUILD awscli-1.29.65.ebuild 2861 BLAKE2B b402d0b73740cce2ba9d44bc9b43de521795ce199aff4c95ce7935a76cbef1f6d4abd7dff8bda03f30b6b6f4dfb5c3e61522effcdd50b9fd96ab8bd430f7f5b7 SHA512 1be69189388b8d4627dc996829adb365ed0724f60ef9424d54b849857ae6649ab265c0d04d8ac6ff56f60fca5937f6b42c8c65b6effb07874f96b85585cad9f6
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.29.65.ebuild b/app-admin/awscli/awscli-1.29.65.ebuild
new file mode 100644
index 000000000000..941051349113
--- /dev/null
+++ b/app-admin/awscli/awscli-1.29.65.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken xdist (signal() works only in main thread)
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_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/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
+		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignore
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
+}
+
+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-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 3b47025b2ffe..49c5695ffe33 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 4fc0a089b6de..42b8c8e4bc9f 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,5 +1,9 @@
 DIST VBoxGuestAdditions_6.1.46.iso 64032768 BLAKE2B cc0181861802822e3887cd821edc687db081993e01e24ac0139ffd29b76aaabf3be20c9394e0ee02748359a7127ed5522418c2c5523ba77c3a8c483aad596c00 SHA512 e31e9cad72132d0f683b8135b5e91bcd42e6cb532fc9e0e9a463347c29053799f51b9d0730a9de4096557010c6ca341715e72515811b87d0df41343510cad55e
+DIST VBoxGuestAdditions_6.1.48.iso 63969280 BLAKE2B 7bba272d427a6a91cd4d63c5d494e50d9984badac47c75f5323b1b2ad25a4fbf7cf28a1eba30988288d6e308b8d62ab5043c445a651b8b767667a267d5dee1e9 SHA512 19b98be42d7c0148ada0342fbbe6e1803fa127aca14662b560624d2c582656af68b01152a9c8b14d238c493d171694e088091b924598cebbf1f8d2c7a949d0c3
 DIST VBoxGuestAdditions_7.0.10.iso 53497856 BLAKE2B 8577cd44c4564f205e65d955f3cca33084215c4e2b777d944cb14240a47b6a6196cd9e40acbfbec9e915bda55f676627c1819ca2c881f8d0945c334df4e1d242 SHA512 5148823cc3bfd5145bff4ecfb6e0f3f068e0e3a9f1021161122b89dd01197e64345a73efdda6259134a35cbb0b6cd8361f235c2c996ef6a4dbf03d452b3ae9db
+DIST VBoxGuestAdditions_7.0.12.iso 53448704 BLAKE2B 1b738c648c902c1a98d83dc9525c7e091cd2234aa67f464a4beb3d6bd9bbb6893fe02eee4a37a05eae8e880efc6c834931a7ec7f08ae7b1615b1a622117767a2 SHA512 7f5db8f73bc2c89ad798fd2ec3543c460aa3fd3e44f02c04c334539172699af08c16312d96b6fdd5c561bc3d8133fc7a3662e51a86f82980d692f050286e0e7e
 EBUILD virtualbox-additions-6.1.46.ebuild 567 BLAKE2B dc91227571c02c0556289d93bf3d862c6a06493cbeb92938c56f1ba5b47541f99726aa626b383c23d477d915c2d99e01b8014c3d0f807b22929aad8116886dfe SHA512 950099b0c5918477d47e74deeb4c1501e2f110b3cbbd9c132b71e1ea792bd59197d0d23f1dc0d93b87d98998210f77fcefeab620136e17fcfe2d8dd545acb0b4
+EBUILD virtualbox-additions-6.1.48.ebuild 568 BLAKE2B 82842151addd12a10f80e32a830bebb7c10da2f60314a75f0354c7770454356d767e41b82f013faf394c9a45764536b5d7a6fdd579b8948407b68f5ed989be4b SHA512 95693f347aa1d098c505c023495f1a9bab0e851918acc050e77daf0e7a5974b5f1df5206a6c3611ee4f5a9f12822e03aecc4b5e82c69b2ebdfd832e5dd66d177
 EBUILD virtualbox-additions-7.0.10.ebuild 555 BLAKE2B 2825d0a87644c02f55a5b0cc1cf70850309ae5e0db3f94dad42f8157a170abb09242bb7336c1a0ec600387141903c4d9fb7fc61c54bddca459931d6c8a9a9dac SHA512 a1c8d1d38d6e27b78019456acdaf3fe47c6863eb03391c1c1670015637d40320d24bc90f9f4d865e7d989a47e6d9b72d9150f716afe4bd2c8ad4c220f174fd3e
+EBUILD virtualbox-additions-7.0.12.ebuild 556 BLAKE2B 3369e6ed0e925e9826072a8cbfd67a39406f8276c6d4f88a1fe0cdd5a2221a99e60e703224ebc15be632096f8cc44bc208224371dcf321ebf07a0086ef2194fe SHA512 b9705f2ae8963aa0576b477d6405be5ced09b23d63f3e29f05e5eb56f1cf2b281d74a66a1e4ece0973102d85e47b8ebc71b4b8d5771f6ce33c22a4a8568b489a
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.48.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.48.ebuild
new file mode 100644
index 000000000000..9729d64d300e
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.48.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=VBoxGuestAdditions
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.12.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.12.ebuild
new file mode 100644
index 000000000000..65d20c161bc1
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.12.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=VBoxGuestAdditions
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+S="${WORKDIR}"
+
+LICENSE="GPL-3 || ( GPL-3 CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 7b81e24e2872..e7c4e682405a 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,5 +1,9 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.46.tar.gz 11175297 BLAKE2B 00c99036cb34579da811f0a2e3e46ac49b5588af3d8effa44132c496375c87c0778dc6650591a7e1bb11d3b3a459f775de94a8a06ae2bd42ce08385250db00d9 SHA512 9efdb746e5ef63872cde3adafb9e5c45c65183f59b7b2c2d3424588909c85ce3574e65c5bf1a2e0471028051e29ec010b4ed1968fcf4637d81d8f8d6547a24c7
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.48.tar.gz 11166368 BLAKE2B 5c1ced1742f44110490aee07e0323d418152b87c5c8c9dfbeffb05cc59fcc94bb88b8e932b59f5bd79e3d85b347525b939df2a60f52d46533bd2d877c1720439 SHA512 71ca826ac886fdb9389a09f6fc1b5b7e99e8bfda1fa64cecefebc60e3cd7c11f678bfe1fb853a7bd0de8ed2ffe00f5f9758a2b00e122bc678b71fa74ad366573
 DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.10.tar.gz 18259331 BLAKE2B 0afcd918243cd52e90278df63a8bb7aa1415a3662ad8bc2d49c19dd9a1cfe3ab9f810d8d66b4be2c1742361e000c547f9cdd88ad215b764a80991e0b7ea44c50 SHA512 fd5dc7577467d54d170c325be27dbb67eee16860e0b876bca1afa023c33a45c356cb77303b0c26fa7ca2057908b9acd7ebc41dbc68a0a9bc3253a797cc9ccb55
+DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.12.tar.gz 18245684 BLAKE2B 6a55307034da5510d47bbf57bf557308be5c0459bbb21d0c79cc769a0f1ebae1e26c3202e23da17cd900b0ca88dbc653d2be0297817b79b61f426c6c5880c43a SHA512 0d311ed94a52d02634050f309886d6c5b627151b7e85a50e81a602c02c9400f01c1dfc21a7f52f33e50c2e27df96213f5b97cb3edc82f784ef171796c3ae6d56
 EBUILD virtualbox-extpack-oracle-6.1.46.ebuild 742 BLAKE2B fa5331bfc4b311de2623b66c5379e1760a90f1b584bf42c8f53eaa7c7b46f51b2156ea4983e032eb70128ceba675f786410a5245157fc61402cb2b64f0948da6 SHA512 e6c936f477c19c6589844df4cb26a193d6b431ffcbc05379ab3b327f5f6a0096b5d48795fa34a675a2fea0929c40d2c7a4742717993fd5d9ab722b56def21266
+EBUILD virtualbox-extpack-oracle-6.1.48.ebuild 743 BLAKE2B 450ec1cc08fb63c291cdfcaba59c1d992746b9ca9c9f5e73f3459c72663cc6a010640116bd17eb94f1585c0b66c599915a86622656b83dd79c3e626fa62f7776 SHA512 5438db55953f6dd51ca8b2a91bf1394a7b9c3ddef1460304153e6531ed11f0d073e93bd269f3f253581b91af811ba77aee60ed5c4fbce6c0ca6758382e69944e
 EBUILD virtualbox-extpack-oracle-7.0.10.ebuild 742 BLAKE2B 9d21636185a31f656ec1ea779b7e5ebf475c39256b94541af1d8d32ecf0b33fc703d461054957441bb9b2e22a403a90fc7555acb06e06a798d4047da66d12ccc SHA512 75928ea546071159bddd68cd585d5821d8ceb179db21b5722cc68b7323181e600825117409e051399b86c2d1b7f471c7246dbbda74dbbc84aef351cf48fa1345
+EBUILD virtualbox-extpack-oracle-7.0.12.ebuild 743 BLAKE2B e69ef2bac32a14cb5deae43c7a3888bbb984567c8ba7172c81cbd6ddd641f6064128f2a0bebd827e5f9cbd46d264a6d9d39413e6a03459cbe9654e3c8daa2823 SHA512 763bff27532b48cb1509d50e74f108dd1fc02719d065fa2f08b919c328be39e249c4ecf15673215ae251073a691d00752b6a9baf1c290d81138bbd4e1e47e26c
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.48.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.48.ebuild
new file mode 100644
index 000000000000..7043fd77ee54
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.48.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="$(ver_cut 1-3)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="PUEL-11"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND=">=app-emulation/virtualbox-${MY_PV}"
+
+QA_PREBUILT="usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.12.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.12.ebuild
new file mode 100644
index 000000000000..18a227280590
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="$(ver_cut 1-3)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="PUEL-11"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="=app-emulation/virtualbox-${MY_PV}*"
+
+QA_PREBUILT="usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index ff27a097e70e..3c79e83bb25a 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -7,10 +7,14 @@ AUX virtualbox-guest-additions-8.initd-r1 547 BLAKE2B 1b26fc26e95baa74d551f8a9cf
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
 DIST VirtualBox-6.1.46.tar.bz2 166045588 BLAKE2B 041fad30d7cbe524cfd5c865b225c00df7715a6648ed0d8f7ee3ca4be0d0dabcb324c676ba2ea78288cde89ed8e5412fae75e31bb49f623de2acddb8f10d6ee1 SHA512 695ca4d41ff10d0581e4cffe4a0ec80e0fe380f4c7d5d51ee4d21aeb61646c26edd60301e541894e71c3323e2d7207e23299938c18ee45631afd1e0851946e77
+DIST VirtualBox-6.1.48.tar.bz2 165960987 BLAKE2B c981e390ae518b829970827f6032fb19a93685fb58835a9d489c6e14cc60a5c14c65b0a3da5adae7818e73e1b0e558e8fa803160cb67847f18565bb78d656e97 SHA512 fff759f3871e4e8962536002f2bc13e5150a927e280493f5cb0abf06466ce66e45f4c6ef43489b5b3ed8682d8a3ac0eb6fb3dd7c4144924c81612553ec71a95f
 DIST VirtualBox-7.0.10.tar.bz2 175450841 BLAKE2B 49eaa14f716f021f1ecec1ad48a2aa8a3a758cbd9b03cf30d65ddcf5aba11842b0ea8bc2c4d477084a4cea318dc302a4ed426ec9f675a1fe675c5f18c48796c7 SHA512 2870d39385f66557281edf1368db68cd69d6a9bebc30d52511929462d0ac210cec49dd8531a280c6facff22ba6e4808477fbf3d09abf998d863a007fc7f2c3bd
+DIST VirtualBox-7.0.12.tar.bz2 175644088 BLAKE2B 507cbf7b1a8a807bd2602e74bc19a59cb177b9b2bdefa1be582e520666360a42510ca501f20c354746a0f1dadf61fe29135e3edc867e611bfe60a9405cb2bbce SHA512 9fe4511442eba788d02f932f5e98cfcc5aa4ebed41c00bd7333cf7e3f5de787e458f1f56930978283f041f403652c803143335fe9120ab63a2c113ca7b3f588f
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf
 EBUILD virtualbox-guest-additions-6.1.46.ebuild 7513 BLAKE2B 03710cc1587aef146cecde50915f7181e7251956605c5f84e069265c9918a583a8ac3d12af5ca9ce88f7e025a55327dddd779c8f8fb94dc12097d45db96ae5a1 SHA512 7ffb5b6e835519b566612a040301b1aae87d5542c65d6c5ff6b6d647fe85c585ba3e24c380dba9f26dbbf06404c182bdbb332e77adf78f6084f7ce7219812268
+EBUILD virtualbox-guest-additions-6.1.48.ebuild 7515 BLAKE2B de9b6a457ccb4d78c4d0dd92b3edf6b51dd75179d309b1ef57c4898e2024590c54c7bff93fd29cafa3d7d4fa7b7293506957183cad47bc4ad0803f05da834e67 SHA512 2dba618288947fab91690e72003f6f74157210aa05cbe0d4e84b26dff221506210aa57a8b7256f242c783415e08531223dccf85aea90513a9cc27bbdd3f5717d
 EBUILD virtualbox-guest-additions-7.0.10-r1.ebuild 7923 BLAKE2B dd8f77c7a3d573f2d44681da44da38cf8624a176ba0c8e207fdfe36f3c6418bd91ac41c674d108f8b7742a096e1ebb3f6dada0c6bcc1e84bb794d9f1bb7c59d4 SHA512 98fcba920871098e3ca5352c3d604082b104cf461a582ebb53880bd1bc63537cc192145c4cf11a5a413414980462bc63cd8a5b87a035a0eb847c87cb995ac899
 EBUILD virtualbox-guest-additions-7.0.10.ebuild 7837 BLAKE2B 8635995d24c5257a9e635c90ff33204a5d12e1ed57bf48b31e41bdbf87c5b06be31907188fe08a73d92462d94b380aa26ed45ea4d7fc03c19adb9ce1eafc1d84 SHA512 a8555e77239e78d8480be113826ad0ba60ad343dbf14b967d8c606924b6d3b07424e02d7235556b9f4234c53ae711a32d49dde354a7bb67957b082bac556427c
+EBUILD virtualbox-guest-additions-7.0.12.ebuild 7839 BLAKE2B c1a57e60a4618810442b3a731c47f4aae4a8fd613c4acfad95736dbc2227edec6141ddf928864901294df73798739bf8c0b63ceebff6e9c11d56652deb927703 SHA512 77e1c29b10a76590c81978e7c9118673cc5ba3d364a39218135c82ce63608d33240a95a6cb4ea37722240623793a6c2349bf38ed989c2e2b626e167795ef2946
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.48.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.48.ebuild
new file mode 100644
index 000000000000..35c42213697c
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.48.ebuild
@@ -0,0 +1,288 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo linux-mod-r1 systemd toolchain-funcs udev
+
+MY_PN="VirtualBox"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +dbus"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+RDEPEND="
+	acct-group/vboxguest
+	acct-group/vboxsf
+	acct-user/vboxguest
+	sys-libs/pam
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	X? (
+		x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+"
+DEPEND="
+	${RDEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXau
+		x11-libs/libXdmcp
+	)
+"
+BDEPEND="
+	>=dev-util/kbuild-0.1.9998.3127
+	<=dev-util/kbuild-0.1.9998.3500
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-power/iasl
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
+
+PATCHES=(
+	"${FILESDIR}"/virtualbox-guest-additions-7.0.8-fix-gcc13.patch
+)
+
+DOCS=()	# Don't install the default README file during einstalldocs
+
+VBOX_MOD_SRC_DIR="out/linux.${ARCH}/release/bin/additions/src"
+CONFIG_CHECK="DRM_TTM"
+
+src_prepare() {
+	eapply "${PATCHES[@]}"
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Provide kernel sources
+	pushd src/VBox/Additions &>/dev/null || die
+	ebegin "Extracting guest kernel module sources"
+	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
+	eend $? || die
+	popd &>/dev/null || die
+
+	# PaX fixes (see bug #298988)
+	eapply -d "${VBOX_MOD_SRC_DIR}" -- "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# Remove pointless GCC version check
+	sed -e '/^check_gcc$/d' -i configure || die
+
+	# Respect LDFLAGS (bug #759100)
+	sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk
+
+	eapply "${WORKDIR}/virtualbox-patches-6.1.36/patches"
+	eapply_user
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+
+	# Build the user-space tools, warnings are harmless
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		$(usev !dbus --disable-dbus)
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+
+	# bug #843437
+	# Respect LDFLAGS (bug #759100)
+	# Cannot use LDFLAGS here because they also get passed to $(LD)
+	cat >> LocalConfig.kmk <<-EOF || die
+		CFLAGS=${CFLAGS}
+		CXXFLAGS=${CXXFLAGS}
+		CCLDFLAGS=${LDFLAGS}
+	EOF
+
+	edo ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_ONLY_ADDITIONS=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		LD="$(tc-getCC)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_CXX="$(tc-getCXX)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+		TOOL_YASM_AS=yasm
+	)
+
+	MAKE="kmk" emake "${myemakeargs[@]}"
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	# Move this here for bug 836037
+	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
+	local modlist=( vboxguest vboxsf )
+	use X && modlist+=( vboxvideo )
+	modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+
+	insinto /etc/modprobe.d # 485996
+	newins - vboxsf.conf <<-EOF
+		# modprobe.d configuration file for VBOXSF
+
+		# Internal Aliases - Do not edit
+		# ------------------------------
+		alias fs-vboxsf vboxsf
+	EOF
+
+	cd out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	if use dbus; then
+		newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
+	else
+		newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN}
+	fi
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+		doins VBoxDRMClient
+		fperms 4755 /usr/bin/VBoxDRMClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	dodoc "${FILESDIR}"/xorg.conf.vbox
+	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+	udev_reload
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.12.ebuild
new file mode 100644
index 000000000000..877db42ca620
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.12.ebuild
@@ -0,0 +1,294 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo linux-mod-r1 systemd toolchain-funcs udev
+
+MY_PN="VirtualBox"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild
+LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dbus gui"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+# TODO: find out what this is, remove comment if obsolete
+
+RDEPEND="
+	acct-group/vboxguest
+	acct-group/vboxsf
+	acct-user/vboxguest
+	sys-libs/pam
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+"
+# some libs here are indirect dependencies, and also needed at compile time.
+# keeping them in DEPEND to avoid warnings from qa-vdb.
+DEPEND="
+	${RDEPEND}
+	gui? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	>=dev-lang/yasm-0.6.2
+	>=dev-util/kbuild-0.1.9998.3127
+	sys-devel/bin86
+	sys-power/iasl
+"
+PDEPEND="
+	gui? ( x11-drivers/xf86-video-vboxvideo )
+"
+
+PATCHES=(
+	"${FILESDIR}"/virtualbox-guest-additions-7.0.8-fix-gcc13.patch
+)
+
+DOCS=()	# Don't install the default README file during einstalldocs
+
+VBOX_MOD_SRC_DIR="out/linux.${ARCH}/release/bin/additions/src"
+CONFIG_CHECK="DRM_TTM"
+
+src_prepare() {
+	eapply "${PATCHES[@]}"
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Provide kernel sources
+	pushd src/VBox/Additions &>/dev/null || die
+	ebegin "Extracting guest kernel module sources"
+	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
+	eend $? || die
+	popd &>/dev/null || die
+
+	# PaX fixes (see bug #298988)
+	eapply -d "${VBOX_MOD_SRC_DIR}" -- "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	if ! use gui; then
+		echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die
+	fi
+
+	# Remove pointless GCC version check
+	sed -e '/ check_gcc$/d' -i configure || die
+
+	# Respect LDFLAGS (bug #759100)
+	sed -i -e '/TEMPLATE_VBoxR3Exe_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die
+
+	eapply "${WORKDIR}/virtualbox-patches-7.0.8/patches"
+	eapply_user
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+
+	# Build the user-space tools, warnings are harmless
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		$(usev !dbus --disable-dbus)
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+
+	# bug #843437
+	# Respect LDFLAGS (bug #759100)
+	# Cannot use LDFLAGS here because they also get passed to $(LD)
+	cat >> LocalConfig.kmk <<-EOF || die
+		CFLAGS=${CFLAGS}
+		CXXFLAGS=${CXXFLAGS}
+		CCLDFLAGS=${LDFLAGS}
+	EOF
+
+	edo ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_ONLY_ADDITIONS=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		LD="$(tc-getCC)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_CXX="$(tc-getCXX)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+		TOOL_YASM_AS=yasm
+	)
+
+	MAKE="kmk" emake "${myemakeargs[@]}"
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	# Move this here for bug 836037
+	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
+	local modlist=( vboxguest vboxsf )
+	use gui && modlist+=( vboxvideo )
+	modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+
+	insinto /etc/modprobe.d # 485996
+	newins - vboxsf.conf <<-EOF
+		# modprobe.d configuration file for VBOXSF
+
+		# Internal Aliases - Do not edit
+		# ------------------------------
+		alias fs-vboxsf vboxsf
+	EOF
+
+	cd out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	if use dbus; then
+		newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
+	else
+		newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN}
+	fi
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use gui ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+		doins VBoxDRMClient
+		fperms 4755 /usr/bin/VBoxDRMClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	dodoc "${FILESDIR}"/xorg.conf.vbox
+	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+	udev_reload
+	if ! use gui ; then
+		elog "use flag gui is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 8bb783074c02..5056ac5a341f 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -2,9 +2,13 @@ AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1de
 AUX virtualbox-modules-7.0.10-kernel-6.4.10.patch 312 BLAKE2B 878d706d8aeb11780ff8068c5f18784c4282da5e2fbec620a794a791e20c44256d54f1919e8abde939137607204442cc9fd13121b79518606cceae4f0d141508 SHA512 0c90a82d377bbbd294f9e9fec1810ff4e07afc43fe97ef2b8cc7eafa2a6fde00e1e0352bd8b1d14f3bee0eb7c8094906a880d1092823620f5230cb30bd260911
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
 DIST vbox-kernel-module-src-6.1.46.tar.xz 680036 BLAKE2B 46963957424fab934152ff945a3f1c0da9ca395f6ce7834e249805d155e2d41ec94b9feaed5c214d90fab547509ca48282fa7603b7f9434e7a5d596ea75177f9 SHA512 b60cf42e8213cb4c7f68090d118a477b4535cca7011f495b8ed3a254070dd8912853bb6c647cb4c86448e241005ad2467888d4731aee994c1ac80d2f38e153b3
+DIST vbox-kernel-module-src-6.1.48.tar.xz 680552 BLAKE2B 243cd013a7e027634b7f6338056708cbbfb4ccf46b569c21e60b0e2450dd1ad1395c6881eb235f2cab68a65c0911322604e732fdde06eb389f83171f38ded5ae SHA512 e26e8e4dce70d0dd07a336a6681d49e0fd5991ed92997139311cefa9cb55d03066c6400d4bdb9dbf54fba683192cfc5a63a98076525f3b3066269dc8fc498598
 DIST vbox-kernel-module-src-7.0.10.tar.xz 717508 BLAKE2B 7e4517eb39a7927a9b4343ab3cf3700c28fd1b2271311a980b4e257029dd228fd541a940b9f0a3b8190161d1b020e76f1a6d89752016620116fc175e45fb038b SHA512 0c7c3bac13a42cca4c6b30c4bbea86511ebbb296c5f941a3fb6cb190cbc60303f80ec93e3e18f03f85a6de1f02c3db102f6bd80f793610a38645b03112fc5ce7
+DIST vbox-kernel-module-src-7.0.12.tar.xz 718284 BLAKE2B 8b427f9764ad7cb216d3b8dcfa05e8b564a8b67cf3beb7ec048b2529a31580eb59eb0e41a887bb85503542cae18d873d91108a522fc0ba106d119a73ce629f34 SHA512 0b64ad2ddc6eaf56759e636aa6c8e5dba998e232ec42a7bf0cf92dc00e7a6c0ebb11e9d7500a8a407e0c92a162ebb71cdb15cbfd4f570c1860641a7fdba21bd0
 EBUILD virtualbox-modules-6.1.46-r1.ebuild 1002 BLAKE2B 354032d27a55e478e15da1b382387247d464706c6b110dbdf22cbb4ebe479c752c4b195defb14d7d3fcd0f6d1c7c76c398624d7bb21649d84e87ca8c77399386 SHA512 f94b0656475eacf9e99a989a5f0e917a8c38e09f9eda7a085b3431fffebdb9a970dbf4caab3d7732c5070f827c26d493212f6ab5580267d2999c4feddb60c1d0
 EBUILD virtualbox-modules-6.1.46.ebuild 941 BLAKE2B 2e25e3085b1a5879cc8e753a04552735bc1bcdf4a1ecfc11f9c796d4a6f770f5028e0712771a6415f481c89bf332652ba5973d51e54cf56146335ccc53d27fcf SHA512 3f5d092613f4013c3d3f39675350b17b4a305ce96d8ffda446736021d581821c4b18bf3161fefc3ad772186b12dcc3e0f0eb52751acfd78883837efd78c0f03b
+EBUILD virtualbox-modules-6.1.48.ebuild 942 BLAKE2B d001b609287f13ded153dcca7e6188a9389503a7fbf1a0ac014554fba47582acc0e6416b1b58a524cbc33972a8bac3ce052cf3c4d9dfe01d5d296419261f371e SHA512 3ad9fb5df15b2666148204323fd43f72aa5dafbd74a2402258a286ebbb65b27d42f979068f13552d717ac07d24664c8603feaae09b06f17071c8871617aba209
 EBUILD virtualbox-modules-7.0.10-r1.ebuild 1002 BLAKE2B 6e5f51d3e7c0931558528c667e967217169057b95948fa7cc679a6effa33b85e0b01217698028660f83964d14e8f559402bb2bfc19d4e09e9e92bb46efbcacff SHA512 e49e662f1dc6c447ea4f6596196f04e63af3cf3ba6cb85b322f7861dc3a247fa00a58bf9510c3858ecf8e559580a5d8fed1798198288737973934d287c3a59eb
 EBUILD virtualbox-modules-7.0.10.ebuild 941 BLAKE2B e48bef455faacaa9b1882e739e4bed41fd9b7f83315f33133b185c19433e8191603ae73aa9c5342221bb57f0518af6cb085b9d8def670f1135af66d2dc130df5 SHA512 deed8b02d834136fef5021bc9127dc45fb0cfa425fcd90692bd03ae851a713b9032b996fa8fa2180c0e85ce4083a96cc538ddc0959051609ec0a0f63c08f8b45
+EBUILD virtualbox-modules-7.0.12.ebuild 942 BLAKE2B 666835042ed720f08e0e51ab83ee1a4c9328b7abff922c929148ed246a03cc410856e846542ce5d1758b0c094ab9f040c6a8ba29ea2486ca64dddc01d9db05bc SHA512 b3dd20429f4dad94e1c5f270de8de0af095fec9e5980283f9ebbf625047840e238f254ed42c73cc985ab0dfb86bec225e6124f21d990d040f723ba39cfa5c0fe
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.48.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.48.ebuild
new file mode 100644
index 000000000000..00acad894a77
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.48.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from VirtualBox-*.run
+# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb
+
+EAPI=8
+
+inherit linux-mod-r1
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+CONFIG_CHECK="~!SPINLOCK JUMP_LABEL"
+
+src_compile() {
+	local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc )
+	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.12.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.12.ebuild
new file mode 100644
index 000000000000..d0c1bf4e4df5
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from VirtualBox-*.run
+# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb
+
+EAPI=8
+
+inherit linux-mod-r1
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+CONFIG_CHECK="~!SPINLOCK JUMP_LABEL"
+
+src_compile() {
+	local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc )
+	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index f505ea533aae..4b40259c0971 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -20,13 +20,18 @@ AUX virtualbox-7.0.9-python.patch 983 BLAKE2B ef9f83cb1447789d189b1eaaafe461ea79
 AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-6.1.46.tar.bz2 166045588 BLAKE2B 041fad30d7cbe524cfd5c865b225c00df7715a6648ed0d8f7ee3ca4be0d0dabcb324c676ba2ea78288cde89ed8e5412fae75e31bb49f623de2acddb8f10d6ee1 SHA512 695ca4d41ff10d0581e4cffe4a0ec80e0fe380f4c7d5d51ee4d21aeb61646c26edd60301e541894e71c3323e2d7207e23299938c18ee45631afd1e0851946e77
+DIST VirtualBox-6.1.48.tar.bz2 165960987 BLAKE2B c981e390ae518b829970827f6032fb19a93685fb58835a9d489c6e14cc60a5c14c65b0a3da5adae7818e73e1b0e558e8fa803160cb67847f18565bb78d656e97 SHA512 fff759f3871e4e8962536002f2bc13e5150a927e280493f5cb0abf06466ce66e45f4c6ef43489b5b3ed8682d8a3ac0eb6fb3dd7c4144924c81612553ec71a95f
 DIST VirtualBox-7.0.10.tar.bz2 175450841 BLAKE2B 49eaa14f716f021f1ecec1ad48a2aa8a3a758cbd9b03cf30d65ddcf5aba11842b0ea8bc2c4d477084a4cea318dc302a4ed426ec9f675a1fe675c5f18c48796c7 SHA512 2870d39385f66557281edf1368db68cd69d6a9bebc30d52511929462d0ac210cec49dd8531a280c6facff22ba6e4808477fbf3d09abf998d863a007fc7f2c3bd
+DIST VirtualBox-7.0.12.tar.bz2 175644088 BLAKE2B 507cbf7b1a8a807bd2602e74bc19a59cb177b9b2bdefa1be582e520666360a42510ca501f20c354746a0f1dadf61fe29135e3edc867e611bfe60a9405cb2bbce SHA512 9fe4511442eba788d02f932f5e98cfcc5aa4ebed41c00bd7333cf7e3f5de787e458f1f56930978283f041f403652c803143335fe9120ab63a2c113ca7b3f588f
 DIST virtualbox-help-7.0.10.tar.xz 3941196 BLAKE2B fa6667e0cf12e2e05b896a7d9d7e1f78d43bb4618f35b3c81f5ccf5f227d1181b0c8fb1f6dc02a8619550b193a73d4094c5d3f0d43514392f9ed563085068789 SHA512 fab2dff812a438f3e78dbace24741d91b317bbbc7362f082a18f3871e3c6fd8af7744cf1b3fd3b82cf5135e03d521de05a7a5bc98ec19aacfa1b4e5392e60f30
+DIST virtualbox-help-7.0.12.tar.xz 3945920 BLAKE2B 7f2201f3baf6d27d95dc9f878426e34a27c9f9e113d55348f57703b1bd4878df8c6f02492412b779896c48224fb2df224c953b425dde9c99d2b4dbfda1d80d4f SHA512 ddf429a984fe433c4bcbdf87930b3cc16075d4f4725d2e571e9bf05d820d26eb6f88dd6f2bd3992927b261377c84ac4e35a929113b3294e3b2887760fe7a0b52
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 DIST virtualbox-patches-7.0.10_pre20230615.tar.bz2 2253 BLAKE2B 27b422acc2ae85c4324d6f4471db80c9f680b1c4a00223c38b9e3fb31709b05163a1bd53408cffeabdef295e856aa8b01b86e0fecf5d80ace376ea1bd4fc9504 SHA512 c2177f46048f09b6be9ac2c35b43d74f67350b052411cc64adf6c0b3d284055eef79f960f1384a3aaeee7d25f8c19ea8f936ee2623a2251d1d28f85ed3469c22
 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf
 EBUILD virtualbox-6.1.46.ebuild 18887 BLAKE2B aed99c4c6f459b4f05e70f21f8e4a83d423bd18f49cb4b3776fd4352c49980a1addbc4388676bb5e9f6821943227f869b1c32b3e253e36be095f34de769bc91c SHA512 ddf75c7aeaaaa640703625aaaa803e6ae96857aaf6cb31fe8e0ed7f722c6403d7230836fdfa6a929b08e465f5665b1f76e79ac9c2d332c9f6796637fbf27fe6b
+EBUILD virtualbox-6.1.48.ebuild 18888 BLAKE2B 6e55b3a6f848bb4ddbb701e9a04b1194d16dc70b2e25f0f258783ac13c75f00a627e9d3e9582a09f849907c6901fc6f281c6bcfb7959854f3eb2e31f1a252e13 SHA512 430d80557df8b049934ee7da2f66d5f43ba7c49a897c38a1566ffd4cd5f32a5b454dde7fd07b047fbc90bda0dbac28279bc31c98d8d11ec321aa199718653b4a
 EBUILD virtualbox-7.0.10-r1.ebuild 21461 BLAKE2B b11ff4fc0265a1de225c61ae3057e555c75b2fcde5be7101c83cd076c11dd23247c3f617c35679c4d0593d912c27e0dabc06458a8ae54c5a04a6aa2ac724224d SHA512 6dd43a891ead77d10a829f9dbb11ee61c50805d728f2f42c2feb6f44e616439618c166f8fcc2b6910f678c2fce908f6b3bc1d92ef73a75fadf7fe4eee6abbb68
 EBUILD virtualbox-7.0.10.ebuild 20658 BLAKE2B c59f66e1c81d6f522b738aaf3d1f50192cc1e992c08c5eb60a654664325088e97d70db867cb61aa0c6bcc046d8a79f4db7731ca861c5cc84983cb144c3515f77 SHA512 cb1293093cdcab9d9d51602b624cd46d122974e4314a20da021d33175a4a27d2434052c2baffce2780b15a109acdb90989ead907ba2828e0ecfc38a244f27e8c
+EBUILD virtualbox-7.0.12.ebuild 21490 BLAKE2B b0dd371bc83044a41eca766730e4b26fcec344df90d15a8d16fbe529e1ac0933f7300b9d4ccef7c9a2d9da754082689beda2d48bf30cdda629307fdeab742914 SHA512 b53c1c2d3fa82510f3ac57c6ab03eb76d55f98598c9b93c33a2cad063752a92b2626a4976f5d7db43457fbbe9986fcccb6e3fa220c5462fa7f5c9f773ed72456
 EBUILD virtualbox-9999.ebuild 22108 BLAKE2B 8926329c1c0c414196851216070c0565ccfbae44f4a5f6f11171fcda8a31ab583d1040c1ba13a91175484e1c8c06f31c5d32f9f4e07c2935dbc5a4b7992ca5af SHA512 029caa34ba207d7fdb9ce9e8eff29503cbbad4d5d0824bb37cd0a8008602aad44dc01144abadb7a01ce534594248d91b7857ece7d30bd222fafde2819b7b82db
 MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33
diff --git a/app-emulation/virtualbox/virtualbox-6.1.48.ebuild b/app-emulation/virtualbox/virtualbox-6.1.48.ebuild
new file mode 100644
index 000000000000..a07c5a01bf04
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-6.1.48.ebuild
@@ -0,0 +1,675 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
+	python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2 dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${PV}
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		sdl? ( media-libs/libsdl:0[X,video] )
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? (
+			media-libs/libglvnd[X]
+			virtual/glu
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #878299 to track this issue.
+DEPEND="
+	${COMMON_DEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? (
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		opengl? ( virtual/opengl )
+	)
+	java? ( virtual/jdk:1.8 )
+	pam? ( sys-libs/pam )
+	pax-kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-libs/libpulse )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/tar-1.34-r2
+	>=dev-util/kbuild-0.1.9998.3127
+	<=dev-util/kbuild-0.1.9998.3500
+	>=dev-lang/yasm-0.6.2
+	dev-libs/libIDL
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( virtual/jdk:1.8 )
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( virtual/jre:1.8 )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
+
+	# This patch is needed to avoid automagic detection based on a hardcoded
+	# list of Pythons in configure. It's necessary but not sufficient
+	# (see the rest of the ebuild's logic for the remainder) to handle
+	# proper Python selection.
+	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
+
+	# 865361
+	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
+
+	# 906309
+	"${FILESDIR}"/${PN}-6.1.44-fix-libxml2.patch
+
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-6.1.36/patches
+)
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+
+	# 749273
+	local d=${ROOT}
+	for i in usr "$(get_libdir)"; do
+		d="${d}/$i"
+		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
+			die "${d} should be owned by root, VirtualBox will not start otherwise"
+		fi
+	done
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie ; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something more sensible.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch ; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# 890561
+	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
+}
+
+src_configure() {
+	tc-ld-disable-gold # bug #488176
+
+	#856811 #864274
+	# cannot filter out only one flag, some combinations of these flags produce buggy executables
+	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
+		append-cflags $(test-flags-CC -mno-$i)
+		append-cxxflags $(test-flags-CXX -mno-$i)
+	done
+
+	# replace xhtml names with numeric equivalents
+	find doc/manual -name \*.xml -exec sed -i \
+		-e 's/&nbsp;/\&#160;/g' \
+		-e 's/&ndash;/\&#8211;/g' \
+		-e 's/&larr;/\&#8592;/g' \
+		-e 's/&rarr;/\&#8594;/g' \
+		-e 's/&harr;/\&#8596;/g' {} \+ || die
+
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-dbus
+		--disable-kmods
+
+		$(usev !alsa --disable-alsa)
+		$(usev debug --build-debug)
+		$(usev !doc --disable-docs)
+		$(usev !java --disable-java)
+		$(usev !lvm --disable-devmapper)
+		$(usev !opus --disable-libopus)
+		$(usev !pulseaudio --disable-pulse)
+		$(usev !python --disable-python)
+		$(usev vboxwebsrv --enable-webservice)
+		$(usev vnc --enable-vnc)
+	)
+
+	if ! use headless ; then
+		myconf+=(
+			$(usev !opengl --disable-opengl)
+			$(usev !qt5 --disable-qt)
+			$(usev !sdl --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usev python 1)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+
+	if use python ; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile ; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} \
+		vboximg-mount *so *r0 iPxeBaseBin ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
+		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst rdesktop-vrdp
+		if use sdl ; then
+			vbox_inst VBoxSDL 4750
+			pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+			for each in vboxsdl VBoxSDL ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+		fi
+
+		if use qt5 ; then
+			vbox_inst VirtualBox
+			vbox_inst VirtualBoxVM 4750
+			for each in VirtualBox{,VM} ; do
+				pax-mark -m "${ED}"${vbox_inst_path}/${each}
+			done
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox{,vm} VirtualBox{,VM} ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			domenu ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	if use python ; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/./_}"
+
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
+		if [[ ! -x "${python_path_ext}" ]] ; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev ; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev ; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
diff --git a/app-emulation/virtualbox/virtualbox-7.0.12.ebuild b/app-emulation/virtualbox/virtualbox-7.0.12.ebuild
new file mode 100644
index 000000000000..7e6498bde1f8
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-7.0.12.ebuild
@@ -0,0 +1,758 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
+	python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="
+	https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2
+	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${PV}.tar.xz ) )
+"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libtpms
+	dev-libs/libxml2
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	net-misc/curl
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		x11-libs/libX11
+		x11-libs/libXt
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	lvm? ( sys-fs/lvm2 )
+	opengl? (
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	pam? ( sys-libs/pam )
+	sdl? (
+		media-libs/libsdl2[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXt
+	)
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
+	vde? ( net-misc/vde )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #878299 to track this issue.
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/libxslt-1.1.19
+	virtual/libcrypt:=
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	gui? (
+		x11-base/xorg-proto
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+	)
+	java? ( virtual/jdk:1.8 )
+	opengl? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+		virtual/glu
+	)
+	sdl? ( x11-libs/libXinerama )
+	pulseaudio? ( media-libs/libpulse )
+	udev? ( >=virtual/udev-171 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	gui? ( x11-libs/libxcb:= )
+	java? ( virtual/jre:1.8 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/tar-1.34-r2
+	>=dev-lang/yasm-0.6.2
+	dev-libs/libIDL
+	dev-util/glslang
+	>=dev-util/kbuild-0.1.9998.3592
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		app-text/docbook-xsl-ns-stylesheets
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+		dev-qt/qthelp:5
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	nls? ( dev-qt/linguist-tools:5 )
+	java? ( virtual/jdk:1.8 )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
+
+	# This patch is needed to avoid automagic detection based on a hardcoded
+	# list of Pythons in configure. It's necessary but not sufficient
+	# (see the rest of the ebuild's logic for the remainder) to handle
+	# proper Python selection.
+	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
+
+	# 865361
+	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
+
+	"${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch
+	"${FILESDIR}"/${PN}-7.0.10-python.patch
+	"${FILESDIR}"/${PN}-7.0.6-gcc-13.patch
+	"${FILESDIR}"/${PN}-7.0.8-mtune-keep-size.patch
+	"${FILESDIR}"/${PN}-7.0.6-fix-libxml2.patch
+	# 913109
+	"${FILESDIR}"/${PN}-7.0.10-fix-binutils-hardened.patch
+
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-7.0.8/patches
+)
+
+pkg_pretend() {
+	if ! use gui; then
+		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
+	fi
+
+	if ! use opengl; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	if ! use nls && use gui; then
+		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
+		einfo "will have NLS support."
+	fi
+
+	# 749273
+	local d=${ROOT}
+	for i in usr "$(get_libdir)"; do
+		d="${d}/$i"
+		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
+			die "${d} should be owned by root, VirtualBox will not start otherwise"
+		fi
+	done
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
+	rm -r kBuild/bin || die
+	# Remove everything in tools except kBuildUnits
+	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+		echo -e "\nIPRT_WITHOUT_PAM=1" >> LocalConfig.kmk || die
+	fi
+
+	# add correct java path
+	if use java; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	#856811 #864274
+	# cannot filter out only one flag, some combinations of these flags produce buggy executables
+	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
+		append-cflags $(test-flags-CC -mno-$i)
+		append-cxxflags $(test-flags-CXX -mno-$i)
+	done
+
+	# bug #908814
+	filter-lto
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	if use sdl; then
+		sed -i 's/sdl-config/sdl2-config/' configure || die
+		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
+	fi
+
+	#443830
+	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
+
+	if tc-is-clang; then
+		# clang assembler chokes on comments starting with /
+		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
+
+		# clang does not support this extension
+		eapply "${FILESDIR}"/${PN}-7.0.8-disable-rebuild-iPxeBiosBin.patch
+	fi
+
+	# fix doc generation
+	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
+	# replace xhtml names with numeric equivalents
+	find doc/manual -name \*.xml -exec sed -i \
+		-e 's/&nbsp;/\&#160;/g' \
+		-e 's/&ndash;/\&#8211;/g' \
+		-e 's/&larr;/\&#8592;/g' \
+		-e 's/&rarr;/\&#8594;/g' \
+		-e 's/&harr;/\&#8596;/g' {} \+ || die
+
+	# fix help path #891879
+	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
+
+	# 489208
+	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
+	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
+		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
+	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
+		src/VBox/Frontends/VirtualBox/src/main.cpp \
+		src/VBox/VMM/VMMR3/VM.cpp || die
+
+	# 890561
+	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
+
+	if ! use nls && ! use gui; then
+		cat >> LocalConfig.kmk <<-EOF || die
+			VBOX_WITH_NLS :=
+			VBOX_WITH_MAIN_NLS :=
+			VBOX_WITH_PUEL_NLS :=
+			VBOX_WITH_VBOXMANAGE_NLS :=
+		EOF
+	fi
+}
+
+src_configure() {
+	tc-ld-disable-gold # bug #488176
+
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-kmods
+
+		$(usev !alsa --disable-alsa)
+		$(usev !dbus --disable-dbus)
+		$(usev debug --build-debug)
+		$(usev !doc --disable-docs)
+		$(usev !java --disable-java)
+		$(usev !lvm --disable-devmapper)
+		$(usev !pulseaudio --disable-pulse)
+		$(usev !python --disable-python)
+		$(usev vboxwebsrv --enable-webservice)
+		$(usev vde --enable-vde)
+		$(usev vnc --enable-vnc)
+	)
+
+	if use gui || use sdl || use opengl; then
+		myconf+=(
+			$(usev !opengl --disable-opengl)
+			$(usev !gui --disable-qt)
+			$(usev !sdl --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usev python 1)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+
+	if use python; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
+		vboximg-mount vbox-img *so *r0; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
+		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
+
+	if use pam; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	# environment variables used during SDK binding installation
+	echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox"
+	echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use sdl; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+	fi
+
+	if use gui; then
+		vbox_inst VirtualBox
+		vbox_inst VirtualBoxVM 4750
+		for each in VirtualBox{,VM} ; do
+			pax-mark -m "${ED}"${vbox_inst_path}/${each}
+		done
+
+		if use opengl; then
+			vbox_inst VBoxTestOGL
+			pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+		fi
+
+		for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		insinto /usr/share/${PN}
+		doins -r nls
+		doins -r UnattendedTemplates
+
+		domenu ${PN}.desktop
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]]; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc; then
+		dodoc UserManual.pdf UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	elif use gui; then
+		dodoc "${WORKDIR}"/${PN}-help-${PV}/UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	fi
+
+	if use python; then
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
+		if [[ ! -x "${python_path_ext}" ]]; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+
+		# 378871
+		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer"
+		pushd "${installer_dir}" &> /dev/null || die
+		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
+			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
+			-i vboxapi/__init__.py || die
+		# insert shebang, the files come without one
+		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
+		python_domodule vboxapi
+		popd &> /dev/null || die
+		python_doscript vboxshell.py
+
+		# do not install the installer
+		rm -r "${installer_dir}" || die
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if use gui; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index c7ad5b2834ea..70aaef14d853 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 6210a6cbe719..61ec98c9b9ef 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,10 +1,13 @@
 AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
 AUX calibre-5.31.0-qt-image-test.patch 691 BLAKE2B b0eb6e3a5f74277b967d2002ad1090107a4a131fa2c1107fdb9ea0ca8593e7872e73a4c6d657670b5de1a1296567fa87f5a891514e379b83925a8d0c55154bdc SHA512 29a86e8416eff1f47f49790472480ebf6dc4c0dc771d045b0c3ea632e0df6d05f5fe23adac9510135b944757dc84c1f96cae55ef4860dc68bd68ee6a3ab3902b
 AUX calibre-5.35.0-jxr-test.patch 827 BLAKE2B 0a94ac5b12ee2ec732d3ff68979c2060b0b218eee27409b3c351a9cc0b6bccce2260b8b387b442ae10f31483b20bd6d672f7d5424f7d9a8297a1bd14af2f7793 SHA512 259a3b4882bf0fbb01cb22974e219a621a2b337d6f638234a806148b11142fdbf9ac36ae38e71fcb7e18bd61362b34cf3c221ba1df317ec6ea8668591ad2d3ff
+AUX calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch 1065 BLAKE2B 7a74b7d7788340f96b326619f5e2bd916ff21644f0554b2507fcea439eec8217b8b002a2da3b99021fa576a6d3a6fd15d82222f005b8a4fbf37ab5016f33bdb9 SHA512 13f6fc949cc8c5c66013c772cd40429a679fa067d7828cc02e416ecbd556eafb56bebc80bc85a8b442feb3e6b94518450252e701e6426f5a2cde9d102312cf87
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-5.43.0.tar.xz 38641220 BLAKE2B dddf9e5f7303845f8d86826d38d08dfbf05f144c4fb80d215197f51dc6685f09d848148f00f9795c441f8cd8c541ed9d4988b0a5d2020ce98eb8f8bcd4853dac SHA512 1a5b95c621e47b660841d989445ab56244b9c805aa5d01efc4d95d8c37c5290e93523cedec92a6ca12d16e5f74b63743d6e682bf4084f400d080678ff540a190
 DIST calibre-5.44.0.tar.xz 41015696 BLAKE2B c7053e728da20fccfa981ed4f56e24a4d5b382b7687c92ecb039b078fd4828de0529380093e4ab33f77d78aa54a59758c1620cf8f918937a9a64f13decdf77ee SHA512 3d79e76d820cd1a41605dfd4c1d992599a6e4a759e57a8383d42d86982177e4539313f59e647758ab1896ce5874cb2a93c7678bf962e332c44171651aabf0230
+DIST calibre-5.44.0.tar.xz.sig 566 BLAKE2B 413b95855d79bdb5b17ca5d760f834006797b4d3e413604f27d351a3392e16d647e772dc063306bf973e1156c34f68cb38152a66164bca849ebed5484e7f6065 SHA512 59957bf35a73f218241bf76cc86994d5af87cea11d3b0800e83f157bf0b2cfcaf4b6c1314562e74a1141d0c167fdb1619cb9a90e93b67f55dd55ceed77045059
 EBUILD calibre-5.43.0.ebuild 10192 BLAKE2B 97e9e7e9cce94e0206ef3b4a93b442a1cd008021755e780a0e2fa0d22d7452a2c8a5f3d99dbad1da61f030033a56d159d37de790ef816c9aaf8d78762b931ecc SHA512 fc70706a3079a7d0e089072773a32378be3ea220f2d4d921bbe002a67f6dd8ddeeec2a2cc6a74c312101ad6ee798223a3b5f9460c16aee30ba97e105d531f537
-EBUILD calibre-5.44.0-r1.ebuild 10201 BLAKE2B 45b41952133880c1c28820cb3a65c08ce001641a2ef17b37152ea36563b4562eb09264608a163e92d467d9aa8fe8aa14c13fc35befc2d7dc59192287fababf97 SHA512 7f040849a079e776f99970191af14edd3c006a1fc8c3f719bf72b65d96d83e7d90e0ea93df027e2dc8a1074ec602b6e9e9a160b141b941654875d4b49fd0aed4
-MISC metadata.xml 364 BLAKE2B 970d39f28421dbb398cef4dd957d5723f7596d0a9c99f40cceb55909d339e79261cf4b6de552b1855e8afcf9c09ba2b5332c5deb0c097b2d6c83f0f31a47bc7c SHA512 ae6a8dfd2b4055258c3fc85c3874725afb9c35bbe085e667ae50002bd26eaf8522d1f3cf809e06821fec70009a4a9646ed449a4dfb2d79d398942f39dbf8ac49
+EBUILD calibre-5.44.0-r1.ebuild 9883 BLAKE2B 3a801266bc5b9e620624da95e4d5371d2f3a6069defc33f20e9556d52c0694332cf1b066ea5e925d4903a92ea93aa94e7d4fb64eb35155f8974ef55f6eebe1f1 SHA512 6507510dfa88c77d4089852793a6766cf61a608fba03a2e87dd5b17ffcc00959822e041c1389f8960ead82d2daba7a6642daf6149c73f0dd7296aabe74735518
+EBUILD calibre-5.44.0-r2.ebuild 8739 BLAKE2B cac6ff34848d71cc7b4c27094e60fc9315c5eecfe497f5ceda72b928ce87f9c3b9af0a8ac72fe8cb4bfc25f8e0b156a8a87183efae19a9ad3da4f0e1cbbb18b8 SHA512 353b344cde07d298e604bff64c318f179102a0866f6bfff6adcbb09b73937e0fff6d7b7cc07031b8d965f407a0c4af59c2ba0c8c3e5fc952c0d898de2405b47e
+MISC metadata.xml 572 BLAKE2B be33ecb84304bebc23c7f92529f410a58941ed15c9083c488d443305a99c1c64dff0d3ba9f82de2a0c0f3b6277decfa70d00baafa0cbf46af6a3fcb9f44ea202 SHA512 cff8a886c1b4bc491b7745197b91048b242110fea6a4b1826764d1157adf3f44e79a9a24bb3aa840c9748c96c716cc9590c2851b79986b837f0e6d239ca84a41
diff --git a/app-text/calibre/calibre-5.44.0-r1.ebuild b/app-text/calibre/calibre-5.44.0-r1.ebuild
index ba8f956e0af1..7b4d5e9dea2c 100644
--- a/app-text/calibre/calibre-5.44.0-r1.ebuild
+++ b/app-text/calibre/calibre-5.44.0-r1.ebuild
@@ -6,11 +6,15 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
 
-inherit toolchain-funcs python-single-r1 qmake-utils xdg-utils
+inherit toolchain-funcs python-single-r1 qmake-utils verify-sig xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+SRC_URI="
+	https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+	verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
 
 LICENSE="
 	GPL-3+
@@ -115,7 +119,9 @@ BDEPEND="$(python_gen_cond_dep '
 	')
 	>=virtual/podofo-build-0.9.6_pre20171027
 	<virtual/podofo-build-0.10
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
 
 PATCHES=(
 	# Don't prompt the user for updates - they've installed via
@@ -281,23 +287,7 @@ src_install() {
 	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
 }
 
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
 pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	xdg_icon_cache_update
diff --git a/app-text/calibre/calibre-5.44.0-r2.ebuild b/app-text/calibre/calibre-5.44.0-r2.ebuild
new file mode 100644
index 000000000000..28908e49f5d8
--- /dev/null
+++ b/app-text/calibre/calibre-5.44.0-r2.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
+
+inherit toolchain-funcs python-single-r1 qmake-utils verify-sig xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+	https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+	verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios speech test +udisks"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	<app-text/podofo-0.10:=
+	app-text/poppler[utils]
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/openssl:=
+	dev-libs/snowball-stemmer:=
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/cchardet[${PYTHON_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+		dev-python/jeepney[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+		dev-python/zeroconf[${PYTHON_USEDEP}]
+		>=dev-python/PyQt5-5.15.5_pre2107091435[gui,widgets,network,printsupport,svg,${PYTHON_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+	')
+	dev-qt/qtimageformats:5
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=[jpeg,png]
+	dev-qt/qtwidgets:5
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-gfx/optipng-0.7.6
+	virtual/libusb:1=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+		>=dev-python/sip-5[${PYTHON_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	<virtual/podofo-build-0.10
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+	# Don't prompt the user for updates - they've installed via
+	# an ebuild.
+	"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch"
+
+	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+	# We don't (yet?) package libjxr and it seems to be dead upstream
+	# (last commit in 2017)
+	"${FILESDIR}/${PN}-5.35.0-jxr-test.patch"
+
+	# fix compatibility with recent versions of zeroconf
+	"${FILESDIR}"/${PN}-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch
+)
+
+src_prepare() {
+	default
+
+	# Warning:
+	#
+	# While it might be rather tempting to add yet another sed here,
+	# please don't. There have been several bugs in Gentoo's packaging
+	# of calibre from seds-which-become-stale. Please consider
+	# creating a patch instead, but in any case, run the test suite
+	# and ensure it passes.
+	#
+	# If in doubt about a problem, checking Fedora's packaging is recommended.
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+	sed -e "/^            os.chdir(os.path.join(src_dir, 'build'))$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
+		-e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# This is only ever used at build time. It contains a small embedded copy
+	# of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+	# have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+	# is to build some resources that come bundled in dist tarballs already...
+	# and which we may also need to regenerate e.g. to use system-mathjax.
+	#
+	# However, running qtwebengine violates the portage sandbox (among other
+	# things, it tries to create directories in /usr! amazing) so this is a
+	# wash anyway. The only real solution here is to package rapydscript-ng.
+	#
+	# We do not need it at build time, and *no one* needs it at install time.
+	# Delete the cruft.
+	rm -r resources/rapydscript/ || die
+}
+
+src_compile() {
+	# TODO: get qmake called by setup.py to respect CC and CXX too
+	tc-export CC CXX
+
+	# bug 821871
+	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+	export QMAKE="$(qt5_get_bindir)/qmake"
+
+	${EPYTHON} setup.py build || die
+	${EPYTHON} setup.py gui || die
+
+	# A few different resources are bundled in the distfile by default, because
+	# not all systems necessarily have them. We un-vendor them, using the
+	# upstream integrated approach if possible. See setup/revendor.py and
+	# consider migrating other resources to this if they do not use it, in
+	# *preference* over manual rm'ing.
+	${EPYTHON} setup.py liberation_fonts \
+		--path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+		--system-liberation_fonts || die
+}
+
+src_test() {
+	# Skipped tests:
+	local _test_excludes=(
+		# unpackaged Python dependency: py7zr
+		7z
+		# unpackaged Python dependency: unrardll
+		test_unrar
+		# tests if a completely unused module is bundled
+		pycryptodome
+
+		$(usev !speech speech_dispatcher)
+
+		# undocumented reasons
+		test_mem_leaks
+		test_searching
+	)
+
+	${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}" || die
+}
+
+src_install() {
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C.utf8 #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+	mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	addpredict /dev/dri #665310
+
+	# If this directory doesn't exist, zsh completion won't install
+	dodir /usr/share/zsh/site-functions
+
+	"${PYTHON}" setup.py install \
+		--staging-root="${ED}/usr" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--staging-libdir="${ED}/usr/$(get_libdir)" \
+		--system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins" || die
+
+	cp -r man-pages/ "${ED}"/usr/share/man || die
+
+	find "${ED}"/usr/share -type d -empty -delete || die
+
+	einfo "Converting python shebangs"
+	python_fix_shebang "${ED}/usr/bin"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch b/app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch
new file mode 100644
index 000000000000..79af5d94bb59
--- /dev/null
+++ b/app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch
@@ -0,0 +1,26 @@
+From 5d8d85c649b181747d182f676cfd76f843bd61f0 Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Sun, 1 Oct 2023 15:08:59 +0530
+Subject: [PATCH] Fix compatibility with zeroconf >= 0.73
+
+Fixes #2038 (fix compatibility with newer zeroconf)
+---
+ src/calibre/devices/smart_device_app/driver.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
+index 87608f305b..b41c3a0063 100644
+--- a/src/calibre/devices/smart_device_app/driver.py
++++ b/src/calibre/devices/smart_device_app/driver.py
+@@ -2175,6 +2175,8 @@ def monkeypatch_zeroconf():
+     # "monkeypatch" zeroconf with a function without the check
+     try:
+         from zeroconf._utils.name import service_type_name
++        # zeroconf 0.73 uses an lru cache so we need __wrapped__
++        service_type_name = getattr(service_type_name, '__wrapped__', service_type_name)
+         service_type_name.__kwdefaults__['strict'] = False
+     except ImportError:
+         import zeroconf
+-- 
+2.41.0
+
diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml
index a969c28b1737..7a4fb8fcb017 100644
--- a/app-text/calibre/metadata.xml
+++ b/app-text/calibre/metadata.xml
@@ -4,8 +4,15 @@
   <maintainer type="person">
     <email>zmedico@gentoo.org</email>
   </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>eschwartz93@gmail.com</email>
+    <name>Eli Schwartz</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">calibre</remote-id>
     <remote-id type="github">kovidgoyal/calibre</remote-id>
   </upstream>
+  <use>
+    <flag name="speech">Enable text-to-speech support</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ff23ce120e4e..0d42bc1a86b1 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 56d24868f3cb..32f79a080cbe 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,3 +1,5 @@
 DIST asm-ASM_9_5.tar.bz2 1372645 BLAKE2B 3eac319c9322dfd9fff1324b032a2248127592107c0256adec6f0c592cf55298b9f060603e1697e7560db9b337585f59bfebea684dcefaf0b4a149061ebb915c SHA512 6c1b4624789435b347b43db50e6605cf60008c73125245e1495e11eef03770e49308963ee152654fa45ac9b05150e8ff4d646d69b69aef27296069f4a7343301
+DIST asm-ASM_9_6.tar.bz2 1374579 BLAKE2B 621b19f1818ffdd451037af210ec7c3286e3dabdb1d6192157c2e6e8c101f599691cd4de57adf500f5413b4aaf4f808d6ac791e84626223a7be5672a17137670 SHA512 86b2db3e81c29c465d4128736f88ae3b73af8f312915921549d0acdb50a8d2c2c2beed5162af164b6e75278702af0c6f0a8d84b4133516eb4ac419520b7c764d
 EBUILD asm-9.5.ebuild 2489 BLAKE2B 8ba1a29735898ac4d40660154cf37f54d4ac02807a02675985e5c97716bc649edfe6853b5443e66f05f48be16497a124858f4180a67bc370590d3f2cbf19f0ba SHA512 2a7f00119625129681e73c51070647cdccb9926322f0b60d629abde270ff05effacd840a0df413f7c49abdc375359dc1921d5dd6b6d936b74840818c9bbfe9a9
+EBUILD asm-9.6.ebuild 2447 BLAKE2B 86256b75ac44f3e15a9be079d1e1a2defebbe4a3ead6c58c80ed62eb4b0538bcb5708c58262bfb0bf1e838eb1071c9585be62668655443ff92a2a68ad110d0c6 SHA512 894ff7a264cc13700a06f4efe418a7ac745f616eed7d032feed038fd3066c3847c31b66434575ab03b6de67179c1a7cb12a26abee4afa7ed4d1bdfb87f17ebbb
 MISC metadata.xml 1233 BLAKE2B 13faf251d3d40ed558c83262972ea106892cc3be0f7a1b95a0b484123d93473bd867b2f7b53c3e5ccc2f1fe249ebe66cb9e757e19ad36c8d3e3eac6a7a981d98 SHA512 59a292291ac757818e41d009e2cdbb73b6d914c1f552c34e9360635cb468f1ebfdf9c58d6642710d5218689d08797320102c8ccb6d5f4bc9478883feb9b9b397
diff --git a/dev-java/asm/asm-9.6.ebuild b/dev-java/asm/asm-9.6.ebuild
new file mode 100644
index 000000000000..f121718f5735
--- /dev/null
+++ b/dev-java/asm/asm-9.6.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# tests not enabled because of missing eclass support of junit-jupiter
+JAVA_PKG_IUSE="doc source"
+MAVEN_PROVIDES="
+	org.ow2.asm:asm-bom:${PV}
+	org.ow2.asm:asm:${PV}
+	org.ow2.asm:asm-analysis:${PV}
+	org.ow2.asm:asm-commons:${PV}
+	org.ow2.asm:asm-tree:${PV}
+	org.ow2.asm:asm-util:${PV}
+"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="https://asm.ow2.io"
+MY_P="ASM_${PV//./_}"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.bz2"
+S="${WORKDIR}/asm-${MY_P}"
+
+LICENSE="BSD"
+SLOT="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+ASM_MODULES=( "asm" "asm-tree" "asm-analysis" "asm-commons" "asm-util" )
+
+src_prepare() {
+	default
+	local module
+	touch "${T}/asm.module" || die
+	for module in "${ASM_MODULES[@]}"; do
+		module=${module/-/.}
+		cat > ${module/./-}/src/main/java/module-info.java <<-EOF || die
+			open module org.objectweb.${module/analysis/tree.analysis} {
+				$(cat ${T}/asm.module)
+				requires java.base;
+				exports org.objectweb.${module/analysis/tree.analysis};
+			}
+		EOF
+		echo "requires transitive org.objectweb.${module/analysis/tree.analysis};" \
+			>> "${T}/asm.module" || die
+	done
+	sed -e '/^$/d' \
+		-e '/asm;/p;s:\(asm\)\(;\):\1.signature\2:' \
+		-i  asm/src/main/java/module-info.java || die
+	sed -e '/analysis/d' \
+		-i  asm-commons/src/main/java/module-info.java || die
+	sed -e '/commons/d' \
+		-i  asm-util/src/main/java/module-info.java || die
+}
+
+src_compile() {
+	local module
+	for module in "${ASM_MODULES[@]}"; do
+		einfo "Compiling ${module}"
+		JAVA_JAR_FILENAME="${module}.jar"
+		JAVA_SRC_DIR="${module}/src/main/java"
+		java-pkg-simple_src_compile
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
+		rm -r target || die
+	done
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		JAVA_SRC_DIR=()
+		for module in "${ASM_MODULES[@]}"; do
+			rm "${module}/src/main/java/module-info.java" || die
+			JAVA_SRC_DIR+=("${module}/src/main/java")
+		done
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_install() {
+	local module
+	for module in "${ASM_MODULES[@]}"; do
+		java-pkg_dojar ${module}.jar
+		if use source; then
+			java-pkg_dosrc "${module}/src/main/java/*"
+		fi
+	done
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+	default
+}
diff --git a/dev-java/felix-framework/Manifest b/dev-java/felix-framework/Manifest
index 51fc41d960ef..f858269ea9f6 100644
--- a/dev-java/felix-framework/Manifest
+++ b/dev-java/felix-framework/Manifest
@@ -1,4 +1,4 @@
 DIST org.apache.felix.framework-7.0.5-source-release.tar.gz 505118 BLAKE2B 3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec SHA512 58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3
 DIST org.apache.felix.framework-7.0.5-source-release.tar.gz.asc 195 BLAKE2B 94d0afbb7f20119a3f75927e75dc10420caab1c6ce2c3cc5b2b8600a2fd6af4c9217df565cd922bd0017ec6ac54113cc2a894b60249978c87c61c7961d258dda SHA512 2b22f242b5d3ff6c38457908e801dc95abeca6c6427fe8eab4badae171692f9b8de6edf091dca78cc43c3a467a56aa85895cabdfa7eaa92faf6cb090e9fae8fa
-EBUILD felix-framework-7.0.5-r2.ebuild 3603 BLAKE2B b7695e50204af73d5f57ebf1e97b91fc5f48e7bf349cb5dbbfff76c9deee794abf305efd0aa4607fa3211ec631a5338633a6e67b9b44d18440a5264c49fbe6b0 SHA512 d9660af0ba00a9134c5303f54cb07e5f9fa765ef9f6b39447ea3bcd6d663d75ebc9af1f7cf3585243ac461de94e06137f3f35c3d3716b1b8a293db6e7c84fdd7
+EBUILD felix-framework-7.0.5-r2.ebuild 2998 BLAKE2B c9c2d5452e24544d9bdc6787add51699c9402b2f587602b0b930681406e88f1dc2b07990d37ee66d720b3744d61c124a1913aa5acd7064c507403e0d299d5883 SHA512 4bc60287babbabdc08e4261051418c96efc18cdb262bf9f305ac32dbfec9b430c0b807b9d3ae34d4302b005b77c8d1cee826ba32eef6e7c78d4ebb88113c3456
 MISC metadata.xml 455 BLAKE2B 69e2d92cd05dd44530363b6920e0673ac8f6d87cebf7ca931d4699378062348b83391fdfeaa4dc95d470a718d363fa7e6578f949b6f8f3510317f6d63bc7c514 SHA512 585dc4c8a3fb5c6c01940c887207346065ca9c7499abdb79ab6f6554a05fe6b27734e48101cb0dab61b8e0e32417bf28e722947864bd0ea3d48296198a3f3264
diff --git a/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
index ddb1eee0510a..487fb4f1846f 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
@@ -19,39 +19,22 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-# Common dependencies
-# POM: pom.xml
-# org.codehaus.mojo:animal-sniffer-annotations:1.9 -> >=dev-java/animal-sniffer-annotations-1.15:0
-
 CP_DEPEND="dev-java/animal-sniffer-annotations:0"
 
-# Compile dependencies
-# POM: pom.xml
-# org.apache.felix:org.apache.felix.resolver:2.0.4 -> >=dev-java/felix-resolver-2.0.4:0
-# org.osgi:org.osgi.annotation:6.0.0 -> !!!artifactId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-# test? org.easymock:easymock:2.5.2 -> >=dev-java/easymock-2.5.2:2.5
-# test? org.mockito:mockito-all:1.10.19 -> !!!artifactId-not-found!!!
-# test? org.ow2.asm:asm-all:5.2 -> !!!artifactId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CP_DEPEND}
-	dev-java/osgi-annotation:0
+DEPEND="${CP_DEPEND}
 	dev-java/felix-resolver:0
+	dev-java/osgi-annotation:0
+	>=virtual/jdk-11:*
 	test? (
 		dev-java/asm:9
 		dev-java/easymock:2.5
 		dev-java/mockito:0
-	)
-"
+	)"
 
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
 
-DEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc"
 
 JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation"
diff --git a/dev-java/jal/Manifest b/dev-java/jal/Manifest
index cb8d1b236b10..95850d3f5850 100644
--- a/dev-java/jal/Manifest
+++ b/dev-java/jal/Manifest
@@ -1,3 +1,3 @@
 DIST jal-20031117.tar.gz 48793 BLAKE2B b7cb51f5adb2b0f2fc4e03c9adf826519accee43aee3d98be0139439408527618af9e30b63c1e439a5defe4c74a0185ea48e9fd24235a319e9571fb8764e080f SHA512 0cb6cbd5e80d38dfbf57417b756dbc3bdddb2a28c4cbec292799ee71ac86cff3121f1e09e86f976f6562dafac54835bdd58780e4f1ffe733897b6d6ef053f95e
-EBUILD jal-20031117-r6.ebuild 1052 BLAKE2B c0a2ffe2e9b783de798d5bb014df174a1b5fe7cd5e5db33878075dac96b16e17c949e3489c8b73d43218d9c8104361d3b8b3bc990ba3ea07051e9e29ec06bd42 SHA512 60ca5eadc41bd29a4cc0543ef6ea8fa93901a71e39cbdb74e56c1dd5d070685a8343d72d8771bb52eb2c68be48ab972211eca614818aab745e593969169c07d0
+EBUILD jal-20031117-r6.ebuild 1063 BLAKE2B 3c340606dde9226c6687140e313dffef0e582e97e579bf7c0216c7b7fa8e91d5ccebbbb1e7d2756bce44b8dd536f9169c59e0e1f04034cd7a8c2b879a40e947a SHA512 15368e2fd94f43721d7223abb85f2d6fc14073ce2bcb57164457e6accfdf7d9710c1f3e0a0741664862cd937e0f85f1f1979130a7a26290d2722d5830d0df446
 MISC metadata.xml 549 BLAKE2B a1f9b88d1930fa34d04a62d2f927f85f981edd46abe2a5a210701a223982abe059c27ee6ef61cf6efe06b0baec457982b5871df4ceabd51068e9bd92645cf9af SHA512 1e30ba295c2d7b008bedf56eaf212266359ca2ecb82206be5e542c44b5912b3ca0f4de8afbc45dab628a35bb3b6d5b2974a596878ecaca7b9054ef9ceaa35028
diff --git a/dev-java/jal/jal-20031117-r6.ebuild b/dev-java/jal/jal-20031117-r6.ebuild
index f8f5bb559e77..d8d008aab7b0 100644
--- a/dev-java/jal/jal-20031117-r6.ebuild
+++ b/dev-java/jal/jal-20031117-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Partial port of the C++ Standard Template Library"
-HOMEPAGE="http://vigna.dsi.unimi.it/jal"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 
 LICENSE="HPND"
diff --git a/dev-java/java-getopt/Manifest b/dev-java/java-getopt/Manifest
index 0ea45e0399ed..30710165498a 100644
--- a/dev-java/java-getopt/Manifest
+++ b/dev-java/java-getopt/Manifest
@@ -1,4 +1,4 @@
 DIST java-getopt-1.0.14.tar.gz 45561 BLAKE2B d82234c2e49f6f556ddabd38cd283a63c2f6365ed23c227c42c48c75d834ce7de6a3fdc84c890762f05a63d4e09bab7e584f1cb9d17ef0a4784cd36c62f3128e SHA512 611a08b60ed787eaa1bf6bf6ce45075ed2bd75d7eead941879e019ef12cb4fcd7a196d0e64e9a75adaf35240c872f14590d7afa4e2dda03016fa970bd2e2dc25
 EBUILD java-getopt-1.0.14-r1.ebuild 834 BLAKE2B c370b2158f06519adf35f5d626d996d63e807dcf9b9570445764220e8a2500fc925ca0f0572c6f9c64d71966128e8fbd39da6d9cc38c54e53b9e77afb3e07ea6 SHA512 ef61d990d4b366aebbe7939ca4193abe2d1bc62e873216244b0f5087d553942ea3b91aa081f6178d110663e3634d963eb951143bdd11670de5813f918b459171
-EBUILD java-getopt-1.0.14-r2.ebuild 871 BLAKE2B 190c62eda62858e57382106e3e9d87950144573d988541560f1a203337177544cffb1f5372b05497f66dd29496058dc713951a64a0d78765b177a329801c0ce9 SHA512 c8411827aecf4d26e47219f3a93e1822c90df699d82f6ba1d194b405d977228cfb70e0324fb56c867d7414b4044bfa7bd23b84ca43e30563f1c040886eaf8508
+EBUILD java-getopt-1.0.14-r2.ebuild 869 BLAKE2B 3d93f08fc279a583435eee6d255b1137badcc2bf3f2b41592d0bf343cb22aee7f14b97308483b0ae7d5d07cca4283b89885a049825d7caafdf7c1a9257d35446 SHA512 c4cfa7432a928f1be27378a2cea727e992102b674d7fce5af6906df8dc24e68ba3ddf75dab3921494b5ed00dc9fb1ae8197cdfe59cb24432863efbcc8ac8d930
 MISC metadata.xml 319 BLAKE2B 8d40237d50e465875bdb05c3ebef67c94cc4f0b027b144be26d5ede9615d6b901f280c37a2cd23d409b6fc961793e1d83424ffb6469e2318ff427fd6f7f5dad4 SHA512 736af5ae0778189310f240fabe9ee24651fb1b552eb73f672ca559a7853d0b86ae1c6877f2176076e22d93ca807a80a44eb990156855afae3a2ff7d0d93cd48d
diff --git a/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild b/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild
index fa256a4e77ce..efcb94a4aeea 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest
index 2e0b15eaaf3c..e4ed5126ddcf 100644
--- a/dev-java/jcommander/Manifest
+++ b/dev-java/jcommander/Manifest
@@ -1,3 +1,5 @@
+DIST jcommander-1.64.tar.gz 4404316 BLAKE2B 17ade214604de2ed8e85fd8b8043483f5b3c6d26b7a59afe2cc83dfa804fa298a2a1a4251ac65f66ad3a89002f532c29ee031b0a26293cbbd4f3df72e9a3a6ac SHA512 aaf7c323d9a829635847774b927d63cc35fbe479271029b8f3fdb94c6839dc26ac55f5c28fefbee6a0219e11c73f2c487c3660bf2f3a7f4033c0e2092d6f2fa4
 DIST jcommander-1.82.tar.gz 4433079 BLAKE2B 08111ae7a85202dc3a082db58f42ef5183b05cae827bc304ba426a3d02bf7a4123f84500e6ec5694578a7aa29c631cca692fe71d67e12a1107c57e1858be4dcf SHA512 1abcb54cec21e95a3e5fc952320a7fca1d480f9900992e686f66df49749b6eee79e18dc670f10cc05b0d2a4f0a72fae302568a51ff193788897878aefc3ff67b
+EBUILD jcommander-1.64.ebuild 573 BLAKE2B 578a360dc97bda518497b099f5e3d3c9be7d50e12bf298dcbc41c32c4f6b54037ea02fce14ac51cb4fe5e9434a6205629fce1e91b416d8994ac691333046c40a SHA512 b7317f7f5b3a402bc03c3d2a9577b661061c388ee1ac3b38855a63e5f9c0a7119ab0c81e2aa2fe5b6ec3f3b6cb9909baf60711cca32a3ff2a263c61f3568f362
 EBUILD jcommander-1.82.ebuild 1664 BLAKE2B 2f8a41a1c5142ad2449bf2eccfbd5d0fb50afbfaba2f5e98f282a55dd96b608546a8226f05d0b463be8855d6e22c1e652263407855eb89649da898bb3797dba3 SHA512 e14edea1c5882e1c4fd17c1162238c9ab55ac3503b0a2224b0fcc535b05cae9381121cc55969113818b94ffa28725e1c8ab2339f267a2539b197f523581ea147
 MISC metadata.xml 329 BLAKE2B 35efab95ec95b721d53463b4fe8d98358c632a76476f1648e2e1f33f7432b2fbf9d00199e4e53c047a91c90ac9e86e733089bf1c9dc69a9f2961d7cc8266b710 SHA512 c83a4611485d806ca1c1848db6605a8d4956956dd521e5b6171d98027324236e51a13c9032e76b462168d07bb74dc105fb9587ab91bd554845d733e668c9df32
diff --git a/dev-java/jcommander/jcommander-1.64.ebuild b/dev-java/jcommander/jcommander-1.64.ebuild
new file mode 100644
index 000000000000..cb9a9a664486
--- /dev/null
+++ b/dev-java/jcommander/jcommander-1.64.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.beust:jcommander:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Command line parsing framework for Java"
+HOMEPAGE="https://jcommander.org/"
+SRC_URI="https://github.com/cbeust/jcommander/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="1.64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
index 50eda94f887c..fc89ae0f90a9 100644
--- a/dev-java/testng/Manifest
+++ b/dev-java/testng/Manifest
@@ -1,3 +1,9 @@
+DIST apache-groovy-binary-2.4.21.zip 37467992 BLAKE2B e0f925bad53f0f8a7012f0bea420ec3e5986118cc23cd677a11f619284754eacc15c3012cf780063fef574053781bba924a86e5fa2ac284d86f349ad18173704 SHA512 e2f73405d7521b99e3ce5622cffcc505bbc039ccb1c35696fc895d648a9325937a136cf97a229f7ac1b90b63ad8603881350c4d41e514ad45233fb333d76d510
+DIST groovy-all-2.4.7.jar 7015434 BLAKE2B 23d22ddd78229c485ed9384169acee154258644249b856661e17d1d0efb5518e32473a26962b5d657a09b41d490813ed76254820ffdf39e83869209617b66c2d SHA512 4c26ff9f7137c0506c95f7ba1d4228ce57e16d87b77dd1d114390224207d71d3958460c7b5a239d5f41596ab87e7f4aa7aaea1dfce19a50badf8f9b818329c54
+DIST jquery-3.5.1.jar 313070 BLAKE2B 76abfbd21d83f72a3cfcb666f3a2fcfcf5975e723a462996bac9701caf6b59cb9998746af713ebb1f6bfe49cce91544216cc65dc6819e95e8a15930744685415 SHA512 9f560415b36875958ff1d3c6d37fa79d6d134c5f5fc7719dd21db36d1f24dec39787834b2a9ffb104ec6b56e725ccc524a8ff9b189ced3d68e24296b2daae720
+DIST spock-core-1.0-groovy-2.4.jar 588030 BLAKE2B 68d8fad8b6ffb45a18778797ea23d4f3b09256bf4e9f207ee666d07572399cd13522e6f1590219a80e23f6906a2e9eaf1f22c6a3c01717e8c1e99b5d37b89210 SHA512 078c0b16688eaa3134043e58ed4273981797ea92f08723b5508c7d7e4f635278dd5ca731fb294da2a1f35674623d969ee423d4344c2c822e1d4cb8d4f3383790
+DIST testng-6.11.tar.gz 677522 BLAKE2B 2e7bf30fcf805cce5a7ec42f22c39e9f4678642fcde9752c51d118e655189805661edeeff1a3db0e960c79e7542fe25ab8fa6995f142da12b3adc8753fd8a361 SHA512 996d7a18399e16626756b7a790182c7b6bf3453280209d0a09d4a509d698fcad1a80e58ec36702de95bd59c90c237463719ad44934c14390620fc9655d871252
 DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e
+EBUILD testng-6.11.ebuild 2900 BLAKE2B 38d9064c21e7507c702f6bb821e6a6ba7dc846786560ebf0d0d245c92531b2a429c2315faf23faae6662c81bafa6b4c3b29bdae2818a6036662e931c4414f46a SHA512 0f1a6eec4101f926b6b05ff6d236ec2cbd5674014223f899da26c6f43bc2926beec05a9067f5b23fbb2422c3f070beeb9235aa503e3e0946698699ea2148ad7b
 EBUILD testng-6.9.10-r1.ebuild 1780 BLAKE2B 62f09080eed66022b7405957bd165bd3577648c10c44cca649585875f10df8f0e3a85347d24a889566eefe18682b26077ec3031df1fc3edfb43da43fdf664a52 SHA512 4853dc5819df413ec32f16d89d4d89e00dbcc517e51d7d481606c9435f2342a17a308450b0f896bcd9a6331929dc2db57756b8fe4b7160dacc864966f3952953
 MISC metadata.xml 320 BLAKE2B 5ca0fd5c9a1b96006e41e91449b99b94d176cb4bd23729a3dc320e22ed1a5cb25dda726e685be7f5df57cb2c73d8d54fab29e5f549568b6e2a80162980d92fa9 SHA512 0195fb62a47f3bb7617d6fa59a920621a2c58cf2821ab47db87337fc1976339c7d382af35c24b7454781d2f4fce1cd7e5900a293ee5e519af87354486a9480a5
diff --git a/dev-java/testng/testng-6.11.ebuild b/dev-java/testng/testng-6.11.ebuild
new file mode 100644
index 000000000000..fa7a919959da
--- /dev/null
+++ b/dev-java/testng/testng-6.11.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.testng:testng:6.11"
+JAVA_TESTING_FRAMEWORKS="testng"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features"
+HOMEPAGE="https://testng.org/"
+# Presently we install the binary version of jquery since it is not packaged in ::gentoo.
+JQV="3.5.1"
+# Currently we bundle the binary versions of spock-core, groovy-all and apache-groovy-binary.
+# These are used only for tests, we don't install them.
+SCV="1.0-groovy-2.4"
+GAV="2.4.7"
+AGV="2.4.21"
+SRC_URI="https://github.com/testng-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://repo1.maven.org/maven2/org/webjars/jquery/${JQV}/jquery-${JQV}.jar
+	test? (
+		https://repo1.maven.org/maven2/org/spockframework/spock-core/${SCV}/spock-core-${SCV}.jar
+		https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-all/${GAV}/groovy-all-${GAV}.jar
+		https://downloads.apache.org/groovy/${AGV}/distribution/apache-groovy-binary-${AGV}.zip
+	)"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="0"
+
+CP_DEPEND="
+	dev-java/ant-core:0
+	dev-java/bsh:0
+	dev-java/guice:4
+	dev-java/jcommander:1.64
+	dev-java/junit:4
+	dev-java/snakeyaml:0
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/assertj-core:3
+		dev-java/guava:0
+	)"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( README {ANNOUNCEMENT,CHANGES}.txt )
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY="src/test/resources/testng.xml"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean ! -path "./src/*"
+
+	rm src/main/resources/META-INF/MANIFEST.MF || die
+}
+
+src_test() {
+	# This contains the compiler groovyc
+	unzip "${DISTDIR}/apache-groovy-binary-${AGV}.zip"
+
+	JAVA_GENTOO_CLASSPATH_EXTRA=":${DISTDIR}/spock-core-${SCV}.jar"
+
+	ejavac -cp "${JAVA_TEST_SRC_DIR}:${PN}.jar:$(java-pkg_getjars guava)" \
+		src/test/java/test/SimpleBaseTest.java || die
+
+	# java-pkg-simple.eclass expects generated test classes in this
+	# directory and will copy them to target/test-classes
+	mkdir generated-test || die "cannot create generated-test directory"
+	"groovy-${AGV}/bin/groovyc" \
+		-cp "${JAVA_TEST_SRC_DIR}:${DISTDIR}/spock-core-${SCV}.jar" \
+		-d generated-test \
+		src/test/groovy/test/groovy/* || die
+
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/groovy-all-${GAV}.jar"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN} --main org.testng.TestNG
+
+	java-pkg_newjar "${DISTDIR}/jquery-${JQV}.jar" jquery.jar
+	java-pkg_regjar "${ED}/usr/share/${PN}/lib/jquery.jar"
+
+	java-pkg_register-ant-task
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7313b72e495b..4dba021e9b0f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/agate/Manifest b/dev-python/agate/Manifest
index 958e3aa240d8..23308c9ba075 100644
--- a/dev-python/agate/Manifest
+++ b/dev-python/agate/Manifest
@@ -1,5 +1,7 @@
 DIST agate-1.7.1.tar.gz 202018 BLAKE2B 9df0f108f1ac47c1eb199015aedc903d72ce62a7d2c34198f0f287863527a2305c5682ef7dd385d130fd0eb3ce566e98978b9ef438858510e3aeae02a6345318 SHA512 e40df26f1e738b4c386f540d642f4fdb240dac5229032c6074977a67c7fdae7838c770703d93916e10741a9f2569ac9672165f8c8715b2567b2e5b926c7dabd5
 DIST agate-1.8.0.tar.gz 201730 BLAKE2B c0138f912d6981059b8cd62424bdb428c9b6bff566bc47466bea9f0fd78f100333583dddaf081ea2f9810e8a1e586d4697960141ea4e97e8cef4a5084f09ce78 SHA512 9870f31f87efcb057947cf0c93062c2dbfa2aa996d1e6d69c552935eca3ab5c047ea0cbdf2eaca8e37d2a0530d210318fd342324f1ce43d7cba9f6291206f6fb
+DIST agate-1.9.0.tar.gz 202237 BLAKE2B f4a6609f843b0b0499b44c6596c186198e2d6a0c964727fbd3d3fa69bd6164a067384354e3426a0276f91fc3b6f2d1fc86e05e4d4be974d1f2c223b20cb5a6b3 SHA512 bbd05b503d27e34625cebba71c0d3a1362bf63c45a3ce7c327fb73f0730b739fe8f9bf780c37c4e1a0e70c9d263d9191946fa6b70c147c0761a43ed479ae7fed
 EBUILD agate-1.7.1.ebuild 1133 BLAKE2B e4eebdadb1598214cd15244bab87622b16a1afd8248ef5c8b1ebcfe96fe96defca6a436b52bdca7a8b91cceef74910604cb36222eba9a6022c060f9efe9b0dd5 SHA512 ea1287f7bfff8eb835309ec03c9518e0f7fddaef28a77656ba66a94b450b661fa2c3621593766c001f7c141103c99141a5b7951e847717c3a4e52a91e6d12293
 EBUILD agate-1.8.0.ebuild 1122 BLAKE2B 3e4bd01a37455a15a741bc3ad35767186f84c88b2fd7ae703eda57d52941fdd75e899bb4e9c26ea894329748c6a960eef78870c450db69eb68111ef2049811a4 SHA512 a7ccbad1830c0b74c1b97d6db4910f425afb554b608ee8d7f7a6eb978db9361e4957ee7df9b54adc8a36777efca19f058720a9b4855828b3a7eb8ac6bffb0d30
+EBUILD agate-1.9.0.ebuild 1122 BLAKE2B 3e4bd01a37455a15a741bc3ad35767186f84c88b2fd7ae703eda57d52941fdd75e899bb4e9c26ea894329748c6a960eef78870c450db69eb68111ef2049811a4 SHA512 a7ccbad1830c0b74c1b97d6db4910f425afb554b608ee8d7f7a6eb978db9361e4957ee7df9b54adc8a36777efca19f058720a9b4855828b3a7eb8ac6bffb0d30
 MISC metadata.xml 611 BLAKE2B a288b63c7859d99467f9304b4d8b007b9df6b4345157e3b7363f23757797fa7f84420b8a515f754775de14893c2fba1ddd62fc3757f5b96f791f65b524db41f7 SHA512 3101db1d600b60da2704dd732b898db6d932ef2305a28dbfdc8b221fc7938a72309e1fd27af4567b4930a20f00490ad8d65bd962978df44cf401ddd058442f02
diff --git a/dev-python/agate/agate-1.9.0.ebuild b/dev-python/agate/agate-1.9.0.ebuild
new file mode 100644
index 000000000000..bf35fa27a14c
--- /dev/null
+++ b/dev-python/agate/agate-1.9.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
+HOMEPAGE="
+	https://github.com/wireservice/agate/
+	https://pypi.org/project/agate/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.0[${PYTHON_USEDEP}]
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/leather-0.3.3-r2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/furo
+
+EPYTEST_DESELECT=(
+	# require specific locales
+	tests/test_data_types.py::TestDate::test_cast_format_locale
+	tests/test_data_types.py::TestDateTime::test_cast_format_locale
+)
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 57e8e0eaa513..7eca15c3222e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,11 +4,13 @@ DIST boto3-1.28.61.gh.tar.gz 711460 BLAKE2B 7710c97ecb3e968a302abc9645488a470fdd
 DIST boto3-1.28.62.gh.tar.gz 712305 BLAKE2B 1d61f857143f9471a254e035cf532cab38699262b116ccc40e922005bf90ca64a33b7aa7f64df8b0641f58e250d9b6000977a50be10e5ebe93dcbf54148276b7 SHA512 f13d8f812caa650d877ecb3ae72a47ed6f93dfbfede62588266909917a1af6c8c446dbefd130d39f9a5dd156e1b9eca96a0ae084bfbadf926cdcfabfc255633c
 DIST boto3-1.28.63.gh.tar.gz 713769 BLAKE2B f2e300458934893bb6d2186e900c4ba9abbd51d2ffabdbcd3026394315653e64fdc486f3ed4e33b26bef160b00e75acea875278eab03b4eeb50b5ecc94d4c0fc SHA512 782c7bb48af31638899e8bcf8fc87f67ab793fe724392be90951ece61b165f55d1df47585bd5211d7ecf3c989e5316ff9db774c8f0f357d1afc2af3ca0e49879
 DIST boto3-1.28.64.gh.tar.gz 714823 BLAKE2B b051c57d2852699d2c18472629934b97e76f30b1e6e0f398fde113771146cd65f8042bb8622884294fb802424b7beb498648d558f6d5cfc3dd48b1100dafc2d2 SHA512 ca0042e173c4a35dc9d6ab8ed362d3308753d3722bb4cf25302fd0018c5d94e66a2ea288610192ad5a353ca54f0ab8f1942224269935b1fe3444b2e70842da13
+DIST boto3-1.28.65.gh.tar.gz 715573 BLAKE2B 24cf962b2b9e5c52f0e8d86e9acd730c4fe48bd7634ac65ccdf344985e82c51af05ff10f903cbde5048e8510adc5a83992cf2ad4ddf880435c121b20f981a6f6 SHA512 ea8ff1b72b5b8db00c959abf522a7aaf53bccf9b1e06f8ce70052cc752d18b73a8bc75d6bd97bd0740acac5bf3fd68f6fa39fc8aa084128291940c93d6745bf1
 EBUILD boto3-1.28.53.ebuild 1581 BLAKE2B 0bd744caa1591cf114c8ce87e14d9af4afd13782c7e012c6701b9a13b66d913798bffa5a79753d1bd9c5928893c6b92478d9d3c8a764d59982bc864bcbd0619f SHA512 e3985f59bcdc4548dc51ca23290b3ac4d9d0b5e6f214e3e7a73dde99232ba7fde47983aa8fdd6679d148f4ab56c0b01906e431c33c3f9b8eebc7cb75f99b74dc
 EBUILD boto3-1.28.57.ebuild 1588 BLAKE2B bfcf68e1a1dffa36c71f030ad8743b59c9170c34a425a7982ee81d1fb0df1c29fdecefa7b55f373557b735d60ab51d510ca398edd4045def5fffb6d4d4d9d579 SHA512 1bca684f585a51d8b58a594c71974b36b145912550f051d6d4c84ba28bce949ec10c112a6f7bfa8f60fa362d9126d9a830243ab36595754bef02f19e02161bb8
 EBUILD boto3-1.28.61.ebuild 1588 BLAKE2B bfcf68e1a1dffa36c71f030ad8743b59c9170c34a425a7982ee81d1fb0df1c29fdecefa7b55f373557b735d60ab51d510ca398edd4045def5fffb6d4d4d9d579 SHA512 1bca684f585a51d8b58a594c71974b36b145912550f051d6d4c84ba28bce949ec10c112a6f7bfa8f60fa362d9126d9a830243ab36595754bef02f19e02161bb8
 EBUILD boto3-1.28.62.ebuild 1588 BLAKE2B bfcf68e1a1dffa36c71f030ad8743b59c9170c34a425a7982ee81d1fb0df1c29fdecefa7b55f373557b735d60ab51d510ca398edd4045def5fffb6d4d4d9d579 SHA512 1bca684f585a51d8b58a594c71974b36b145912550f051d6d4c84ba28bce949ec10c112a6f7bfa8f60fa362d9126d9a830243ab36595754bef02f19e02161bb8
 EBUILD boto3-1.28.63.ebuild 1588 BLAKE2B bfcf68e1a1dffa36c71f030ad8743b59c9170c34a425a7982ee81d1fb0df1c29fdecefa7b55f373557b735d60ab51d510ca398edd4045def5fffb6d4d4d9d579 SHA512 1bca684f585a51d8b58a594c71974b36b145912550f051d6d4c84ba28bce949ec10c112a6f7bfa8f60fa362d9126d9a830243ab36595754bef02f19e02161bb8
 EBUILD boto3-1.28.64.ebuild 1588 BLAKE2B bfcf68e1a1dffa36c71f030ad8743b59c9170c34a425a7982ee81d1fb0df1c29fdecefa7b55f373557b735d60ab51d510ca398edd4045def5fffb6d4d4d9d579 SHA512 1bca684f585a51d8b58a594c71974b36b145912550f051d6d4c84ba28bce949ec10c112a6f7bfa8f60fa362d9126d9a830243ab36595754bef02f19e02161bb8
+EBUILD boto3-1.28.65.ebuild 1588 BLAKE2B bfcf68e1a1dffa36c71f030ad8743b59c9170c34a425a7982ee81d1fb0df1c29fdecefa7b55f373557b735d60ab51d510ca398edd4045def5fffb6d4d4d9d579 SHA512 1bca684f585a51d8b58a594c71974b36b145912550f051d6d4c84ba28bce949ec10c112a6f7bfa8f60fa362d9126d9a830243ab36595754bef02f19e02161bb8
 EBUILD boto3-9999.ebuild 1588 BLAKE2B bfcf68e1a1dffa36c71f030ad8743b59c9170c34a425a7982ee81d1fb0df1c29fdecefa7b55f373557b735d60ab51d510ca398edd4045def5fffb6d4d4d9d579 SHA512 1bca684f585a51d8b58a594c71974b36b145912550f051d6d4c84ba28bce949ec10c112a6f7bfa8f60fa362d9126d9a830243ab36595754bef02f19e02161bb8
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.28.65.ebuild b/dev-python/boto3/boto3-1.28.65.ebuild
new file mode 100644
index 000000000000..a37cc38af2f3
--- /dev/null
+++ b/dev-python/boto3/boto3-1.28.65.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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} \
+		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c5acd3acfc0f..3124931c0524 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,11 +4,13 @@ DIST botocore-1.31.61.gh.tar.gz 11959525 BLAKE2B 27797d055bf54b91b5eeda7a41baddc
 DIST botocore-1.31.62.gh.tar.gz 11961556 BLAKE2B 315a1ba1543ba5b92c0a0394a4a21b124a9435e660daef43164cd61ce0b5924c6ba9fa82e41c32b4ae7f0e89783abbe107abf11c807e81a3cb2f883352935053 SHA512 ba13c945fe9308bcc053d459b8934ea358e734b3079620ceb4d4df8274426f349a0ff26190d45275ca05588d48c692338c2dbdbde5122fdda79556af64cfb6c8
 DIST botocore-1.31.63.gh.tar.gz 11975759 BLAKE2B 3e757c6303f3390d3d563187c47140042d09271b16022a7a633bf68dc7188d42ac5a73838d2ae0556c8eec63296bb3f3b3f1011889fa7c10d660654695cd70f1 SHA512 39f1b6cb5c61a55a6f01e41750f651baf16c6d66e0b9e30cff042f54d03c0e862ab91a8f918257df8da678b13e732c68e887b21aa00006778bafad5361f4edd2
 DIST botocore-1.31.64.gh.tar.gz 11983429 BLAKE2B 636f0c394a3af8bf174f992444e3e352893f3e8cf11e9732a6e73af3f155b638e9ee3060617bbf184b5872768257ad81aa95379b48452a1fe8a6bc100f601074 SHA512 375b406eb16f93d0ca9631fe9943959d24b62ac579b70f0782f6b386933fb3de25343c05bda7667c441c050ccd10c9c5a254bfd8a620610adb7669ed326a0203
+DIST botocore-1.31.65.gh.tar.gz 11988384 BLAKE2B 38c563e13e4205af8f41622eb0715ae11ac2214979d367894afc75a872e2d2d38be57f8b8a10efcd847bc8751b09e5d4394f21aa8bf4358d8ec55888adcb68d9 SHA512 1919efbf6d807a23d33050c7d306cc63bf85f088b84b6ea18a58b40eb0acec4e2bb6acd3150bd7b2939bed594cfc3fa681c094b35b8ca049ef2299c60502c3d0
 EBUILD botocore-1.31.53.ebuild 1592 BLAKE2B c5a131514206b9f7ef98aaed462ec767d932eeea538773e42ca99947021c1041dbffcd6e2f46d892031cc069e60a9a0ca607d9550ac1c5aeed89d1054e00a1b2 SHA512 056d3df23d41a7a44604241a9cad27b7052f065f5e4cf9fc335cc0228ff6e27cdc744cc9e1a33f5b77414dc598467ac436588e6f1e1375464b8ea5961dbec73f
 EBUILD botocore-1.31.57.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 EBUILD botocore-1.31.61.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 EBUILD botocore-1.31.62.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 EBUILD botocore-1.31.63.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 EBUILD botocore-1.31.64.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
+EBUILD botocore-1.31.65.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 EBUILD botocore-9999.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.31.65.ebuild b/dev-python/botocore/botocore-1.31.65.ebuild
new file mode 100644
index 000000000000..7cacb5c3f634
--- /dev/null
+++ b/dev-python/botocore/botocore-1.31.65.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_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 EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 6ba12405ae2e..80c2163b961e 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -2,8 +2,10 @@ DIST cfn-lint-0.80.3.tar.gz 3685775 BLAKE2B 3b8d233e64d2060b124eb560aa963c3ae06a
 DIST cfn-lint-0.80.4.tar.gz 3657880 BLAKE2B 8507c2381bfb7e7f796eb8fbc505bbda48bdb217d9357063289d66307140914dce7d40de8851b0459e6f6154bc3e09d4d0e30da5e1f1cdcf0fad6e8f8b00f3d3 SHA512 a09954b014d2cf677b97012b2635345f94cefbe227f4040eed80aad5ee602daa2542a636295a4c90ad60bcf4e8eb9015a5b9de75c72ffcb903a6ec460a22267e
 DIST cfn-lint-0.81.0.tar.gz 3688759 BLAKE2B 595429d5891b5a4b563645c2b3ba55e8c79179419de73bbaf7298462c40431074ac4c31c7b4fabd037ed252771f3961a006cc2ea4095b79bf0e7dab4c952b4d3 SHA512 cbc4a7183c147df9c057420dd9f407762fd79a76447212a4c8ae183c3915061b2a93d3d1cc18a733ac809a81463b1f8cab68b031af50c56441b269c559abf7c0
 DIST cfn-lint-0.82.0.tar.gz 3714744 BLAKE2B adaf9e7482983f6585d9ae83979d3066533eeb6192019b621e206d144fbbb0ae0bcb9f3f70602d41cc3958218130ecdbc54eeb7f54f645c729cef1eb31bd9aae SHA512 68c90bb34be029c635f0e1caede46560b011d92a149b701fb3e2aa5794462a9e28addd4489e9fde06df110684728a7dbb9c383a37d7510e076a30d5b7d653cd9
+DIST cfn-lint-0.82.1.tar.gz 3714778 BLAKE2B b06678e0046ffaf9d90245105303c37d8bdca2b5a3e77dac37969185483a4c60b43de418e75c76fd49f8418eddc2892bec91d0a4fac92831d8840f174f841e9f SHA512 6bbce9cb54db302298df811ca2ebbb7fffe01ad14e31808fb66b257c25606baab9948e31d4bb113e816510a16737a33be5a5e4effc6b6f30c56eb232f8f8ccf6
 EBUILD cfn-lint-0.80.3.ebuild 2066 BLAKE2B 796df054c86bcd34236e7862575bdd323ea2b664f0f4aeef1f0cc0a6701abcee2b581115f08bc339d3ab39285316f13f87698533a926a5202cd35a3fb2a1c671 SHA512 94c3cbfbfd0b310086112fe34fcc5314941c3459990ed24bf9df2e3ef954876b532fb10751187770f7f94c614bdbec765c18f75ab659b9978a60c34e3f74a1e1
 EBUILD cfn-lint-0.80.4.ebuild 2068 BLAKE2B 9c1980d65cce4e1343db0d4c3e8bb488f4a6790f1b45aa4f4e68ba117a8b2257ac44c722ba77d8ba1fe5582513d829b7ab7df19b466e04041323c933681abe5d SHA512 0cee2a5e229063d39ecd2fb276e7a1b046e6f27801c5c4408c58973b54f073060b53834e20c08937abd8c8a1352b935977ac811efd26615b0af5e603de7d8433
 EBUILD cfn-lint-0.81.0.ebuild 2068 BLAKE2B 6a553b2b5b7f4fdef344a98f64068fcb00670ed1dc91b8d67447b4d8554db05defae8b8b5aff2371c832c2f32f9f6a25c2ccfabe103a7329cffe1ce49c82cef9 SHA512 b4765b94f84435328941d01100306db3bb9a322e9a61aea7884e90c982a26969e860e39eb351e968c8cbfa246e35624136010f3df6d6bb4055a36c93aae4b1c0
 EBUILD cfn-lint-0.82.0.ebuild 2068 BLAKE2B 6a553b2b5b7f4fdef344a98f64068fcb00670ed1dc91b8d67447b4d8554db05defae8b8b5aff2371c832c2f32f9f6a25c2ccfabe103a7329cffe1ce49c82cef9 SHA512 b4765b94f84435328941d01100306db3bb9a322e9a61aea7884e90c982a26969e860e39eb351e968c8cbfa246e35624136010f3df6d6bb4055a36c93aae4b1c0
+EBUILD cfn-lint-0.82.1.ebuild 2068 BLAKE2B 6a553b2b5b7f4fdef344a98f64068fcb00670ed1dc91b8d67447b4d8554db05defae8b8b5aff2371c832c2f32f9f6a25c2ccfabe103a7329cffe1ce49c82cef9 SHA512 b4765b94f84435328941d01100306db3bb9a322e9a61aea7884e90c982a26969e860e39eb351e968c8cbfa246e35624136010f3df6d6bb4055a36c93aae4b1c0
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.82.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.82.1.ebuild
new file mode 100644
index 000000000000..ed04444ce9f3
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.82.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.75.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/requests-2.15.0[${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 setup.py || 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
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 98ad0d6482fe..e457fcdcdbbf 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -6,7 +6,9 @@ AUX cython-3.0.2-enummeta.patch 2485 BLAKE2B 65d662309a470e316f6fbf5d310f6a0821e
 DIST cython-0.29.36.gh.tar.gz 2115333 BLAKE2B 6d43779c7222ff65d7de3a35ec18ef636480807d53480a8f94cc8c92d462fcc2f4d201a3bbf6e840a11fd33025e32c53f85626b05c131d10eed2859cdca7eb2d SHA512 a086fe1a11290cd3c870b891e61a0a0e2595bab9c26888024a758b6950c07059346d682fa9349e46c0af89805abbdd750059b3189960b8ce18007dfb5eb4391a
 DIST cython-3.0.2.gh.tar.gz 2744583 BLAKE2B f631891870a6ce24acf2bcde75ebcb9775cf0df7840fe9d7b138cfdea64d54e9253a53d35d892a9086f251c1294d9414eec8521218d031840a3cd06903fefb86 SHA512 f55be138efdca6ca61bd39c6f2fab736244328a170a6f6c9bda87036e022c846930b209e9e9101fad889cb179d6e60034ba6f299f14b3056536d46235b438eb7
 DIST cython-3.0.3.gh.tar.gz 2753188 BLAKE2B 0e6d40533f1cebf3c4217dc19aeebc2f873a8bacb94e68810e81d1c6d4cd75176de88516f2d82f43b36107656b6cd5e6990547e93bd8436b1aa93c73ccda6eaf SHA512 c27c16abaf0122ad61e0eeb92aa80a33fc491332b8ebec209cd1810d2b0e3bf14fe1e81838803b86f407520a6d6f7ab8b84d97e495e7d91fd6f7702a46980caa
+DIST cython-3.0.4.gh.tar.gz 2754689 BLAKE2B 5418b8c374565894deb07e7a3f2fe242e1ef43eed5d716cbd9c6b9fd3d62088d9982eb156c981fa9f6edcf42592f2249f9eb450d16ef908be464e357ee9bbea7 SHA512 bc87e38f9c188a5311f75f49ba4b9ec1ee0af00ff9ed655ca69972891f8b0801025265f8cad4521670088275c7da3d6136aeda7ebb6a33554f64cc7aef362c73
 EBUILD cython-0.29.36.ebuild 2232 BLAKE2B 437729f1c61680b7d7f4d6cba1bbfd85e8ae6f70e4da47d8ff30aa84cf5ec50e7049671d75d6b7921e02236ffd47c3451e6f01bebc9e55e1ee834879e62f8b56 SHA512 dfd4d1f7c1907f27ff38a2e2dbcf27de4c5435920cbd19874430827e3089ca6285d225ae594f6c1566d84880fbcc541a7f78f3709c960822590b2e4fba5765a8
 EBUILD cython-3.0.2-r1.ebuild 2085 BLAKE2B e8a78a6d020acf7755d6cd2ab0c9cb5f9a704eb4aa3bdff6761fd6a9cacde72374fb49f270bb98eab7d9754a7f03d0a43f863f0eb7336f5b7af405f884887eaf SHA512 3685d1eb1d4766ddca4220a750c13ad978bdffb168bb3ab05671c22e58f1860ace6ca60c3d8a55c74226942c711124a2953f51861ff2ce05f7fed21aad626620
 EBUILD cython-3.0.3.ebuild 2017 BLAKE2B 0416cca96aa1e5ff9ef31fbad4260b348aa33f7422b0092e26a8a7564613fc0b2681d3f1a3345775e0941e863c96624878f7acf3bd47f3b28a67a113daeb5434 SHA512 933421ea06e3ca92c8a635b73e474e783fa4456870f63f34bd55f706e8e97bdff918b9cb03c1723389839f2dfd16de3e869b87336494327f7abd3cbd60d87776
+EBUILD cython-3.0.4.ebuild 2017 BLAKE2B 0416cca96aa1e5ff9ef31fbad4260b348aa33f7422b0092e26a8a7564613fc0b2681d3f1a3345775e0941e863c96624878f7acf3bd47f3b28a67a113daeb5434 SHA512 933421ea06e3ca92c8a635b73e474e783fa4456870f63f34bd55f706e8e97bdff918b9cb03c1723389839f2dfd16de3e869b87336494327f7abd3cbd60d87776
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-3.0.4.ebuild b/dev-python/cython/cython-3.0.4.ebuild
new file mode 100644
index 000000000000..4223753eab93
--- /dev/null
+++ b/dev-python/cython/cython-3.0.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{10..11} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 multiprocessing toolchain-funcs
+
+MY_P=${P/_rc/rc}
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="
+	https://cython.org/
+	https://github.com/cython/cython/
+	https://pypi.org/project/Cython/
+"
+SRC_URI="
+	https://github.com/cython/cython/archive/${PV/_rc/rc}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+	"${FILESDIR}/${PN}-0.29.23-pythran-parallel-install.patch"
+)
+
+distutils_enable_sphinx docs \
+	dev-python/jinja \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-tabs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
+		einfo "Skipping tests on ${EPYTHON} (xfail)"
+		return
+	fi
+
+	# Needed to avoid confusing cache tests
+	unset CYTHON_FORCE_REGEN
+
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py \
+		-vv \
+		-j "$(makeopts_jobs)" \
+		--work-dir "${BUILD_DIR}"/tests \
+		--no-examples \
+		--no-code-style \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/deepdiff/Manifest b/dev-python/deepdiff/Manifest
index 2a6c68af973e..8be048da0114 100644
--- a/dev-python/deepdiff/Manifest
+++ b/dev-python/deepdiff/Manifest
@@ -3,9 +3,11 @@ DIST deepdiff-6.4.0.tar.gz 394464 BLAKE2B dce005461b4ce1c4b84b9093ba445b11a96b91
 DIST deepdiff-6.4.1.tar.gz 394531 BLAKE2B a95b18bf335e88beb2ee19209fa9166fe2c0c65a5312ee4283b03e745c0469913ccf3b132042c7173a518416f8d227da24f8c3aa3dd91d916ac67fb190b9bf54 SHA512 3e54313b4681b75d607ad2eb2485245f43d78f0a80adf2f50847fd9a241cb1752cf66028a3cb5dc2980786e1c9de35fa9da52df8ed434ca2f889d99250088f66
 DIST deepdiff-6.5.0.tar.gz 395348 BLAKE2B e7a509ac1950da7ba2c3d12c85eb80d03b8f78229c5a041d14aee8368d8a2a071a0afc8cad0425f23eda82d3f5038d9340c8ed2870f637fd9bb2665cd15be67f SHA512 857d1e0e34ab85c67c5b655fe245f4aba4de3620ad39e1f044bf6329b0ecd0afeeb9511a318badadb21daac03594844d6c6357c91a8056e44e67e83e4635f26b
 DIST deepdiff-6.6.0.tar.gz 400645 BLAKE2B 4210c050bf94d974561270ea9b6884d3c1004a9ebfadb1edcae361a1a15765dd7314418a4455b8ddb548100774f048df0aefea9d880179979eefcfb8f8d5906a SHA512 81b31ab52a23928746cc890439e7733b8ca6c5df390cf866977420cbd08f9d93b49d938e663e4d6e46f4b19741cbb52bc1f631b3cb733a7390535adf0fb432f2
+DIST deepdiff-6.6.1.tar.gz 402840 BLAKE2B 78fa059644d068fb0e6f16a81ba91d0e776f91eda6f049f73d57bd176a9bbca5fc60f301e8ac652ba1339be2474c9eb6912ce532d720328d2b017bfcc52196dc SHA512 5a18bdb5d5dbc7b6de39d90fc3a740ddeeddd0742953f8618eefafbd0c086138219dbb3a515ead40b315c28590b642721b9350d2b9cc9e4a1e9ea8a8dbb25712
 EBUILD deepdiff-6.3.1-r1.ebuild 873 BLAKE2B c368734341a649dbc8230927a2187a17ebd428fb214554778ce74493370f3f6f45beb1686b42372fe227226130caff0f034f72a428a24b0d0c6c54d3dcc670e3 SHA512 b7a7f88744256fe982a42a9b835ea1d8966319774fd1ee134f5bb2ac31c06c8ba4ef0e57d90ed41108958188a7a9bc30d3cb0938d8cd0e38fd4eba156527d301
 EBUILD deepdiff-6.4.0.ebuild 873 BLAKE2B c368734341a649dbc8230927a2187a17ebd428fb214554778ce74493370f3f6f45beb1686b42372fe227226130caff0f034f72a428a24b0d0c6c54d3dcc670e3 SHA512 b7a7f88744256fe982a42a9b835ea1d8966319774fd1ee134f5bb2ac31c06c8ba4ef0e57d90ed41108958188a7a9bc30d3cb0938d8cd0e38fd4eba156527d301
 EBUILD deepdiff-6.4.1.ebuild 873 BLAKE2B c368734341a649dbc8230927a2187a17ebd428fb214554778ce74493370f3f6f45beb1686b42372fe227226130caff0f034f72a428a24b0d0c6c54d3dcc670e3 SHA512 b7a7f88744256fe982a42a9b835ea1d8966319774fd1ee134f5bb2ac31c06c8ba4ef0e57d90ed41108958188a7a9bc30d3cb0938d8cd0e38fd4eba156527d301
 EBUILD deepdiff-6.5.0.ebuild 873 BLAKE2B c368734341a649dbc8230927a2187a17ebd428fb214554778ce74493370f3f6f45beb1686b42372fe227226130caff0f034f72a428a24b0d0c6c54d3dcc670e3 SHA512 b7a7f88744256fe982a42a9b835ea1d8966319774fd1ee134f5bb2ac31c06c8ba4ef0e57d90ed41108958188a7a9bc30d3cb0938d8cd0e38fd4eba156527d301
 EBUILD deepdiff-6.6.0.ebuild 873 BLAKE2B c368734341a649dbc8230927a2187a17ebd428fb214554778ce74493370f3f6f45beb1686b42372fe227226130caff0f034f72a428a24b0d0c6c54d3dcc670e3 SHA512 b7a7f88744256fe982a42a9b835ea1d8966319774fd1ee134f5bb2ac31c06c8ba4ef0e57d90ed41108958188a7a9bc30d3cb0938d8cd0e38fd4eba156527d301
+EBUILD deepdiff-6.6.1.ebuild 873 BLAKE2B c368734341a649dbc8230927a2187a17ebd428fb214554778ce74493370f3f6f45beb1686b42372fe227226130caff0f034f72a428a24b0d0c6c54d3dcc670e3 SHA512 b7a7f88744256fe982a42a9b835ea1d8966319774fd1ee134f5bb2ac31c06c8ba4ef0e57d90ed41108958188a7a9bc30d3cb0938d8cd0e38fd4eba156527d301
 MISC metadata.xml 485 BLAKE2B f26f45bd1e750536952bcedf941166ae9ed39bcaf5bd2377102fb9546f8cdca8bfe23f137fa71fc1c05adc6b602e4831c96c712f27cd45eed80801aa6d1f4daa SHA512 1b8cf1dfd77b6dcab39b1cc3385e3d1b371ac6e9074167f2ba8e43333410e671a760c25a6a4496cf45fb023243a644d15b213824bd6a33c39991ef251cc3e3da
diff --git a/dev-python/deepdiff/deepdiff-6.6.1.ebuild b/dev-python/deepdiff/deepdiff-6.6.1.ebuild
new file mode 100644
index 000000000000..e41b020f504f
--- /dev/null
+++ b/dev-python/deepdiff/deepdiff-6.6.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A library for comparing dictionaries, iterables, strings and other objects"
+HOMEPAGE="
+	https://github.com/seperman/deepdiff/
+	https://pypi.org/project/deepdiff/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+	>=dev-python/click-8.1.3[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	test? (
+		>=dev-python/jsonpickle-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.23.5[${PYTHON_USEDEP}]
+		dev-python/pydantic[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/tomli-w[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.10)
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/outcome/Manifest b/dev-python/outcome/Manifest
index cd783eda5fbc..b3ec0c3cdff0 100644
--- a/dev-python/outcome/Manifest
+++ b/dev-python/outcome/Manifest
@@ -1,3 +1,5 @@
 DIST outcome-1.2.0.gh.tar.gz 18147 BLAKE2B 19e99c8beb1c537a15040211e2fb2f30e425dbb6c81225f2b44720d52e26d8065f434949cd22f97d3a44b64d404077118842a7c85d38f1b7b01ec60d26ddaa39 SHA512 ac8f8738b000e50ace5fbf2c373c9d28f05e88fe40a11602dbb08c48d369f28651ca6c1269ce9ba4ebf1aa9701525e966c061f75313d8650e739934e3ad15003
+DIST outcome-1.3.0.gh.tar.gz 20685 BLAKE2B 5bc6bd82a855cdd009b5613bcdf371d7f946b58567c436ec89db4511fa17ac15508498bfac90ec4ee4e1e60abe80f662c1e75f6da03ca087cca2264988a0b488 SHA512 0f8278db3dee0c15f82b08a172a6b1b2f360f5bd91d894338b24c6eb38884bf59f0a18d29af51b87857c41b25a81079fbffd87190392002ec9250c2d97b71965
 EBUILD outcome-1.2.0.ebuild 826 BLAKE2B 79d399c4d2e222f2eb55834549a70869c4430f6a2542e6a092aab45898838b48293ccd65903c16acf6c4ffdd0c0c310f2dc5be73989037b897734934f78a46cc SHA512 7b25c2b67babb686bc3389914513eca151e67409299e428fb671d9d6f56341d25ec77626c962c271c604194ba7931aa63327f989588e114a78a58207e3119f01
+EBUILD outcome-1.3.0.ebuild 834 BLAKE2B c28b35a0a6fd7f384c68a1bf7a35e5c68b3e913a5d31e21125a6aa03a274c31e36471c3223855773d193e3f16e550b09f3ee8161e6f8339c4d265033ad7271ee SHA512 f7686173a5b788371b1a3243ada02c252e8da10d1821a9f09fa0debe4dad8e9e3bd58b452296546abe0a4f3c2573adcda4edebd343a4ef85553d4e297a2cf616
 MISC metadata.xml 413 BLAKE2B 375ed97b3bcb2ba5392f09962f6376e5ec8ecb842a70eb8c94647968f2f59e326ddacba74f0e65b7bb5733a05779d464b38d589f3a3dd364ba510bec2825eb5c SHA512 b9b9b94031580858aae25d0733688ce39f5026b4c1a59415370ed50dc27b63654927c36536d4c4cdf6389e68db0b397ddaa7e0aeb786713fdffca4bddaa217d2
diff --git a/dev-python/outcome/outcome-1.3.0.ebuild b/dev-python/outcome/outcome-1.3.0.ebuild
new file mode 100644
index 000000000000..cb55f06f4835
--- /dev/null
+++ b/dev-python/outcome/outcome-1.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Capture the outcome of Python function calls"
+HOMEPAGE="
+	https://github.com/python-trio/outcome/
+	https://pypi.org/project/outcome/
+"
+SRC_URI="
+	https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinxcontrib-trio dev-python/sphinx-rtd-theme
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index 76cfbeb69d17..cc02bb10bbd5 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -15,6 +15,7 @@ DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b
 DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb
 DIST indexmap-2.0.0.crate 64038 BLAKE2B e7a1b2bbd790f1446f77262b5b0799c2a816a01295a9a4db66f10e6c0502f8970982fb808581472e840cc34dc70e7938b89408799ed0d91aa50d3dd0b4807995 SHA512 59bc19653436389e1408e21b0933e5ca6f9fe228f0f5fbe9a7e4fb461b9712ba82983cbf22c0581eaf7913298b9ef5842702946152b493c1dc651381d6bce1a3
 DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76e2669b21c0304692efd6709cd048920f7822e92c6a5620fb178e0e85c7776118cef8ccee0f58398e14abf SHA512 db8aef4a7bb606452dc8ed45aa29a255c7a135357a0bd586fb4429c5f56a1aa2ca9400d6fac39956aeb486a15d25cf5d1b9524967867f2c651d9d563e3e85be8
+DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a
 DIST itoa-1.0.8.crate 10465 BLAKE2B e518264938d044e24a4d72cab788de717c36cc7396fdbf2805fe3a3e0cdfc361c4f6fedee7bcebea6fbacff254e073da26b2400a073fa75f75523b8ed9de9938 SHA512 6171bfcd70634a2587740c145a15790e12807d2c756a25e74950daf9dd36acc662f12836c5b87e20483b4d020bc0d98a352b8e9787b0b8544bf1ee1b6a0c2c8e
 DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
 DIST lock_api-0.4.10.crate 26713 BLAKE2B 113adf8554c65e9782e8fd0360d0398567dfbfddb1fea4928cc152fbab98dbe086e42b81170f6f5c333d61dd3261e8a1ebfbaed786e6bf6378e6afde6d7f9e5c SHA512 ffe8cad8099bc382832181c1ff95e0935993491f247114604201be7d4ddf8402fd4db8fd6499c611f95fbce7d57dc3d3738eddfab31c52f50ab8709e549697db
@@ -33,29 +34,40 @@ DIST percent-encoding-2.3.0.crate 10196 BLAKE2B 155bb1aaf0db4d22179bbe24b2d312f3
 DIST proc-macro2-1.0.64.crate 44848 BLAKE2B 4422122d9299eff3bfbb4507c4a117fef7c0906cab5a680933d482b7f9b49480bcb9c8172b412e70bf87dd0737b8532e90c310bf083f144292cc72190059ba3b SHA512 884fd14ff23c19420692e35a38f88bb6a766a09da105759cd958c315b9360a2c49cfe61ceaa3122307d44040195ec9dffb12b6d0ce224fbac5d3701621a12b04
 DIST pydantic_core-2.10.0.tar.gz 347291 BLAKE2B 3a437ca92a7decca36669854da7f89acb8086f247c2613aec45d73a5ff68505d0036297279ba030c3568a84470a6b0e345745f28b8a874fa489c12bae1db4c1e SHA512 ae621a2a98c1c661978880400bac25826508b0703048f3db9e7559b4f16dedd87114f4da561916ca5d9c0ae06b8bdbd5b80f8373c29deb4f2798f1338a6d9c10
 DIST pydantic_core-2.10.1.tar.gz 347316 BLAKE2B 782daaae0781da0abfa48056a9eebc8610737b719335f013f9573e3fa886f89af99390c5e9fa2ceeb46169392b480446a59acf0f182ab083b8f5dc8d62b090ee SHA512 c07d838268bbaa53e8a49afe18733532ac3f43005a5d4e4dee3a1cd23fa94af91d6471f9f2c146cc317cb8d14385b4aa7af404fdbbae7b4538f0cefffac7cf58
+DIST pydantic_core-2.11.0.tar.gz 351430 BLAKE2B 6471e17df66f7e6134724bfe6d697869c936a3a5603bef08286fe86a4039fa155cbb65c9255b827f9c974321394caca62634b811cac01bdb622d31438a5c719c SHA512 f66ad263f3b0608064173fc15cd7595c7a1ce8b53419280d00435acaba989411bf403667be246ec5da1b3e4f6cf97d413eec8ce810a648d332b2042ea2e51661
 DIST pydantic_core-2.6.3.tar.gz 337231 BLAKE2B 942a12228ad46d4b5365c781f8f7be28266c54e29bf5ab21e49ef31d25319d065c2f5f0bdc2ccca77888d38cfdea90fb2b415a0c203d8ae62825fb3ef618e1fb SHA512 5123fb55b002bc857ec03239163a5517709ea84430ac7b92d2027bdfbdba278d37caaa0d017d89af8e5306296667d7eb500bfc536a769d99c662b3fbb3835b63
 DIST pydantic_core-2.9.0.tar.gz 345661 BLAKE2B 27e37046490162115be5a193ce914ce16f04ecb71744ed9368944b030d1f03f52ce5c21d0d350f87e2b595661f90990d56cac755382451e46ba6c1824e354086 SHA512 ad399a5a47dfe739b225370ccc0c35df6122bcf6cd0527b21657a89048da7c6134b03c2ba290c9e749a049eef8aafa7f25db44acdd3d4334f5cb02da2e0e957d
 DIST pyo3-0.19.2.crate 418228 BLAKE2B ee018b33383fada78cd22643aea9231a8c8a2f19d1eb297f40eec9206c5220f322fff4c926d939a93a24ac6d231a207ebb25afcc0709191151c7ed9af7465efa SHA512 58698183e0f2f0507f8f765bf3e90185c933e78d62f0a9be65c4b1ce8eea19a98fe0341abe7c58cafdacb63a012ec417876dccb7be6facc1360fcb22796fcaf9
+DIST pyo3-0.20.0.crate 431766 BLAKE2B 104bc21ce2c6931753ca0c7b2d91693f454c964260ca3c4628a899fc8e7edbe4238db913ed7356f3beff154d88a60a17c0e252b655768e75483e1d9d9b86f40b SHA512 85d9533c75f905752c62f6a4898582ae48daf085e287b44949c47260301205a5f00477927877ce46300d2801d22fbc04a958c058a37eb28374c834fff27feca1
 DIST pyo3-build-config-0.19.2.crate 29206 BLAKE2B 5b1cd80d643e448cf8f1d28a514333526061c178121b9a0dcb5bff6082f402ecfd166536d94d42065f6dc1f108a73f12bbb78eedf9ea053a6aa2e9c80ac00ddf SHA512 ccc73061ec1989258921c5b5800689170635fa5503d74a4ac458baef903dd31efa41995d238783f1e099ece1f66d0a0e95c4fcb4b772b9f653dbb20e838b4e28
+DIST pyo3-build-config-0.20.0.crate 29534 BLAKE2B eb1d5f75276533483c52c6fcae49b294d6d8edf504859dae18811c1ef695dc6d0a055f2a34bea305975e4c1492c312433d2dcb7753484f793376c62cd59c8e40 SHA512 a01d06ebeb4b9cfe6ff6731046101e9437498453ca5aa68ec53df3bfb2f34665a489f8072636c2da16c1e867f536032fd293f05a43561117fd131bde5fe5aac7
 DIST pyo3-ffi-0.19.2.crate 66500 BLAKE2B b4139fba31ef17017b6b60784e41ccda34931a072c2638af1eed8d02d7af701c46fe38b12772d2301cff41d10a433ff0f00a69d79d40233eadafe82abe585f8d SHA512 789191bca537998dd23d72dce4f185b84bbe700f4171c47de35b9bbca15a180ad214392b4f465cc1ecb0be955ebec1cf5a3c497815073be18035bd8bf8c51a32
+DIST pyo3-ffi-0.20.0.crate 64220 BLAKE2B dfe75b9459b4a564d1dd9f907166b76d00c5b50ba027db65d11540a7b993f3ef4e19e574135b538635ebb9c9eba66115c09198c7b6071b0b82fd94faccb1bb63 SHA512 a68f0b1380f2ac3d3034ac8b3788cd6573850137c6678694cbcc3e814b619510b9b21b11704c2e702d4eb7433d8b1d3a6dac663501b6db5197a409407802b714
 DIST pyo3-macros-0.19.2.crate 7173 BLAKE2B 8862f42a30929579b0b0bc2ba7f0b416518724480e197fa13288e49324e851f964183e1529b7f31bf5d4fe0ae194a412723b6b401100e66fba98bbcd9c283866 SHA512 852cc2792aa3d30d9ab8802a451be5617cae6536adced1bf0dde71704a3c7c1bfe862fba751b6d045249819a8ba5d87dfc50914d142a0b662f046498c06f8c2e
+DIST pyo3-macros-0.20.0.crate 7678 BLAKE2B 03fdc0cc9c735086ca2d27e0bcd197e69538c3640ba7f87bc3d65907db374ac7283f61bdb67a1d45b66ce972072ddcb3b1daed4aeb9a66100d11bba6515cdc86 SHA512 79b61f55010dad60dda2c5061c9736bef3f6805f28db230726937340a5c40a3fcfb727a0db7779c3eb094ebd45492f7af4f40a3fcaef42f160989a8ef6174e7e
 DIST pyo3-macros-backend-0.19.2.crate 49962 BLAKE2B 9d8a032c2205f55d2431b6bbc40df153339e08479df3a8a65506ade7d1f3d17cfaf664cbd09eaec9acff3f5a248598e37427d0c5a531eaf527137803adf49834 SHA512 fd708e6fdbd54ef7c676bedc62070175bac6b8f7ae11231578196dbf552b163a8a2499a1266f786bb6bfb85517fe83610902137d59a5c42efcb1a27c4235a07e
+DIST pyo3-macros-backend-0.20.0.crate 49383 BLAKE2B a239042abdfcf5ad38505b57bc6b858ba346bf8681e24acf2e433f53e4a40bf0b28928b434b96f596d12acbb602b14b7e1bbf4be1e5789e6d9c754368db00a1e SHA512 c823caba48b4a30aaf84c23f80934f0172f2c76a41b538b69ebc25afcb61611b54b8fbb4ab6cac1c7a78b4e6f9f909f22748a2cd279b508d3897b74b17021d56
 DIST python3-dll-a-0.2.9.crate 66092 BLAKE2B 2c4baa31df7f55da8f1c6073525b4498bae7207ee38ef0eba4dbe58088609937a7d7b851c603ae62e5eb5361881e67a05d8c112d0a76aba5d99b13cdccd59d59 SHA512 1914d3ce67284f13551a4efefaeb9c11138fcca3d5082746282f64b7a36f732c6834766d981f27d862a61410eed09b3d281e0cab8cc1a46d424d04823ffaee35
 DIST quote-1.0.29.crate 28345 BLAKE2B 3aeb637a4139730348775caab4d48173650d8bdce08247263d741ccc657dfff7f2facff05725bcaa73486818d394c392c64ecbc61bae3f5b612104aec16ff289 SHA512 d686a3943dca059a8e79689c77e6e8f6dbfa9b16a1a7ecdd27099339b77a55334252eaa8b4340e79c35ebb1f6e4deeb3f6356dfd02484f9c724e66a74387e30b
 DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
+DIST regex-1.10.1.crate 252549 BLAKE2B fd9c0e052bcc5d5d488bf947a4ae757313976e62cfa7d2c74ca3da4f5366d3d582f47a1193b532bd584597d634ff74197dd10ce369bdd9c3c051336dcbed74b6 SHA512 cb31447c570b52bd0a1f49ac58903ae1d230162167615163a4940c48f3476369d86e7716cce827ffc7c76a4fd8a179061390d48b86163a25f257efd01dee570a
 DIST regex-1.9.3.crate 252676 BLAKE2B dd419b02b7dbd28a71e14c90bc538e98a63c0b9cc2ea01e7d8f6a0075c723c42c3d7bcbb45391431dec3008e6709e9d1d396d8e505f7f8d5d3a629ededf74b4d SHA512 ef5ece7d2b80a136d437ac42c5395cb01f6d357dcc490c8f6c89657f3f97af6befcc699008535c27583d7354e979418d1d933e36e8774ff2bb62750b9009d5d6
 DIST regex-1.9.5.crate 253883 BLAKE2B aeb05371251aaa0fd11dce1f22ea095345b3b1e68d9d5e083b4b8b0b938d0d901b3bade66015bec830db3ee71d0d2ccac09b842ff9919e08b0e98112ea1897be SHA512 79b921edc977dc98bd07e89dc17873c8a1088473ddf941504973259bb8c46ad11bbe3818fb88a7ed07b86841206c322a9555033d0a5dfebb18fcae45e07ea53e
 DIST regex-automata-0.3.6.crate 607174 BLAKE2B 6d02512501b45b0e87d8746c894009ec669fbfdeb742966e8ba8960ebf692f3b2c3df44ce5ee03e7d5320136709ad83b532dbc322a779e3c21ff0f65768c0d0e SHA512 ab3da2e63ff2c6a4da2c149dd34e565303f961f38547db7b34fbe984cf90aac107d4ec116111c765c9b71c4bf26022742151e1d4c5d01a6beac0a8a0887e30ce
 DIST regex-automata-0.3.8.crate 610113 BLAKE2B 1aebbca26e76e85b42b035fa9ba02f98425b75fdeeec0f12c1c08e8f4a320c64d36c129c692e622256d7f8772052041c47df1aff165d8337d55d61770963a777 SHA512 47ad01be2c51fd510576e14f399b7f30d379a2cce2dbef3af4ee3e609859451082885132ae703c810e2b19bb3716976356e057a1a592ed507146aff9e7138dac
+DIST regex-automata-0.4.2.crate 616928 BLAKE2B a1fc22f481eb32df5f994450d56b2f903306a84d63916f31d8293fa5a428d940c494da4a9d14f4c6486f4cc2fc0b0961c9e0dfe00c7535080d562781357fd077 SHA512 e8d9aa7ab3e86d02c3e72809500f6a1ceb2ce1f06a15af70b697ccd99d7be05a4d8f39f513e16f8f1d1983c805691e663135c0620f9cfd171868e2b0b803f2d0
 DIST regex-syntax-0.7.4.crate 343365 BLAKE2B b50c01f02e08729496e8bcf023949d088463bf62348b4a1043fe5205650da37863b2ca51f683662a4df33bd56085e0501e50410106c9c471a0daec4c71dfe945 SHA512 b33713c71f6f753820ca6405e8415e5eeed457efd01e81b0b720e48c135b9bb0973962269587ddca31350233aec6d3f598596cb48310db0633bf67f8970f0e18
 DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd
+DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
 DIST rustversion-1.0.13.crate 17267 BLAKE2B f2cc10a9d998b95bedaecb60298b11637724058634b00844d7e3e77dc321d8c7578bab9a9362b94c6b4b30558df538578fe7a4a05a130fb16795e913b3fda8bf SHA512 4705face9c4e2570c6a7c8bd61ccfe1ce68bcc7bd11dcbb9e7321744de38277d1f66429b59498adad3cbfc25de68dbf194c2d244ab74003830ba5fcda47e621a
 DIST ryu-1.0.14.crate 46861 BLAKE2B 208fa87e54e3c6831193ddefcdfa7e9731a3b72de6ea23a4af708a15487cf4d6cbc49fd3681da078390741595ff5d44b02e607cab6ea9e37e7f5f05c7275b4a9 SHA512 9832c760d1ac674ba362639968962928971231d696e450738045ca36ae2780116ad865b2bdd96e36f14d8f92e12107dc8b75be90c74d76e3bb834a94bd6e5599
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST serde-1.0.185.crate 77337 BLAKE2B 602d8ce302f73327ce0dcfcdc5377408f4805be8a22ef93496fa31be512985188111c131b6dfaf110069ddbc45a9fdcdb8409d14689422fedcffa652e5a5000f SHA512 0c48d6ac7916104e108025c3ddf88a7e98b98ffaa98fcb7ff9eecbc4d3ed5930efbcb0de9e4072f795a3cbfa12aa5e17ee7eeeed948a7c99453c9a9d0c9985c3
 DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2
+DIST serde-1.0.189.crate 76276 BLAKE2B e4cf8d9608f341007f9a92af434395659511238040ddd2cec137539a51c05b949f79c4965ad9ec25f67a72fe8341573f2d1075766f7ab5842a107b12e0468a3a SHA512 3fb1732f6866db8412cbc4ceb57bc8f90cbee005e2687a388b052e5b94dd464aebff57a91cc8ce5da62508bfbd6cc4e14a524090a5fa60724cc9bd1bb5ea1035
 DIST serde_derive-1.0.185.crate 55569 BLAKE2B 629304ece108ea3549d9ac2284c1432d10686481611e8aeaa1420c9bec32ecccfa3b2132b9192a9a5b49e927080bfc281a9223c94a4fdf068da6939bed4ed908 SHA512 11e61703dc71c9ebf2cbf371f70ff44911899ccf4b98379982250eefb6ad36516959f452939d67c894db5372dcf814f7cf508ae111b1fb56594235635e2fe4ff
 DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0
+DIST serde_derive-1.0.189.crate 55708 BLAKE2B 6f49c1a8ef5402251d6bdbfcc03fa411c0440d292fb03bbe38e9d4f9eacc128c60a33bbdcdb5fceeb4e0a6f6eace56b8da16f90fffda08c580b87409ac5c3d29 SHA512 54bf81d6a18297d57122d8eca3fa4fd60a13907fe65bb68081c6f9c0f8c13f3f3206f74a0e9e3c3546c8581b8f7d4af92dd74fe4172f039d3022eda031e1e342
 DIST serde_json-1.0.105.crate 146316 BLAKE2B a40b99ac4b5e9aa31a61c4f49f9f4dd9fad94946267a47ac4ba7c1bf3af7122dc410c8984235281b19a917b1fea088615c8e95b4f1aead0957c9e31f2b222599 SHA512 d4203d93ee6e8ffa0d88c21d347196b8d1496d506841273e992c9996019175ed9a965e9401ba63d48589133b13ad9cac6246b7e0143545778b5a090a48a31452
 DIST serde_json-1.0.107.crate 146458 BLAKE2B 753be6076826ee0ba41a067e81c031e6fd69b539086a2d649e6595136fd05d61b717c3d4cb6774af0a0c02102f7f4588e682bd21732450afa93877d093596880 SHA512 ecd4ef86538df402f2a397cb86c5b4b277a9a43d742e2af3d51ab5ac0ba31c677bfc72db06c10f8abbc970ee41d5f77d758f1f70ea18495d96bf78cb7d66c2bc
 DIST smallvec-1.11.0.crate 34680 BLAKE2B e54d56f6bbffbfa7ce5fe5f04e325b2e5cf19d290e4be278bc00a136e26284625b9c18c7c2b10b7fb8fad0ea7e3770f3cdbcfbaa913f5ac08d0a2f8b4e0de188 SHA512 41bfbecbc2c244497568a41724d65791ec3fd6d8057813d521367cca316c09c2b28fb3973826236b01c1f5d2f905d8d22b0c3c47f957a9ff5d7685591f15ccd7
@@ -63,6 +75,7 @@ DIST smallvec-1.11.1.crate 34831 BLAKE2B bad85ddb1d3a1fcec0cb6aba413f90695e0aa0c
 DIST speedate-0.12.0.crate 30792 BLAKE2B 2280dcc9396546b8c46a13451cbc290c38bed9d77ea8ef9e0b24b1cdc5d52c55dcbcc2ab7768b96854d47a9ceda6e1e119139c9b03df9018abfa16656ba481f3 SHA512 f9f75b9e8111a39922d8e2a525c559f1ae04620cce6c56e64e70f0458ada23d57ecc074ce6f510948cf88515e8bb34cc9b9ca8dcf941968fc1a666dfc9c384f7
 DIST strum-0.25.0.crate 5539 BLAKE2B 9c031e5ce19e2ecaa63e63118197c740ae9295b8881f6280ad92847b99fca6fb08b0d395ab1b2a66e25c8374cd18866d8436540538e3c0f1f047fd2235971b40 SHA512 a3522df79547e94518f25a0e29248f67f1d7e2586a7a424d7d996cb6bfe5d98fcc4fc44da7ddcd4e35a1127b2816bee55107f30cb2a559f5b9bbb1346139544a
 DIST strum_macros-0.25.2.crate 21964 BLAKE2B 9069220e7adaaf9e87687a710ba372e5c360f56b81d0a1cf2bb9dcd9b81d514760f301a27c9bc049876c34292ddf74a4766a83a8467c1f281fecb2a356c9e36c SHA512 39e80178ca26859fa915195812158a0beaa7ec106c111e7e3a11e70c181bb5462074b59e236645f96ad197c2480dbdc481a4cae0a90d60311e4cf70dc7020149
+DIST strum_macros-0.25.3.crate 22570 BLAKE2B 511af0d1f0f76df7ad1528c79987b6e09390bfb33e1c34078fb5450171aca7f169afb83fa2f2338a861ded6842c8535ea6e4cdb0d31f341edab0a06d7eeac16c SHA512 e6ebc00943d9f88104815a5bd6a302a391a06fb0ed5ff836e01d341150628684e00e5e2e5b3f6466ece92d376985246f818243a0d1d775cfa55d1c50c0ec0c62
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.28.crate 241635 BLAKE2B 5784468a0dd04eb298821ae5a3facf72c5fe5907cc469919b0a0b636bb55bd15e9e3a31c9ceb05b7b0f88e7a53e5891e6874641b61e5fde247a91361ae37047f SHA512 96e83979e70e2e1e46ca2af45d10fb259847d61e327809a51351a988282be9688a8c4942a284504674c8684970082dc15cd9ab9b3584bbfa68ac9716e071f9c5
 DIST target-lexicon-0.12.9.crate 24532 BLAKE2B 7f09be1827a5f9563b842c38aff659432ec61b66b814ebf4cc8a963daf6c93e7dc453a6966aa02d3a886007506d2b993e16ceb047bd34f6d206de76a39d08dfe SHA512 62033617d4587fb9d4b3159c78dbb628041d7ba6c5849c27a5755f173a7279aa4a03e56d31e03f87adfae50cef49eb6f0bc5eea1f6a131b87c618330d19d61d5
@@ -72,6 +85,7 @@ DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4
 DIST unicode-ident-1.0.10.crate 42039 BLAKE2B 3365850e1991b9e572c6917a35f3c85523d921d5ebd9fa7025fbc1ce2a0518b06aaa9f3e3bfafb47d357226b5b9964145c7f1b5ddc16cb7280542f6c96f650ec SHA512 5dcc24e138a86f84cb05290332d02953b0ca18839ead1e74b0319bc361ea449700e04d62a51e435cba266121e463643e017718d3023a84f844a59e4ca4475686
 DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
 DIST unindent-0.1.11.crate 7700 BLAKE2B d4d1dde410c4194acb51f74f374cf11fa872e49fad8f5f24b596d72476403e5e312fedf7b0bcb1027384d53c8de565368d63c30eaf70a6e6cd958b82e5288ca3 SHA512 f800d6c37fe72477908c91457a738a73d2b8085bb5ae303d6d954405d6ccd98833b5da16a12c3ad1ab75d32a68dedc706dfaacc0fcbb95571dd829cdc03a356a
+DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
 DIST url-2.4.0.crate 75670 BLAKE2B 8cfff1d8ae0b7353ab4f539e2df1f15dde3c75f347c36bc5c4c8ea45a0cfcb31950b073b50acb34a14cd3d7a11b665c3a73a3d070cc590ce740c561f0e6e92d2 SHA512 acef524d2c00d2fd68ec6385ca2a44b740f60724256750d8b0ea609dec7f9d59303069f315f04a5205925a27274ec7709f3818a2237ea0023845e9a12905694c
 DIST url-2.4.1.crate 78228 BLAKE2B 6e324237af50605e9285889d967e6a66e258982c5e78ec99b2df68cbcc555574c0b0d650724ecb015e1065c737c88e3c04205973c35b0afcd63f222e91dde3f9 SHA512 ff2aed100e405f4474e17dcc01d59b63460e7a8babeb7cdcf9df6c1c65216c425e24d557f76c7097702b2befc381656107bef755ce929089b52a3901c46aa185
 DIST uuid-1.4.1.crate 55291 BLAKE2B 36a1d7abe0a695f6fa3a8ad3a0c8a078bc61b17396a317b01226d9b35a3544a8a74305ade1166dfee7a9028e6d4a1e6b0956dc0975ea58a86ec6052fb869c577 SHA512 95914b62948941e9dcda7b66b932088b328a23286d163449a72961874f4a856db6db1d60a125e56cd1d7b1c00391485a45520852ea49bd8e5a7b8cae8ecf8b96
@@ -87,6 +101,7 @@ DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d15799780
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
 EBUILD pydantic-core-2.10.0.ebuild 2872 BLAKE2B d6edcfc279f37263b7add4e13ae43b24b6ebc2d665f44c7f394b78dd5d4cc921e0bfd03c585ddc84c391bdf7259ee274003bd36bf90793a666560c887f3b37d3 SHA512 46e4ce31df9bbf3bc7984dd6ead18afc7fc0327c8d53312bcecd38deb0a97928c46068b9f8acdff4facdb48c7e0aa185178d91d60b7cf80e083042a1f57ddac3
 EBUILD pydantic-core-2.10.1.ebuild 2879 BLAKE2B 30cb3dadc3f90cf94da03385aff2b717a6a17efaf4ed3070b41bc19870ee15dc06714efb4cc1bc2b1fe887822a90d0ef93809b8fbe0e9263c3ee6dbe3578bdb9 SHA512 61d387f096fda9dc9be471cd487865f50458760bf50cbabbd376ae3cb795d3d5c3d540938515bb4e390152c6023504adab59b7149a9ee9e19a607a786e889f44
+EBUILD pydantic-core-2.11.0.ebuild 2884 BLAKE2B 728b6c52959f6e0fec2ae564a368d312d4dd124c28a27bc9273f47548c48c6a5c2c9c41347ca350b116c1e15228ad99d661cd094201177d230a5d1460e917801 SHA512 5f5cd17b053c8d1d84ea72849a2df14827f7d21c7cfe51dff55ea410a62b7a65e5a753e08f62a1fbf32f58ad986ce07dd043d487612371fa8c3f4caa6b005261
 EBUILD pydantic-core-2.6.3.ebuild 2870 BLAKE2B 23c3a868a2060ad3b1e9b760ff7a0f1e0b68a3d5652ab6b3bd148cd0ff150d89cb95dc1a52babe0d14f31b897bea4c9f11b9747b8be3ef4e5bfff44144d231b8 SHA512 e37545de9bab7dd717340d2a24911985467ad3b9c8ff96d805cd07fd8d6d7d119f6e24cec0690e4a12949c1fc25b23be4762886a9af3c13802d1129fa4bdb475
 EBUILD pydantic-core-2.9.0.ebuild 2872 BLAKE2B d6edcfc279f37263b7add4e13ae43b24b6ebc2d665f44c7f394b78dd5d4cc921e0bfd03c585ddc84c391bdf7259ee274003bd36bf90793a666560c887f3b37d3 SHA512 46e4ce31df9bbf3bc7984dd6ead18afc7fc0327c8d53312bcecd38deb0a97928c46068b9f8acdff4facdb48c7e0aa185178d91d60b7cf80e083042a1f57ddac3
 MISC metadata.xml 379 BLAKE2B ac0fa1abd0aac6436f234dfbfdb1517cdef2f7636c019a16257619d1a1a95a31b67061daa6606b47b68332d03bd213fa9bf67017b0e4af9733a26ab4828cf206 SHA512 7e3b5785628be025efc5360924e31a5a5becab941c9db255357b966dd5d3aca733e96485e92e78533bcde95379c59c36a601d4b407550c5ff1c649f09c3a21a6
diff --git a/dev-python/pydantic-core/pydantic-core-2.11.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.11.0.ebuild
new file mode 100644
index 000000000000..c9b73273e233
--- /dev/null
+++ b/dev-python/pydantic-core/pydantic-core-2.11.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+# pypy3 is waiting for new pyo3 release
+PYTHON_COMPAT=( python3_{10..12} )
+
+CRATES="
+	ahash@0.8.3
+	aho-corasick@1.0.2
+	autocfg@1.1.0
+	base64@0.21.4
+	bitflags@1.3.2
+	cc@1.0.79
+	cfg-if@1.0.0
+	enum_dispatch@0.3.12
+	equivalent@1.0.1
+	form_urlencoded@1.2.0
+	getrandom@0.2.10
+	hashbrown@0.14.0
+	heck@0.4.1
+	idna@0.4.0
+	indexmap@2.0.0
+	indoc@2.0.4
+	itoa@1.0.8
+	libc@0.2.147
+	lock_api@0.4.10
+	memchr@2.6.3
+	memoffset@0.9.0
+	num-bigint@0.4.4
+	num-integer@0.1.45
+	num-traits@0.2.16
+	once_cell@1.18.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.8
+	percent-encoding@2.3.0
+	proc-macro2@1.0.64
+	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
+	python3-dll-a@0.2.9
+	quote@1.0.29
+	redox_syscall@0.3.5
+	regex-automata@0.4.2
+	regex-syntax@0.8.2
+	regex@1.10.1
+	rustversion@1.0.13
+	ryu@1.0.14
+	scopeguard@1.1.0
+	serde@1.0.189
+	serde_derive@1.0.189
+	serde_json@1.0.107
+	smallvec@1.11.1
+	speedate@0.12.0
+	strum@0.25.0
+	strum_macros@0.25.3
+	syn@2.0.28
+	target-lexicon@0.12.9
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	unicode-bidi@0.3.13
+	unicode-ident@1.0.10
+	unicode-normalization@0.1.22
+	unindent@0.2.3
+	url@2.4.1
+	uuid@1.4.1
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	windows-targets@0.48.1
+	windows_aarch64_gnullvm@0.48.0
+	windows_aarch64_msvc@0.48.0
+	windows_i686_gnu@0.48.0
+	windows_i686_msvc@0.48.0
+	windows_x86_64_gnu@0.48.0
+	windows_x86_64_gnullvm@0.48.0
+	windows_x86_64_msvc@0.48.0
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Core validation logic for pydantic written in Rust"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic-core/
+	https://pypi.org/project/pydantic-core/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
+	|| ( Apache-2.0 Boost-1.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=virtual/rust-1.70.0
+	test? (
+		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2022.7.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
+
+src_prepare() {
+	sed -i -e '/--benchmark/d' pyproject.toml || die
+	sed -i -e '/^strip/d' Cargo.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		tests/benchmarks
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	rm -rf pydantic_core || die
+	epytest -p pytest_mock -p timeout
+}
diff --git a/dev-python/sqlglot/Manifest b/dev-python/sqlglot/Manifest
index da455a572bb0..c0452eb3a409 100644
--- a/dev-python/sqlglot/Manifest
+++ b/dev-python/sqlglot/Manifest
@@ -1,7 +1,9 @@
 DIST sqlglot-18.12.0.tar.gz 8854252 BLAKE2B 30bd8a7a8d4dd2337c61b4bddcce74a35a7594ed6ac16e0c68f3103c54c1eb9499246d2ec340ae3ebb137a09a2fb29c4a9e0a82eacef959c9cac1204fa68da0d SHA512 0ac80e9f51f68121f5cf7ac7db08832ac48e706dcdb966ab1c432d4d81dc808221e3b45fd6bf31f570ff7add1a49de2f82a8671b8c81d27efb402776c20d6fd3
 DIST sqlglot-18.13.0.tar.gz 8873766 BLAKE2B 4dfe6d3d6332bedf13229d2820a12ead44ffcaad0f3f68bb1578d62c325173fddd73f9033277cb0ed8cdfa8e919464ce0efa51ba7dc2a946e725c1698f2afdf8 SHA512 6ed3d4eca1496b800c677b45df5499f96266e09b3c0909b8af9c4512a1bab7b7cfabaf89dad6353af2f579211364597b1ffb0f55975ffcd8c3f520802621e9aa
 DIST sqlglot-18.14.0.tar.gz 8880297 BLAKE2B f5036816e165ca8f6d65ed21db618b216444578b5a0d403f4674d878a02fae6d9dfc5ce67cef3398d040f4cc44eaff7e5f62bcb1521f244a1fa5b9b127dd666a SHA512 1da34636a92238c0cf67230da3fb5551bd6b9e2a252f252e8fdb0a0b237c7bea2435ecd2852f66a4427628445b25ffe78cd86b46f3939a798612f72efd884148
+DIST sqlglot-18.15.0.tar.gz 8888074 BLAKE2B 22082ddd15eb6245c05495b4202e9fab5d3ab1085cc74139a5ba3f909fbde1487e2cd9501bb218efe9e72748e8b2f7d04a247e357c27e6a9027169b809fe7136 SHA512 25df8fdf1ba2e2022ed82ba7d7a6f2c861b96cc5e440bf23488b75f861ee93504ad1d706cd88cdb74a652070c328abe52e4790cc4020059f27129720c0fa4be8
 EBUILD sqlglot-18.12.0.ebuild 919 BLAKE2B d6c7bf029e48f9b11c305adbc89473b9bcb7277299a869569aeefe69dd63e4ac19c9a7e3c23ba8981e6d7f46b7e4611cbfcc18b871876e949e0912c3ded446bc SHA512 5f42256d970f291e0a0eed073a1060a1e5dc15b872b1ecca6b9aeceb380c48e1bb1f1b61719a582d8bd56e01eaf8b3578fd374ee7fff761ac6a95e746b07c2f9
 EBUILD sqlglot-18.13.0.ebuild 919 BLAKE2B d6c7bf029e48f9b11c305adbc89473b9bcb7277299a869569aeefe69dd63e4ac19c9a7e3c23ba8981e6d7f46b7e4611cbfcc18b871876e949e0912c3ded446bc SHA512 5f42256d970f291e0a0eed073a1060a1e5dc15b872b1ecca6b9aeceb380c48e1bb1f1b61719a582d8bd56e01eaf8b3578fd374ee7fff761ac6a95e746b07c2f9
 EBUILD sqlglot-18.14.0.ebuild 919 BLAKE2B d6c7bf029e48f9b11c305adbc89473b9bcb7277299a869569aeefe69dd63e4ac19c9a7e3c23ba8981e6d7f46b7e4611cbfcc18b871876e949e0912c3ded446bc SHA512 5f42256d970f291e0a0eed073a1060a1e5dc15b872b1ecca6b9aeceb380c48e1bb1f1b61719a582d8bd56e01eaf8b3578fd374ee7fff761ac6a95e746b07c2f9
+EBUILD sqlglot-18.15.0.ebuild 919 BLAKE2B d6c7bf029e48f9b11c305adbc89473b9bcb7277299a869569aeefe69dd63e4ac19c9a7e3c23ba8981e6d7f46b7e4611cbfcc18b871876e949e0912c3ded446bc SHA512 5f42256d970f291e0a0eed073a1060a1e5dc15b872b1ecca6b9aeceb380c48e1bb1f1b61719a582d8bd56e01eaf8b3578fd374ee7fff761ac6a95e746b07c2f9
 MISC metadata.xml 635 BLAKE2B fb154da2feeea6d590b4f3edb8d8d90d316feee1b8faababc022db026254bd24674d8419b74074b089d4d8930bab642cdc5fa7694bfa9e033cb5ef4ad4988562 SHA512 dd5ed7212dc2eac6a4d84bb2e3639db1ffe163598d911073d7100a8ebfeceb85842ea2e6a597d1036d5b1388d18954b95a782af7b3a84479bf3b59ef9e9b6bf8
diff --git a/dev-python/sqlglot/sqlglot-18.15.0.ebuild b/dev-python/sqlglot/sqlglot-18.15.0.ebuild
new file mode 100644
index 000000000000..368b77416b42
--- /dev/null
+++ b/dev-python/sqlglot/sqlglot-18.15.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2023 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 optfeature
+
+DESCRIPTION="An easily customizable SQL parser and transpiler"
+HOMEPAGE="
+	https://sqlglot.com/
+	https://github.com/tobymao/sqlglot/
+	https://pypi.org/project/sqlglot/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+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"
+)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
+}
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 88d6f72b74f3..b45d61f69635 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,5 +1,7 @@
 DIST tldextract-3.6.0.tar.gz 110460 BLAKE2B 3bc0179f7d83db0e1c33687b05215e96a7636f6c88fcbc75113bf6473c31840223de2d05b47e57567b72314a2fe0b9eb83c515942906db3bbc0f6aac55d202c0 SHA512 5cfae8bc293d5ce774f648186a4256477049ef2f6b916d4895636fdd50067cecf4ddea11962d9d4557c29c9ab6e62ba6306062c6219178573c9747a56036318d
 DIST tldextract-5.0.0.tar.gz 110751 BLAKE2B 28c6ae8372946eab647849e937f851e5b88807045d7959ae5e0bf893ff9ff5cf6b4ece800ba5b6a47607da7b62e92da22e492729dd423e8d93add56bd9669a31 SHA512 367d1acb5ea7111b5255d92f6bfb5527ace3a0d9a11ce49dd0d005c0acd5898832320207c59efedde29961252c8b82c106b7b44d2445acad38b58ce86695f3fc
+DIST tldextract-5.0.1.tar.gz 111023 BLAKE2B 854addd19c15fd0c246d449d3373649a7ef0d30f1501312b802867d3789d5c95d5e36390d570fc83e37ef73074c4514215e9cdadefa6831f8075139afdb1523b SHA512 3fe148e2893b09dcdc7e1f16b39d6da5a1ca3cc33ca6b5a473d3479e177de451522773211e6cd2335a6864506b85e06b3f4ce7fdd7dce3f541f099d7da975b78
 EBUILD tldextract-3.6.0.ebuild 834 BLAKE2B 316227108113fa897d426144fab0862c18e12a9c06e5d150ab4536791bcb3b91e10bbf033e775f0085a5e30c20a82c29fbc5f9900993c13a1c9b3c0d30959619 SHA512 cfcfcabfebf60365af68d2ea0c675f5719722a6390bdc2ae1e3f26387772d34fa59af86d6aa9478cfcb84336cf6270616e3b437bf73af7c8bedb879cc8b37a3c
 EBUILD tldextract-5.0.0.ebuild 836 BLAKE2B 4dc27288306684e738a820e2b38111997570afd82e9c59ba812e2a353b5daab1de401deb0720c05775b3b3837a68d4432000d9d129d0e89f2dd83eda271aee5c SHA512 5a2523d09dc1c0b146629baad443e403bb977cb304bc84530643a4060227741fb305d1f7e7e970ec8b89297f8a2375b3d987fc600a60ff2bc4d72110dd8211d1
+EBUILD tldextract-5.0.1.ebuild 836 BLAKE2B 4dc27288306684e738a820e2b38111997570afd82e9c59ba812e2a353b5daab1de401deb0720c05775b3b3837a68d4432000d9d129d0e89f2dd83eda271aee5c SHA512 5a2523d09dc1c0b146629baad443e403bb977cb304bc84530643a4060227741fb305d1f7e7e970ec8b89297f8a2375b3d987fc600a60ff2bc4d72110dd8211d1
 MISC metadata.xml 560 BLAKE2B 4d6e6aa7507ce4734371e8b8442e8d4840db0d2896f7e7430438bc9b700edf6c8546fc3beb1e17d489013b6cc49d1daf805581d6fda29f51109e7a643b0e8965 SHA512 4e7ed8a1876afc62954ee58937557182099ea2289633d2d279a2982bb32a8de261163f0b83ba44c257b8c087c007b1bb462ecad69df1115a024a3a9c8ea1fe9e
diff --git a/dev-python/tldextract/tldextract-5.0.1.ebuild b/dev-python/tldextract/tldextract-5.0.1.ebuild
new file mode 100644
index 000000000000..26a480fa5866
--- /dev/null
+++ b/dev-python/tldextract/tldextract-5.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL"
+HOMEPAGE="
+	https://github.com/john-kurkowski/tldextract/
+	https://pypi.org/project/tldextract/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+
+RDEPEND="
+	>=dev-python/filelock-3.0.8[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-file-1.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/unearth/Manifest b/dev-python/unearth/Manifest
index a4284cabcc66..93caf09b8195 100644
--- a/dev-python/unearth/Manifest
+++ b/dev-python/unearth/Manifest
@@ -1,5 +1,7 @@
 DIST unearth-0.10.0.tar.gz 270997 BLAKE2B 8b18df4616fc72025492aa187101bc1f338967b1738ef9ec33d16cbd906c1cf91c1b84e391538521b4a9d6ea40301eb0b7ed0926aa4e6c4d6ffc57401f9d78d9 SHA512 98799202939e1206b6fdd46eb61947c9f9f8068a6857f76aace8dd2c67a3fad9dd3b7a5232d7812b0dcd214c39a9e2a6fafbd18cbfeb9aa4c216571b88b3f131
 DIST unearth-0.11.0.tar.gz 271154 BLAKE2B 405c97ef152afb241cb70d9b309fd1ac454be932c96f95b606bb6038ffb2369fbc55c6afabd86f6a15949182de276dcda035fdb17d4810933286a0fa0b567e42 SHA512 70a06a32f6f2ca74c16a55f9613b543d807e437bd99c0ebb02c0d721144cf45208df78940ee41911a8168c9181ec733b9aec2176038b2556d0e2ad5e8c2cc0d4
+DIST unearth-0.11.2.tar.gz 271479 BLAKE2B c3c3f6bfb3f207eb9a7d7667d966efb84e316579ebffc833e94664c089f0c92bc4915f62a07b53b79aa9f43098080231a3644808bf35172df407cd80a7be9096 SHA512 6ec961456640fe3ca8922e0ee83ecadb6b6fa3dd7b5977a228111ad3ad2d79782eb75d76d4a7066c29f53ce023471c2a38d9f587c35f8d04bb0704bdd6406f71
 EBUILD unearth-0.10.0.ebuild 687 BLAKE2B 593b2a0c003808785c03b1a543564f7c403beb98e858f8991ee075271b4fd579c5141b9c3cfb94d8be9a6399afd177dfa23017a72bd2d70d2847cf98c590c04d SHA512 dd05341700e9788aa76664fed91afd2264f99d6bd8ce0c4b9ef21054e50dba42a642e6abb9706770207164a5eafa316abdfa6c3af8673afe655c1d3de06ceaab
 EBUILD unearth-0.11.0.ebuild 818 BLAKE2B e2e8ce3d6e258627d32fe1e4a2f7cda8af19d2755def4d14715c61bdbd0d959f5659cb2fe9747df32268e20d5be9aa64e625aee17a02953f3ebee65667dc7b01 SHA512 7b965932ece6ab01a9d333fe33901d831336ede0cb14a4a273ff1a597d5ecf70f92d12dc92cdbcd0914b7170e60f9fbdf96c8a54cacccb43ccaa8a6087d6ea7b
+EBUILD unearth-0.11.2.ebuild 818 BLAKE2B e2e8ce3d6e258627d32fe1e4a2f7cda8af19d2755def4d14715c61bdbd0d959f5659cb2fe9747df32268e20d5be9aa64e625aee17a02953f3ebee65667dc7b01 SHA512 7b965932ece6ab01a9d333fe33901d831336ede0cb14a4a273ff1a597d5ecf70f92d12dc92cdbcd0914b7170e60f9fbdf96c8a54cacccb43ccaa8a6087d6ea7b
 MISC metadata.xml 480 BLAKE2B 489aab9c338887392b943b48593bd9d752083d82fcf89a419e3677f2d24939af51cabe16641c3a16942f9658fe79f804af61cffc807cdeb909d44a6cff5ced5b SHA512 9fe2154826a2399f5570fa150445220f7490e10741275f77791b1d29522336912812e3f8905c026cb748845d2f2a005196185db6576708b47f1cdf582216182f
diff --git a/dev-python/unearth/unearth-0.11.2.ebuild b/dev-python/unearth/unearth-0.11.2.ebuild
new file mode 100644
index 000000000000..9c0635d2317b
--- /dev/null
+++ b/dev-python/unearth/unearth-0.11.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2023 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..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A utility to fetch and download python packages"
+HOMEPAGE="
+	https://pypi.org/project/unearth/
+	https://github.com/frostming/unearth/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_httpserver
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 48c51663a1e2..27bb85e9fc9e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 66e8f2d07914..6fc50b136401 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-dev-tools-4.18.0.tar.bz2 349125 BLAKE2B c82496de1a279a3ce57f895a52ee4eab98d2d174cf7109ac70790d9f1c8a6812196f4ff5bd951352b2345496f0ebf4113472a7e1f9e3826a1d02b163e4108f6e SHA512 59f858b633d95585a74c9b9515a0994744f4355ab3813e582e10c776454ac41c86296a9fbd935d5dae88929ec09ec9c30f48629c7addb5729e6bea108d304f7c
+DIST xfce4-dev-tools-4.18.1.tar.bz2 363652 BLAKE2B f78c39de833353aecd57db6d199a2bdb1a478eff996732653f49199cf8b9c6d54c02c969f823ebc441415fb6376d588e79796bcaa48bb4349c3d54068d86622b SHA512 8fa65aa57450d3e65ef55bf86e8a113c06e64289a9f71875049b422da2a8bdfcdd36c3a3e94a3c0e7c602a3e9577eca14d63318489f81fd88d6743e188636304
 DIST xfce4-dev-tools-4.19.0.tar.bz2 368601 BLAKE2B 349e3dcf69c1fc1f0af052546d78b86ffc89ca81b66c27e8b7058f549adb0c6a16e6c462a6f5e00e66dc4b419dd2ea7fa43c210d83153e23254b8b5ae5a77fbf SHA512 7372efcb686fe6c1e42f17564d693cbe24792d00fbf131faff46040c8940ad355067d4a4cc5d5de5ec6b9707943c5db5de84eee4a4ff894ef8c33c3616a26044
 EBUILD xfce4-dev-tools-4.18.0.ebuild 625 BLAKE2B 7e0ae9e3b5360249b9db71564b33dfa17c9e57beb798caee94326d8b5589f8357eff7c31dd3c822b247d92a516cc066eaf5c93dc2f6c442cbb21b12798c2f41d SHA512 a3319cbbb0418816fcc4191ba4c10910119992afa2838ac49fdf309ff9fc35aec20d86e3e2df0fa08ceb1338b60fc96b9c244ffc80fcdafe857c3efe5536029f
+EBUILD xfce4-dev-tools-4.18.1.ebuild 631 BLAKE2B 670c70889a01c50d77342f5112fa1913caf3dcb27331f1bf4ca1cb95e0f432691673c8a9d99b4e251fea71a144ec9d97434e97a75a797bd2607b8ed45113452c SHA512 7050f0af3c5434addfba88a3816ecfdd8087e8ef28d784992d63c1a24be84cdd52ea895fa844d538a2e70ab72cf7d5902604bc1801dcf4a47f583c40dc8f40d1
 EBUILD xfce4-dev-tools-4.19.0.ebuild 672 BLAKE2B cefd34949e5ca824dad4609cd9ad7424d35f0c4e9da13bd28221dab894ea6a79d51f91881aac0500101deb539c17e1dd6b479326037277225c15ebf0c2fdad7a SHA512 b8c0343caf7847d9b89977057135d78ce0e7f5e066a67fabf26dabe83d1b9e3af97e7f92f30746d5566ad78500b37028b22c69dd77238d29aba169f2ccabeda3
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.1.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.1.ebuild
new file mode 100644
index 000000000000..2930cac6ccf4
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfce4-dev-tools/start
+	https://gitlab.xfce.org/xfce/xfce4-dev-tools/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index e781dc16fa78..8da163acc69c 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index 02200f10cb8d..ea4833727ea1 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -46,7 +46,8 @@ if has test ${JAVA_PKG_IUSE}; then
 				test_deps+=" amd64? ( dev-util/pkgdiff
 					dev-util/japi-compliance-checker )";;
 			testng)
-				test_deps+=" dev-java/testng:0";;
+				[[ ${PN} != testng ]] && \
+					test_deps+=" dev-java/testng:0";;
 		esac
 	done
 	[[ ${test_deps} ]] && DEPEND="test? ( ${test_deps} )"
@@ -506,6 +507,11 @@ java-pkg-simple_src_test() {
 	# create the target directory
 	mkdir -p ${classes} || die "Could not create target directory for testing"
 
+	# generated test classes should get generated into "generated-test" directory
+	if [[ -d generated-test ]]; then
+		cp -r generated-test/* "${classes}" || die "cannot copy generated test classes"
+	fi
+
 	# get classpath
 	classpath="${classes}:${JAVA_JAR_FILENAME}"
 	java-pkg-simple_getclasspath
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 92e02e3085b1..fd1f708b86b4 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -1886,13 +1886,17 @@ ejunit4() {
 # @CODE
 # $1 - -cp or -classpath
 # $2 - the classpath passed to it
-# $@ - test classes for testng to run.
+# $@ - test classes or testng.xml for testng to run.
 # @CODE
 etestng() {
 	debug-print-function ${FUNCNAME} $*
 
 	local runner=org.testng.TestNG
-	local cp=$(java-pkg_getjars --with-dependencies testng)
+	if [[ ${PN} != testng ]]; then
+		local cp=$(java-pkg_getjars --with-dependencies testng)
+	else
+		local cp=testng.jar
+	fi
 	local tests
 
 	if [[ ${1} = -cp || ${1} = -classpath ]]; then
@@ -1910,6 +1914,7 @@ etestng() {
 		-cp ${cp}
 		-Djava.io.tmpdir="${T}"
 		-Djava.awt.headless=true
+		-Dtest.resources.dir="${JAVA_TEST_RESOURCE_DIRS}"
 		${JAVA_TEST_EXTRA_ARGS[@]}
 		${runner}
 		${JAVA_TEST_RUNNER_EXTRA_ARGS[@]}
@@ -1922,7 +1927,11 @@ etestng() {
 		)
 	fi
 
-	args+=( -testclass ${tests} )
+	if [[ "${test%.xml}" == "${test}" ]]; then
+		args+=( -testclass ${tests} )
+	else
+		args+=( ${tests%,} )
+	fi
 
 	debug-print "java ${args[@]}"
 	java ${args[@]} || die "Running TestNG failed."
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e9cb2f50fd3a..db333767fae6 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -233,7 +233,7 @@ qt5-build_src_configure() {
 
 	# Workaround for bug #915203
 	# Upstream: https://bugreports.qt.io/browse/QTBUG-111514
-	if [[ ${PN} != qtcore ]]; then
+	if [[ ${PN} != qtcore ]] && tc-ld-is-lld ; then
 		append-ldflags -Wl,--undefined-version
 	fi
 
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 7d141e711b19..146ee169977e 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/foot-terminfo/Manifest b/gui-apps/foot-terminfo/Manifest
index 0b3aae5362d7..37a2852749a3 100644
--- a/gui-apps/foot-terminfo/Manifest
+++ b/gui-apps/foot-terminfo/Manifest
@@ -7,6 +7,7 @@ DIST foot-1.15.1.tar.gz 523399 BLAKE2B 6e9296dcb8fd16fb77ec1e7a7668b46da31f83343
 DIST foot-1.15.2.tar.gz 524743 BLAKE2B 7c6f573e733210f532238eb0d2385d49f61fcb531265ff1474b93cd092c8d860f27b11e6b36c506379d7874b9cc285825f56518817a2623fdde93b7c3d0e4fc6 SHA512 931231e0518950d3ac42625befab63ecc9a253bb870ea4c439d1110c40b31c15d049b9fc1e2a6282927737a9f6d7cd3278d42dffa6a57c3c1366e342e1e79622
 DIST foot-1.15.3.tar.gz 524297 BLAKE2B 3909a2cd9b7df1dbc6305a14675494d65874d1af2ad550fcbc7fe4b33c1a2bb2287029922daedbea8c9bfa5a855e1dd5c01fa2011bc0f9ebddca8565a44da591 SHA512 c27fefd40518382a184c590d02eee69deecf665759e909de6f4a61234159df7a1b38061eb9fd776ed205f10a556d5bf7520f5515fa9cec22a683f2f25d7495f8
 DIST foot-1.16.1.tar.gz 529761 BLAKE2B a3b88cfd1f369dc89c1a1b459cc2de0a031624b1348b04737e2fba0b70fed6ad1407ab4972ee245d1e38cf00bc0dab52c7e7f2f88131c16d240672df4527fb60 SHA512 ba37f05b1bad9f2e3bc35aceb4465071273744b53b9f6cb93cd348e72ab37c9a14a268ba8d68e43ea5fc540f5d3deb33b88d9160c80b7743f7ca2f05130bd677
+DIST foot-1.16.2.tar.gz 529917 BLAKE2B 2ad75af2505da361b8a186119229516210492f48923186c747c4b010048782846026f53ab454e2ee4c61c42d03a01552377696fd4fc234ba233bea1f507d2d2f SHA512 c357f4c8479e70ba716ab65ddc6605c1705702306273eb6de9797892c7b2a6ea5b8c1b05d74f552f630307356ce2b5546a5bed8ae38dc3d45f090a77cb74bb49
 EBUILD foot-terminfo-1.12.1.ebuild 650 BLAKE2B c55b2484914072849ef8b591be60847277299fd4a32a1d57bbd415f0e6dd764dbd189a289fbdd46a325f2004e5449dfc2f362c39541f94bed8806d144a8e9652 SHA512 ed97c8e883e7c152cb9707c7bbb71516802f8b87992cc64ea6d597257d92c122073f8ecccf10e448862ad1407243084a1ba6bc963f98e39df447c670418a96be
 EBUILD foot-terminfo-1.13.0.ebuild 650 BLAKE2B c55b2484914072849ef8b591be60847277299fd4a32a1d57bbd415f0e6dd764dbd189a289fbdd46a325f2004e5449dfc2f362c39541f94bed8806d144a8e9652 SHA512 ed97c8e883e7c152cb9707c7bbb71516802f8b87992cc64ea6d597257d92c122073f8ecccf10e448862ad1407243084a1ba6bc963f98e39df447c670418a96be
 EBUILD foot-terminfo-1.13.1.ebuild 650 BLAKE2B c55b2484914072849ef8b591be60847277299fd4a32a1d57bbd415f0e6dd764dbd189a289fbdd46a325f2004e5449dfc2f362c39541f94bed8806d144a8e9652 SHA512 ed97c8e883e7c152cb9707c7bbb71516802f8b87992cc64ea6d597257d92c122073f8ecccf10e448862ad1407243084a1ba6bc963f98e39df447c670418a96be
@@ -16,4 +17,5 @@ EBUILD foot-terminfo-1.15.1.ebuild 650 BLAKE2B b6c9c9ce11793c77d8037b89cb11b15ae
 EBUILD foot-terminfo-1.15.2.ebuild 650 BLAKE2B b6c9c9ce11793c77d8037b89cb11b15aefb63f4c26d9a18b7c613b3530a8e9b964480ce1760a91234f51daca90a95a4d41504034f58cd492c29ce3f23cecf780 SHA512 c535505c4215969e6c6cd0ed527d54efb9080e9e475930f0a1b4a11c3cd9d59fbd23712f04a1e429895555c90e7dac89d57e48753b288d24835e54ce87de906a
 EBUILD foot-terminfo-1.15.3.ebuild 650 BLAKE2B b6c9c9ce11793c77d8037b89cb11b15aefb63f4c26d9a18b7c613b3530a8e9b964480ce1760a91234f51daca90a95a4d41504034f58cd492c29ce3f23cecf780 SHA512 c535505c4215969e6c6cd0ed527d54efb9080e9e475930f0a1b4a11c3cd9d59fbd23712f04a1e429895555c90e7dac89d57e48753b288d24835e54ce87de906a
 EBUILD foot-terminfo-1.16.1.ebuild 650 BLAKE2B b6c9c9ce11793c77d8037b89cb11b15aefb63f4c26d9a18b7c613b3530a8e9b964480ce1760a91234f51daca90a95a4d41504034f58cd492c29ce3f23cecf780 SHA512 c535505c4215969e6c6cd0ed527d54efb9080e9e475930f0a1b4a11c3cd9d59fbd23712f04a1e429895555c90e7dac89d57e48753b288d24835e54ce87de906a
-MISC metadata.xml 249 BLAKE2B f8cb99969645c7958d31db7935ba45d3b41ed0a6254c23993a2bdfe469228e7c7a514561ef92b9d126197728bc4cbd7373236af165bad13a1d065afb7c12cd09 SHA512 f93636a6e521b3baeed1a2665ef0e600b00a63ab9027a3906fca4ffd33a72b95c5ebf52551ab6c974759ca67d5306019d6029cf2be35c75769a0abf6d87fa5db
+EBUILD foot-terminfo-1.16.2.ebuild 650 BLAKE2B b6c9c9ce11793c77d8037b89cb11b15aefb63f4c26d9a18b7c613b3530a8e9b964480ce1760a91234f51daca90a95a4d41504034f58cd492c29ce3f23cecf780 SHA512 c535505c4215969e6c6cd0ed527d54efb9080e9e475930f0a1b4a11c3cd9d59fbd23712f04a1e429895555c90e7dac89d57e48753b288d24835e54ce87de906a
+MISC metadata.xml 325 BLAKE2B c27cf94eac2f9d070217c697bf771c4d6ea581f917f8ae0f2a9cc685e6df5243471bdc6f1ece95cb6793cd2a0b288a5ba6c58a6b9671859426530aeea98dd5e8 SHA512 10e0c3be147a79c713ffe0402b5d2098376d468e22503881234b75aec25aaa13639513b7bbde9de5d04170a3ab6b0e956f71a071ec7da7c8e7beec232ffef78a
diff --git a/gui-apps/foot-terminfo/foot-terminfo-1.16.2.ebuild b/gui-apps/foot-terminfo/foot-terminfo-1.16.2.ebuild
new file mode 100644
index 000000000000..2d56410468f2
--- /dev/null
+++ b/gui-apps/foot-terminfo/foot-terminfo-1.16.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for foot, a fast, lightweight and minimal Wayland terminal emulator"
+HOMEPAGE="https://codeberg.org/dnkl/foot"
+SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> foot-${PV}.tar.gz"
+S="${WORKDIR}/foot"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="!>=sys-libs/ncurses-6.3[-minimal]"
+BDEPEND="sys-libs/ncurses"
+
+src_prepare() {
+	default
+	sed -i s/@default_terminfo@/foot/ foot.info || die
+}
+
+src_install() {
+	dodir /usr/share/terminfo/
+	tic -xo "${ED}"/usr/share/terminfo foot.info || die
+}
diff --git a/gui-apps/foot-terminfo/metadata.xml b/gui-apps/foot-terminfo/metadata.xml
index 68250fed57b4..039ff4c540e4 100644
--- a/gui-apps/foot-terminfo/metadata.xml
+++ b/gui-apps/foot-terminfo/metadata.xml
@@ -5,4 +5,7 @@
 		<email>arsen@gentoo.org</email>
 		<name>Arsen Arsenović</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="codeberg">dnkl/foot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/gui-apps/foot/Manifest b/gui-apps/foot/Manifest
index 4a74c9798b86..7ebdd4cb32dd 100644
--- a/gui-apps/foot/Manifest
+++ b/gui-apps/foot/Manifest
@@ -7,6 +7,7 @@ DIST foot-1.15.1.tar.gz 523399 BLAKE2B 6e9296dcb8fd16fb77ec1e7a7668b46da31f83343
 DIST foot-1.15.2.tar.gz 524743 BLAKE2B 7c6f573e733210f532238eb0d2385d49f61fcb531265ff1474b93cd092c8d860f27b11e6b36c506379d7874b9cc285825f56518817a2623fdde93b7c3d0e4fc6 SHA512 931231e0518950d3ac42625befab63ecc9a253bb870ea4c439d1110c40b31c15d049b9fc1e2a6282927737a9f6d7cd3278d42dffa6a57c3c1366e342e1e79622
 DIST foot-1.15.3.tar.gz 524297 BLAKE2B 3909a2cd9b7df1dbc6305a14675494d65874d1af2ad550fcbc7fe4b33c1a2bb2287029922daedbea8c9bfa5a855e1dd5c01fa2011bc0f9ebddca8565a44da591 SHA512 c27fefd40518382a184c590d02eee69deecf665759e909de6f4a61234159df7a1b38061eb9fd776ed205f10a556d5bf7520f5515fa9cec22a683f2f25d7495f8
 DIST foot-1.16.1.tar.gz 529761 BLAKE2B a3b88cfd1f369dc89c1a1b459cc2de0a031624b1348b04737e2fba0b70fed6ad1407ab4972ee245d1e38cf00bc0dab52c7e7f2f88131c16d240672df4527fb60 SHA512 ba37f05b1bad9f2e3bc35aceb4465071273744b53b9f6cb93cd348e72ab37c9a14a268ba8d68e43ea5fc540f5d3deb33b88d9160c80b7743f7ca2f05130bd677
+DIST foot-1.16.2.tar.gz 529917 BLAKE2B 2ad75af2505da361b8a186119229516210492f48923186c747c4b010048782846026f53ab454e2ee4c61c42d03a01552377696fd4fc234ba233bea1f507d2d2f SHA512 c357f4c8479e70ba716ab65ddc6605c1705702306273eb6de9797892c7b2a6ea5b8c1b05d74f552f630307356ce2b5546a5bed8ae38dc3d45f090a77cb74bb49
 EBUILD foot-1.12.1.ebuild 1591 BLAKE2B e453588383603bb3806acbd0674344310c27de1076124d8434f72d79b95322175dc00f5143b64c49ae2a1ee0507e685aab62d5e1da87ac816ff634a5e048db82 SHA512 cf29983afddebec219c94e720f83d541ef13e060a7d613043952b227bebbe55e595d4bc4246a34fcb55ef2b43c8100298de3036e1f0159b323e2ab20568bcd21
 EBUILD foot-1.13.0.ebuild 1592 BLAKE2B cfe29b7a5dcfecd51e61c227eb06547ffb5d87844d41e81d346ecf0637a30608f958eaa6cfd2e955faa935a93b4179ea962c81a2fba18870c7dc258a73cbafcf SHA512 e7b79fea6e923e4a6afc82a307224c95b5558afbbbe01d6d01ae1822e1e74b2d45734556dadd6b8e8b41a33986863437a39a1bccfbc0548fc53d7b15bfc57265
 EBUILD foot-1.13.1.ebuild 1592 BLAKE2B cfe29b7a5dcfecd51e61c227eb06547ffb5d87844d41e81d346ecf0637a30608f958eaa6cfd2e955faa935a93b4179ea962c81a2fba18870c7dc258a73cbafcf SHA512 e7b79fea6e923e4a6afc82a307224c95b5558afbbbe01d6d01ae1822e1e74b2d45734556dadd6b8e8b41a33986863437a39a1bccfbc0548fc53d7b15bfc57265
@@ -16,4 +17,5 @@ EBUILD foot-1.15.1.ebuild 1660 BLAKE2B 72321101c9888edf691368638946dd5f4a3f13afa
 EBUILD foot-1.15.2.ebuild 1660 BLAKE2B 72321101c9888edf691368638946dd5f4a3f13afab127d0d902492f83ec1d8b2a526d76f49e87e0c7a93da7427a736e0e498055a816fa15757ba380e4df03d62 SHA512 7080d0b915980eebe87bd7fcd77ea7a48e7c31ad0b7ae08eb36ef87a9e4a16d2e1032425d4a3dab6f82b2a701b72e19c4ae05b86719240e5ed92cb1d2ee55f9c
 EBUILD foot-1.15.3.ebuild 1660 BLAKE2B 72321101c9888edf691368638946dd5f4a3f13afab127d0d902492f83ec1d8b2a526d76f49e87e0c7a93da7427a736e0e498055a816fa15757ba380e4df03d62 SHA512 7080d0b915980eebe87bd7fcd77ea7a48e7c31ad0b7ae08eb36ef87a9e4a16d2e1032425d4a3dab6f82b2a701b72e19c4ae05b86719240e5ed92cb1d2ee55f9c
 EBUILD foot-1.16.1.ebuild 1667 BLAKE2B 63dd411f0447a57a23d5147ba863e37c3c095e56132c6cd69a3abfa1bd214ba8da86a0a021b84f448e69d2d09f3ea21b4349ed718487a607600382b99c16e33d SHA512 c2b1379385b3fcf0963b329d080676c379c5551ce483521802da511a71f92a66a8914b06ee0f54ccfbf0d2abf8e1d5cfbe5e7aed3a8fb61e7e8683d797404806
-MISC metadata.xml 341 BLAKE2B 1c7c659aadbfc8310fdc626c7d90053d9ec209f68bed5225eb1b25eb457e82152ea9fc078a59aedd631ad783d07070db6005396eb96876466bf6b5f734ac61a8 SHA512 1abc7340be6660844fd09412b39da5ca99dfd3b160bdc7c7f01b031850ba24de0544397537316162b8132c46751aa67f49ecedfd98a69151e8285d371452274c
+EBUILD foot-1.16.2.ebuild 1667 BLAKE2B 63dd411f0447a57a23d5147ba863e37c3c095e56132c6cd69a3abfa1bd214ba8da86a0a021b84f448e69d2d09f3ea21b4349ed718487a607600382b99c16e33d SHA512 c2b1379385b3fcf0963b329d080676c379c5551ce483521802da511a71f92a66a8914b06ee0f54ccfbf0d2abf8e1d5cfbe5e7aed3a8fb61e7e8683d797404806
+MISC metadata.xml 417 BLAKE2B 79751f755417450132e2d66f53ab5642452178da0f08b877572db0f1c3de3093c1047cd9e8e3d8b884745b54e1e7a60425e453e987193625e3be806cfe07023e SHA512 9392f93e37673f12fe5587fc4e4ea55014080b254e327532375212c7b2c43870cd5342b45afc170a60776ab747108ce70cf888096070c74f258fe6392ef23155
diff --git a/gui-apps/foot/foot-1.16.2.ebuild b/gui-apps/foot/foot-1.16.2.ebuild
new file mode 100644
index 000000000000..df30967e93ea
--- /dev/null
+++ b/gui-apps/foot/foot-1.16.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg systemd
+
+DESCRIPTION="Fast, lightweight and minimalistic Wayland terminal emulator"
+HOMEPAGE="https://codeberg.org/dnkl/foot"
+SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+grapheme-clustering test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/wayland
+	media-libs/fcft
+	media-libs/fontconfig
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	grapheme-clustering? (
+		dev-libs/libutf8proc:=
+		media-libs/fcft[harfbuzz]
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/tllist-1.1.0
+	>=dev-libs/wayland-protocols-1.32
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	|| (
+		>=sys-libs/ncurses-6.3[-minimal]
+		~gui-apps/foot-terminfo-${PV}
+	)
+"
+BDEPEND="
+	app-text/scdoc
+	dev-util/wayland-scanner
+"
+
+src_prepare() {
+	default
+	# disable the systemd dep, we install the unit file manually
+	sed -i "s/systemd', required: false)$/', required: false)/" "${S}"/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature grapheme-clustering)
+		$(meson_use test tests)
+		-Dthemes=true
+		-Dime=true
+		-Dterminfo=disabled
+	)
+	meson_src_configure
+
+	sed 's|@bindir@|/usr/bin|g' "${S}"/foot-server.service.in > foot-server.service || die
+}
+
+src_install() {
+	local DOCS=( CHANGELOG.md README.md LICENSE )
+	meson_src_install
+
+	# foot unconditionally installs CHANGELOG.md, README.md and LICENSE.
+	# we handle this via DOCS and dodoc instead.
+	rm -r "${ED}/usr/share/doc/${PN}" || die
+	systemd_douserunit foot-server.service "${S}"/foot-server.socket
+}
diff --git a/gui-apps/foot/metadata.xml b/gui-apps/foot/metadata.xml
index 98b6ded11416..bd0c815befd4 100644
--- a/gui-apps/foot/metadata.xml
+++ b/gui-apps/foot/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="grapheme-clustering">Enable grapheme clustering support</flag>
 	</use>
+	<upstream>
+		<remote-id type="codeberg">dnkl/foot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 6a747581f517..5e0e9a7bca10 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a8de8c0a07fa..96f7df1e2fa7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Oct 2023 02:39:57 +0000
+Wed, 18 Oct 2023 08:39:58 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index dd55ba5df3a7..c357109dfc96 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 550894 BLAKE2B 798965263c5d46e96205dc199bf25a6ce30d8338486a9e848484a9fd5ed830d3c27c166ba202e07c36df6988d550704f299a879de8c58b3b01520f804c90e943 SHA512 f6ec462cab8043045f98a1e866ddbe0f314f470e436c8cc7e0c07b22f2f914a169ca9d6120ef606f1879badd4bf0b66721cb9a50d5074d457a8e0d58296ee3b4
-TIMESTAMP 2023-10-18T02:40:01Z
+TIMESTAMP 2023-10-18T08:40:03Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUvRYFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUvmeNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBfbw/+IVnjc5WB1PXyMMKpdsJ4hMhwy2wghPXdorQQBz3hrMinjISW44HiPxc0
-FHGQHNd9SSDq2lYTKn3d8yWlownuFt09sL8S2UGoh2SkcAi7mx5T+jyGsXmvgDCd
-jroi6HsHZdnsyUs2haNOiYr4//HDo4cepj6df3ekyezxlWOGjKfYRJg4iHMhOeQi
-3ErlvmurpenNTbgBRd1+BxE7+/DABY1BGvsL1AwmQF3EuFcBxJq+ZoBmDu1DlSt4
-j4rAIoB07ZkiHW3enu6tliy4J9ZqKYIMwK+32WSyTaBXo8V8rXqImao4YDrCTZje
-+hAPQzz9vD5VRCmRaGLDdRDfAqp2WnsmcEhvWpQHWShQtnxBubmG+/Uu5s/YYyFp
-LdwSttdnH9zH5lQ44uM44AZBcCfNw/GT4aRQzupsTtGhIF65536Z92fmp02S7Wf9
-4U8Qqq90nMHluxtEGNEssjH/SQnT/l0ccTIrP9A7aPNcwDYOF2nfxbGy0c84lTPt
-DufmwfOCpQ2OoMdfcUOxr6gkHBMxiWtRVQ1euYL18Qtn9IkenGvTjH8K7edH8k41
-ohzmMiPkrNJJF1BPXtxNkjLvQPj2x09Xc2xGjaP7sdyKdoAmuvs2KEiv6TslzUel
-bpNXkOHhyo57Z1Us7/k7omG76SxGzdp6/OyAfc2WcIjh0tt07Ac=
-=UZIh
+klA9Hg/+OlcFn8mZSr17n1bxPZuG5rTkT1px03sQjxBxVpdgoBHLhibLKPuQs9Zq
+hYHEnnSjmU0AHrWMlswO2+KuaLP+CRiC7jTyYWeDVqa2Cjuvwrola3YCxQJREQwb
+RQlVGvgPk4GeyUE6NPBnC1Yd94o+2PwvyWxBJ3wKLcoq1dt1ZLr5HT7ksKkug1vr
+HvATQPxxiTE3kXBHlVhznRB7v1sq/2VZxefHBPYmpA4O3yu2N5qXiXNjbZXJSv1r
+H7go9Dv6L/OCS9TmFpQZ/zLQSrxJ1Dkf29Ih+J/+8ekRWDxnOlhuNy+EHWcfMva5
+FM8Iioti35yLc2G2kJZv7xa4l6DP1ngFALgbqI1vX1klWi44YlBorhtSrd+Ni73F
+xvcxX2JU8JtHRtd+2gNCEmUKqXa4B02NGWLzyxsBzcyVLg5kYANSUs4c8hAG6pA/
+6PYxb2wZS6uZe3WUn30qHwNtiglIGwh0EpAiHToYwuU2kYvUBm7rks+HDcSWgsVt
+GxCO7da0QnA2NHvhbgyfL4EyKKL/1I3pAlufntqKgRFiejTsbr4MBzPOTDYrEiv+
+AvG1a6UD8cKmedzJz+qHhJYL1tNcTjTxzz/CBA8yvDsQWqBV8dwGVWBi5NXzltpc
+L/esXOMeNOAg3O/fxSZYClWlsHNj0i3SYUD4PnBZcMyki8nd4k0=
+=9M3j
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a8de8c0a07fa..96f7df1e2fa7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Oct 2023 02:39:57 +0000
+Wed, 18 Oct 2023 08:39:58 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 446a59cd7058..4122d0af8df7 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 02a8d6d0bca1..b38d41347a7d 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.5-r2 b/metadata/md5-cache/app-accessibility/brltty-6.5-r2
index ff6a79197c56..cba7259b759b 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.5-r2
+++ b/metadata/md5-cache/app-accessibility/brltty-6.5-r2
@@ -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 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.5.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	findlib	cc1c14904708a0a28bcb256b342a808c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	findlib	cc1c14904708a0a28bcb256b342a808c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=9b5459915ba5014933ef02d8fb0fb695
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.5-r3 b/metadata/md5-cache/app-accessibility/brltty-6.5-r3
index 7427c4baf0ff..d5e81c6ae7e7 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.5-r3
+++ b/metadata/md5-cache/app-accessibility/brltty-6.5-r3
@@ -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 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.5.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	findlib	cc1c14904708a0a28bcb256b342a808c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	findlib	cc1c14904708a0a28bcb256b342a808c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=0366b46b0bcba0897c7c64d7f3360a3f
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.6 b/metadata/md5-cache/app-accessibility/brltty-6.6
index b370f69272f8..cac9538edb4a 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.6
+++ b/metadata/md5-cache/app-accessibility/brltty-6.6
@@ -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 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.6.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	findlib	cc1c14904708a0a28bcb256b342a808c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	findlib	cc1c14904708a0a28bcb256b342a808c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=beec701704d6b763288c506fb4437ddb
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 0bab7be8e49e..0030b30bce75 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=mirror://sourceforge/freetts/freetts-1.2.2-src.zip
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=fab2c4ced3c94f9bdfdc5ee605e0dd89
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index de93696ebf05..8bf6dd59b37f 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.29.65 b/metadata/md5-cache/app-admin/awscli-1.29.65
new file mode 100644
index 000000000000..a396266c048e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.29.65
@@ -0,0 +1,16 @@
+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(-)?] ) test? ( >=dev-python/botocore-1.31.65[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.7.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.3.1[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-67.8.0-r1[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 multiprocessing
+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.31.65[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.7.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.29.65.tar.gz -> aws-cli-1.29.65.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	d05609532b134be7c4ae2514f4c7d06e	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=fa06e79acff4953f2ae1c47398088ddc
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.17.10 b/metadata/md5-cache/app-admin/logstash-bin-7.17.10
index fcebc8abe472..d881de094224 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-7.17.10
+++ b/metadata/md5-cache/app-admin/logstash-bin-7.17.10
@@ -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.10-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.17.10-linux-x86_64.tar.gz )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=943777be07a0e39edd53c1a0b21f807b
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.17.12 b/metadata/md5-cache/app-admin/logstash-bin-7.17.12
index c7e4eef39255..c56095203101 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-7.17.12
+++ b/metadata/md5-cache/app-admin/logstash-bin-7.17.12
@@ -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.12-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.17.12-linux-x86_64.tar.gz )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=943777be07a0e39edd53c1a0b21f807b
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.17.9 b/metadata/md5-cache/app-admin/logstash-bin-7.17.9
index 630693d71388..d3cf5b5321b5 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-7.17.9
+++ b/metadata/md5-cache/app-admin/logstash-bin-7.17.9
@@ -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.9-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.17.9-linux-x86_64.tar.gz )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=943777be07a0e39edd53c1a0b21f807b
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 4d64dcad591c..8338bbc411d2 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.4.0-r1 b/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1
index 444058ad7e34..6aeb2f6a2651 100644
--- a/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1
+++ b/metadata/md5-cache/app-crypt/jacksum-3.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/jonelo/jacksum/archive/v3.4.0.tar.gz -> jacksum-3.4.0.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=e019ae46076724dc6101a41bd8218343
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 613355c9e17e..7d2334a03a39 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/jedit-5.6.0 b/metadata/md5-cache/app-editors/jedit-5.6.0
index f9a720bb1cc4..99159d345e79 100644
--- a/metadata/md5-cache/app-editors/jedit-5.6.0
+++ b/metadata/md5-cache/app-editors/jedit-5.6.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jsr305:0 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/jedit/jedit/5.6.0/jedit5.6.0source.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2220867ff111d631c0bac489df27212c
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index f67d6a1bb8dd..293335d6d5ea 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.46 b/metadata/md5-cache/app-emulation/virtualbox-6.1.46
index 297fa6831a16..ed69b3d18adc 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.46
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.46
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.46/VirtualBox-6.1.46.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1bba513726ced524384c96aaf2f9254c
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.48 b/metadata/md5-cache/app-emulation/virtualbox-6.1.48
new file mode 100644
index 000000000000..d81fca6ae8c7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.48
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) >=app-arch/tar-1.34-r2 >=dev-util/kbuild-0.1.9998.3127 <=dev-util/kbuild-0.1.9998.3500 >=dev-lang/yasm-0.6.2 dev-libs/libIDL sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.8 ) qt5? ( dev-qt/linguist-tools:5 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.48 >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( sdl? ( media-libs/libsdl:0[X,video] ) x11-base/xorg-proto x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] virtual/glu ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama x11-libs/libXrandr opengl? ( virtual/opengl ) ) java? ( virtual/jdk:1.8 ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-libs/libpulse ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc java python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-2 dtrace? ( CDDL )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.48 >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( sdl? ( media-libs/libsdl:0[X,video] ) x11-base/xorg-proto x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] virtual/glu ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.48/VirtualBox-6.1.48.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5f9962c4cdd5385a80ededa25836d992
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.10 b/metadata/md5-cache/app-emulation/virtualbox-7.0.10
index 1f6f9817c068..d1d153ab4978 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-7.0.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-7.0.10
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0/7.0
 SRC_URI=https://download.virtualbox.org/virtualbox/7.0.10/VirtualBox-7.0.10.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.10.tar.xz ) )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=010ce27fd3a212fe6b72c0d3f4a8d2f3
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.10-r1 b/metadata/md5-cache/app-emulation/virtualbox-7.0.10-r1
index b1ff5795b888..c116c59cce8d 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-7.0.10-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-7.0.10-r1
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0/7.0
 SRC_URI=https://download.virtualbox.org/virtualbox/7.0.10/VirtualBox-7.0.10.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.10.tar.xz ) )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5e443ecc557f88980e8886f4a422b5bf
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.12 b/metadata/md5-cache/app-emulation/virtualbox-7.0.12
new file mode 100644
index 000000000000..35814635f5a0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-7.0.12
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) >=app-arch/tar-1.34-r2 >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-util/kbuild-0.1.9998.3592 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) gui? ( dev-qt/linguist-tools:5 ) nls? ( dev-qt/linguist-tools:5 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.12 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) gui? ( x11-base/xorg-proto x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr ) java? ( virtual/jdk:1.8 ) opengl? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr virtual/glu ) sdl? ( x11-libs/libXinerama ) pulseaudio? ( media-libs/libpulse ) udev? ( >=virtual/udev-171 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+IUSE=alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc java python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.12 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.12/VirtualBox-7.0.12.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.12.tar.xz ) )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c25fb7c2a1a904f4dbbabc5b5c15cf85
diff --git a/metadata/md5-cache/app-emulation/virtualbox-9999 b/metadata/md5-cache/app-emulation/virtualbox-9999
index c2180f7bed27..7db685ab7644 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-9999
+++ b/metadata/md5-cache/app-emulation/virtualbox-9999
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0/9999
 SRC_URI=https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.10_pre20230615.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.10.tar.xz ) )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	subversion	44c6a1cae0381c100a526e3b348622cd	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	subversion	44c6a1cae0381c100a526e3b348622cd	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4266e08168dea3706d9dad6af6021b49
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.48 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.48
new file mode 100644
index 000000000000..4052b01363cb
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.48
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.48/VBoxGuestAdditions_6.1.48.iso
+_md5_=f177bb73aa3d2a5cff281e63b6d1ec93
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.12 b/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.12
new file mode 100644
index 000000000000..454bf6953fb9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.12
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=GPL-3 || ( GPL-3 CDDL )
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.12/VBoxGuestAdditions_7.0.12.iso
+_md5_=0fc3a435d9d38cd2937969a4a60f3f1d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.48 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.48
new file mode 100644
index 000000000000..d8a1a062375b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.48
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=PUEL-11
+RDEPEND=>=app-emulation/virtualbox-6.1.48
+RESTRICT=bindist mirror strip
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.48/Oracle_VM_VirtualBox_Extension_Pack-6.1.48.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.48.tar.gz
+_md5_=630869824830de0981321b68fd60f067
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.12 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.12
new file mode 100644
index 000000000000..2c14f31ebe9c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.12
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=PUEL-11
+RDEPEND==app-emulation/virtualbox-7.0.12*
+RESTRICT=bindist mirror strip
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.12/Oracle_VM_VirtualBox_Extension_Pack-7.0.12.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-7.0.12.tar.gz
+_md5_=915c06ff675f38e396aea87224ff4e2d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.48 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.48
new file mode 100644
index 000000000000..1b916a1a9251
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.48
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/kbuild-0.1.9998.3127 <=dev-util/kbuild-0.1.9998.3500 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-power/iasl sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) X? ( x11-base/xorg-proto x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp ) virtual/linux-sources
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=edo linux-mod-r1 systemd toolchain-funcs udev
+IUSE=X +dbus dist-kernel modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.48/VirtualBox-6.1.48.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=db6baf9fec576f7c37fbc3a44bb51184
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.12 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.12
new file mode 100644
index 000000000000..5ce1c624e01a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.12
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/yasm-0.6.2 >=dev-util/kbuild-0.1.9998.3127 sys-devel/bin86 sys-power/iasl sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) gui? ( x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-base/xorg-proto ) virtual/linux-sources
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=edo linux-mod-r1 systemd toolchain-funcs udev
+IUSE=+dbus gui dist-kernel modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )
+PDEPEND=gui? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.12/VirtualBox-7.0.12.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=6f316589e72e08e34186d38dec86ca19
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.48 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.48
new file mode 100644
index 000000000000..ec5a81586757
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.48
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=dist-kernel modules-sign +strip
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0/6.1
+SRC_URI=https://dev.gentoo.org/~ceamac/app-emulation/virtualbox-modules/vbox-kernel-module-src-6.1.48.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=97b26a0ce28937561a97265d764826c4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.12 b/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.12
new file mode 100644
index 000000000000..10e11763b69f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.12
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=dist-kernel modules-sign +strip
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0/7.0
+SRC_URI=https://dev.gentoo.org/~ceamac/app-emulation/virtualbox-modules/vbox-kernel-module-src-7.0.12.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=0fb79576a03c8892507f721f2178ce6f
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 90e1a8b38037..4e8368a1759d 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-r1 b/metadata/md5-cache/app-forensics/sleuthkit-4.11.1-r1
index d8d54c6aef5a..06f8c2bb1ccc 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.11.1-r1
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.11.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.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	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=5552f95358e5c37443558c825648b9b7
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-4.12.0 b/metadata/md5-cache/app-forensics/sleuthkit-4.12.0
index 968051e9273b..9f2eb2606903 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.12.0
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.12.0
@@ -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.0/sleuthkit-4.12.0.tar.gz java? ( https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.36.0.3/sqlite-jdbc-3.36.0.3.jar ) ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=8c9142a2ad73f2611c2b6aa10ff08921
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index c93cd329c6a1..97c18f0fac51 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-r8 b/metadata/md5-cache/app-metrics/collectd-5.12.0-r8
index 058115b2d2c0..4059a32bfae6 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.12.0-r8
+++ b/metadata/md5-cache/app-metrics/collectd-5.12.0-r8
@@ -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 ) ) 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	6ae9a4347149b19a112caa1182d03bde	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	fcaps	c0a086b957a1b183a8d136eabf02f191	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	fcaps	c0a086b957a1b183a8d136eabf02f191	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=78d254d37f136ea775022e91549bc605
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 7c646e9c8e04..ac824d85308e 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/rundeck-cli-bin-2.0.1 b/metadata/md5-cache/app-misc/rundeck-cli-bin-2.0.1
index 6f034787bade..947a289eca31 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=5a6db1938fc115a535c8c6d0b8d8c0cf
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index bf5443500c49..84213d7a84fe 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/libreoffice-7.5.5.2 b/metadata/md5-cache/app-office/libreoffice-7.5.5.2
index ff605671e456..02111a96f67e 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.5.5.2
+++ b/metadata/md5-cache/app-office/libreoffice-7.5.5.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.gentoo.org/~asturm/distfiles/libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.5.5.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.5.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.5.5//libreoffice-7.5.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.5.5//libreoffice-help-7.5.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.5.5.2/src/libreoffice-7.5.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.5.5.2/src/libreoffice-help-7.5.5.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//skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.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	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0b6860a6c401f627e8347745638953ad
diff --git a/metadata/md5-cache/app-office/libreoffice-7.5.6.2 b/metadata/md5-cache/app-office/libreoffice-7.5.6.2
index 27b1cde90a7e..50b18573a504 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.5.6.2
+++ b/metadata/md5-cache/app-office/libreoffice-7.5.6.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.gentoo.org/~asturm/distfiles/libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.5.6.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.5.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.5.6//libreoffice-7.5.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.5.6//libreoffice-help-7.5.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.5.6.2/src/libreoffice-7.5.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.5.6.2/src/libreoffice-help-7.5.6.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//skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.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	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=db91eab01ffc0e41b97a31ee65e5ca5f
diff --git a/metadata/md5-cache/app-office/libreoffice-7.5.7.1 b/metadata/md5-cache/app-office/libreoffice-7.5.7.1
index 791472ba278b..a81340a9d038 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.5.7.1
+++ b/metadata/md5-cache/app-office/libreoffice-7.5.7.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.gentoo.org/~asturm/distfiles/libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.5.7.1.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.5.7.1.tar.xz https://download.documentfoundation.org/libreoffice/src/7.5.7//libreoffice-7.5.7.1.tar.xz https://download.documentfoundation.org/libreoffice/src/7.5.7//libreoffice-help-7.5.7.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.5.7.1/src/libreoffice-7.5.7.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.5.7.1/src/libreoffice-help-7.5.7.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//skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.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	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7ddf86695d4d8d4070367f652928664a
diff --git a/metadata/md5-cache/app-office/libreoffice-7.5.9999 b/metadata/md5-cache/app-office/libreoffice-7.5.9999
index 31cc7d3a1f1e..8df76d56e456 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.5.9999
+++ b/metadata/md5-cache/app-office/libreoffice-7.5.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.gentoo.org/~asturm/distfiles/libreoffice-7.5.2.2-loong-buildsys-fix.patch.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//skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.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	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7ddf86695d4d8d4070367f652928664a
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index a1b23f25d6b2..9499189007dd 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 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	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0961bc76363876edf158158b35e6eaa4
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-7.5.5.2 b/metadata/md5-cache/app-office/libreoffice-bin-7.5.5.2
index 7b9b27b990d3..85960f7852dc 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-7.5.5.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-7.5.5.2
@@ -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.5.5.2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-7.5.5.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-7.5.5.2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-7.5.5.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-7.5.5.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-7.5.5.2.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-7.5.5.2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-7.5.5.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-java-7.5.5.2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-7.5.5.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-7.5.5.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-java-7.5.5.2.xd3 ) ) ) )
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=837ab796906f34109bb22cbe355d4d29
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-7.5.6.2 b/metadata/md5-cache/app-office/libreoffice-bin-7.5.6.2
index 899b879812ab..aee2afb03312 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-7.5.6.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-7.5.6.2
@@ -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.5.6.2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-7.5.6.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-7.5.6.2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-7.5.6.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-7.5.6.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-7.5.6.2.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-7.5.6.2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-7.5.6.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-java-7.5.6.2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-7.5.6.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-7.5.6.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-java-7.5.6.2.xd3 ) ) ) )
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f1d5fe38d717078173c7db3419a1f079
diff --git a/metadata/md5-cache/app-office/moneydance-2022.4060 b/metadata/md5-cache/app-office/moneydance-2022.4060
index cf0a8a5c5fd4..a78231279d6f 100644
--- a/metadata/md5-cache/app-office/moneydance-2022.4060
+++ b/metadata/md5-cache/app-office/moneydance-2022.4060
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-java/openjdk-bin:11 dev-java/openjdk:11 ) >=dev-java/java-confi
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://infinitekind.com/stabledl/2022_4060/Moneydance_linux_amd64.tar.gz -> moneydance-2022.4060-amd64.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ad8354696b07bdba575831dac48a0f2f
diff --git a/metadata/md5-cache/app-office/moneydance-2023.1.5006 b/metadata/md5-cache/app-office/moneydance-2023.1.5006
index 4de728d0c7ed..05b9521bc7fc 100644
--- a/metadata/md5-cache/app-office/moneydance-2023.1.5006
+++ b/metadata/md5-cache/app-office/moneydance-2023.1.5006
@@ -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/2023.1_5006/Moneydance_linux_amd64.tar.gz -> moneydance-2023.1.5006-amd64.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=911c0e3b1a4412186c309840bd7f0e9c
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 5da4b8d9f4cc..5ba961bc43b3 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 3ec86dca43f0..cd0f0b3c5ce8 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	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 84b4b52ffd66..afc6c62b1cbe 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	2358a7b20091609e24bd3a83b3ac5991	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=236bc1b36bdbe638ac48bded5871d084
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 455685c702f1..d93de9dbb50b 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/calibre-5.44.0-r1 b/metadata/md5-cache/app-text/calibre-5.44.0-r1
index e118e27934ab..24e63bb54f01 100644
--- a/metadata/md5-cache/app-text/calibre-5.44.0-r1
+++ b/metadata/md5-cache/app-text/calibre-5.44.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-python/setuptools-23.1.0[python_targets_python3_10(-)] >=dev-python/sip-5[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-23.1.0[python_targets_python3_11(-)] >=dev-python/sip-5[python_targets_python3_11(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 <virtual/podofo-build-0.10 virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+BDEPEND=python_single_target_python3_10? ( >=dev-python/setuptools-23.1.0[python_targets_python3_10(-)] >=dev-python/sip-5[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-23.1.0[python_targets_python3_11(-)] >=dev-python/sip-5[python_targets_python3_11(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 <virtual/podofo-build-0.10 virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install postinst postrm prepare setup test unpack
 DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[ipv6(+),sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[ipv6(+),sqlite,ssl] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= <app-text/podofo-0.10:= >=app-text/poppler-0.26.5[qt5] dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 dev-libs/openssl:= dev-libs/snowball-stemmer:= >=sys-apps/dbus-1.10.8 python_single_target_python3_10? ( app-accessibility/speech-dispatcher[python,python_targets_python3_10(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cchardet[python_targets_python3_10(-)] >=dev-python/chardet-3.0.3[python_targets_python3_10(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_10(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_10(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_10(-)] dev-python/dnspython[python_targets_python3_10(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_10(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_10(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_10(-)] dev-python/jeepney[python_targets_python3_10(-)] >=dev-python/lxml-3.8.0[python_targets_python3_10(-)] >=dev-python/markdown-3.0.1[python_targets_python3_10(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_10(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_10(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_10(-)] >=dev-python/pillow-3.2.0[truetype,python_targets_python3_10(-)] >=dev-python/psutil-4.3.0[python_targets_python3_10(-)] >=dev-python/pychm-0.8.6[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/pygments-2.3.1[python_targets_python3_10(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_10(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_10(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-accessibility/speech-dispatcher[python,python_targets_python3_11(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] dev-python/cchardet[python_targets_python3_11(-)] >=dev-python/chardet-3.0.3[python_targets_python3_11(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_11(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_11(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_11(-)] dev-python/dnspython[python_targets_python3_11(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_11(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_11(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_11(-)] dev-python/jeepney[python_targets_python3_11(-)] >=dev-python/lxml-3.8.0[python_targets_python3_11(-)] >=dev-python/markdown-3.0.1[python_targets_python3_11(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_11(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_11(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_11(-)] >=dev-python/pillow-3.2.0[truetype,python_targets_python3_11(-)] >=dev-python/psutil-4.3.0[python_targets_python3_11(-)] >=dev-python/pychm-0.8.6[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] >=dev-python/pygments-2.3.1[python_targets_python3_11(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_11(-)] dev-python/zeroconf[python_targets_python3_11(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_11(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_11(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev )
 DESCRIPTION=Ebook management application
 EAPI=8
 HOMEPAGE=https://calibre-ebook.com/
-INHERIT=toolchain-funcs python-single-r1 qmake-utils xdg-utils
-IUSE=ios +udisks python_single_target_python3_10 python_single_target_python3_11
+INHERIT=toolchain-funcs python-single-r1 qmake-utils verify-sig xdg-utils
+IUSE=ios +udisks python_single_target_python3_10 python_single_target_python3_11 verify-sig
 KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
 RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[ipv6(+),sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[ipv6(+),sqlite,ssl] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= <app-text/podofo-0.10:= >=app-text/poppler-0.26.5[qt5] dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 dev-libs/openssl:= dev-libs/snowball-stemmer:= >=sys-apps/dbus-1.10.8 python_single_target_python3_10? ( app-accessibility/speech-dispatcher[python,python_targets_python3_10(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cchardet[python_targets_python3_10(-)] >=dev-python/chardet-3.0.3[python_targets_python3_10(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_10(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_10(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_10(-)] dev-python/dnspython[python_targets_python3_10(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_10(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_10(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_10(-)] dev-python/jeepney[python_targets_python3_10(-)] >=dev-python/lxml-3.8.0[python_targets_python3_10(-)] >=dev-python/markdown-3.0.1[python_targets_python3_10(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_10(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_10(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_10(-)] >=dev-python/pillow-3.2.0[truetype,python_targets_python3_10(-)] >=dev-python/psutil-4.3.0[python_targets_python3_10(-)] >=dev-python/pychm-0.8.6[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/pygments-2.3.1[python_targets_python3_10(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_10(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_10(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-accessibility/speech-dispatcher[python,python_targets_python3_11(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] dev-python/cchardet[python_targets_python3_11(-)] >=dev-python/chardet-3.0.3[python_targets_python3_11(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_11(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_11(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_11(-)] dev-python/dnspython[python_targets_python3_11(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_11(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_11(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_11(-)] dev-python/jeepney[python_targets_python3_11(-)] >=dev-python/lxml-3.8.0[python_targets_python3_11(-)] >=dev-python/markdown-3.0.1[python_targets_python3_11(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_11(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_11(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_11(-)] >=dev-python/pillow-3.2.0[truetype,python_targets_python3_11(-)] >=dev-python/psutil-4.3.0[python_targets_python3_11(-)] >=dev-python/pychm-0.8.6[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] >=dev-python/pygments-2.3.1[python_targets_python3_11(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_11(-)] dev-python/zeroconf[python_targets_python3_11(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_11(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_11(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
-SRC_URI=https://download.calibre-ebook.com/5.44.0/calibre-5.44.0.tar.xz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=17e7cc83c808f32d6f8de50742471e78
+SRC_URI=https://download.calibre-ebook.com/5.44.0/calibre-5.44.0.tar.xz verify-sig? ( https://calibre-ebook.com/signatures/calibre-5.44.0.tar.xz.sig )
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2a944589b35c7fae87b0dc335914bb88
diff --git a/metadata/md5-cache/app-text/calibre-5.44.0-r2 b/metadata/md5-cache/app-text/calibre-5.44.0-r2
new file mode 100644
index 000000000000..9b59b8a28f26
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-5.44.0-r2
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( >=dev-python/PyQt-builder-1.10.3[python_targets_python3_10(-)] >=dev-python/sip-5[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/PyQt-builder-1.10.3[python_targets_python3_11(-)] >=dev-python/sip-5[python_targets_python3_11(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 <virtual/podofo-build-0.10 virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install postinst postrm prepare setup test unpack
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[ipv6(+),sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[ipv6(+),sqlite,ssl] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= <app-text/podofo-0.10:= app-text/poppler[utils] dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/openssl:= dev-libs/snowball-stemmer:= python_single_target_python3_10? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cchardet[python_targets_python3_10(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_10(-)] dev-python/dnspython[python_targets_python3_10(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_10(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_10(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_10(-)] dev-python/jeepney[python_targets_python3_10(-)] >=dev-python/lxml-3.8.0[python_targets_python3_10(-)] >=dev-python/markdown-3.0.1[python_targets_python3_10(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_10(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_10(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_10(-)] >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,python_targets_python3_10(-)] >=dev-python/psutil-4.3.0[python_targets_python3_10(-)] >=dev-python/pychm-0.8.6[python_targets_python3_10(-)] >=dev-python/pygments-2.3.1[python_targets_python3_10(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,widgets,network,printsupport,svg,python_targets_python3_10(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] dev-python/cchardet[python_targets_python3_11(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_11(-)] dev-python/dnspython[python_targets_python3_11(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_11(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_11(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_11(-)] dev-python/jeepney[python_targets_python3_11(-)] >=dev-python/lxml-3.8.0[python_targets_python3_11(-)] >=dev-python/markdown-3.0.1[python_targets_python3_11(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_11(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_11(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_11(-)] >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,python_targets_python3_11(-)] >=dev-python/psutil-4.3.0[python_targets_python3_11(-)] >=dev-python/pychm-0.8.6[python_targets_python3_11(-)] >=dev-python/pygments-2.3.1[python_targets_python3_11(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_11(-)] dev-python/zeroconf[python_targets_python3_11(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,widgets,network,printsupport,svg,python_targets_python3_11(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) dev-qt/qtimageformats:5 dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg,png] dev-qt/qtwidgets:5 dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-gfx/optipng-0.7.6 virtual/libusb:1= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) speech? ( python_single_target_python3_10? ( app-accessibility/speech-dispatcher[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-accessibility/speech-dispatcher[python,python_targets_python3_11(-)] ) ) udisks? ( virtual/libudev ) test? ( python_single_target_python3_10? ( >=dev-python/chardet-3.0.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/chardet-3.0.3[python_targets_python3_11(-)] ) )
+DESCRIPTION=Ebook management application
+EAPI=8
+HOMEPAGE=https://calibre-ebook.com/
+INHERIT=toolchain-funcs python-single-r1 qmake-utils verify-sig xdg-utils
+IUSE=ios speech test +udisks python_single_target_python3_10 python_single_target_python3_11 verify-sig
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[ipv6(+),sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[ipv6(+),sqlite,ssl] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= <app-text/podofo-0.10:= app-text/poppler[utils] dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/openssl:= dev-libs/snowball-stemmer:= python_single_target_python3_10? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cchardet[python_targets_python3_10(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_10(-)] dev-python/dnspython[python_targets_python3_10(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_10(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_10(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_10(-)] dev-python/jeepney[python_targets_python3_10(-)] >=dev-python/lxml-3.8.0[python_targets_python3_10(-)] >=dev-python/markdown-3.0.1[python_targets_python3_10(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_10(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_10(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_10(-)] >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,python_targets_python3_10(-)] >=dev-python/psutil-4.3.0[python_targets_python3_10(-)] >=dev-python/pychm-0.8.6[python_targets_python3_10(-)] >=dev-python/pygments-2.3.1[python_targets_python3_10(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,widgets,network,printsupport,svg,python_targets_python3_10(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] dev-python/cchardet[python_targets_python3_11(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_11(-)] dev-python/dnspython[python_targets_python3_11(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_11(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_11(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_11(-)] dev-python/jeepney[python_targets_python3_11(-)] >=dev-python/lxml-3.8.0[python_targets_python3_11(-)] >=dev-python/markdown-3.0.1[python_targets_python3_11(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_11(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_11(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_11(-)] >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,python_targets_python3_11(-)] >=dev-python/psutil-4.3.0[python_targets_python3_11(-)] >=dev-python/pychm-0.8.6[python_targets_python3_11(-)] >=dev-python/pygments-2.3.1[python_targets_python3_11(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_11(-)] dev-python/zeroconf[python_targets_python3_11(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,widgets,network,printsupport,svg,python_targets_python3_11(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) dev-qt/qtimageformats:5 dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg,png] dev-qt/qtwidgets:5 dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-gfx/optipng-0.7.6 virtual/libusb:1= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) speech? ( python_single_target_python3_10? ( app-accessibility/speech-dispatcher[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-accessibility/speech-dispatcher[python,python_targets_python3_11(-)] ) ) udisks? ( virtual/libudev ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/5.44.0/calibre-5.44.0.tar.xz verify-sig? ( https://calibre-ebook.com/signatures/calibre-5.44.0.tar.xz.sig )
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=90db657ca68989d7b034345ab8e4ffdd
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 928476b7d53a..c01ca0ec43f3 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	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=d4d0f7781fc8186cfe22b2c2d6072277
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.8.2 b/metadata/md5-cache/app-text/jabref-bin-3.8.2
index ebc5581e3f54..c6f975b0d6df 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.8.2
+++ b/metadata/md5-cache/app-text/jabref-bin-3.8.2
@@ -9,5 +9,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	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=3e5c17681bbcfbe7ee69ef5aa62130e2
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 c7ff9f0a385c..8296b1783848 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=9deb1f208f5ca8680053e3e3479a0f1a
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 7b4186e853d3..45079cf9a189 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=86124901880ae1398c0dc2af6e18b1da
diff --git a/metadata/md5-cache/app-text/languagetool-5.4-r2 b/metadata/md5-cache/app-text/languagetool-5.4-r2
index d1f81cb471d4..82d0e264aa0b 100644
--- a/metadata/md5-cache/app-text/languagetool-5.4-r2
+++ b/metadata/md5-cache/app-text/languagetool-5.4-r2
@@ -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://www.languagetool.org/download/LanguageTool-5.4.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2123dd484d8bcc348056c956c9f11642
diff --git a/metadata/md5-cache/app-text/pdftk-3.3.3 b/metadata/md5-cache/app-text/pdftk-3.3.3
index 2b901b2aceb3..e9499db547b5 100644
--- a/metadata/md5-cache/app-text/pdftk-3.3.3
+++ b/metadata/md5-cache/app-text/pdftk-3.3.3
@@ -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/v3.3.3/pdftk-v3.3.3.tar.bz2
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=77449e5dcc1b87ae82dd5cf13ccf25a4
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 f42d4af2866e..04c6fcc7ba9d 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=ef37cf303f94d10839733bc9d8ba68ed
diff --git a/metadata/md5-cache/app-text/pdftk-9999 b/metadata/md5-cache/app-text/pdftk-9999
index 5627d64d9ae7..1009c4d1f523 100644
--- a/metadata/md5-cache/app-text/pdftk-9999
+++ b/metadata/md5-cache/app-text/pdftk-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=virtual/jre-1.8:* dev-java/bcprov:1.74 dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=341d82d381c1ff186d0ea44b93353e9e
diff --git a/metadata/md5-cache/app-text/trang-20181222 b/metadata/md5-cache/app-text/trang-20181222
index f98f5d18493a..2ab43e969c76 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=d3b2a0ce976735b9eb69599aac0a8b8c
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index dcd650d89ec2..17e696c611fb 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 09f482b115fa..7b2ac2aef569 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 bc22b753176b..0f7d0b8ec7ea 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=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=398128d9c7492554287af74461e3a54a
diff --git a/metadata/md5-cache/dev-db/mariadb-10.11.5 b/metadata/md5-cache/dev-db/mariadb-10.11.5
index 67fd45474d1a..f9e13d18cb9a 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	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0d18f0c864ff1403435b4b5065136022
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.11 b/metadata/md5-cache/dev-db/mariadb-10.6.11
index 7b9bb0f911e9..7a12b755d120 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.11
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.11
@@ -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.11/source/mariadb-10.6.11.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.10-patches-01.tar.xz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=badc728d4035eed0c702532390ad9380
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.14 b/metadata/md5-cache/dev-db/mariadb-10.6.14
index 0d686d53c0d2..50b9b90c1dc0 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	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a53b92d9fd801bb1c39934f23464633a
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.15 b/metadata/md5-cache/dev-db/mariadb-10.6.15
index 24b85afc420c..5efb1c50add7 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	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5df265438415c59c86a6919a48cdbd70
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r4 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r4
index da12c99ab2ea..9869b40a1f45 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r4
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r4
@@ -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 ) ) 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	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=1c0acc9b2a2bc362fbee8bf4560a6687
diff --git a/metadata/md5-cache/dev-db/sqlcl-bin-23.1.0.089.0929 b/metadata/md5-cache/dev-db/sqlcl-bin-23.1.0.089.0929
index 1eac08deaa7b..f4de0080aea0 100644
--- a/metadata/md5-cache/dev-db/sqlcl-bin-23.1.0.089.0929
+++ b/metadata/md5-cache/dev-db/sqlcl-bin-23.1.0.089.0929
@@ -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.1.0.089.0929.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=5591de148f6e6938051dff5522554719
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-23.1.0.097.1607 b/metadata/md5-cache/dev-db/sqldeveloper-23.1.0.097.1607
index e416258680de..cf6f627aa8ec 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-23.1.0.097.1607
+++ b/metadata/md5-cache/dev-db/sqldeveloper-23.1.0.097.1607
@@ -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.0.097.1607-no-jre.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=1c93173947dcd4bf8e0fc8746045f38c
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 96693bdb3a17..2b0d83623549 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 74788bd4c6bb..f77ec8098835 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	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 a85dbbb656f2..5111cdd60fef 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=6b904b616f39ce42b1c248beff623ae1
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 1e594b1e7d98..58d9c3d2af76 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 e0dd68ed13e3..46f24565521e 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 13c0ef02006a..d02200e71c2a 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=5365b105212193b14dbba1b0a2109750
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.10.9 b/metadata/md5-cache/dev-java/ant-antlr-1.10.9
index c133ff7a06cf..87c676da2a9f 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=95b25a81b2078596185b8c633916297c
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
index 283f57f24308..7ed01ac624aa 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=38e89e04094fd723f33e230a67080265
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
index f1d9d8be8ef6..fcaed20fb9fc 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=17ef357fd6ee6b9f679ec4d597b38bc5
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
index 9a5f5831ca0d..eda8ce252678 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j-12-api:2 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-co
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=6927de0050741d27d434190f09d25282
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
index 178ef7eea0c9..1727d56507b7 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=ece355386a034501aefc3abbf63f290c
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
index dbefd7a20cdc..660f236d8989 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=b1df8370de1c2e4446bbc1a857090021
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
index 39c5bd34b1f3..bd011486da52 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=9010b1d5007987008f8989150f4f3459
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
index 14fec18dc9dd..2bcc7c528c4a 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=525c909435e802693faa9089623d681a
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9 b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
index 37c59e333dbb..c11f76184fc5 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=c17cca848a2209269372949af9e28e04
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.10.9 b/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
index f85194a7e822..2acbcfa12b1b 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=f9777c11b201ce8e54fdb4c143832bfd
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
index 9328cb6adf60..b531fe0cea14 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/ant-ivy:2 dev-java/bcel:0 dev-java/commons-
 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=fa7c24e7af94c93a09a703c266c268bc
diff --git a/metadata/md5-cache/dev-java/ant-core-1.10.9-r5 b/metadata/md5-cache/dev-java/ant-core-1.10.9-r5
index 26b3c2cd9238..399626b04582 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.10.9-r5
+++ b/metadata/md5-cache/dev-java/ant-core-1.10.9-r5
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=059cc9a4ad7fe562359e8db875e5e2e7
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
index 4bc1e0e24c43..6051ae1ccd73 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.15-r1
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.15:4.15 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.15
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/ecjsrc-4.15.jar
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=f39456c3afb285979f50389b39c95102
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26
index 8954e70430fb..db092c251f38 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.26:4.26 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.26
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-4.26.jar
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=74daa57494920e4ddf88b4f31d9d21fa
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1 b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
index aa1056ab5408..2334b5459714 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.5.0-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcompo
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.5.0/apache-ivy-2.5.0-src.tar.gz
-_eclasses_=java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=b8ffa063f56d10f6081980a097bcb278
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.10.9 b/metadata/md5-cache/dev-java/ant-jai-1.10.9
index 8ad5956f7482..788c962d095f 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jai-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=42e8a3bbc17b75be224e72baf75747a2
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
index 777976ecfd03..a934715c6aee 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/javax-mail:0 >=dev-java/java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=0d0fe5000a6697f59ae1a22ee8899d2d
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.10.9 b/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
index 39777cc53c36..8f8f4117dc25 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=f3b9655aa578743dcf51d9369738a1e4
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.10.9 b/metadata/md5-cache/dev-java/ant-jmf-1.10.9
index 73afc4634b04..201c93c9fdd8 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=9d7fd9f097b82993ec1201c2aac20158
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.10.9 b/metadata/md5-cache/dev-java/ant-jsch-1.10.9
index 3bf285762e7b..84eb206a17b5 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=ddcbb7ce88f3db70836c837727ec9c66
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.10.9 b/metadata/md5-cache/dev-java/ant-junit-1.10.9
index 378370589d36..f5dbab37373f 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junit-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=6367f66edd8a2057d214a119368067a2
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.10.9 b/metadata/md5-cache/dev-java/ant-junit4-1.10.9
index 10cbdc1142ee..f224cf409690 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.10.9 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=6967158f03a23bbcfe494ed4c782ad81
diff --git a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9 b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
index 7513061c9a26..bfacd4e602cd 100644
--- a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=6a9589f1600cbdca6a8c270f017a4a35
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.10.9 b/metadata/md5-cache/dev-java/ant-swing-1.10.9
index 4636aa097361..2fc467163200 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-swing-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=8d417d53c02c7ddda1c12ed921471c2d
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.10.9 b/metadata/md5-cache/dev-java/ant-testutil-1.10.9
index 23d632bd7fef..56c7fa8a8cdd 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=1edff5e584aae5eb0dd2c080d5f1f9c4
diff --git a/metadata/md5-cache/dev-java/ant-xz-1.10.9 b/metadata/md5-cache/dev-java/ant-xz-1.10.9
index 4c679988dc21..109f9f17e521 100644
--- a/metadata/md5-cache/dev-java/ant-xz-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-xz-1.10.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xz-java >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=ant-tasks	f4cef80c43613a641f3f0f22d74883f0	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=80b30c32b257df29fde82bdf94428c6f
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 5da51739815e..0afc85def6bf 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=48fb8dc5008da2dab11a5f53ef0ea086
diff --git a/metadata/md5-cache/dev-java/antlr-3.2-r1 b/metadata/md5-cache/dev-java/antlr-3.2-r1
index d6653a6a5077..e1c0f6efabdf 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2-r1
+++ b/metadata/md5-cache/dev-java/antlr-3.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.8:
 RESTRICT=!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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=a3909c090fe701b05bf419f9d3f1469c
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.3 b/metadata/md5-cache/dev-java/antlr-3.5.3
index 722bdbe0aa96..74c27423e587 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 068c0863e2a0..c3c523004145 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 600565e64cbd..fcf817891270 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 8ca36a347305..6c80c2f9ec16 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=24940d00dbb98aa66e931290836ae633
diff --git a/metadata/md5-cache/dev-java/antlr-tool-3.5.3 b/metadata/md5-cache/dev-java/antlr-tool-3.5.3
index bbb7ce2cf2f7..c4b1c60dc17b 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-3.5.3
+++ b/metadata/md5-cache/dev-java/antlr-tool-3.5.3
@@ -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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=dc14d4dde5ff1bb15323b17429976974
diff --git a/metadata/md5-cache/dev-java/antlr-tool-4.9.3 b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
index df6408d363f2..bd8f5b9987cb 100644
--- a/metadata/md5-cache/dev-java/antlr-tool-4.9.3
+++ b/metadata/md5-cache/dev-java/antlr-tool-4.9.3
@@ -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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=ca183b61d5570a4229b78a404a5e13e0
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r3 b/metadata/md5-cache/dev-java/aopalliance-1.0-r3
index f0c3920e52cb..ab646db3b342 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=0bcbc7cba4df84544947602428a6dd59
diff --git a/metadata/md5-cache/dev-java/apache-rat-0.13 b/metadata/md5-cache/dev-java/apache-rat-0.13
index 401425684b06..c75039c56b8f 100644
--- a/metadata/md5-cache/dev-java/apache-rat-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-0.13
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=~dev-java/apache-rat-core-0.13:0 ~dev-java/apache-rat-tasks-0.13:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=828c126e4c3fb88b8082ea80f3b25206
diff --git a/metadata/md5-cache/dev-java/apache-rat-0.15 b/metadata/md5-cache/dev-java/apache-rat-0.15
index d1fe6815c523..400f9b3ff37e 100644
--- a/metadata/md5-cache/dev-java/apache-rat-0.15
+++ b/metadata/md5-cache/dev-java/apache-rat-0.15
@@ -12,5 +12,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-collections:
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache//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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=93774b68398f5e495b3c1b5428272a1f
diff --git a/metadata/md5-cache/dev-java/apache-rat-core-0.13 b/metadata/md5-cache/dev-java/apache-rat-core-0.13
index 0230301fde8d..c08a9c1e6524 100644
--- a/metadata/md5-cache/dev-java/apache-rat-core-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-core-0.13
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-cli-1.3.1:1 >=dev-java/commons-co
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=d22bad28e451f95f75c485378fececf2
diff --git a/metadata/md5-cache/dev-java/apache-rat-tasks-0.13 b/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
index 4ba9d966ab78..3fdae6d2318d 100644
--- a/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
+++ b/metadata/md5-cache/dev-java/apache-rat-tasks-0.13
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 ~dev-java/apache-rat-core-0.13:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache//creadur/apache-rat-0.13/apache-rat-0.13-src.tar.bz2
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=7c5b860615c9f5b27aa0563531da9afa
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 3e3bc3d7331b..dbc7736eea55 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=5f020dc4845edbebc486fb168740816f
diff --git a/metadata/md5-cache/dev-java/appenh-0.5.0 b/metadata/md5-cache/dev-java/appenh-0.5.0
index e65640ebbbd4..7d2402618de9 100644
--- a/metadata/md5-cache/dev-java/appenh-0.5.0
+++ b/metadata/md5-cache/dev-java/appenh-0.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/loadlib:0 >=dev-java/java-config-2.2.0-r3 s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/teras/appenh/archive/137b99422ad02953cf957e09b129a47b876d1e2a.tar.gz -> appenh-0.5.0.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=a052f8dba5c13e29feb163b357413857
diff --git a/metadata/md5-cache/dev-java/aqute-bnd-annotation-6.3.1 b/metadata/md5-cache/dev-java/aqute-bnd-annotation-6.3.1
index 91fa04728f4b..3e04853d1f73 100644
--- a/metadata/md5-cache/dev-java/aqute-bnd-annotation-6.3.1
+++ b/metadata/md5-cache/dev-java/aqute-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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=9b6924a56bbe5d84137a134d5a652054
diff --git a/metadata/md5-cache/dev-java/asm-9.5 b/metadata/md5-cache/dev-java/asm-9.5
index ae429222fe52..78f254df7d3c 100644
--- a/metadata/md5-cache/dev-java/asm-9.5
+++ b/metadata/md5-cache/dev-java/asm-9.5
@@ -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_5/asm-ASM_9_5.tar.bz2
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=6aef405bacc4c198da0e0029a14a1f80
diff --git a/metadata/md5-cache/dev-java/asm-9.6 b/metadata/md5-cache/dev-java/asm-9.6
new file mode 100644
index 000000000000..36b37821c189
--- /dev/null
+++ b/metadata/md5-cache/dev-java/asm-9.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Bytecode manipulation framework for Java
+EAPI=8
+HOMEPAGE=https://asm.ow2.io
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
+_md5_=9fe6e2d33985e4bde3958adcbc1cbe49
diff --git a/metadata/md5-cache/dev-java/aspectj-1.9.7 b/metadata/md5-cache/dev-java/aspectj-1.9.7
index b8c069c6cc56..95088928ef35 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.9.7
+++ b/metadata/md5-cache/dev-java/aspectj-1.9.7
@@ -11,5 +11,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/asm:9 dev-java/commons-logging:0 dev-java/ant-apache-regexp:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse/org.aspectj/archive/refs/tags/V1_9_7.tar.gz -> aspectj-1.9.7.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=72e4c000f4d64ad768a7fcfd8c05933c
diff --git a/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1 b/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
index f08c3906da19..e4f190a5f1f0 100644
--- a/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
+++ b/metadata/md5-cache/dev-java/assertj-core-2.3.0-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/assertj/assertj-core/archive/assertj-core-2.3.0.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=74c0f187f05a2b4e485e2e4d881f1e45
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 1cfebc398183..80e7ca067e9d 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=2d7798708bdc2edb66c9421153a5a1ba
diff --git a/metadata/md5-cache/dev-java/batik-1.16-r2 b/metadata/md5-cache/dev-java/batik-1.16-r2
index e06054287c35..aefc70be34e6 100644
--- a/metadata/md5-cache/dev-java/batik-1.16-r2
+++ b/metadata/md5-cache/dev-java/batik-1.16-r2
@@ -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.16.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/batik/source/batik-src-1.16.tar.gz.asc )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=178fb23af89ed596fd2fdc1db38b5442
diff --git a/metadata/md5-cache/dev-java/batik-1.17 b/metadata/md5-cache/dev-java/batik-1.17
index 98b173985d78..8e68801c12a5 100644
--- a/metadata/md5-cache/dev-java/batik-1.17
+++ b/metadata/md5-cache/dev-java/batik-1.17
@@ -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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5da2771c5801a2d0e9334265ed3377e1
diff --git a/metadata/md5-cache/dev-java/bcel-6.6.0 b/metadata/md5-cache/dev-java/bcel-6.6.0
index 5b0f19805517..1e82cf84ee39 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=0090e9c87f37011a5b16591d3d223f3d
diff --git a/metadata/md5-cache/dev-java/bcmail-1.72 b/metadata/md5-cache/dev-java/bcmail-1.72
index 03f3a42da935..d75f64e11429 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.72
+++ b/metadata/md5-cache/dev-java/bcmail-1.72
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcpkix-1.72:0 ~dev-java/bcprov-1.72:0 ~dev-java/bcutil-1.72:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=392e33e4210b7288b9ffd1d8de00aa0c
diff --git a/metadata/md5-cache/dev-java/bcmail-1.76 b/metadata/md5-cache/dev-java/bcmail-1.76
index 8c534544f249..5ec23a776252 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.76
+++ b/metadata/md5-cache/dev-java/bcmail-1.76
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcpkix-1.76:0 ~dev-java/bcprov-1.76:0 ~dev-java/bcutil-1.76:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv76.tar.gz -> bc-java-r1rv76.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=f66ba69f15533b6ca28b405e8d7fdf7b
diff --git a/metadata/md5-cache/dev-java/bcpg-1.72 b/metadata/md5-cache/dev-java/bcpg-1.72
index 2618b6a6b66a..5e8f507f5493 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.72
+++ b/metadata/md5-cache/dev-java/bcpg-1.72
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.72: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/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=31e7099838e87b12597cdc2c2f59290f
diff --git a/metadata/md5-cache/dev-java/bcpg-1.76 b/metadata/md5-cache/dev-java/bcpg-1.76
index 2a1fd1067e60..0d069536e19a 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.76
+++ b/metadata/md5-cache/dev-java/bcpg-1.76
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.76: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/r1rv76.tar.gz -> bc-java-r1rv76.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=f6558e640d582ad3263022c2103b257e
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.72 b/metadata/md5-cache/dev-java/bcpkix-1.72
index 78a92a391701..3a428bc9e5d5 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.72
+++ b/metadata/md5-cache/dev-java/bcpkix-1.72
@@ -12,5 +12,5 @@ RDEPEND=~dev-java/bcprov-1.72:0 ~dev-java/bcutil-1.72:0 >=virtual/jre-1.8:* >=de
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=04597e54bfdaeb887510228c3081eca4
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.76 b/metadata/md5-cache/dev-java/bcpkix-1.76
index dda95fa1cb68..28561cba5e68 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.76
+++ b/metadata/md5-cache/dev-java/bcpkix-1.76
@@ -12,5 +12,5 @@ RDEPEND=~dev-java/bcprov-1.76:0 ~dev-java/bcutil-1.76:0 >=virtual/jre-1.8:* >=de
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcgit/bc-java/archive/r1rv76.tar.gz -> bc-java-r1rv76.tar.gz test? ( https://github.com/bcgit/bc-test-data/archive/r1rv76.tar.gz -> bc-test-data-r1rv76.tar.gz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=6a2986db5795be0d9d3365f23472e45c
diff --git a/metadata/md5-cache/dev-java/bcprov-1.72 b/metadata/md5-cache/dev-java/bcprov-1.72
index 770c94d0b60c..9800d405ceb7 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.72
+++ b/metadata/md5-cache/dev-java/bcprov-1.72
@@ -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/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=d9513ba3face8d44d2e6e0a249976f61
diff --git a/metadata/md5-cache/dev-java/bcprov-1.74 b/metadata/md5-cache/dev-java/bcprov-1.74
index 1b7a6d8db708..022bcaa74501 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=b993413aaeb47f21d5ed09b1cfa03852
diff --git a/metadata/md5-cache/dev-java/bcprov-1.76 b/metadata/md5-cache/dev-java/bcprov-1.76
index ab5e58033494..75a270e3a78d 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.76
+++ b/metadata/md5-cache/dev-java/bcprov-1.76
@@ -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/r1rv76.tar.gz -> bc-java-r1rv76.tar.gz test? ( https://github.com/bcgit/bc-test-data/archive/r1rv76.tar.gz -> bc-test-data-r1rv76.tar.gz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=11b64ecb661104b76adde321b912e526
diff --git a/metadata/md5-cache/dev-java/bcutil-1.72 b/metadata/md5-cache/dev-java/bcutil-1.72
index 678b461de7c0..506695fa24b9 100644
--- a/metadata/md5-cache/dev-java/bcutil-1.72
+++ b/metadata/md5-cache/dev-java/bcutil-1.72
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.72: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/r1rv72.tar.gz -> bc-java-r1rv72.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=15e19954de3e22bcffcf3fcb7903ef8c
diff --git a/metadata/md5-cache/dev-java/bcutil-1.76 b/metadata/md5-cache/dev-java/bcutil-1.76
index ec2d3fdd3f6c..a18266b8a7c8 100644
--- a/metadata/md5-cache/dev-java/bcutil-1.76
+++ b/metadata/md5-cache/dev-java/bcutil-1.76
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/bcprov-1.76: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/r1rv76.tar.gz -> bc-java-r1rv76.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=3a6fa1db4ab462f265559bde14aeb872
diff --git a/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2 b/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
index f1d26e4812e8..3d5b6e3cb379 100644
--- a/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
+++ b/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/osgi-core-api:0 dev-java/bndlib:0 virtual/jre:1.8 >=dev-java/ja
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=024d611dae6922351631e7f7f594bca7
diff --git a/metadata/md5-cache/dev-java/bndlib-2.1.0-r1 b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
index e6f4855b98a4..8dfc20517d21 100644
--- a/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/jre:1.8 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/osgi
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=7c66aa75cfeb1d877ddbc7a33913c75a
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 b740947701dd..f1ee2f7a51b7 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 400dbe821644..552d6ff628ed 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=6980f4df76aae52005da887f43702c95
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r3 b/metadata/md5-cache/dev-java/bsf-2.4.0-r3
index e2688e190bbb..a89cd82372c3 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r3
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) dev-java/xalan:0 dev-java/commons-logging: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
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=d6f05ed1b930f79f2053d5f3e336da4a
diff --git a/metadata/md5-cache/dev-java/bsh-2.1.1 b/metadata/md5-cache/dev-java/bsh-2.1.1
index d06811fd1e4c..61912bc17b98 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 cc8069b7a6fa..9e8ee6526a5a 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 ece3a5dab3f2..bb54bf93e8fc 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=mirror://sourceforge/project/c3p0/c3p0-src/c3p0-0.9.5.5/c3p0-0.9.5.5.src.tgz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=6af13cc902a709bd62f79cdde4d1843f
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 708b105aefb7..ac593ef45be8 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 a3c49946cc7c..06458a13f3e4 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=05634d9650e947826e14a0e142aa73ee
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index 7dea2b02ab8d..1fcc39653d65 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 f2fc7e6a18fd..f4d30821ee02 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=19b90d3f7f970c0b52c793432bcfac4a
diff --git a/metadata/md5-cache/dev-java/cglib-3.3.0-r1 b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
index 5d86e5147b11..0e1e1b502f27 100644
--- a/metadata/md5-cache/dev-java/cglib-3.3.0-r1
+++ b/metadata/md5-cache/dev-java/cglib-3.3.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/asm:9 >=dev-java/java-c
 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=ce17e92c57e18188a5d7ac54ab915579
diff --git a/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0 b/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
index 73cdbb8bbf64..66abe07fdc69 100644
--- a/metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
+++ b/metadata/md5-cache/dev-java/checker-framework-qual-3.14.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://codeload.github.com/typetools/checker-framework/tar.gz/refs/tags/checker-framework-3.14.0 -> checker-framework-3.14.0.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=7ee370ee2561a156f144a8211a56d9c5
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1 b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
index 52df598e15bf..ceae00970fbf 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.9.4-r1
@@ -11,5 +11,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
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=b818ee63d0978430ab19080ede8dc626
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 571672ecbfd4..928b32d2bdc0 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=85914dd7c216340154c31bd57ab54e9e
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.15-r1 b/metadata/md5-cache/dev-java/commons-codec-1.15-r1
index 5a60233b0249..20e186195d8c 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.15-r1
+++ b/metadata/md5-cache/dev-java/commons-codec-1.15-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=mirror://apache/commons/codec/source/commons-codec-1.15-src.tar.gz -> commons-codec-1.15.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=9786abaa80d21cbee5f20605f2cb2029
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.2-r1 b/metadata/md5-cache/dev-java/commons-collections-3.2.2-r1
index e8ca43981b69..b6730d9f3907 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.2-r1
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.2-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://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-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=61692e9bdfa9f11d45ea3ae996e6ac9c
diff --git a/metadata/md5-cache/dev-java/commons-collections-4.4-r1 b/metadata/md5-cache/dev-java/commons-collections-4.4-r1
index e26f083549a9..054baf08264a 100644
--- a/metadata/md5-cache/dev-java/commons-collections-4.4-r1
+++ b/metadata/md5-cache/dev-java/commons-collections-4.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=4
 SRC_URI=mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz -> commons-collections-4.4-src.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=49a17da70c32257347df61e3627074af
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.21-r1 b/metadata/md5-cache/dev-java/commons-compress-1.21-r1
index aa09a7e74e4b..5299a44f0b3a 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.21-r1
+++ b/metadata/md5-cache/dev-java/commons-compress-1.21-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 dev-java/brotli-dec:0 dev-java/xz-jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/compress/source/commons-compress-1.21-src.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8b5aadb2b4ca8069e0e557c0cddf51f3
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 1527af013fb0..aa234aff1b88 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=ee03a72c337c9e519e3ed23d324e9281
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.3.3 b/metadata/md5-cache/dev-java/commons-daemon-1.3.3
index 58e6368250ab..e5cc2534e331 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.3.3
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.3.3
@@ -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/daemon/source/commons-daemon-1.3.3-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz.asc )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=7902829c493349f239b87ed827604b4a
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 94f62a853199..5e8d23da3529 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 9fcfd3432987..91e38db5cbbe 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=32cba32ff0bd4c3adba31f8ed800b86a
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
index e959df330ce0..4a7c3e036a47 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/commons-codec:0
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=4bfadc2ca13c5ff2db0bdd47f2f9d72c
diff --git a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3 b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3
index 64a883a1ba39..3bacfaa25516 100644
--- a/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3
+++ b/metadata/md5-cache/dev-java/commons-imaging-1.0_alpha3
@@ -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/commons/imaging/source/commons-imaging-1.0-alpha3-src.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=f45b2c70456dad769a00122939de99c6
diff --git a/metadata/md5-cache/dev-java/commons-io-2.11.0-r1 b/metadata/md5-cache/dev-java/commons-io-2.11.0-r1
index 27689c44f308..c62193124748 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.11.0-r1
+++ b/metadata/md5-cache/dev-java/commons-io-2.11.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
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.11.0-src.tar.gz -> commons-io-2.11.0-sources.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=7f9be216b3bdd5cef89741e950ef63ba
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 0ea52f8824b3..4fe68badf980 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=f6b48236edef7d1d31fadc2b19014938
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.6-r3 b/metadata/md5-cache/dev-java/commons-lang-2.6-r3
index e4b228af8bb6..567e9dfd08ca 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.6-r3
+++ b/metadata/md5-cache/dev-java/commons-lang-2.6-r3
@@ -12,5 +12,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/lang/source/commons-lang-2.6-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/lang/source/commons-lang-2.6-src.tar.gz.asc )
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=78f8e85424664b777fe94f78ea37ba3a
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.12.0-r1 b/metadata/md5-cache/dev-java/commons-lang-3.12.0-r1
index 23d61e4e1540..327b1195fe71 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.12.0-r1
+++ b/metadata/md5-cache/dev-java/commons-lang-3.12.0-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=3.6
 SRC_URI=https://archive.apache.org/dist/commons/lang/source/commons-lang3-3.12.0-src.tar.gz -> commons-lang-3.12.0-sources.tar.gz verify-sig? ( https://archive.apache.org/dist/commons/lang/source/commons-lang3-3.12.0-src.tar.gz.asc -> commons-lang-3.12.0-sources.tar.gz.asc )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=6641a8b2897f55515d3f24a8ef5c6cbb
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.13.0 b/metadata/md5-cache/dev-java/commons-lang-3.13.0
index 2e5d8bf191bf..d1db0da8b7a1 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.13.0
+++ b/metadata/md5-cache/dev-java/commons-lang-3.13.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.13.0-src.tar.gz -> commons-lang-3.13.0-sources.tar.gz verify-sig? ( https://archive.apache.org/dist/commons/lang/source/commons-lang3-3.13.0-src.tar.gz.asc -> commons-lang-3.13.0-sources.tar.gz.asc )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=41d971bd57385a74bba47a1f9f75d3b2
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319 b/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
index 00ce96684737..a4f1de24cafa 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
+++ b/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
@@ -11,5 +11,5 @@ RDEPEND=log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-cor
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apache/commons-logging/archive/d376d3128663e53de4af948e161291e7ec0c6ec1.tar.gz -> commons-logging-1.3.0_pre20230319.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=09b7ae7d17cd2d826de808ede67989b5
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 76bcc7fde759..6b3867ccf7a1 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=7e2bb8544741eb020aee274f920b5c98
diff --git a/metadata/md5-cache/dev-java/commons-net-3.9.0 b/metadata/md5-cache/dev-java/commons-net-3.9.0
index f29471a4c50f..65490ac1bcae 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.9.0
+++ b/metadata/md5-cache/dev-java/commons-net-3.9.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.9.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/net/source/commons-net-3.9.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=27dc73792a33a7871a1a04d77708a4b3
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 21e8fff530ff..1273ca04d1d4 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=b83918bf0874a5e01d61969486095419
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.7 b/metadata/md5-cache/dev-java/commons-validator-1.7
index 83af5452b5b3..d11bd46f02d3 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.7
+++ b/metadata/md5-cache/dev-java/commons-validator-1.7
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-beanutils:1.7 dev-java/commons-digester:2.1 dev-java/co
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.7-src.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=77e3c85c5463e21f4a84ecf440783bc6
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
index 3889950e76cc..6576e6a81c7a 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/ant-core: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=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=7fe2e1d80a50330b345a7433034ced4f
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 19503aa7c854..c8b60cf80fea 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 e5312ea7c1c6..2614c292ef78 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=9b2debbc537a0092e0ea6d6a4fbe4292
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
index eaa26a1f77ec..c636d478fa9d 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/xerces:2 >=dev-java/jav
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=e34ce749cce1ab0dc73cf770b0590392
diff --git a/metadata/md5-cache/dev-java/dom4j-2.1.4 b/metadata/md5-cache/dev-java/dom4j-2.1.4
index 2274d8fe7a79..3ef1f26fc9bb 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 512bf90f90d6..26dca68f32b1 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 47b6c1f88e5e..303407899970 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8756a40188a88794646f84faaea90d85
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.15 b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
index f7edf4950c5b..5d9cd8da3021 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.15
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.15
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.15 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.15
 SRC_URI=https://archive.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/ecjsrc-4.15.jar
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=f6cb7c6000b8916c6aa9c810b13de370
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.26 b/metadata/md5-cache/dev-java/eclipse-ecj-4.26
index 3043c7430dd6..27007207b218 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.26
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.26
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.26 )
 RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.26
 SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-4.26.jar
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=060289137978c9a0adc600f4639d9ebe
diff --git a/metadata/md5-cache/dev-java/emma-2.0.5312-r4 b/metadata/md5-cache/dev-java/emma-2.0.5312-r4
index b0401e1ec6fb..8905dfbbd0dc 100644
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r4
+++ b/metadata/md5-cache/dev-java/emma-2.0.5312-r4
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0
 RDEPEND=dev-java/ant-core launcher? ( !sci-biology/emboss ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/emma/emma-2.0.5312-src.zip
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=c4267c86a013dd64bbab4bb5874832e5
diff --git a/metadata/md5-cache/dev-java/error-prone-annotations-2.16 b/metadata/md5-cache/dev-java/error-prone-annotations-2.16
index 5eb95998deb3..cf26351c2603 100644
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.16
+++ b/metadata/md5-cache/dev-java/error-prone-annotations-2.16
@@ -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.16.tar.gz -> error-prone-2.16.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=55bb72f733ad3d4d757502160948de14
diff --git a/metadata/md5-cache/dev-java/failureaccess-32.1.2 b/metadata/md5-cache/dev-java/failureaccess-32.1.2
index bfddf43ed314..755d77651c11 100644
--- a/metadata/md5-cache/dev-java/failureaccess-32.1.2
+++ b/metadata/md5-cache/dev-java/failureaccess-32.1.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/google/guava/archive/v32.1.2.tar.gz -> guava-32.1.2.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=689999bd98e66d7fed7e9f4a1bd9b6d5
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 2a3563cb2e70..84caf41482c4 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 3a8ea659f5be..b8d4f11c1db7 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	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _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 62620ddc0c3e..2546b3341bfe 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
@@ -1,6 +1,6 @@
-BDEPEND=verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-felix ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-felix ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DEPEND=dev-java/animal-sniffer-annotations:0 dev-java/felix-resolver:0 dev-java/osgi-annotation:0 >=virtual/jdk-11:* test? ( dev-java/asm:9 dev-java/easymock:2.5 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=Implementation of the OSGi R8 core framework specification
 EAPI=8
 HOMEPAGE=https://felix.apache.org/documentation/subprojects/apache-felix-framework.html
@@ -8,9 +8,9 @@ INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/animal-sniffer-annotations:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/animal-sniffer-annotations:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
-_md5_=99d6968528e901760a5535510945af10
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_md5_=f72bc72dee427f1a1a48e3eaa5957e73
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 e65b6d740f72..91b2e025bbfd 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=fbbae730af850bc6f4785c548e78644c
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 ad7ea757db3e..ab385ca6181e 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=764368a94faf0095b9a8b9ac76b9387a
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 bbc91720b1e8..1039d2a053ae 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=5f13279f8049039ff5370f24867e7e0b
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 767fd676d3d6..dec488309ed3 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=6c535dd2eb7bf22f692a9291758ff87b
diff --git a/metadata/md5-cache/dev-java/fishbowl-1.4.1 b/metadata/md5-cache/dev-java/fishbowl-1.4.1
index ee43a2991fda..fd6bc8ede25d 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 95babf1cf3b1..1895d6aa3ac8 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=beabd835debe0df66cdc641ad9f639b3
diff --git a/metadata/md5-cache/dev-java/fop-2.8-r1 b/metadata/md5-cache/dev-java/fop-2.8-r1
index 8cf746fe037b..e093709818f3 100644
--- a/metadata/md5-cache/dev-java/fop-2.8-r1
+++ b/metadata/md5-cache/dev-java/fop-2.8-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/batik:1.16 dev-java/commons-io:1 dev-java/commons-logging:0 dev
 RESTRICT=!test? ( test )
 SLOT=2.8
 SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.8-src.tar.gz https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz verify-sig? ( https://www.apache.org/dist/xmlgraphics/fop/source/fop-2.8-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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=d0ce08e8e54eb30fb1af359136c42b29
diff --git a/metadata/md5-cache/dev-java/fop-2.9 b/metadata/md5-cache/dev-java/fop-2.9
index 66c9acf3386c..04dd9ba219a4 100644
--- a/metadata/md5-cache/dev-java/fop-2.9
+++ b/metadata/md5-cache/dev-java/fop-2.9
@@ -12,5 +12,5 @@ RDEPEND=dev-java/batik:1.16 dev-java/commons-io:1 dev-java/commons-logging:0 dev
 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://www.apache.org/dist/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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=f9ad89dcdbda8b3761113299ac3cf5b9
diff --git a/metadata/md5-cache/dev-java/freenet-ext-29 b/metadata/md5-cache/dev-java/freenet-ext-29
index 2c7ba0c30ea3..4ba4d3c27c7b 100644
--- a/metadata/md5-cache/dev-java/freenet-ext-29
+++ b/metadata/md5-cache/dev-java/freenet-ext-29
@@ -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=29
 SRC_URI=https://github.com/hyphanet/contrib/archive/v29.tar.gz -> freenet-ext-29.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=4425e45f7277948066b5a52e011c59b6
diff --git a/metadata/md5-cache/dev-java/gin-2.1.2-r1 b/metadata/md5-cache/dev-java/gin-2.1.2-r1
index a30342c52267..0c694a223d91 100644
--- a/metadata/md5-cache/dev-java/gin-2.1.2-r1
+++ b/metadata/md5-cache/dev-java/gin-2.1.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/aopalliance:1 dev-java/javax-inject:0 dev-java/gwt:2.8 dev-java
 RESTRICT=mirror
 SLOT=2.1
 SRC_URI=https://github.com/gwtplus/google-gin/archive/2.1.2.tar.gz -> gin-2.1.2.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=2411d184bca3209b2a42c682775c8ad2
diff --git a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2 b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
index 80b39099f14a..1748d4b53903 100644
--- a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
+++ b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r2
@@ -10,5 +10,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=2eda64ba01f7d0e0fdbb0489beb321e9
diff --git a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1 b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
index 51b2f2d1fc0a..2a99e5d2b4a1 100644
--- a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gnu/classpathx/activation-1.1.2.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=8262c20d8c547d826d3620a0c5929896
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 adc92471f674..12c93bb465ea 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=3e2b517468bb0aaf8aa31524c2242598
diff --git a/metadata/md5-cache/dev-java/gradle-bin-6.8.3 b/metadata/md5-cache/dev-java/gradle-bin-6.8.3
index d224662b80ed..3d0b80576c20 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-6.8.3
+++ b/metadata/md5-cache/dev-java/gradle-bin-6.8.3
@@ -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=6.8.3
 SRC_URI=https://services.gradle.org/distributions/gradle-6.8.3-all.zip -> gradle-bin-6.8.3.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=5aa706dbb29d22a8cf9b12ce444721d9
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.1.1 b/metadata/md5-cache/dev-java/gradle-bin-7.1.1
index 799ca3759871..507b853203c6 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.1.1
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.1.1
@@ -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=7.1.1
 SRC_URI=https://services.gradle.org/distributions/gradle-7.1.1-all.zip -> gradle-bin-7.1.1.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=5aa706dbb29d22a8cf9b12ce444721d9
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.2 b/metadata/md5-cache/dev-java/gradle-bin-7.2
index 0f68d450596c..aec1a2d66099 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.2
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.2
@@ -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=7.2
 SRC_URI=https://services.gradle.org/distributions/gradle-7.2-all.zip -> gradle-bin-7.2.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.3.3 b/metadata/md5-cache/dev-java/gradle-bin-7.3.3
index 62da2dabd882..67905427213b 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.3.3
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.3.3
@@ -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=7.3.3
 SRC_URI=https://services.gradle.org/distributions/gradle-7.3.3-all.zip -> gradle-bin-7.3.3.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.4.2 b/metadata/md5-cache/dev-java/gradle-bin-7.4.2
index ec8d9289b4dd..c04609f97977 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.4.2
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.4.2
@@ -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=7.4.2
 SRC_URI=https://services.gradle.org/distributions/gradle-7.4.2-all.zip -> gradle-bin-7.4.2.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=386ee51f52c5a6bc43ccbf484647ce29
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.5.1 b/metadata/md5-cache/dev-java/gradle-bin-7.5.1
index b59b771cf926..32751917807b 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.5.1
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.5.1
@@ -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=7.5.1
 SRC_URI=https://services.gradle.org/distributions/gradle-7.5.1-all.zip -> gradle-bin-7.5.1.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=6dfb0252e635869bae866b3b55ad96a0
diff --git a/metadata/md5-cache/dev-java/gradle-bin-7.6.1 b/metadata/md5-cache/dev-java/gradle-bin-7.6.1
index b101cc5f7879..cc20582c613d 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.6.1
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.6.1
@@ -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=7.6.1
 SRC_URI=https://services.gradle.org/distributions/gradle-7.6.1-all.zip -> gradle-bin-7.6.1.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=22cedbcff90d310938d35aeb0368bfde
diff --git a/metadata/md5-cache/dev-java/gradle-bin-8.0.2 b/metadata/md5-cache/dev-java/gradle-bin-8.0.2
index 3346ab4afa42..49a3d51e570c 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-8.0.2
+++ b/metadata/md5-cache/dev-java/gradle-bin-8.0.2
@@ -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.0.2
 SRC_URI=https://services.gradle.org/distributions/gradle-8.0.2-all.zip -> gradle-bin-8.0.2.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=22cedbcff90d310938d35aeb0368bfde
diff --git a/metadata/md5-cache/dev-java/gradle-bin-8.1.1 b/metadata/md5-cache/dev-java/gradle-bin-8.1.1
index fffa2a2a397b..5610292d9ed3 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-8.1.1
+++ b/metadata/md5-cache/dev-java/gradle-bin-8.1.1
@@ -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.1.1
 SRC_URI=https://services.gradle.org/distributions/gradle-8.1.1-all.zip -> gradle-bin-8.1.1.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=22cedbcff90d310938d35aeb0368bfde
diff --git a/metadata/md5-cache/dev-java/gradle-bin-8.2.1 b/metadata/md5-cache/dev-java/gradle-bin-8.2.1
index 9557a33b4861..483d1edb9b26 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-8.2.1
+++ b/metadata/md5-cache/dev-java/gradle-bin-8.2.1
@@ -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.2.1
 SRC_URI=https://services.gradle.org/distributions/gradle-8.2.1-all.zip -> gradle-bin-8.2.1.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=87ce936e2935473d37b2c5ccbe22bcd1
diff --git a/metadata/md5-cache/dev-java/gradle-bin-8.3 b/metadata/md5-cache/dev-java/gradle-bin-8.3
index d682a3287eb4..38fcd6cd7b62 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-8.3
+++ b/metadata/md5-cache/dev-java/gradle-bin-8.3
@@ -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.3
 SRC_URI=https://services.gradle.org/distributions/gradle-8.3-all.zip -> gradle-bin-8.3.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=0bb7bf7366f2f5b3a6bbaaf87fd32ecb
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 ebb3cbf52bca..499458a2ea42 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=b9df8132f54d1cc77e67c59f605680b2
diff --git a/metadata/md5-cache/dev-java/gson-2.10.1 b/metadata/md5-cache/dev-java/gson-2.10.1
index 3615bbb7cc92..7514e31587e9 100644
--- a/metadata/md5-cache/dev-java/gson-2.10.1
+++ b/metadata/md5-cache/dev-java/gson-2.10.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.6
 SRC_URI=https://github.com/google/gson/archive/gson-parent-2.10.1.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=11bf4fb58a6845969cae32d5ae32aa2c
diff --git a/metadata/md5-cache/dev-java/guava-32.1.2-r1 b/metadata/md5-cache/dev-java/guava-32.1.2-r1
index 2d471708f298..ad4ab6fc28c1 100644
--- a/metadata/md5-cache/dev-java/guava-32.1.2-r1
+++ b/metadata/md5-cache/dev-java/guava-32.1.2-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/checker-framework-qual:0 dev-java/error-prone-annotations:0 ~dev-java/failureaccess-32.1.2:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v32.1.2.tar.gz -> guava-32.1.2.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=54e79c156dc523bc89511f8cfe230f99
diff --git a/metadata/md5-cache/dev-java/guava-testlib-32.1.2 b/metadata/md5-cache/dev-java/guava-testlib-32.1.2
index da12f8f0da3e..04f05043b652 100644
--- a/metadata/md5-cache/dev-java/guava-testlib-32.1.2
+++ b/metadata/md5-cache/dev-java/guava-testlib-32.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/checker-framework-qual:0 dev-java/error-prone-annotations:0 ~de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/guava/archive/v32.1.2.tar.gz -> guava-32.1.2.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=5cfbb05a8d451077d8e9b82497ce06e4
diff --git a/metadata/md5-cache/dev-java/guice-5.1.0 b/metadata/md5-cache/dev-java/guice-5.1.0
index 42de397ca614..ac4a24f0a269 100644
--- a/metadata/md5-cache/dev-java/guice-5.1.0
+++ b/metadata/md5-cache/dev-java/guice-5.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/aopalliance:1 dev-java/asm:9 dev-java/guava
 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=685cafffd922ef9f81fe437e0f590464
diff --git a/metadata/md5-cache/dev-java/gwt-2.9.0-r3 b/metadata/md5-cache/dev-java/gwt-2.9.0-r3
index a6daa0ca2a7c..a740b7384f5a 100644
--- a/metadata/md5-cache/dev-java/gwt-2.9.0-r3
+++ b/metadata/md5-cache/dev-java/gwt-2.9.0-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-java/guava:0 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:
 RESTRICT=mirror test
 SLOT=2.8
 SRC_URI=https://github.com/gwtproject/gwt/archive/2.9.0.tar.gz -> gwt-2.9.0.tar.gz https://github.com/gwtproject/tools/archive/194772ed94078802d8030136796de344eb1fdbe1.tar.gz -> gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=ff32efc4c783593995d5cb71417aa35b
diff --git a/metadata/md5-cache/dev-java/hamcrest-2.2-r1 b/metadata/md5-cache/dev-java/hamcrest-2.2-r1
index 9431296ca304..9054a46817b9 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 611bc5c961a8..4cd64b09d03c 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 77ebc3c3055b..09a2d3726304 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 c75252405fb3..3b947fc89b3c 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 e73bb06cf553..5fb97a00a317 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=5cc69385ac64a49c82035e357d933a72
diff --git a/metadata/md5-cache/dev-java/hashcash-1.1 b/metadata/md5-cache/dev-java/hashcash-1.1
index 7fbd4d44cbfb..e61280ba6943 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 a47bdd74e794..aa4770221bec 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=4124437359740c8d9cb9da5c6f7fb6ec
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.26 b/metadata/md5-cache/dev-java/htmlcleaner-2.26
index 84a1b5c86bc7..4e1bf138d03d 100644
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.26
+++ b/metadata/md5-cache/dev-java/htmlcleaner-2.26
@@ -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=mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v2.26/htmlcleaner-2.26-src.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8e7fc31f99f05f7c15a65a1edc87ad8d
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1 b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
index 136b494e4369..d66571301f5d 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.5.13-r1
@@ -11,5 +11,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
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=bb83a3c6a052302645f9eefbde882a6d
diff --git a/metadata/md5-cache/dev-java/httpcore-4.4.14 b/metadata/md5-cache/dev-java/httpcore-4.4.14
index de8a0dd03822..bd0b76177e33 100644
--- a/metadata/md5-cache/dev-java/httpcore-4.4.14
+++ b/metadata/md5-cache/dev-java/httpcore-4.4.14
@@ -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=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.4.14-src.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=98ecdd55b66865a821b1bdfbd1cd4777
diff --git a/metadata/md5-cache/dev-java/icedtea-3.21.0 b/metadata/md5-cache/dev-java/icedtea-3.21.0
index c43d776de4bb..bb0d5e1c2c55 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.21.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.21.0
@@ -13,5 +13,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/openjdk.tar.xz -> icedtea-3.21-openjdk-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/corba.tar.xz -> icedtea-3.21-corba-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jaxp.tar.xz -> icedtea-3.21-jaxp-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jaxws.tar.xz -> icedtea-3.21-jaxws-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/jdk.tar.xz -> icedtea-3.21-jdk-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/hotspot.tar.xz -> icedtea-3.21-hotspot-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/nashorn.tar.xz -> icedtea-3.21-nashorn-3.21.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/langtools.tar.xz -> icedtea-3.21-langtools-3.21.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/shenandoah.tar.xz -> icedtea-3.21-shenandoah-3.21.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.21.0/aarch32.tar.xz -> icedtea-3.21-aarch32-3.21.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b80119a1990d211bd58f3cba3241bd88
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 cabc51a78ae8..219c7ac08b9f 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 89f9e6659f7c..76f92e55ed0b 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	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	8520ae1bed0e6965d027399b471a3595	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	8520ae1bed0e6965d027399b471a3595	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=152e6755ea5728eb8ac17fbf5596f575
diff --git a/metadata/md5-cache/dev-java/icu4j-72.1 b/metadata/md5-cache/dev-java/icu4j-72.1
index 023db4173dcd..2316e1e2c1e7 100644
--- a/metadata/md5-cache/dev-java/icu4j-72.1
+++ b/metadata/md5-cache/dev-java/icu4j-72.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=70
 SRC_URI=https://github.com/unicode-org/icu/archive/refs/tags/release-72-1.tar.gz -> icu-72.1.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=a9693d450bf9f299f30d73177874e95e
diff --git a/metadata/md5-cache/dev-java/icu4j-73.2 b/metadata/md5-cache/dev-java/icu4j-73.2
index 05a06f3f677e..213b081cfd5f 100644
--- a/metadata/md5-cache/dev-java/icu4j-73.2
+++ b/metadata/md5-cache/dev-java/icu4j-73.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=70
 SRC_URI=https://github.com/unicode-org/icu/archive/release-73-2.tar.gz -> icu-73.2.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=c78119a0b6e1b589d3176c50ea476a2e
diff --git a/metadata/md5-cache/dev-java/identicon-1.0 b/metadata/md5-cache/dev-java/identicon-1.0
index 653267e88641..37ecc4782466 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 c2fd5ad6e53b..479ed76813be 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=70ee83e00158f1bb21c72545d2f43857
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r5 b/metadata/md5-cache/dev-java/iso-relax-20050331-r5
index dcd68e457d5e..850430d76dba 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r5
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r5
@@ -11,5 +11,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/iso-relax-20050331.tar.bz2
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8da8f72cea0d9287f9b995c70a2dae46
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 06b3dfb7ed2c..e81921cc5324 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 08520ffd5c31..982fc6c2a1ae 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=c4d9deeb2ade4e71cae767046f3da2a1
diff --git a/metadata/md5-cache/dev-java/j2objc-annotations-2.8 b/metadata/md5-cache/dev-java/j2objc-annotations-2.8
index 524d5271e222..6b578772b0d0 100644
--- a/metadata/md5-cache/dev-java/j2objc-annotations-2.8
+++ b/metadata/md5-cache/dev-java/j2objc-annotations-2.8
@@ -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/2.8.tar.gz -> j2objc-2.8.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=f9c8f7f050feb6ce0924b131ebee4d5e
diff --git a/metadata/md5-cache/dev-java/jackcess-4.0.0 b/metadata/md5-cache/dev-java/jackcess-4.0.0
index 22068203097a..b6523b590cd0 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 6708e3650c8a..05279acf7d1c 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 41cd8a439a60..a256497101ab 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 f62208a1e1ce..2988378338e6 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 292fe2f73f0a..c0bbb6581db1 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 19b69bbae497..aed6012affee 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 beff0ebb9f2b..c767a833aeae 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 d5cd41143caf..bc9f8c586b8e 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 b8fa3f65d58e..fb89d05b1093 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=mirror://sourceforge/project/tcljava/jacl/1.4.1/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=2b2f769227fc69a612651c02ccdd38b5
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 806f06170713..8c474ff33ea1 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 570e53c29f12..ef8cd59a9e40 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 3dd28aa877c2..fe6da014950b 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 b578fb64a75c..95a30897dda1 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 c5ea452b75af..2523b47e5f14 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 86585945c3e6..3bb9e4241b96 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 d626bb200a85..12d399e607ee 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 96487f806178..45ab5af47374 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 ce6368d1c1ca..dcc362071e24 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 633baec3a856..465cad139110 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 a0bd7a9a6399..5a45659b48d1 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=>=virtual/jre-1.8:* dev-java/jakarta-activation:2 >=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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8cdd8992109772f04714d6e851383ff6
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.1
index f4931f8c26d1..cc30eb633ebb 100644
--- a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.1
+++ b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.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/jakartaee/mail-api/archive/2.1.1.tar.gz -> jakarta-mail-api-2.1.1.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=9e3062cfbd382a2dbd78bd7f700886a6
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 a1be893ba527..9b08eebdf769 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 63e66bb936e4..7058b9adc2f6 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 6bef2c74de3e..ff1b13364de6 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 ba6bb73b14b7..c150442947d5 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=a2e13785d9e40e2220de63b1b386fda0
diff --git a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1 b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
index 0d03a9857729..f812a81b8479 100644
--- a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
@@ -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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8212132e29f76e010a845b20bd15d1a2
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.7-r1 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.7-r1
index 7b317544fb5b..9efe1f40132c 100644
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.7-r1
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.7-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/bcel:0 dev-java/commons
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.7/source/jakartaee-migration-1.0.7-src.tar.gz -> jakartaee-migration-1.0.7-sources.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=7d2fa94a88e5a0391b0471e8362e067c
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r6 b/metadata/md5-cache/dev-java/jal-20031117-r6
index baf4162169f1..8adc0a963422 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r6
+++ b/metadata/md5-cache/dev-java/jal-20031117-r6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Partial port of the C++ Standard Template Library
 EAPI=8
-HOMEPAGE=http://vigna.dsi.unimi.it/jal
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=amd64 x86
@@ -10,5 +10,5 @@ LICENSE=HPND
 RDEPEND=dev-java/ant-core: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/~monsieurp/packages/jal-20031117.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
-_md5_=c8457e8bbe91555b895391aab6235604
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
+_md5_=a224f9655ad253eaccfee7c3ac067deb
diff --git a/metadata/md5-cache/dev-java/jansi-1.13 b/metadata/md5-cache/dev-java/jansi-1.13
index 5e5cb46660d9..598e0d014fca 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 bf43af700e5c..13319a4ef6a3 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _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 8dc7f6c28863..3a6000e53742 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
 _md5_=758fbbc82194cc75be177b62685c36a1
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.5-r2 b/metadata/md5-cache/dev-java/java-dep-check-0.5-r2
index 8c3be53b1ce4..e64c1175847f 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.5-r2
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.5-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=04076e4d2385022294374d78ef955ca9
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 3c5c030d2567..1f92d344a185 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8a28218570abaa15bfa2f5a82611068b
diff --git a/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1 b/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1
index 3b419b93bc17..94b9b33521d8 100644
--- a/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1
+++ b/metadata/md5-cache/dev-java/java-getopt-1.0.14-r1
@@ -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-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=3c2aef5e083b2c5cc82a44999aaaad3d
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 2cb58399f05a..eb6aff52687e 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
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.urbanophile.com/arenn/hacking/download.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
-_md5_=97d2227eba11226dac700b460e7fe037
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
+_md5_=33bd784dae27aaf4a73a02285989c433
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 efd4dd8fb493..3277a0a9d40f 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=0289e85479573729c116bd0e84ef1649
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r4 b/metadata/md5-cache/dev-java/javacc-5.0-r4
index 7f1edb721920..9fcb50453f27 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r4
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r4
@@ -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=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=d89460767e9b517238fbed3a2464460d
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 7cdf8b07b62e..086ed0402e29 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=b7861a015fa8d672bd4aa7c7aa5ac1b6
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 15b24deb38b6..4a3843260100 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=affaa6213111dd69d75e3f3d70a021a5
diff --git a/metadata/md5-cache/dev-java/javassist-3.29.2 b/metadata/md5-cache/dev-java/javassist-3.29.2
index 494e14deaa53..30c8ab77a640 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 5caa1b60ac4d..e6cb6da5ed35 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 708dfa0b6a9c..27915b936c1c 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 58439dbfed25..230821289329 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 9d1d352e9b31..a7748fbadfcf 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 100d596e733f..89257cf41b3e 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=7f90fe0b658c1a131aa73c781bdc45c7
diff --git a/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1 b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
index 8ec4228c4d15..89c504ef0704 100644
--- a/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
+++ b/metadata/md5-cache/dev-java/javax-mail-1.6.7-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-activation:1 >=dev-java/java-config
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/mail-api/archive/refs/tags/1.6.7.tar.gz -> javax-mail-1.6.7.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=7be93e237da31f10de11870ff7ec07e5
diff --git a/metadata/md5-cache/dev-java/javax-persistence-api-2.2 b/metadata/md5-cache/dev-java/javax-persistence-api-2.2
index 71a825220319..f3133a4f4a60 100644
--- a/metadata/md5-cache/dev-java/javax-persistence-api-2.2
+++ b/metadata/md5-cache/dev-java/javax-persistence-api-2.2
@@ -11,5 +11,5 @@ LICENSE=CDDL
 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=559599ab0efcfebd89445db1c3075e42
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 27e3451ec1ed..d1f58484a434 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 9f6a902ccdb9..66b3115e7183 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 12bbecf70ce7..3bce10433223 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 acc10491ba85..7c4ff530d4c5 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 0e9fd63bbeb6..a171fb7f1888 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=7705f3bf87befa49a6a52ee71cfb24df
diff --git a/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1 b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
index 4a368f64fcc0..5dc3cc9481f0 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
+++ b/metadata/md5-cache/dev-java/jaxb-api-2.3.3-r1
@@ -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/eclipse-ee4j/jaxb-api/archive/2.3.3.tar.gz -> jaxb-api-2.3.3.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=eaad392d1fe1f2dd6238ab66a6d755c8
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 f47c8c0d8fdd..f6ebe8dd2e81 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=189e24d7f81c9503e4d29c01dd6706b9
diff --git a/metadata/md5-cache/dev-java/jaxb-api-4.0.0 b/metadata/md5-cache/dev-java/jaxb-api-4.0.0
index 98b84f9c54b0..2c6f3745dccb 100644
--- a/metadata/md5-cache/dev-java/jaxb-api-4.0.0
+++ b/metadata/md5-cache/dev-java/jaxb-api-4.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jakarta-activation:2 >=virtual/jre-1.8:* >=dev-java/java-config
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-api/archive/4.0.0.tar.gz -> jaxb-api-4.0.0.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=6c076d76bd637bb68d4877add518a21f
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 b8167880ad04..6529c5bbb013 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 f669488ade8d..e78fb4174e5f 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 b595bd628f59..4885b8fae0b3 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 fa8ecd3552f6..2b9c63381752 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 11753c35d242..10532087875a 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 003ad2e4d752..4b5d9c9d58ff 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 92140857dbee..b6a86bdfd537 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=520b92f115908b456c7f99746eb67b1f
diff --git a/metadata/md5-cache/dev-java/jbcrypt-0.4 b/metadata/md5-cache/dev-java/jbcrypt-0.4
index 49b75f9c7d81..0012292b8110 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 bd29063914bc..f6c6bb911c63 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=3ed85986046b86bfe4923b43b92aa74a
diff --git a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1 b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
index ada148914471..3b959565211c 100644
--- a/metadata/md5-cache/dev-java/jbitcollider-core-0.8-r1
+++ b/metadata/md5-cache/dev-java/jbitcollider-core-0.8-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=mirror://sourceforge/project/bitcollider/jBitcollider%20%28Java%29/0.8/jBitcollider-0.8.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=650aabbae482fd484ab5cfeeff14885c
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 ca368cd474ea..f498e0ff4c15 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 7a26147e1c55..60770d1c489d 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=cea34c9f66e014bc4174572339efe672
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 a81c05fc144a..6602505bdcde 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=mirror://sourceforge/project/jchart2d/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8ee1afeba3f37c7129584659dbe505fb
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 cce220fe840c..632b301e6ca9 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 7e53a1303834..67eae9f4504e 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=e8fc11b9dda2ea2bc79f400b074596a3
diff --git a/metadata/md5-cache/dev-java/jcommander-1.64 b/metadata/md5-cache/dev-java/jcommander-1.64
new file mode 100644
index 000000000000..39fa10440f75
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jcommander-1.64
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Command line parsing framework for Java
+EAPI=8
+HOMEPAGE=https://jcommander.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=1.64
+SRC_URI=https://github.com/cbeust/jcommander/archive/1.64.tar.gz -> jcommander-1.64.tar.gz
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
+_md5_=62504d44943d07f8d405f44c2f9ac649
diff --git a/metadata/md5-cache/dev-java/jcommander-1.82 b/metadata/md5-cache/dev-java/jcommander-1.82
index 6839820bf1bf..41238fdd58ea 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=78b36510eb443bcc396ec20166e65ae3
diff --git a/metadata/md5-cache/dev-java/jctools-core-4.0.1 b/metadata/md5-cache/dev-java/jctools-core-4.0.1
index 72f91c8a8edd..4a664f5a09a9 100644
--- a/metadata/md5-cache/dev-java/jctools-core-4.0.1
+++ b/metadata/md5-cache/dev-java/jctools-core-4.0.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/JCTools/JCTools/archive/v4.0.1.tar.gz -> jctools-4.0.1.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=fa033cd4ecfca3a23491c0ced6fcaa16
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0 b/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0
index 6484616c9692..d3c658215a5a 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-MySQL-FLOSS-exception
 RDEPEND=dev-java/c3p0:0 dev-java/protobuf-java: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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=39e40349980c93b03c7fa35c0f588109
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-42.6.0 b/metadata/md5-cache/dev-java/jdbc-postgresql-42.6.0
index 03dcad9aa4c7..9e5eda0eb6b5 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-42.6.0
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-42.6.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/scram:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-42.6.0.src.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=e6853776174d9c72f85c826c8d3d912b
diff --git a/metadata/md5-cache/dev-java/jdepend-2.10 b/metadata/md5-cache/dev-java/jdepend-2.10
index 1a1403a3cec4..e2f19bd7c4a4 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.10
+++ b/metadata/md5-cache/dev-java/jdepend-2.10
@@ -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/clarkware/jdepend/archive/refs/tags/2.10.tar.gz -> jdepend-2.10.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=e95a132893c926604ff3b29f02d8d597
diff --git a/metadata/md5-cache/dev-java/jdisasm-1.0.6 b/metadata/md5-cache/dev-java/jdisasm-1.0.6
index 9b299d97b524..6020f1c404d0 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 4f450d87c1ab..b3c3404b6009 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=15279c6eb7b16492a9dae6bc7ef27c76
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 c92bd44220ee..5dc06dc22699 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 054ccf5f34c5..7d714d3902e8 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 865b92909b19..f1302a5716d9 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=7ac4d88379b0b6230b7e2e8100050edf
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1-r1 b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
index d844bb5d2948..2ed53141630e 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
@@ -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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=479edb30c65ebe69783faaf5f7ffa02e
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 68898b1fb10a..38488654a97d 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 6ff17ab226ea..c3d0695c0f1a 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 e5411e975d71..fe641909e57b 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=c56dd1b825e9b9b216e38d167a33cb19
diff --git a/metadata/md5-cache/dev-java/jline-2.14.6 b/metadata/md5-cache/dev-java/jline-2.14.6
index 1a4a9b42f6bb..885e4e833cec 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=5e27aa77287fd305780286a6ca2c1ae1
diff --git a/metadata/md5-cache/dev-java/jmh-core-1.35 b/metadata/md5-cache/dev-java/jmh-core-1.35
index eedd7eb77556..916f57e867ad 100644
--- a/metadata/md5-cache/dev-java/jmh-core-1.35
+++ b/metadata/md5-cache/dev-java/jmh-core-1.35
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/commons-math:3 dev-java/jopt-simple:0 >=dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openjdk/jmh/archive/1.35.tar.gz -> jmh-core-1.35.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=e9ebc246564e61aa07ef11575c206054
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 6321a41c48df..3d24d5d368a3 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 e14c264cfb4a..908c2d8cda76 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 0e07eebde5ff..0c70c07257c1 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=baa09454187fd31064ef8fd3bdde94fb
diff --git a/metadata/md5-cache/dev-java/jnacl-1.0 b/metadata/md5-cache/dev-java/jnacl-1.0
index b9bc5c69cc1c..ffe7d827004f 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 56739d196cc5..d1ffc60b935a 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 623b92091da4..497caaaa5ab9 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 876ed14c4953..5350d3e24f82 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 be62ade6dd84..f765a4d2c6b7 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 a3bf3e93624a..d14f4f682526 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 905b87965f80..dff327ef981e 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 a85711ded3c6..eddeb6b9182d 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 30509bc2931c..027d13366263 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	c0eb9cbe6b0bd01fcb4918f12598a4d3	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 75d29f260a00..df681fb4fc5e 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 1e00b6ce10b6..6df3e2e68a58 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 d6eece662353..8a1c74d3fb40 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 2f745d4147c1..fa551b2b3cdc 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=mirror://sourceforge/jsch/jsch-0.1.55.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=3c67018e37f64ad1b88f0747698b03d1
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 b6d9634fd0b1..2b2d9e2a700d 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=f0145b7f42bda4b62567a4fe7ed159e0
diff --git a/metadata/md5-cache/dev-java/json-20220320 b/metadata/md5-cache/dev-java/json-20220320
index 380fe7cf788f..5af9b203be52 100644
--- a/metadata/md5-cache/dev-java/json-20220320
+++ b/metadata/md5-cache/dev-java/json-20220320
@@ -10,5 +10,5 @@ LICENSE=JSON
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://codeload.github.com/stleary/JSON-java/tar.gz/20220320 -> json-20220320.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=0c4b904e5a8e6d956a21cdf4f4e42532
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 7d9bf37cf74b..3f1d0e47ef4d 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 13cae4a92224..77123debb5c5 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=44e72e9e758823266b0cdc262329caae
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 d01968247d9a..49add9328ba4 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 e5949387e985..83a67eafb984 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 3705f8ee69c6..692ed523ac64 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 6b4960f87d74..9bc1c7e6cd4a 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 40c9d6fc3b18..bf8c35c8efbf 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 a01054c4df3a..fe18217aacf2 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=mirror://sourceforge/project/jtds/jtds/1.3.1/jtds-1.3.1-src.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=730dfb2314979eb49a33d1e6e2b55e02
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0-r1 b/metadata/md5-cache/dev-java/jtidy-1.0-r1
index 3ee4ef2bbd49..84e602f4c175 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0-r1
+++ b/metadata/md5-cache/dev-java/jtidy-1.0-r1
@@ -11,5 +11,5 @@ LICENSE=HTML-Tidy W3C
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/jtidy/JTidy/r938/jtidy-r938-sources.zip -> jtidy-1.0.zip
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=b140cbe80d1d147d604ba3d6832d278c
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 039f2cc8d236..16b3909f652d 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 8e6afc70bc2c..9ee1cb044c93 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r2
@@ -10,5 +10,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=mirror://sourceforge/junit/junit3.8.2.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=75a4665c456b795a30afb4c8f0ef100a
diff --git a/metadata/md5-cache/dev-java/junit-4.13.2 b/metadata/md5-cache/dev-java/junit-4.13.2
index 71a82cd187dc..5029bb672cfa 100644
--- a/metadata/md5-cache/dev-java/junit-4.13.2
+++ b/metadata/md5-cache/dev-java/junit-4.13.2
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/junit-team/junit4/archive/refs/tags/r4.13.2.tar.gz -> junit-4.13.2.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=b617f9470dd842691e40845b597067ba
diff --git a/metadata/md5-cache/dev-java/junit-5.9.2 b/metadata/md5-cache/dev-java/junit-5.9.2
index d03685e61210..4929b31f1604 100644
--- a/metadata/md5-cache/dev-java/junit-5.9.2
+++ b/metadata/md5-cache/dev-java/junit-5.9.2
@@ -10,5 +10,5 @@ LICENSE=EPL-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/apiguardian-api:0 dev-java/opentest4j:0 dev-java/open-test-reporting-events:0 dev-java/picocli:0 dev-java/univocity-parsers:0 migration-support? ( dev-java/junit:4 ) vintage? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5
 SRC_URI=https://github.com/junit-team/junit5/archive/r5.9.2.tar.gz -> junit-5.9.2.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=14aab5aef96170ff434eddf8b14d4951
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 541f0dba8580..414b78d9252b 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 f6d9d70c6dc3..7ddaa8aa88de 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 be97f952bb89..b08f7826e4e8 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 772914106c01..baf8fa6bb3a8 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 62fb15e7c475..1cf8cdd31ab9 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=e349412855f51dda74f62c8f9d543bb9
diff --git a/metadata/md5-cache/dev-java/leiningen-bin-2.9.8 b/metadata/md5-cache/dev-java/leiningen-bin-2.9.8
index 40f3180e22c0..57462fcf5b90 100644
--- a/metadata/md5-cache/dev-java/leiningen-bin-2.9.8
+++ b/metadata/md5-cache/dev-java/leiningen-bin-2.9.8
@@ -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.9.8/leiningen-2.9.8-standalone.jar https://raw.githubusercontent.com/technomancy/leiningen/2.9.8/bin/lein-pkg -> leiningen-2.9.8.sh
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=fcd58995e06652d1f6d36bbac97e3c03
diff --git a/metadata/md5-cache/dev-java/libg-2.1.0-r2 b/metadata/md5-cache/dev-java/libg-2.1.0-r2
index 11edaf73d2ca..a33e5b41f519 100644
--- a/metadata/md5-cache/dev-java/libg-2.1.0-r2
+++ b/metadata/md5-cache/dev-java/libg-2.1.0-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=f0a9c234e14606974c5cd4c4f7050818
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 49904fac8214..de24983cc4ed 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=b146537d280a8b896c6cc08bc4f64ed5
diff --git a/metadata/md5-cache/dev-java/loadlib-0.2.2 b/metadata/md5-cache/dev-java/loadlib-0.2.2
index 49ce32049958..d14313ca13f4 100644
--- a/metadata/md5-cache/dev-java/loadlib-0.2.2
+++ b/metadata/md5-cache/dev-java/loadlib-0.2.2
@@ -10,5 +10,5 @@ LICENSE=LGPL-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/teras/loadlib/archive/c2fa52016de23998b2886752f4373a17de2017a7.tar.gz -> loadlib-0.2.2.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=858056657c18f3bb89a3541b69775faf
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 d697c46a1eae..90e769e16e2e 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 f817df3aa0f4..4a118a69048c 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=27aa05fa1790c2623c6d60c4cd05d99b
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 bd3a3af8523c..06caf944d3d1 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 43ccde135549..0866a3c201ea 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=b901993a7a54d46a3a5ee0cb962d78df
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r3 b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
index 928af35dbe15..75c639cd13a2 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r3
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-java/javacc:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 so
 RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz -> lucene-2.4.1.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=590e0bfc50c22320d0caef8faa97ffbd
diff --git a/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1 b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
index d4749d634e83..d5bd6d7c8f39 100644
--- a/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
+++ b/metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* app-arch/lz4:= >=dev-java/java-config-2.2.0-r3 sourc
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lz4/lz4-java/archive/refs/tags/1.8.0.tar.gz -> lz4-java-1.8.0.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=ea5f1bb76e73263100fbc2e08c2e1244
diff --git a/metadata/md5-cache/dev-java/lzma-22.01 b/metadata/md5-cache/dev-java/lzma-22.01
index 10a674df73a4..ac9e2f2b3750 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	unpacker	aa6a4e924009232d8b78b31e932c30b5
 _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 acd38a73d153..40f939d019b5 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=a7faba087b41216fdacdba3c45dc711c
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.8.8 b/metadata/md5-cache/dev-java/maven-bin-3.8.8
index 8407dda7d0f9..8fdb3b04cc78 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.8.8
+++ b/metadata/md5-cache/dev-java/maven-bin-3.8.8
@@ -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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=ee8fd3e2203a061a7921f026d8c4ce99
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.9.4 b/metadata/md5-cache/dev-java/maven-bin-3.9.4
index 9203af579132..01196da7e7f3 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.9.4
+++ b/metadata/md5-cache/dev-java/maven-bin-3.9.4
@@ -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.4/binaries/apache-maven-3.9.4-bin.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=e6f0453c51f05e4fd5e7b2db73053dba
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.9.5 b/metadata/md5-cache/dev-java/maven-bin-3.9.5
index 2728e28146dd..e6aec01f8c3f 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.9.5
+++ b/metadata/md5-cache/dev-java/maven-bin-3.9.5
@@ -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.5/binaries/apache-maven-3.9.5-bin.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8078a27d3932942bc5759ab1ebe69d7e
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 b51bb11e6d61..d3878042cd22 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 ac014a81ec99..40d5a3e0c487 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 2044848ebad4..f03d043856fa 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 6d9e47f3d58b..2076fd452b60 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=a863b6624348b4e4434b9b84a7a7c4cf
diff --git a/metadata/md5-cache/dev-java/miglayout-5.3 b/metadata/md5-cache/dev-java/miglayout-5.3
index f974d1ddcc6b..85c1ef4cd93a 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 e0d8132b9aac..772e448e459b 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=70385cf9d0fd33ccb088197c985d7770
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r3 b/metadata/md5-cache/dev-java/mockito-1.9.5-r3
index 3227b80eb06e..159e5b78d5e5 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r3
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r3
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core: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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=10c25dacd87e87de7303cf8301c1d000
diff --git a/metadata/md5-cache/dev-java/mockito-2.28.2 b/metadata/md5-cache/dev-java/mockito-2.28.2
index 191127c0d1a1..56b14f656671 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 eb77b7e47622..258c3c563185 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=229e6f420f458da610051287c9fce3c6
diff --git a/metadata/md5-cache/dev-java/msv-2022.7 b/metadata/md5-cache/dev-java/msv-2022.7
index 1862e4d9f5de..ff9f71c1a453 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=52e706ca10a7d66f6ba1ca038a131112
diff --git a/metadata/md5-cache/dev-java/mvel-2.3.2-r1 b/metadata/md5-cache/dev-java/mvel-2.3.2-r1
index c48e03e6c978..b52e91af096f 100644
--- a/metadata/md5-cache/dev-java/mvel-2.3.2-r1
+++ b/metadata/md5-cache/dev-java/mvel-2.3.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=2.3
 SRC_URI=https://github.com/mvel/mvel/archive/refs/tags/mvel2-2.3.2.Final.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=36977dbfaeea9af5404e6b16fb157e42
diff --git a/metadata/md5-cache/dev-java/objenesis-3.3 b/metadata/md5-cache/dev-java/objenesis-3.3
index 4b055c09bf5d..3ff77b8f6ab8 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 f2d9823467c0..71533b43b077 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 f253d64a5e59..11d84c30034a 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8898da88a64e5a354452886bfd87326e
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.18_p10 b/metadata/md5-cache/dev-java/openjdk-11.0.18_p10
index 9fc1446310e3..81124bce64b6 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.18_p10
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.18_p10
@@ -12,5 +12,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/refs/tags/jdk-11.0.18-ga.tar.gz -> openjdk-11.0.18_p10.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	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=529cf7b277463f0a9de6a3153d0e6f30
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.19_p7 b/metadata/md5-cache/dev-java/openjdk-11.0.19_p7
index 2f2df9a9823c..2c06424b5c8f 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.19_p7
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.19_p7
@@ -12,5 +12,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/refs/tags/jdk-11.0.19-ga.tar.gz -> openjdk-11.0.19_p7.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	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=46a7ede505db6b13c0489be69018a45a
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.20.1_p1 b/metadata/md5-cache/dev-java/openjdk-11.0.20.1_p1
index a95a6f69feec..b3fb18f37e38 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.20.1_p1
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.20.1_p1
@@ -12,5 +12,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/refs/tags/jdk-11.0.20.1-ga.tar.gz -> openjdk-11.0.20.1_p1.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	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=46a7ede505db6b13c0489be69018a45a
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.6_p10 b/metadata/md5-cache/dev-java/openjdk-17.0.6_p10
index 3849c6695f29..a93929e049a9 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.6_p10
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.6_p10
@@ -12,5 +12,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/refs/tags/jdk-17.0.6-ga.tar.gz -> openjdk-17.0.6_p10.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 ) ) riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e0451e3948b271b8ddccd6180758bdbb
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.6_p10-r1 b/metadata/md5-cache/dev-java/openjdk-17.0.6_p10-r1
index df9d9e20aeea..07b9c78ea0b0 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.6_p10-r1
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.6_p10-r1
@@ -12,5 +12,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/refs/tags/jdk-17.0.6-ga.tar.gz -> openjdk-17.0.6_p10.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 ) ) riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2c461a4289ba1fdc5e3155e34c1d09a1
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.7_p7 b/metadata/md5-cache/dev-java/openjdk-17.0.7_p7
index 91ec41bd2a93..2416d3bfe130 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.7_p7
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.7_p7
@@ -12,5 +12,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/refs/tags/jdk-17.0.7-ga.tar.gz -> openjdk-17.0.7_p7.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 ) ) riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=16fb16a7a434b4fffaefc6137a8dedac
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.8.1_p1 b/metadata/md5-cache/dev-java/openjdk-17.0.8.1_p1
index fa5552ab1f5d..57455e831476 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.8.1_p1
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.8.1_p1
@@ -12,5 +12,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/refs/tags/jdk-17.0.8.1-ga.tar.gz -> openjdk-17.0.8.1_p1.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 ) ) riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c12e9436ed39e3da003b0930eeeea075
diff --git a/metadata/md5-cache/dev-java/openjdk-8.362_p09 b/metadata/md5-cache/dev-java/openjdk-8.362_p09
index 5ca6184ac8a7..14e4cf6ad8f3 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.362_p09
+++ b/metadata/md5-cache/dev-java/openjdk-8.362_p09
@@ -12,5 +12,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/refs/tags/jdk8u362-ga.tar.gz -> openjdk-8.362_p09.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8a4199a11397c0cef77d81864f6f7dd8
diff --git a/metadata/md5-cache/dev-java/openjdk-8.372_p07 b/metadata/md5-cache/dev-java/openjdk-8.372_p07
index e095e6779af7..8cd00c78f415 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.372_p07
+++ b/metadata/md5-cache/dev-java/openjdk-8.372_p07
@@ -12,5 +12,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/refs/tags/jdk8u372-ga.tar.gz -> openjdk-8.372_p07.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=48fddb2bf6533ef5f33b1322f17a5c47
diff --git a/metadata/md5-cache/dev-java/openjdk-8.382_p05 b/metadata/md5-cache/dev-java/openjdk-8.382_p05
index d9a14ccf19d0..8e75c54beb0a 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.382_p05
+++ b/metadata/md5-cache/dev-java/openjdk-8.382_p05
@@ -12,5 +12,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/refs/tags/jdk8u382-ga.tar.gz -> openjdk-8.382_p05.tar.gz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=48fddb2bf6533ef5f33b1322f17a5c47
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r1 b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r1
index 05a9d6c93593..b766b60cab24 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r1
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r1
@@ -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	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=dd48cef1bc56258f764678eac7aa28c4
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0-r1 b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0-r1
index 9659ff1fe5ae..a7b4ef595360 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0-r1
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0-r1
@@ -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.9+0.tar.bz2 -> openjfx-11.0.9_p0.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	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=63e7974b79d6738e69c54fd598cc4e9f
diff --git a/metadata/md5-cache/dev-java/openjfx-8.1000-r1 b/metadata/md5-cache/dev-java/openjfx-8.1000-r1
index 118d5b623a9d..cc060c40939b 100644
--- a/metadata/md5-cache/dev-java/openjfx-8.1000-r1
+++ b/metadata/md5-cache/dev-java/openjfx-8.1000-r1
@@ -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	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=8e2486d22a66faedd9c373b25e28e2ac
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 45eb80165141..7a759444c62a 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 be0e4bf50895..f7d0cbedc291 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=a03a56d045b6a08896036b2c3878277c
diff --git a/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0 b/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0
index 9e0d8c753050..ff409e7bfd74 100644
--- a/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0
+++ b/metadata/md5-cache/dev-java/osgi-cmpn-8.0.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=dev-java/cdi-api:0 dev-java/glassfish-persistence: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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=bfbcd2c44da033d978257c1dd34ae17e
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 07bcef47df6a..dd67d0e4e004 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=914bff7cf28b389259e0dc5ff7d3fcf4
diff --git a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r4 b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r4
index c99f7a8c9061..154ca7691b29 100644
--- a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r4
+++ b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1-r4
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/osgi-foundation:0 dev-java/jakarta-servlet-api:4 >=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/r4v43/osgi.cmpn-4.3.1.jar
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=31e1c2ea69990e4a833b309fe114c209
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 21789ec8522b..3fe0fd15eadb 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=37cb8ebdfc7a261503a25c2be40c1e56
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2 b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
index c2da3b0d993d..8b368aca1914 100644
--- a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r2
+++ b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-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=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=5af090f872a5bf2c3cff9ab2c3e5a826
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3
index 471a46cfb92e..fe95787acd35 100644
--- a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r3
@@ -12,5 +12,5 @@ RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/javax
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://docs.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=5205bc9e089f764abff3238ad44fe4c9
diff --git a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2 b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2
index 26a7834751b0..49c70cad0a24 100644
--- a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 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/~tomwij/files/dist/osgi-foundation-1.2.0.tar.xz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=b5ad8db98fdd4ae0e864800547a520f6
diff --git a/metadata/md5-cache/dev-java/pdfbox-2.0.27 b/metadata/md5-cache/dev-java/pdfbox-2.0.27
index 68db94c880a9..73c32bbc7d67 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 7aaab62553db..d9f111665454 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=e25fb06d87ee8f325d85e36500e9c1d8
diff --git a/metadata/md5-cache/dev-java/plexus-classworlds-2.6.0 b/metadata/md5-cache/dev-java/plexus-classworlds-2.6.0
index ef33c50e28d9..3e535a2e67e8 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.6.0
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.6.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/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-2.6.0.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=6ee76b6ffed94c3ca241032f10d11f7a
diff --git a/metadata/md5-cache/dev-java/poi-5.2.3 b/metadata/md5-cache/dev-java/poi-5.2.3
index 6c81a8dbe354..c860f0e541ea 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 660096b830da..79ae400f93fe 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	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ae2b87600366de7588d058fae095060d
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.24.2 b/metadata/md5-cache/dev-java/protobuf-java-3.24.2
index 40a31fe4eeb7..70d1c54f9424 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.24.2
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.24.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/v24.2.tar.gz -> protobuf-24.2.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8cf26f90f9f03a4081c860637f98531e
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r3 b/metadata/md5-cache/dev-java/qdox-1.12.1-r3
index 6546ea9da7cd..d44101e1a9e4 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r3
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=1.12
 SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=e64f90ccc4aa2c6b1d9796d8e86b2a08
diff --git a/metadata/md5-cache/dev-java/qdox-2.0.1 b/metadata/md5-cache/dev-java/qdox-2.0.1
index 39d225ea7eac..4fb4c8bc2d4f 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 9fe23bcbab81..a38ea6759685 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=ffa4a8dedf4d659af3f555a344b67949
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.12-r5 b/metadata/md5-cache/dev-java/reflections-0.9.12-r5
index b7defa75a074..c543c8f49054 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.12-r5
+++ b/metadata/md5-cache/dev-java/reflections-0.9.12-r5
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/dom4j:1 dev-java/gson:2.6 dev-java/javassis
 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=16b177ef67dfd0e007897d2742742acb
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3 b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
index 9c4c927f29a0..59465a0d88be 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
@@ -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=mirror://sourceforge/relaxng/relaxngDatatype-1.0.zip -> relaxng-datatype-1.0.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=2bf190c0b35edf6f5db77ab56eccd14b
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-20020414 b/metadata/md5-cache/dev-java/relaxng-datatype-20020414
index 3577385f6f4b..6b365442fff3 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 30960dc0bb82..95fa0745ab9b 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=b3ff7d60da0064d7d74c7fca86bf26ed
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.14 b/metadata/md5-cache/dev-java/rhino-1.7.14
index 457540ab2409..69f0cbfee945 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.14
+++ b/metadata/md5-cache/dev-java/rhino-1.7.14
@@ -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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=e22c22e09284defb9a49b15e471af42c
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r4 b/metadata/md5-cache/dev-java/rome-0.9-r4
index d36bf52a51e3..d68fb74d8bc7 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 57d1be751de5..5c1d23451389 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	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _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 f5e750ec6988..db325d503fa0 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 632bbf969918..09c42e9de113 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=mirror://sourceforge/sax/sax2r3.zip -> sax-2.2.1.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=7a2c78e8c769fc141720a601e6ffdfdf
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 066d0f0102e4..ea94d414ccde 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=mirror://sourceforge/project/saxon/saxon6/6.5.5/saxon6-5-5.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=58ccce8abcdbad8e38d4e11952e2031c
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
index 596612a5d977..abe2c3c28901 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
@@ -11,5 +11,5 @@ LICENSE=MPL-1.0
 RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=mirror://sourceforge/project/saxon/Saxon-HE/9.2/saxonhe9-2-0-6source.zip
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=714ce958990a1f8eef01a9a22a724c8d
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 c2c59211d8e3..9353b8a9eb47 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=a286ed1f9d2e96d8c695f0fb33a66249
diff --git a/metadata/md5-cache/dev-java/sbt-bin-1.3.10 b/metadata/md5-cache/dev-java/sbt-bin-1.3.10
index 90459fd75b73..105714707f29 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-1.3.10
+++ b/metadata/md5-cache/dev-java/sbt-bin-1.3.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/sbt/sbt/releases/download/v1.3.10/sbt-1.3.10.tgz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=c27c53d22e3363a7281739fe02f8542f
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 df8c8ffe16d2..c7162301a75d 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=c73d3483f16a0dd0d1fe8bf4b6fea9d8
diff --git a/metadata/md5-cache/dev-java/scram-2.1 b/metadata/md5-cache/dev-java/scram-2.1
index e7bfc57057ce..b8d0902a36a7 100644
--- a/metadata/md5-cache/dev-java/scram-2.1
+++ b/metadata/md5-cache/dev-java/scram-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/saslprep:0 >=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.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=f03d39f288f35be24e795d74483b0153
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 2f452bc3da66..d2fd6f6a7f81 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 ccfc13582f0f..052249136eea 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 eb76dd90fea0..8ef317ea6f07 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 e46ad4093f77..d5b3e91ca6aa 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 415b1581ccff..030e88c70588 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 00e475e5a42f..919a26229fe3 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 ff106fac2609..ae7ba911d6af 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 ee8d1c50dab6..8066a77f6b94 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 4dc193276bb9..7813a918de41 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=778d0b8809400ec08a6ea785cec13279
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.33 b/metadata/md5-cache/dev-java/snakeyaml-1.33
index 8086af37c4a1..adb24aad366c 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8f519c2540dfaf4f22e4c33e3b90e8f2
diff --git a/metadata/md5-cache/dev-java/snakeyaml-2.0 b/metadata/md5-cache/dev-java/snakeyaml-2.0
index 5da3bb783927..8b4412769d52 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=a72f0b84ed08afa27f7476911c329b29
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.10.1-r1 b/metadata/md5-cache/dev-java/snappy-1.1.10.1-r1
index 81a1fb11aa14..cb6ea9ffa781 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.10.1-r1
+++ b/metadata/md5-cache/dev-java/snappy-1.1.10.1-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.1.tar.gz -> snappy-1.1.10.1.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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=1b115ca2294387443a8d8baf4274eb66
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1 b/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1
index 8b6fc5d0a5cd..12681abb0e9d 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1
+++ b/metadata/md5-cache/dev-java/snappy-1.1.7.8-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-core:0 app-arch/snappy dev-libs/bitshu
 RESTRICT=test !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.7.8.tar.gz -> snappy-java-1.1.7.8.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=ba505339ff58699ea6ab2f92b898f948
diff --git a/metadata/md5-cache/dev-java/sparsebitset-1.2 b/metadata/md5-cache/dev-java/sparsebitset-1.2
index fc241c47ef15..c1e6cef03ba8 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 0d8f3f3001fa..36711942a005 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=950511a8e1083c5f4ad34a160222c06e
diff --git a/metadata/md5-cache/dev-java/stringprep-1.1 b/metadata/md5-cache/dev-java/stringprep-1.1
index 1128b10c34c0..50a37c0e7353 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=60be8cc441cc9801b4844c531d85b0ca
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
index cd4334f68615..4c5a4b34d852 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/antlr:0 >=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
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=9809b12f3377f575a08523eaf4d91a8d
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.3.2 b/metadata/md5-cache/dev-java/stringtemplate-4.3.2
index 4e1c3f6e1147..cef36f8e869c 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.3.2
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.3.2
@@ -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.2/ST4-4.3.2-sources.jar https://github.com/antlr/stringtemplate4/archive/4.3.2.tar.gz -> stringtemplate-4.3.2.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=460b133dd0b48f96e7ab18b7ba058d45
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 58ba4a6e8a6a..e386374bce9b 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 875a8574c570..6b6c021372e7 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 d956cd7a7bd5..f8ab1c448d25 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 8a5ac4d1c7a1..bb9467e3dd3c 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 0ea520e85eec..cbaa894fbe64 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=mirror://sourceforge/bt747/Development/swingx-ws-2011_05_15-src.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=48ea44ce683e8616b1bf5804c5571b74
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r3 b/metadata/md5-cache/dev-java/swt-3.7.2-r3
index e0f199cf9806..e58be7f1b351 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r3
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r3
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
 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-ant-2	19239227fab7816f57abbc0c7d819396	java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=da01f369ec32ff0e9e1a3bf3b58fdd50
diff --git a/metadata/md5-cache/dev-java/swt-4.10-r2 b/metadata/md5-cache/dev-java/swt-4.10-r2
index e62db7f1250f..285d05c6027c 100644
--- a/metadata/md5-cache/dev-java/swt-4.10-r2
+++ b/metadata/md5-cache/dev-java/swt-4.10-r2
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 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	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=9357b69c0bdc450cae3296a3992da441
diff --git a/metadata/md5-cache/dev-java/swt-4.28-r1 b/metadata/md5-cache/dev-java/swt-4.28-r1
index c9dfe9325fa5..d13f15f30d0e 100644
--- a/metadata/md5-cache/dev-java/swt-4.28-r1
+++ b/metadata/md5-cache/dev-java/swt-4.28-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:* >=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.28-202306050440/swt-4.28-gtk-linux-x86_64.zip ) arm64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.28-202306050440/swt-4.28-gtk-linux-aarch64.zip ) ppc64? ( https://download.eclipse.org/eclipse/downloads/drops4/R-4.28-202306050440/swt-4.28-gtk-linux-ppc64le.zip )
-_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=25bdc7d4d327714f2bffb21c277adb13
diff --git a/metadata/md5-cache/dev-java/swt-4.29 b/metadata/md5-cache/dev-java/swt-4.29
index 9f004c186e54..eb5484d53f0e 100644
--- a/metadata/md5-cache/dev-java/swt-4.29
+++ b/metadata/md5-cache/dev-java/swt-4.29
@@ -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:* >=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	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=56602167ae7228f52d5f1fd340a373c3
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 461c8747022b..793558a1c207 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=99c09d7bec18b6cb525588968c5568bf
diff --git a/metadata/md5-cache/dev-java/testng-6.11 b/metadata/md5-cache/dev-java/testng-6.11
new file mode 100644
index 000000000000..b98a1d0d1333
--- /dev/null
+++ b/metadata/md5-cache/dev-java/testng-6.11
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/ant-core:0 dev-java/bsh:0 dev-java/guice:4 dev-java/jcommander:1.64 dev-java/junit:4 dev-java/snakeyaml:0 >=virtual/jdk-1.8:* test? ( dev-java/assertj-core:3 dev-java/guava:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Testing framework inspired by JUnit and NUnit with new features
+EAPI=8
+HOMEPAGE=https://testng.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/ant-core:0 dev-java/bsh:0 dev-java/guice:4 dev-java/jcommander:1.64 dev-java/junit:4 dev-java/snakeyaml:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
+_md5_=feeec0a5963975253123dde9e9b30030
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10-r1 b/metadata/md5-cache/dev-java/testng-6.9.10-r1
index 96af19a9dfca..a53cdc111880 100644
--- a/metadata/md5-cache/dev-java/testng-6.9.10-r1
+++ b/metadata/md5-cache/dev-java/testng-6.9.10-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/testng-team/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=d5ba37a2c100edc3b007c52729494b1f
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.38 b/metadata/md5-cache/dev-java/tomcat-native-1.2.38
index 6e1d14aff56c..07ad5055a986 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.38
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.38
@@ -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.2.38/source/tomcat-native-1.2.38-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.38/source/tomcat-native-1.2.38-src.tar.gz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=a25a7a4f82699b0144b9a747532b707e
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.39 b/metadata/md5-cache/dev-java/tomcat-native-1.2.39
index 2b5f554801ea..34d3e5fe654d 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.39
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.39
@@ -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.2.39/source/tomcat-native-1.2.39-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.39/source/tomcat-native-1.2.39-src.tar.gz.asc )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=fba1a02a7c670999e5bae1d32f86ffaf
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.5 b/metadata/md5-cache/dev-java/tomcat-native-2.0.5
index 1439aae3aab7..8c4e3f504cad 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-2.0.5
+++ b/metadata/md5-cache/dev-java/tomcat-native-2.0.5
@@ -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.5/source/tomcat-native-2.0.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.5/source/tomcat-native-2.0.5-src.tar.gz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=8a88829912bf8cfb68e791158a9c0db5
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.6 b/metadata/md5-cache/dev-java/tomcat-native-2.0.6
index 3e721d51b953..b0be6a0a9ca4 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-2.0.6
+++ b/metadata/md5-cache/dev-java/tomcat-native-2.0.6
@@ -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.6/source/tomcat-native-2.0.6-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.6/source/tomcat-native-2.0.6-src.tar.gz.asc )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=f63563a632d5eac69990772cc99f5371
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40 b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
index 33f315c5f41a..6afaab681a20 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
@@ -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-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=d65353f5132fb112929415131a525e35
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 28bea1b919a9..0ec1566286d5 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 b5f2f656dc3f..a201462dfc0e 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 fb55dd39c7c6..ef8b9c3a4bad 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 45ddd6026142..55673dc772ce 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 84c22101ae58..e8f3302b4bd9 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=19253877fdd33c094d6d50c427f7f224
diff --git a/metadata/md5-cache/dev-java/validation-api-1.0.0-r1 b/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
index 913714fdc4e6..d24ebc411d95 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/validation-api-1.0.0-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=1.0
 SRC_URI=https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=a0a24c2ae72b3e51abe0c0d08b649679
diff --git a/metadata/md5-cache/dev-java/validation-api-1.1.0-r1 b/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
index 17a6c16cebe1..61fc46b51660 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.1.0-r1
+++ b/metadata/md5-cache/dev-java/validation-api-1.1.0-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=1.0
 SRC_URI=https://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar -> validation-api-1.1.0.jar
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=5e3cfb69d85910d60d651cc0a669454d
diff --git a/metadata/md5-cache/dev-java/velocity-2.3 b/metadata/md5-cache/dev-java/velocity-2.3
index 5deb742eae59..72f36ec2450f 100644
--- a/metadata/md5-cache/dev-java/velocity-2.3
+++ b/metadata/md5-cache/dev-java/velocity-2.3
@@ -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/refs/tags/2.3.tar.gz -> velocity-2.3.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=196e2c49434cac18d569e94ce794c2cf
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.4.0 b/metadata/md5-cache/dev-java/woodstox-core-6.4.0
index 86dfda8bfd0a..c14bbfdab5ce 100644
--- a/metadata/md5-cache/dev-java/woodstox-core-6.4.0
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.4.0
@@ -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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=950d670ebe48986ff8af948e4eb973ea
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.3 b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
index bb8aa8cc0097..6d63538215a7 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=mirror://sourceforge/project/wsdl4j/WSDL4J/1.6.3/wsdl4j-src-1.6.3.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8265245c27b347da2d3971fb196fc42c
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
index 6f61c5613f83..37760511148a 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.2-r1
+++ b/metadata/md5-cache/dev-java/xalan-2.7.2-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jre-1.8:* ~dev-java/xalan-serializer-2.7.2:0 >=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_2-src.tar.gz doc? ( mirror://apache/xalan/xalan-j/binaries/xalan-j_2_7_2-bin.zip )
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=07982f7ae8bc859a63a836beef79e60d
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.3 b/metadata/md5-cache/dev-java/xalan-2.7.3
index a3ebb89f7ef6..5c9ad5217b7c 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.3
+++ b/metadata/md5-cache/dev-java/xalan-2.7.3
@@ -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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=d010ec64acff4d6e04adb4dd2da2a081
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
index 3ce354af5d24..9a2487c073b4 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2-r1
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.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=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=f551dfbacc32495d4868b20d55fa7b4d
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.3 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.3
index bf59ec97f801..bccaf13b61b6 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.3
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.3
@@ -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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=95bc446c2652d1c5792dbbe12b127e4f
diff --git a/metadata/md5-cache/dev-java/xerces-2.12.2 b/metadata/md5-cache/dev-java/xerces-2.12.2
index 807d73fb1193..4e5813d4caef 100644
--- a/metadata/md5-cache/dev-java/xerces-2.12.2
+++ b/metadata/md5-cache/dev-java/xerces-2.12.2
@@ -10,5 +10,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
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=7fa4e7df315d179713b3fd20c507a16c
diff --git a/metadata/md5-cache/dev-java/xerces-2.12.2-r1 b/metadata/md5-cache/dev-java/xerces-2.12.2-r1
index 2809ca049ac5..62193b61c213 100644
--- a/metadata/md5-cache/dev-java/xerces-2.12.2-r1
+++ b/metadata/md5-cache/dev-java/xerces-2.12.2-r1
@@ -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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=6156ee1a1074882553162eff9e49830f
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.1 b/metadata/md5-cache/dev-java/xerial-core-2.1
index 0ac228d414a3..711044ef0377 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 338dc5bfd1ab..30c574eaa7ca 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 b67d84b0e8ea..bb34038ac2ea 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=4d028ad9252d61dcfe4bca85c6a4547c
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
index 818c8a9712c6..5e7bc9d161e0 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
@@ -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.8-src.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-2.8-src.tar.gz.asc )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=96f14e668236d46c2c26e991cfd6703c
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.9 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.9
index 9f6e24a740de..d902b8838380 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=069be8b2c60b9ffef8a515070125aeec
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6-r1 b/metadata/md5-cache/dev-java/xmlunit-1.6-r1
index 8a85515a1354..cd304e71edd2 100644
--- a/metadata/md5-cache/dev-java/xmlunit-1.6-r1
+++ b/metadata/md5-cache/dev-java/xmlunit-1.6-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 sou
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://sourceforge/xmlunit/xmlunit-1.6-src.zip
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=9394d087cfd29588535e4561e6d5d06a
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 1359b3f49f78..c87af6ee4e5a 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 0b27cf61a0de..bd0dee79fa93 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 3bfcafe3f1a2..38cebdb05c5c 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 eed24eb47ec1..b6fa0cd5008d 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 0f237ec28bae..731365dd796d 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 b027888eeb93..1450b94e5d5b 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=c997da50407e1c5b051225df8e317c3c
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 2ce7c9081cc2..848cfed10209 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=32574ef45b44b2b4a0fe73eb1ddb4c0f
diff --git a/metadata/md5-cache/dev-java/xsdlib-2022.7 b/metadata/md5-cache/dev-java/xsdlib-2022.7
index 572b1a7008e9..7307f66c0d5e 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=6f3294149479b0f7c03175b8919ef856
diff --git a/metadata/md5-cache/dev-java/xz-java-1.9-r1 b/metadata/md5-cache/dev-java/xz-java-1.9-r1
index 13ee5bf82d6b..24617c6db363 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.9-r1
+++ b/metadata/md5-cache/dev-java/xz-java-1.9-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://tukaani.org/xz/xz-java-1.9.zip verify-sig? ( https://tukaani.org/xz/xz-java-1.9.zip.sig )
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=6462ec006b74cb0f541add56c2499870
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 35a929fbe977..fb013189b0cb 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	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	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 96e5013deae3..9affe889e852 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 0b7d34483c27..778fdb03aa45 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=3652497e8415bc9eaad890765242d27b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 326b4eaf3f72..e2f06da3ff3f 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 2a8e780b72a6..b67093807022 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=334c9ba18af6229550b4380824426cdc
diff --git a/metadata/md5-cache/dev-lang/clojure-1.11.1 b/metadata/md5-cache/dev-lang/clojure-1.11.1
index f9d148057ddc..1fe55eba7b69 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.11.1
+++ b/metadata/md5-cache/dev-lang/clojure-1.11.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.11
 SRC_URI=https://github.com/clojure/clojure/archive/clojure-1.11.1.tar.gz https://github.com/clojure/spec.alpha/archive/v0.3.218.tar.gz -> spec.alpha-0.3.218.tar.gz https://github.com/clojure/core.specs.alpha/archive/v0.2.62.tar.gz -> core.specs.alpha-0.2.62.tar.gz test? ( https://github.com/clojure/tools.namespace/archive/tools.namespace-1.1.0.tar.gz https://github.com/clojure/java.classpath/archive/java.classpath-1.0.0.tar.gz https://github.com/clojure/tools.reader/archive/tools.reader-1.3.4.tar.gz https://github.com/clojure/test.generative/archive/test.generative-1.0.0.tar.gz https://github.com/clojure/data.generators/archive/data.generators-1.0.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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=68507b5dcf8fd5c3fd78ed2d147e32b0
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20211107 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20211107
index b48f172e9171..38a63742c60c 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20211107
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20211107
@@ -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/v20211107/closure-compiler-v20211107.jar
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=bd972274895ec7dcf7f59cc3d9031644
diff --git a/metadata/md5-cache/dev-lang/cxprolog-0.98.2 b/metadata/md5-cache/dev-lang/cxprolog-0.98.2
index c1e1fa638228..5895b728c483 100644
--- a/metadata/md5-cache/dev-lang/cxprolog-0.98.2
+++ b/metadata/md5-cache/dev-lang/cxprolog-0.98.2
@@ -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	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
 _md5_=103db162266977c718fe1486b1b9d10b
diff --git a/metadata/md5-cache/dev-lang/dafny-4.3.0 b/metadata/md5-cache/dev-lang/dafny-4.3.0
index 9433bc253868..a6be3a17834d 100644
--- a/metadata/md5-cache/dev-lang/dafny-4.3.0
+++ b/metadata/md5-cache/dev-lang/dafny-4.3.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.3.0.tar.gz -> dafny-4.3.0.tar.gz https://api.nuget.org/v3-flatcontainer/boogie.abstractinterpretation/2.16.8/boogie.abstractinterpretation.2.16.8.nupkg https://api.nuget.org/v3-flatcontainer/boogie.basetypes/2.16.8/boogie.basetypes.2.16.8.nupkg https://api.nuget.org/v3-flatcontainer/boogie.codecontractsextender/2.16.8/boogie.codecontractsextender.2.16.8.nupkg https://api.nuget.org/v3-flatcontainer/boogie.concurrency/2.16.8/boogie.concurrency.2.16.8.nupkg https://api.nuget.org/v3-flatcontainer/boogie.core/2.16.8/boogie.core.2.16.8.nupkg https://api.nuget.org/v3-flatcontainer/boogie.executionengine/2.16.8/boogie.executionengine.2.16.8.nupkg https://api.nuget.org/v3-flatcontainer/boogie.graph/2.16.8/boogie.graph.2.16.8.nupkg https://api.nuget.org/v3-flatcontainer/boogie.houdini/2.16.8/boogie.houdini.2.16.8.nupkg https://api.nuget.org/v3-flatcontainer/boogie.model/2.16.8/boogie.model.2.16.8.nupkg https://api.nuget.org/v3-flatcontainer/boogie.provers.smtlib/2.16.8/boogie.provers.smtlib.2.16.8.nupkg https://api.nuget.org/v3-flatcontainer/boogie.vcexpr/2.16.8/boogie.vcexpr.2.16.8.nupkg https://api.nuget.org/v3-flatcontainer/boogie.vcgeneration/2.16.8/boogie.vcgeneration.2.16.8.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.0.0/microsoft.testplatform.extensions.trxlogger.17.0.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.0.0/microsoft.testplatform.objectmodel.17.0.0.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.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.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.10.0/serilog.2.10.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.0.1/system.collections.nongeneric.4.0.1.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.0.1/system.collections.specialized.4.0.1.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.0.1/system.globalization.extensions.4.0.1.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	a18b301da1d7f09dae8bdf84321f43a8	dotnet-pkg-base	038168faf6ea7218689a80f3652288ac	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	nuget	97fd2c5f9e9770fc8c4d2d7a52ddce5a	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	dotnet-pkg	a18b301da1d7f09dae8bdf84321f43a8	dotnet-pkg-base	038168faf6ea7218689a80f3652288ac	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	nuget	97fd2c5f9e9770fc8c4d2d7a52ddce5a	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=13232f2fc2bad29b0b732a317071e205
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 840a16eb3cb3..01da0dffaf5a 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	c0eb9cbe6b0bd01fcb4918f12598a4d3	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=a3eb0e5389d49e47bde8ef9b34728789
diff --git a/metadata/md5-cache/dev-lang/dzaima-bqn-9999 b/metadata/md5-cache/dev-lang/dzaima-bqn-9999
index 8f2d803b7306..f08c3bb3255d 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	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=a3eb0e5389d49e47bde8ef9b34728789
diff --git a/metadata/md5-cache/dev-lang/erlang-25.3 b/metadata/md5-cache/dev-lang/erlang-25.3
index 5fa97f3b06b9..a56733d8dffd 100644
--- a/metadata/md5-cache/dev-lang/erlang-25.3
+++ b/metadata/md5-cache/dev-lang/erlang-25.3
@@ -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? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/25.3
 SRC_URI=https://github.com/erlang/otp/archive/OTP-25.3.tar.gz -> erlang-25.3.tar.gz https://github.com/erlang/otp/releases/download/OTP-25.3/otp_doc_man_25.3.tar.gz -> erlang_doc_man_25.3.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-25.3/otp_doc_html_25.3.tar.gz -> erlang_doc_html_25.3.tar.gz )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
 _md5_=3e194cd0ad4955566f689e64aaa7a096
diff --git a/metadata/md5-cache/dev-lang/erlang-26.0 b/metadata/md5-cache/dev-lang/erlang-26.0
index 89db399f5b60..78428bac04db 100644
--- a/metadata/md5-cache/dev-lang/erlang-26.0
+++ b/metadata/md5-cache/dev-lang/erlang-26.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? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/26.0
 SRC_URI=https://github.com/erlang/otp/archive/OTP-26.0.tar.gz -> erlang-26.0.tar.gz https://github.com/erlang/otp/releases/download/OTP-26.0/otp_doc_man_26.0.tar.gz -> erlang_doc_man_26.0.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-26.0/otp_doc_html_26.0.tar.gz -> erlang_doc_html_26.0.tar.gz )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
 _md5_=193afd45150bb3b9911772b82135af3b
diff --git a/metadata/md5-cache/dev-lang/fuzion-0.083 b/metadata/md5-cache/dev-lang/fuzion-0.083
index 1942b145ba25..25755ef8dc9e 100644
--- a/metadata/md5-cache/dev-lang/fuzion-0.083
+++ b/metadata/md5-cache/dev-lang/fuzion-0.083
@@ -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/v0.083.tar.gz -> fuzion-0.083.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=68c2aee982b538fa59ee3805c0db0d7d
diff --git a/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r1 b/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r1
index a59f878114c1..6559707af1c3 100644
--- a/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r1
+++ b/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-3+
 RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gnu/gnuprologjava/gnuprologjava-0.2.6-src.zip
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=99759402e73a876c67a98db7ab7fb04b
diff --git a/metadata/md5-cache/dev-lang/interprolog-2.1.2 b/metadata/md5-cache/dev-lang/interprolog-2.1.2
index 6c889eec0b33..7af2c3d4b9ed 100644
--- a/metadata/md5-cache/dev-lang/interprolog-2.1.2
+++ b/metadata/md5-cache/dev-lang/interprolog-2.1.2
@@ -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=http://www.declarativa.com/interprolog/interprolog212.zip
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=7038aa2b985832873c6d176feaeb1c52
diff --git a/metadata/md5-cache/dev-lang/mercury-20.06-r1 b/metadata/md5-cache/dev-lang/mercury-20.06-r1
index ac6b0019ded7..a905afaad245 100644
--- a/metadata/md5-cache/dev-lang/mercury-20.06-r1
+++ b/metadata/md5-cache/dev-lang/mercury-20.06-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.8:* ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://dl.mercurylang.org/release-20.06/mercury-srcdist-20.06.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury/mercury-20.06-gentoo-patchset-3.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ba5b7a587df505c3ad8fb3832e6d490f
diff --git a/metadata/md5-cache/dev-lang/mercury-20.06.1 b/metadata/md5-cache/dev-lang/mercury-20.06.1
index 811d9bd892f1..b84860069f69 100644
--- a/metadata/md5-cache/dev-lang/mercury-20.06.1
+++ b/metadata/md5-cache/dev-lang/mercury-20.06.1
@@ -11,5 +11,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.8:* ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://dl.mercurylang.org/release-20.06/mercury-srcdist-20.06.1.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury/mercury-20.06.1-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0321193909acff8492f2883d0616c54d
diff --git a/metadata/md5-cache/dev-lang/mercury-22.01 b/metadata/md5-cache/dev-lang/mercury-22.01
index 5708894d152e..44cd9ad022e2 100644
--- a/metadata/md5-cache/dev-lang/mercury-22.01
+++ b/metadata/md5-cache/dev-lang/mercury-22.01
@@ -11,5 +11,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=net-libs/libnsl:0= readline? ( sys-libs/readline:= ) java? ( >=virtual/jdk-1.8:* ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://dl.mercurylang.org/release/mercury-srcdist-22.01.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury/mercury-22.01-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4f838fe2d36c3ae3b3f4e90e1af5f972
diff --git a/metadata/md5-cache/dev-lang/mercury-22.01.1 b/metadata/md5-cache/dev-lang/mercury-22.01.1
index ae32bfdffd5b..ec987a0d5930 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	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d35d677456ae159661b7d0270ed0c715
diff --git a/metadata/md5-cache/dev-lang/mozart-2.0.1 b/metadata/md5-cache/dev-lang/mozart-2.0.1
index 036523ca761d..d570dda97f3f 100644
--- a/metadata/md5-cache/dev-lang/mozart-2.0.1
+++ b/metadata/md5-cache/dev-lang/mozart-2.0.1
@@ -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	fc2f89084f590ac95c004ea95b0d2f80	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8d6a6508b6d7621f4aedb600153cba06
diff --git a/metadata/md5-cache/dev-lang/nqp-2023.02 b/metadata/md5-cache/dev-lang/nqp-2023.02
index 816fa76efce9..dbe15201cf6c 100644
--- a/metadata/md5-cache/dev-lang/nqp-2023.02
+++ b/metadata/md5-cache/dev-lang/nqp-2023.02
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( java moar )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2023.02/nqp-2023.02.tar.gz
-_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
 _md5_=2158aaeaf4b4dce27a0b29047c4d74af
diff --git a/metadata/md5-cache/dev-lang/nqp-9999 b/metadata/md5-cache/dev-lang/nqp-9999
index af50ccae47ef..5abb7732d0bc 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	2358a7b20091609e24bd3a83b3ac5991	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
+_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	out-of-source-utils	1a9007554652a6e627edbccb3c25a439
 _md5_=2158aaeaf4b4dce27a0b29047c4d74af
diff --git a/metadata/md5-cache/dev-lang/rakudo-2023.02 b/metadata/md5-cache/dev-lang/rakudo-2023.02
index fa7545003d73..19670870972c 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2023.02
+++ b/metadata/md5-cache/dev-lang/rakudo-2023.02
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( java moar )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rakudo.org/dl/rakudo/rakudo-2023.02.tar.gz
-_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=302ab3ab08fdb069306a326f7dfedc32
diff --git a/metadata/md5-cache/dev-lang/scala-2.12.10 b/metadata/md5-cache/dev-lang/scala-2.12.10
index b3028fce0dcd..3533d2f2dccd 100644
--- a/metadata/md5-cache/dev-lang/scala-2.12.10
+++ b/metadata/md5-cache/dev-lang/scala-2.12.10
@@ -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.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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=82842340253c324f99120fbde604b726
diff --git a/metadata/md5-cache/dev-lang/scala-2.12.4 b/metadata/md5-cache/dev-lang/scala-2.12.4
index ed3c36c5b04d..aeedc096cdbf 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	desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _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 3646bae23128..fcebaa50af84 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=dfec0917918fa8d60ebef99fd4776585
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 a6cedbe65f36..89ec9bb9deb0 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	fc2f89084f590ac95c004ea95b0d2f80	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cf4069aadc93d03ddfd82700c6fcdea3
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.2.0 b/metadata/md5-cache/dev-lang/tuprolog-3.2.0
index dc0d7480b68d..55e8e7242dfc 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-3.2.0
+++ b/metadata/md5-cache/dev-lang/tuprolog-3.2.0
@@ -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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=de3432829a156484f0cdb8c4cb3c8def
diff --git a/metadata/md5-cache/dev-lang/xsb-3.8.0 b/metadata/md5-cache/dev-lang/xsb-3.8.0
index 838b7fb86124..6f3fa9ec1d80 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	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=efc6f991756356193fdf1998e700d5c8
diff --git a/metadata/md5-cache/dev-lang/xsb-4.0.0 b/metadata/md5-cache/dev-lang/xsb-4.0.0
index 48532be618d9..fc5f901849fd 100644
--- a/metadata/md5-cache/dev-lang/xsb-4.0.0
+++ b/metadata/md5-cache/dev-lang/xsb-4.0.0
@@ -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=mirror://sourceforge/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	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=a40e8b6725c43a8b50a69eef5f9c22fe
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 7664231d74a5..a5f691a609d6 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 641e219d4223..a8e2757a9fbf 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	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=b5fb640560c120c1e05c7466f64a93b3
diff --git a/metadata/md5-cache/dev-libs/OpenNI-9999 b/metadata/md5-cache/dev-libs/OpenNI-9999
index bab2b1f8cc4c..7f14e0938ad9 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	e5cc383ea8420f92fe3737be790021dc	git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=189db30fbc89f9db40a0a1947f126be0
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 26a75cfbdca4..6af8a74d67e1 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	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=84642a9704f36bf3554b55170f00f79b
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-9999 b/metadata/md5-cache/dev-libs/OpenNI2-9999
index 86baf7467206..24800b62c255 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	e5cc383ea8420f92fe3737be790021dc	git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=36ab892ac05a74db6f6cfd5bc2eca596
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 39aaea10b195..bb48a56ce618 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-0 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	6ae9a4347149b19a112caa1182d03bde	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=fa7f3c9a852f74afad8071948f3a397a
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 783e91596af0..981bdd5af836 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-0 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	6ae9a4347149b19a112caa1182d03bde	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=127c8bc6191728cbb32dbf794096e6d0
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index aab2721dbf50..48f8ac747633 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.1 b/metadata/md5-cache/dev-lisp/abcl-1.9.1
index 8ef572592542..3f244052f720 100644
--- a/metadata/md5-cache/dev-lisp/abcl-1.9.1
+++ b/metadata/md5-cache/dev-lisp/abcl-1.9.1
@@ -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.1/abcl-src-1.9.1.tar.gz
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=27ef2d7916fd4ff38c6af300cbfb205a
diff --git a/metadata/md5-cache/dev-lisp/abcl-1.9.2 b/metadata/md5-cache/dev-lisp/abcl-1.9.2
index 9d31d71693fc..78c03f303390 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=6b4625ff24b9e182660b71ac1ded1bf8
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 04dfa79d5ec4..bebeffa6e0e8 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/agate-1.9.0 b/metadata/md5-cache/dev-python/agate-1.9.0
new file mode 100644
index 000000000000..fcba6695b863
--- /dev/null
+++ b/metadata/md5-cache/dev-python/agate-1.9.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytimeparse-1.1.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/furo[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/furo[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python data analysis library that is optimized for humans instead of machines
+EAPI=8
+HOMEPAGE=https://github.com/wireservice/agate/ https://pypi.org/project/agate/
+INHERIT=distutils-r1 pypi
+IUSE=test doc python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~arm64-macos ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/pytimeparse-1.1.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/agate/agate-1.9.0.tar.gz
+_eclasses_=distutils-r1	d05609532b134be7c4ae2514f4c7d06e	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=4962fa834498d4ab2e8da37cd1a275aa
diff --git a/metadata/md5-cache/dev-python/boto3-1.28.65 b/metadata/md5-cache/dev-python/boto3-1.28.65
new file mode 100644
index 000000000000..c3c633d7a16f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.28.65
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[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(-)?] ) test? ( >=dev-python/botocore-1.31.65[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.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[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-67.8.0-r1[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 multiprocessing
+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.31.65[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.7.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.28.65.tar.gz -> boto3-1.28.65.gh.tar.gz
+_eclasses_=distutils-r1	d05609532b134be7c4ae2514f4c7d06e	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=d35398c545ff2c2b70294ae914341e8b
diff --git a/metadata/md5-cache/dev-python/botocore-1.31.65 b/metadata/md5-cache/dev-python/botocore-1.31.65
new file mode 100644
index 000000000000..453172a337de
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.31.65
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[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(-)?] ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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/pytest-7.3.1[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-67.8.0-r1[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 multiprocessing
+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/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <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(-)?] 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.31.65.tar.gz -> botocore-1.31.65.gh.tar.gz
+_eclasses_=distutils-r1	d05609532b134be7c4ae2514f4c7d06e	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=a7ced2e7cc030cae76a19171103bdc35
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.82.1 b/metadata/md5-cache/dev-python/cfn-lint-0.82.1
new file mode 100644
index 000000000000..1dd7ae3cd22f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.82.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aws-sam-translator-1.75.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+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
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.75.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn-lint-0.82.1.tar.gz
+_eclasses_=distutils-r1	d05609532b134be7c4ae2514f4c7d06e	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=c5aa8406403b26be8af14232499e20a6
diff --git a/metadata/md5-cache/dev-python/cython-3.0.4 b/metadata/md5-cache/dev-python/cython-3.0.4
new file mode 100644
index 000000000000..36dae6165a00
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cython-3.0.4
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_targets_python3_10? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) doc? ( || ( ( dev-lang/python:3.12[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/jinja[python_targets_python3_12(-)] dev-python/sphinx-issues[python_targets_python3_12(-)] dev-python/sphinx-tabs[python_targets_python3_12(-)] ) ( dev-lang/python:3.11[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] dev-python/sphinx-tabs[python_targets_python3_11(-)] ) ( dev-lang/python:3.10[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/sphinx-tabs[python_targets_python3_10(-)] ) ( dev-python/pypy3[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/jinja[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] dev-python/sphinx-tabs[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
+DESCRIPTION=A Python to C compiler
+EAPI=8
+HOMEPAGE=https://cython.org/ https://github.com/cython/cython/ https://pypi.org/project/Cython/
+INHERIT=distutils-r1 multiprocessing toolchain-funcs
+IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+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
+RDEPEND=python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
+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/cython/cython/archive/3.0.4.tar.gz -> cython-3.0.4.gh.tar.gz
+_eclasses_=distutils-r1	d05609532b134be7c4ae2514f4c7d06e	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=7f06cad0515f6ce0c5fff32384a401a1
diff --git a/metadata/md5-cache/dev-python/deepdiff-6.6.1 b/metadata/md5-cache/dev-python/deepdiff-6.6.1
new file mode 100644
index 000000000000..6d354d9dd2c4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/deepdiff-6.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/pyyaml-6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-8.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/jsonpickle-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.23.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) )
+DESCRIPTION=A library for comparing dictionaries, iterables, strings and other objects
+EAPI=8
+HOMEPAGE=https://github.com/seperman/deepdiff/ https://pypi.org/project/deepdiff/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/pyyaml-6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-8.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/deepdiff/deepdiff-6.6.1.tar.gz
+_eclasses_=distutils-r1	d05609532b134be7c4ae2514f4c7d06e	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=882c0214cdce931e25122eeeb33aa8f1
diff --git a/metadata/md5-cache/dev-python/outcome-1.3.0 b/metadata/md5-cache/dev-python/outcome-1.3.0
new file mode 100644
index 000000000000..7c4289bd0474
--- /dev/null
+++ b/metadata/md5-cache/dev-python/outcome-1.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/attrs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/sphinxcontrib-trio[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinxcontrib-trio[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinxcontrib-trio[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/sphinxcontrib-trio[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/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Capture the outcome of Python function calls
+EAPI=8
+HOMEPAGE=https://github.com/python-trio/outcome/ https://pypi.org/project/outcome/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( Apache-2.0 MIT )
+RDEPEND=dev-python/attrs[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-trio/outcome/archive/v1.3.0.tar.gz -> outcome-1.3.0.gh.tar.gz
+_eclasses_=distutils-r1	d05609532b134be7c4ae2514f4c7d06e	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=28ce0311390c821b81cbe99a4ad2e901
diff --git a/metadata/md5-cache/dev-python/pydantic-core-2.11.0 b/metadata/md5-cache/dev-python/pydantic-core-2.11.0
new file mode 100644
index 000000000000..77b59bc8197b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydantic-core-2.11.0
@@ -0,0 +1,17 @@
+BDEPEND=>=virtual/rust-1.70.0 test? ( >=dev-python/dirty-equals-0.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.63.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-mock-3.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydantic-1.10.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2022.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/typing-extensions-4.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=virtual/rust-1.53 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-util/maturin-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+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 )
+DESCRIPTION=Core validation logic for pydantic written in Rust
+EAPI=8
+HOMEPAGE=https://github.com/pydantic/pydantic-core/ https://pypi.org/project/pydantic-core/
+INHERIT=cargo distutils-r1 pypi
+IUSE=test debug python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016 || ( Apache-2.0 Boost-1.0 )
+RDEPEND=>=dev-python/typing-extensions-4.7.1[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/p/pydantic-core/pydantic_core-2.11.0.tar.gz https://crates.io/api/v1/crates/ahash/0.8.3/download -> ahash-0.8.3.crate https://crates.io/api/v1/crates/aho-corasick/1.0.2/download -> aho-corasick-1.0.2.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.21.4/download -> base64-0.21.4.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/enum_dispatch/0.3.12/download -> enum_dispatch-0.3.12.crate https://crates.io/api/v1/crates/equivalent/1.0.1/download -> equivalent-1.0.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.2.0/download -> form_urlencoded-1.2.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.0/download -> hashbrown-0.14.0.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/idna/0.4.0/download -> idna-0.4.0.crate https://crates.io/api/v1/crates/indexmap/2.0.0/download -> indexmap-2.0.0.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/itoa/1.0.8/download -> itoa-1.0.8.crate https://crates.io/api/v1/crates/libc/0.2.147/download -> libc-0.2.147.crate https://crates.io/api/v1/crates/lock_api/0.4.10/download -> lock_api-0.4.10.crate https://crates.io/api/v1/crates/memchr/2.6.3/download -> memchr-2.6.3.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/num-bigint/0.4.4/download -> num-bigint-0.4.4.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.16/download -> num-traits-0.2.16.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/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.8/download -> parking_lot_core-0.9.8.crate https://crates.io/api/v1/crates/percent-encoding/2.3.0/download -> percent-encoding-2.3.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.64/download -> proc-macro2-1.0.64.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/python3-dll-a/0.2.9/download -> python3-dll-a-0.2.9.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.3.5/download -> redox_syscall-0.3.5.crate https://crates.io/api/v1/crates/regex-automata/0.4.2/download -> regex-automata-0.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.8.2/download -> regex-syntax-0.8.2.crate https://crates.io/api/v1/crates/regex/1.10.1/download -> regex-1.10.1.crate https://crates.io/api/v1/crates/rustversion/1.0.13/download -> rustversion-1.0.13.crate https://crates.io/api/v1/crates/ryu/1.0.14/download -> ryu-1.0.14.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.189/download -> serde-1.0.189.crate https://crates.io/api/v1/crates/serde_derive/1.0.189/download -> serde_derive-1.0.189.crate https://crates.io/api/v1/crates/serde_json/1.0.107/download -> serde_json-1.0.107.crate https://crates.io/api/v1/crates/smallvec/1.11.1/download -> smallvec-1.11.1.crate https://crates.io/api/v1/crates/speedate/0.12.0/download -> speedate-0.12.0.crate https://crates.io/api/v1/crates/strum/0.25.0/download -> strum-0.25.0.crate https://crates.io/api/v1/crates/strum_macros/0.25.3/download -> strum_macros-0.25.3.crate https://crates.io/api/v1/crates/syn/2.0.28/download -> syn-2.0.28.crate https://crates.io/api/v1/crates/target-lexicon/0.12.9/download -> target-lexicon-0.12.9.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.13/download -> unicode-bidi-0.3.13.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-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/url/2.4.1/download -> url-2.4.1.crate https://crates.io/api/v1/crates/uuid/1.4.1/download -> uuid-1.4.1.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/windows-targets/0.48.1/download -> windows-targets-0.48.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.0/download -> windows_aarch64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.0/download -> windows_aarch64_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.0/download -> windows_i686_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.0/download -> windows_i686_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.0/download -> windows_x86_64_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.0/download -> windows_x86_64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.0/download -> windows_x86_64_msvc-0.48.0.crate
+_eclasses_=cargo	8520ae1bed0e6965d027399b471a3595	distutils-r1	d05609532b134be7c4ae2514f4c7d06e	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=9278841c6df388c7d362a7405bfa2771
diff --git a/metadata/md5-cache/dev-python/sqlglot-18.15.0 b/metadata/md5-cache/dev-python/sqlglot-18.15.0
new file mode 100644
index 000000000000..cb76a04960e1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlglot-18.15.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.3.1[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-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+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=distutils-r1 pypi optfeature
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~x86
+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 )
+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/s/sqlglot/sqlglot-18.15.0.tar.gz
+_eclasses_=distutils-r1	d05609532b134be7c4ae2514f4c7d06e	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=fe53db760b0de1ac68c4ab353234a4a9
diff --git a/metadata/md5-cache/dev-python/tldextract-5.0.1 b/metadata/md5-cache/dev-python/tldextract-5.0.1
new file mode 100644
index 000000000000..e56110982d7b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tldextract-5.0.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/responses[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/filelock-3.0.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-file-1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[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-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Accurately separate the TLD from the registered domain and subdomains of a URL
+EAPI=8
+HOMEPAGE=https://github.com/john-kurkowski/tldextract/ https://pypi.org/project/tldextract/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~loong ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/filelock-3.0.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-file-1.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 )
+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/t/tldextract/tldextract-5.0.1.tar.gz
+_eclasses_=distutils-r1	d05609532b134be7c4ae2514f4c7d06e	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=f7a22e74a3109a9baff667ea6f516d1c
diff --git a/metadata/md5-cache/dev-python/unearth-0.11.2 b/metadata/md5-cache/dev-python/unearth-0.11.2
new file mode 100644
index 000000000000..aa6705db7ade
--- /dev/null
+++ b/metadata/md5-cache/dev-python/unearth-0.11.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-httpserver[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests-wsgi-adapter[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/packaging[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/pytest-7.3.1[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/pdm-backend-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A utility to fetch and download python packages
+EAPI=8
+HOMEPAGE=https://pypi.org/project/unearth/ https://github.com/frostming/unearth/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/packaging[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(-)?] 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/u/unearth/unearth-0.11.2.tar.gz
+_eclasses_=distutils-r1	d05609532b134be7c4ae2514f4c7d06e	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=276bfa9b511860860b5d4aa21217fb71
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 17389dbacd70..721236538182 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/assistant-5.15.10 b/metadata/md5-cache/dev-qt/assistant-5.15.10
index 435b17e7f8b2..943f10e58754 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.15.10
+++ b/metadata/md5-cache/dev-qt/assistant-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*[png] =dev-qt/qthelp-5.
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=667cfd572f1120452c161434d206b273
diff --git a/metadata/md5-cache/dev-qt/assistant-5.15.11 b/metadata/md5-cache/dev-qt/assistant-5.15.11
index feda702d2025..2da2939a36ff 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.15.11
+++ b/metadata/md5-cache/dev-qt/assistant-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5= =dev-qt/qtgui-5.15.11*[png] =dev-qt/qthelp-5.
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d86d59781ecde6260d0df5c5a174e499
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.10 b/metadata/md5-cache/dev-qt/designer-5.15.10
index c28bf802b8f1..478d1722b137 100644
--- a/metadata/md5-cache/dev-qt/designer-5.15.10
+++ b/metadata/md5-cache/dev-qt/designer-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*:5=[png] =dev-qt/qtnetw
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a7bba5baa3d6d69511872c9762a78331
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.11 b/metadata/md5-cache/dev-qt/designer-5.15.11
index 478a838270f3..4d61fe9bd2a6 100644
--- a/metadata/md5-cache/dev-qt/designer-5.15.11
+++ b/metadata/md5-cache/dev-qt/designer-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5= =dev-qt/qtgui-5.15.11*:5=[png] =dev-qt/qtnetw
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e9c0714ef5111adba2e08a851720497d
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.10 b/metadata/md5-cache/dev-qt/linguist-5.15.10
index abef8527b6dc..94ef2b05da76 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.15.10
+++ b/metadata/md5-cache/dev-qt/linguist-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/designer-5.15.10* =dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5a1b9c7aeb3e89cfd1532d7ca8257638
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.11 b/metadata/md5-cache/dev-qt/linguist-5.15.11
index 0261c0722dc5..085677ec0449 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.15.11
+++ b/metadata/md5-cache/dev-qt/linguist-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/designer-5.15.11* =dev-qt/qtcore-5.15.11*:5= =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8a740edd19bd1529042ea172de9a56ad
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.10 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.10
index 06fbada9a8fc..7dbc06de110f 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.10
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtxml-5.15.10* qml? ( =dev-qt/qtdecla
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=9f007ba3809bbd7753f5cb27ca27261a
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.11 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.11
index 6675666cdb8a..696c1fba6e1e 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.11
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5= =dev-qt/qtxml-5.15.11* qml? ( =dev-qt/qtdecla
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=39a5ecddc35cf9c89c10ddc1b2e4d081
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.10 b/metadata/md5-cache/dev-qt/pixeltool-5.15.10
index 89f9693cf5e1..bee6f2557243 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.10
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*:5=[png] =dev-qt/qtwidg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=00e7d23318afffaad3704f219def6fc1
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.11 b/metadata/md5-cache/dev-qt/pixeltool-5.15.11
index 399e5c2b06eb..055ed2f94090 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.11
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5= =dev-qt/qtgui-5.15.11*:5=[png] =dev-qt/qtwidg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=8f91f400ac394370a035b4afbed9a2f2
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.10 b/metadata/md5-cache/dev-qt/qdbus-5.15.10
index 682eef15c325..1450806cc928 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.10
+++ b/metadata/md5-cache/dev-qt/qdbus-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdbus-5.15.10* =dev-qt/qtxml-5.15.10* !
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=623b02773f6327175ae2cb42c4d18be9
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.11 b/metadata/md5-cache/dev-qt/qdbus-5.15.11
index a2b63fabe143..e2bb8ab03c2a 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.11
+++ b/metadata/md5-cache/dev-qt/qdbus-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtdbus-5.15.11* =dev-qt/qtxml-5.15.11* !
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=c01d997ae1086c07425cf18cbcfefe0a
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.10 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.10
index 292ee428f39e..81c41761830d 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.10
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdbus-5.15.10* =dev-qt/qtgui-5.15.10* =
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a388ac309dfd8d2d8c48598305960887
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.11 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.11
index a83546d381c4..742d5871b2ad 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.11
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtdbus-5.15.11* =dev-qt/qtgui-5.15.11* =
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=399b0af45014373a4edc78b925c11ca3
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.10 b/metadata/md5-cache/dev-qt/qdoc-5.15.10
index d78962a136fb..3544ce7d454e 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.10
+++ b/metadata/md5-cache/dev-qt/qdoc-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= sys-devel/clang:= qml? ( =dev-qt/qtdeclarativ
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=847236a2fca9f6a6277cf671fb1162c5
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.11 b/metadata/md5-cache/dev-qt/qdoc-5.15.11
index 797d7356a820..c05dc5d2f9ae 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.11
+++ b/metadata/md5-cache/dev-qt/qdoc-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5= sys-devel/clang:= qml? ( =dev-qt/qtdeclarativ
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=e0aed67f843d04721f8b8e3e18e7994f
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.10 b/metadata/md5-cache/dev-qt/qt3d-5.15.10
index 4ff0e80fb34a..77a7ece677f3 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.10
+++ b/metadata/md5-cache/dev-qt/qt3d-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtconcurrent-5.15.10* =dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qt3d-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=cf54b389cfbd20675c1694cc0033eae4
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.11 b/metadata/md5-cache/dev-qt/qt3d-5.15.11
index 285435571d20..beb9c3988bba 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.11
+++ b/metadata/md5-cache/dev-qt/qt3d-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtconcurrent-5.15.11* =dev-qt/qtcore-5.15.11* =dev-qt/qtgui-5.15
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qt3d-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=190840849ee66cc159c793053980d3e0
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.10-r1 b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.10-r1
index a84bfaf979e7..6955d62e5f45 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.10-r1
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.10-r1
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtconcurrent-5.15.10* =dev-qt/qtcore-5.15.10*:5= =dev-qt/qtdbus-
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtconnectivity-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtconnectivity-5.15.10-gentoo-kde-2.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=f68e734c4dfb6c3dc07706d0002a7636
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.11 b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.11
index f4f902fd82bd..bcdbce06b600 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtconcurrent-5.15.11* =dev-qt/qtcore-5.15.11*:5= =dev-qt/qtdbus-
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtconnectivity-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtconnectivity-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=c65b7419d350a02219e526e59ec0ee9b
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.15.10 b/metadata/md5-cache/dev-qt/qtcharts-5.15.10
index 7d070916c780..5aa5bd8c73c9 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10* =dev-qt/qtwidgets-5.15.10
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtcharts-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=5ae4dd718da86d96ede6324da0ef6cbe
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.15.11 b/metadata/md5-cache/dev-qt/qtcharts-5.15.11
index 47f00b5cf119..feb447032bdf 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtgui-5.15.11* =dev-qt/qtwidgets-5.15.11
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtcharts-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=8e1ac51b99f084dd9e70a6d8a3674025
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.10 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.10
index 7021f6705691..a1938d2c36bc 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=97cb5cce52eb17bd1b931a3eb8bb00dd
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.11 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.11
index 65801e901bf9..7421bdffa6d7 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtbase-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.11-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=1256adb2e70cda66e60a9bdf4c4d44ef
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.10-r2 b/metadata/md5-cache/dev-qt/qtcore-5.15.10-r2
index e8775ffbfe9b..63ca9fb1d60a 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.10-r2
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.10-r2
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,un
 RESTRICT=test
 SLOT=5/5.15.10
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=209ca63ec0b6905b079a8e3d90cc18a4
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.11 b/metadata/md5-cache/dev-qt/qtcore-5.15.11
index 9f9e9cc5dd19..f1d37108396c 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.11
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,un
 RESTRICT=test
 SLOT=5/5.15.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtbase-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.11-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=8205051b91a2b318484ba1d948698b98
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.10 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.10
index 7103d469e8ad..db6b962bb5f7 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10*[gles2-only=] qml? ( =dev-
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtdatavis3d-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=79f3f575f5e5a8b9f42c3107b3fb57c3
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.11 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.11
index dc73063f891f..2d55c08e0525 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtgui-5.15.11*[gles2-only=] qml? ( =dev-
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtdatavis3d-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=ee74276a815bde9922938e6141d9aa5c
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.10 b/metadata/md5-cache/dev-qt/qtdbus-5.15.10
index d25f601e7703..0fb8971cf69f 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= sys-apps/dbus
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=6a6f3d70ce776e57e71d1d143c553f28
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.11 b/metadata/md5-cache/dev-qt/qtdbus-5.15.11
index bb109084c5b1..98f304209ff0 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5= sys-apps/dbus
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtbase-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.11-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=db32f12594938ad50e2ecb6214c6accf
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r3 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r3
index 3a654ba01dcf..94694c13bc2d 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r3
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.10-r3
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10*:5=[gles2-only=,vulkan=] =
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtdeclarative-5.15.10-gentoo-kde-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=5e1aec8e71014b7eb585acbf3489bef3
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.11 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.11
index fb5de7593de9..f0f1974791c0 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtgui-5.15.11*:5=[gles2-only=,vulkan=] =
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtdeclarative-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtdeclarative-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=6709e52cb8ad6f1800bcc9def851453a
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.10 b/metadata/md5-cache/dev-qt/qtdiag-5.15.10
index 5526e4166c2a..cb8e03b147ba 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*:5= network? ( =dev-qt/
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=1bd63c5a627e252ec7114c7bb3f872f6
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.11 b/metadata/md5-cache/dev-qt/qtdiag-5.15.11
index 55f2eda95cfc..2a14a1aedb65 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5= =dev-qt/qtgui-5.15.11*:5= network? ( =dev-qt/
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=f34dbb783c562db1e61e61c28e7b9943
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.10 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.10
index 29203e7d678b..d20e573909b2 100644
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtgamepad-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10*[evdev?] evdev? ( virtual/
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtgamepad-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=19fcb846857d5b258f373329381bf9e4
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.11 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.11
index 6aa59b1b23ee..eead4c22f0bd 100644
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtgamepad-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtgui-5.15.11*[evdev?] evdev? ( virtual/
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtgamepad-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=6751c280375e61f0988de2f9fa74b630
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.10 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.10
index f3fc8e12f741..3636ba4ac7ba 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.1
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtgraphicaleffects-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=6dbaff199c1043ab625676d375c0d648
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.11 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.11
index d09fa665bf07..08a1dc21f68a 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtdeclarative-5.15.11* =dev-qt/qtgui-5.1
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtgraphicaleffects-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=e76a27c74205a621daf2051ac93d1fe4
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.10-r2 b/metadata/md5-cache/dev-qt/qtgui-5.15.10-r2
index 4fd0ed5ce07c..96d8e02a4a89 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.10-r2
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.10-r2
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( eglfs linuxfb vnc wayland X ) accessibility? ( dbus X ) eglfs?
 RESTRICT=test
 SLOT=5/5.15.10
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=847827c62c2cc0e5a90e901a52a5ee49
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.11 b/metadata/md5-cache/dev-qt/qtgui-5.15.11
index 3c0531e6cfe7..4f7724a0f445 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.11
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( eglfs linuxfb vnc wayland X ) accessibility? ( dbus X ) eglfs?
 RESTRICT=test
 SLOT=5/5.15.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtbase-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.11-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=4f22c0a51067bb40a1f60018b49833b2
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.10 b/metadata/md5-cache/dev-qt/qthelp-5.15.10
index f7ad34602b57..a4c73ffd9a81 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.10
+++ b/metadata/md5-cache/dev-qt/qthelp-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10* =dev-qt/qtsql-5.15.10*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=3301477fb9532d9cb75555999d059b67
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.11 b/metadata/md5-cache/dev-qt/qthelp-5.15.11
index 80acaf4a9a9a..302764b048e1 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.11
+++ b/metadata/md5-cache/dev-qt/qthelp-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5= =dev-qt/qtgui-5.15.11* =dev-qt/qtsql-5.15.11*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=ce1e8c1a7a1f78982d0ec62bd28873ec
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.10 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.10
index 540694e0dcdc..e77ade30aefb 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10* media-libs/libwebp:= medi
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtimageformats-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=c9f163b1caec0f821d65a7cd7a908d13
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.11 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.11
index 24fe40fb3015..99f33754b1d4 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtgui-5.15.11* media-libs/libwebp:= medi
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtimageformats-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=3e0d067a7ecb7296a11435efbac478d0
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.10 b/metadata/md5-cache/dev-qt/qtlocation-5.15.10
index d1fddefc7ad4..633ce297e13f 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.10
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =d
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtlocation-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.15.10-gentoo-kde-1.tar.xz https://invent.kde.org/qt/qt/qtlocation-mapboxgl/-/archive/5a07e1967dcc925d9def47accadae991436b9686/qtlocation-mapboxgl-5a07e1967dcc925d9def47accadae991436b9686.tar.gz -> qtlocation-mapboxgl-5.15.10-5a07e196.tar.gz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a3eb014244ec7659685c9ff2c84c22cc
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.10-r1 b/metadata/md5-cache/dev-qt/qtlocation-5.15.10-r1
index 33fd93ac0cfc..28afcddd115d 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.10-r1
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.10-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =d
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtlocation-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.15.10-gentoo-kde-1.tar.xz https://invent.kde.org/qt/qt/qtlocation-mapboxgl/-/archive/4c88f2c0e61daa89f584a8a9a3eba210221c6920/qtlocation-mapboxgl-4c88f2c0e61daa89f584a8a9a3eba210221c6920.tar.gz -> qtlocation-mapboxgl-5.15.10-4c88f2c0.tar.gz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=8590189e639a431707ab2b9a1932b4d3
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.11 b/metadata/md5-cache/dev-qt/qtlocation-5.15.11
index 705770bd052d..c9383e51a1a7 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.11
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.11* =dev-qt/qtdeclarative-5.15.11* =d
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtlocation-everywhere-opensource-src-5.15.11.tar.xz https://invent.kde.org/qt/qt/qtlocation-mapboxgl/-/archive/4c88f2c0e61daa89f584a8a9a3eba210221c6920/qtlocation-mapboxgl-4c88f2c0e61daa89f584a8a9a3eba210221c6920.tar.gz -> qtlocation-mapboxgl-5.15.11-4c88f2c0.tar.gz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.15.11-fix-appendChildNode.patch.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=8326d67b234c2255f9aaa7bfb6137718
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.10 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.10
index 79791412b6dd..ab94c9d90549 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10*[gles2-only=] =dev-qt/qtne
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtmultimedia-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtmultimedia-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=b82b2f15fd1bc869252a0726d46e1d84
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.11 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.11
index 99f3f3d27917..6090ffb81c50 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtgui-5.15.11*[gles2-only=] =dev-qt/qtne
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtmultimedia-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtmultimedia-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=0c49bd2ad9668e1477123376c3e31c65
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.10 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.10
index 78b7811a078f..569184a4d0f5 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.1
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=fa82d0c9ed1b34138d9d8f227b726cec
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.10-r3 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.10-r3
index 321a9c71d32d..b3c79760f17a 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.10-r3
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.10-r3
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= sys-libs/zlib:= gssapi? ( virtual/krb5 ) libp
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=0cfede2fb7dc00b1b813cce3f2ba5d11
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.11 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.11
index eda2ff35c159..21b2383f0326 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5= sys-libs/zlib:= gssapi? ( virtual/krb5 ) libp
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtbase-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.11-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=390c8e5bce162d79e501620791449eed
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.10 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.10
index 9c6e0d74d67e..627267bb468d 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtnetwork-5.15.10*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtnetworkauth-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=059c2da7e9eb7b087d853194044d874c
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.11 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.11
index 700a8c45d398..feface75d723 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtnetwork-5.15.11*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtnetworkauth-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=27840167f3f78313f0b2fdf1721da3f7
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.10 b/metadata/md5-cache/dev-qt/qtopengl-5.15.10
index 2a0e35317a90..64c8707fae8f 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*[gles2-only=] =dev-qt/q
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a504a2265bbf0824152c5710f37d03aa
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.11 b/metadata/md5-cache/dev-qt/qtopengl-5.15.11
index 009bb8e380b1..0528abc67a6f 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5= =dev-qt/qtgui-5.15.11*[gles2-only=] =dev-qt/q
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtbase-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.11-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=03efc5503e6d6fcb0646e60198e7ccaf
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.10 b/metadata/md5-cache/dev-qt/qtpaths-5.15.10
index d5dbe7cad34a..2396c4875bdf 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=bb04c76023070e74edeacd9bd911013f
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.11 b/metadata/md5-cache/dev-qt/qtpaths-5.15.11
index 725b3966fed0..3e4e146d2369 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=98422e486f780febee0fe34f27f81586
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.10 b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.10
index 510b82a099f2..194b30ab983d 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttools-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=48c62f96da35af69b9a5ee52b9506f0f
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.11 b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.11
index 735482ab1175..53f51ed608fd 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=48c62f96da35af69b9a5ee52b9506f0f
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.10 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.10
index d9c00952fc7f..fc960635d8f2 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.15.10
@@ -13,5 +13,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* geoclue? ( =dev-qt/qtdbus-5.15.10* ) qml? ( =dev
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtlocation-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=682971f3f24dc14a5bd855a41f2e93e3
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.11 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.11
index 6235b6711398..e071a2919e5b 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.15.11
@@ -13,5 +13,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* geoclue? ( =dev-qt/qtdbus-5.15.11* ) qml? ( =dev
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtlocation-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=07552b6ef2b4e5a1d17a86cb85195547
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.10 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.10
index eb82fe8cb7ea..a988b577e891 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= =dev-qt/qtgui-5.15.10*[gles2-only=] =dev-qt/q
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=c69d6fed55dcea554359dbd0ac3108af
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.11 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.11
index bc946e5b0afb..d48e1318bb77 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5= =dev-qt/qtgui-5.15.11*[gles2-only=] =dev-qt/q
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtbase-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.11-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=4199c357e4b46c1a7f33d63fad5e8a8c
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.10 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.10
index 19da2fd4de82..bd631f13724f 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.1
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtquickcontrols-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=7bedc5969b2323d43b4a6f4b813f2f52
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.11 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.11
index 4d05c77fe16e..aab6554db9a4 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtdeclarative-5.15.11* =dev-qt/qtgui-5.1
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtquickcontrols-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=3bc465c2529424d4526c24dcb583dc78
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.10 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.10
index fc26cb47268a..66c5737aaf00 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.1
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtquickcontrols2-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtquickcontrols2-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=67cf7102d72001b377b8364054c88962
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.11 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.11
index 1140625f306b..c98476184068 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtdeclarative-5.15.11* =dev-qt/qtgui-5.1
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtquickcontrols2-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtquickcontrols2-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=cbfcafc19a75713cc0ee97e254a0234f
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.10 b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.10
index 9fac900fba6c..fd09a1109979 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtquicktimeline-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=1fbf3be9bd7141bca16775d8d0acb990
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.11 b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.11
index 923db532625a..e74ce9745d31 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtdeclarative-5.15.11*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtquicktimeline-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=5b77b5eb477968ead1bc6c0eb622ea38
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.10 b/metadata/md5-cache/dev-qt/qtscript-5.15.10
index 2afa70f3232d..6bc792e915e6 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtscript-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* scripttools? ( =dev-qt/qtgui-5.15.10* =dev-qt/qt
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtscript-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=775aff96333c9c4dab816bb5ca4aa691
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.11 b/metadata/md5-cache/dev-qt/qtscript-5.15.11
index 190b1f1aa8a0..abce9a33b016 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtscript-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* scripttools? ( =dev-qt/qtgui-5.15.11* =dev-qt/qt
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtscript-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=3dc7bdd0bf3478c7cd58f72626fc2f58
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.15.10 b/metadata/md5-cache/dev-qt/qtscxml-5.15.10
index 5f142a659d01..26c86bba5941 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtscxml-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=e5d1cc9fdfe62cf3acf86417a8b8dc88
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.15.11 b/metadata/md5-cache/dev-qt/qtscxml-5.15.11
index 03386b10429b..a07956e55c47 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtdeclarative-5.15.11*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtscxml-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=baf1853ae6e9c77a5103860c8de90be0
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.15.10 b/metadata/md5-cache/dev-qt/qtsensors-5.15.10
index 89c0add10a40..f8e1caabac52 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdbus-5.15.10* qml? ( =dev-qt/qtdeclara
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtsensors-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a45a647cd8072864f8915aadd41f58a4
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.15.11 b/metadata/md5-cache/dev-qt/qtsensors-5.15.11
index 038dbeba18d9..b5e213b2c4bc 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtdbus-5.15.11* qml? ( =dev-qt/qtdeclara
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtsensors-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=335fa425c647d7a0d19ef3140726de99
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.15.10 b/metadata/md5-cache/dev-qt/qtserialbus-5.15.10
index 04abccea6fbc..4a157d0734b0 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtnetwork-5.15.10* =dev-qt/qtserialport-
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtserialbus-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=3d2c6d9047b96a29f57dc2b0a59f1b64
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.15.11 b/metadata/md5-cache/dev-qt/qtserialbus-5.15.11
index 1ac405584040..1d095874252e 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtnetwork-5.15.11* =dev-qt/qtserialport-
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtserialbus-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=3d2c6d9047b96a29f57dc2b0a59f1b64
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.10 b/metadata/md5-cache/dev-qt/qtserialport-5.15.10
index c43ef36b6b99..90897a04c497 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* virtual/libudev:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtserialport-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a73dcc531bbd1d6f61429fd8b3737015
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.11 b/metadata/md5-cache/dev-qt/qtserialport-5.15.11
index 88b0298e91a0..b02b54662b8d 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* virtual/libudev:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtserialport-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=30b1bd81318884ff99ab6ebc33964c34
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.10 b/metadata/md5-cache/dev-qt/qtspeech-5.15.10
index ea575b1e1fb1..5083a37ba8bd 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.15.10
@@ -12,5 +12,5 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.10* flit
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtspeech-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtspeech-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a2dc98eb7c0835c71f16acfb7347e941
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.11 b/metadata/md5-cache/dev-qt/qtspeech-5.15.11
index ed5be7e0a203..9dfa219764e1 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.15.11
@@ -12,5 +12,5 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.11* flit
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtspeech-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtspeech-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=087aac1d05feb20413bc0ae9301decbf
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.10 b/metadata/md5-cache/dev-qt/qtsql-5.15.10
index 340ccef568ef..b226bf2d9df0 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.10
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.15.10
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=db60a2578343b23f551598b6709ba469
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.11 b/metadata/md5-cache/dev-qt/qtsql-5.15.11
index d6ce28f01614..f1c7fd8fbddf 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.15.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtbase-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.11-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=98b047dfc3640fdbbab311e3176996f9
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.10 b/metadata/md5-cache/dev-qt/qtsvg-5.15.10
index 26f52570c695..0f9562dd1653 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10* =dev-qt/qtwidgets-5.15.10
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtsvg-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtsvg-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=5c481e67c749433cedfe05c280a1d1b4
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.11 b/metadata/md5-cache/dev-qt/qtsvg-5.15.11
index 00b544d79b60..5af35667875a 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtgui-5.15.11* =dev-qt/qtwidgets-5.15.11
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtsvg-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtsvg-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=25290ed7a5b8c3897aae1f0aa27082e8
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.10 b/metadata/md5-cache/dev-qt/qttest-5.15.10
index 4e1cc32a9e1a..1bb566f2649b 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.15.10
+++ b/metadata/md5-cache/dev-qt/qttest-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5=
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=973370e0ab430b748b93a6b49fc07264
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.11 b/metadata/md5-cache/dev-qt/qttest-5.15.11
index d2cd253c7c23..165c1ddca068 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.15.11
+++ b/metadata/md5-cache/dev-qt/qttest-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5=
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtbase-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.11-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=33997db537d70022334652757a336712
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.10 b/metadata/md5-cache/dev-qt/qttranslations-5.15.10
index 1025946662aa..f5580e5bc671 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.10
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.15.10
@@ -11,5 +11,5 @@ LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qttranslations-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=8828e3df3c3e1dc5f1d130b9bcae1e2b
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.11 b/metadata/md5-cache/dev-qt/qttranslations-5.15.11
index ac9f0fbafc82..bf5c3f19a336 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.11
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.15.11
@@ -11,5 +11,5 @@ LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttranslations-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=67497341c3a6007941c424a5042e96c0
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.10 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.10
index 55242a9d5d95..98447e61af05 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.1
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtvirtualkeyboard-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a5d9c4b0a73fcbdbb82c369b7c9cfc9a
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.11 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.11
index 7cbefb888802..6daccbad2527 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtdeclarative-5.15.11* =dev-qt/qtgui-5.1
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtvirtualkeyboard-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=6650804b3bc0cb0b3cdc15fa4234f516
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r5 b/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r5
index 9869fca7f3ac..4bacc5be36df 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r5
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r5
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.10*:5= =dev-qt/qtdeclarative-5.15.1
 RESTRICT=test
 SLOT=5/5.15.10
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwayland-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.10-gentoo-kde-3.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=3201e10ad43c4f6458edc5fcf6cee976
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r6 b/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r6
index 995402c1ba46..caa88db72518 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r6
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r6
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.10*:5= =dev-qt/qtdeclarative-5.15.1
 RESTRICT=test
 SLOT=5/5.15.10
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwayland-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.10-gentoo-kde-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=58c3757be842738807688f61e0823a47
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.11 b/metadata/md5-cache/dev-qt/qtwayland-5.15.11
index b713272c43f0..18bc7ee56700 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.11
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.11*:5= =dev-qt/qtgui-5.15.11*:5=[eg
 RESTRICT=test
 SLOT=5/5.15.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtwayland-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=f9a4c1522dc1bb044fcdb2fd2b047ebf
diff --git a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.10 b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.10
index 41f865b4f6bd..d925db9dd539 100644
--- a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5= !<dev-qt/qtwayland-5.15.3:5
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwayland-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=e106c5d257a7ab2d592d548fe2d03ad6
diff --git a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.11 b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.11
index 1522523c3986..f7f394c2a47a 100644
--- a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5= !<dev-qt/qtwayland-5.15.3:5
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtwayland-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=bec03d88137ad4526df2dff4e7f8aa6a
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.10 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.10
index b45dba803387..bf9fc0ee8665 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* qml? ( =dev-qt/qtdeclarative-5.15.10* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwebchannel-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebchannel-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=7f4192d6370abf7e24f6a0e98c01c916
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.11 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.11
index a756124bb875..b5021aa8b8a5 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* qml? ( =dev-qt/qtdeclarative-5.15.11* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtwebchannel-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebchannel-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=0d1f69d6336ee2584f048d11b4344496
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230623 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230623
index ffcf31f5204b..c5e3b531fa17 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230623
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230623
@@ -13,5 +13,5 @@ REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.10_p20230623.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.8_p20230313-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=308c460c68e00bff99e8433642bb6d6b
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230815 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230815
index cb08806d81b1..ad2ebba4c06d 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230815
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.10_p20230815
@@ -13,5 +13,5 @@ REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.10_p20230815.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.10_p20230815-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=e6f7209e4953da96a9ba06093693e0f2
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.11_p20230927 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.11_p20230927
index b8c1b26ddd9a..432ec412148c 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.11_p20230927
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.11_p20230927
@@ -13,5 +13,5 @@ REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.11_p20230927.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.10_p20230815-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=a7a1c66e8b693db9a4fd53d032b792b4
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.10 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.10
index 93ce904cb2b1..ef09a6bd9171 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtnetwork-5.15.10*[ssl=] qml? ( =dev-qt/
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwebsockets-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebsockets-5.15.10-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=fff8ee3ba86f6940fcd8930a3f0ef5a4
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.11 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.11
index c6eb237d985a..d683cf782335 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtnetwork-5.15.11*[ssl=] qml? ( =dev-qt/
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtwebsockets-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebsockets-5.15.11-gentoo-kde-1.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=196474422fcb4b6f77d9aa07c4f32541
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.15.10 b/metadata/md5-cache/dev-qt/qtwebview-5.15.10
index d5e2d92da7b5..9ac2410568f1 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtdeclarative-5.15.10* =dev-qt/qtgui-5.1
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwebview-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=697a2d24a8b7a27212c32c795c97f6c6
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.15.11 b/metadata/md5-cache/dev-qt/qtwebview-5.15.11
index f506271dfa26..6b662b06bf38 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtdeclarative-5.15.11* =dev-qt/qtgui-5.1
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtwebview-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=fe2de0641f096b7243b3a935d65e1991
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.10-r3 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.10-r3
index ade45dc5b640..4c590737eff8 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.10-r3
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.10-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=gtk? ( dbus )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=ae3cf06c089baeefc2807edcf7d03e3f
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.11 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.11
index 9fc830a3b5cc..3ba84d48fc32 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.11
@@ -13,5 +13,5 @@ REQUIRED_USE=gtk? ( dbus )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtbase-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.11-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=d742ee379f79ad2497e479f931acc3e5
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.10 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.10
index c63d6f91ee55..9ca14acba666 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtgui-5.15.10*[X]
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtx11extras-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=13f708fa0fac97b6ee11db2403c6f907
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.11 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.11
index dc1510af8418..2cc2ed883d3f 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtgui-5.15.11*[X]
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtx11extras-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=f8cec7bd99d1ee62de62605a3795ffb3
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.10-r1 b/metadata/md5-cache/dev-qt/qtxml-5.15.10-r1
index 6252497a8ff8..d888222a90cf 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.10-r1
+++ b/metadata/md5-cache/dev-qt/qtxml-5.15.10-r1
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtbase-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.10-gentoo-kde-3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=e284ddfd21e83bbed46cdcf171bcc682
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.11 b/metadata/md5-cache/dev-qt/qtxml-5.15.11
index 884b646cc876..79ad28125ea2 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtxml-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtbase-everywhere-opensource-src-5.15.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.11-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=7662d102d163b38f29d83604e7ac3ae5
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.10 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.10
index 7e943001e462..4a096f223863 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.10
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.10
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.10* =dev-qt/qtnetwork-5.15.10* qml? ( =dev-qt/qtdecl
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtxmlpatterns-everywhere-opensource-src-5.15.10.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=cf709308ab1f9c28ea0abc8a55e02aa1
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.11 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.11
index e5afdf3005e6..21e804d15d5e 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.11
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.11
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.11* =dev-qt/qtnetwork-5.15.11* qml? ( =dev-qt/qtdecl
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtxmlpatterns-everywhere-opensource-src-5.15.11.tar.xz
-_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	f0728f5ce3a6057f30c499160295064d	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	a01643fc12f8b46d8652c5e5c13191ee	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=1fb9ef71166de47d7347d15a43ae11f9
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 562339f21ad8..aabc1f26a178 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/rjb-1.6.7 b/metadata/md5-cache/dev-ruby/rjb-1.6.7
index 575c28190c56..f8453c730863 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.6.7
+++ b/metadata/md5-cache/dev-ruby/rjb-1.6.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rjb-1.6.7.gem
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=2d44a4f53fd2637f052dc94390336a0f
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.6.8 b/metadata/md5-cache/dev-ruby/rjb-1.6.8
index 349fd5fa1619..c7cab27fa5f3 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.6.8
+++ b/metadata/md5-cache/dev-ruby/rjb-1.6.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rjb-1.6.8.gem
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=a7e28eb305d0bdbeb4937ca2bb17b39c
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 57543233f760..a952338f10d2 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 b40f284ebb63..032486caf1a2 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=mirror://sourceforge/jscheme/jscheme-7.2.tgz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=e1016199803bc0a2bc04b2b313f2d9f8
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 3639334cb323..eda701430aba 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	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=4313e982102569186ae2415a188f9400
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index c4192f93e925..20a4e9369985 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.1l-r1 b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
index 9d76cd615634..4bf86b4f5bf2 100644
--- a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
+++ b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/perl-Getopt-Long dev-perl/File-Which >=virtual/jre-1.6 virtual/latex-base >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/pdfannotextractor-0.1l.zip
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	latex-package	c20e442c3953c765f636630631c96194	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	latex-package	c20e442c3953c765f636630631c96194	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=152f7c636e29cdec3c34bc7717f26d94
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
index d05d442e78e0..35d4303c5f53 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
@@ -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_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	latex-package	c20e442c3953c765f636630631c96194	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	latex-package	c20e442c3953c765f636630631c96194	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=9b809c41b99d61a427a7e00e382b8e2a
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 923139be0cdf..d02fe195ce1e 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	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	latex-package	c20e442c3953c765f636630631c96194	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	latex-package	c20e442c3953c765f636630631c96194	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=99f9f57485204a0ce5d0dc901e3e910e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 9ec3c3977c62..c873220298e8 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/argouml-0.34-r1 b/metadata/md5-cache/dev-util/argouml-0.34-r1
index 73b574a1ccf8..52a7adbb7aff 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	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 3cd0eac35c1b..fdf021ec58b8 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=mirror://sourceforge/astyle/astyle_3.1_linux.tar.gz
-_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=366e1a6b4349f5ecc9d9c4571441e106
diff --git a/metadata/md5-cache/dev-util/astyle-3.4.8 b/metadata/md5-cache/dev-util/astyle-3.4.8
index 3e8c076cd017..8d5a700ec02d 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=mirror://sourceforge/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	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=7c9453a94d1038f73b80802443c32509
diff --git a/metadata/md5-cache/dev-util/bazel-3.7.2-r1 b/metadata/md5-cache/dev-util/bazel-3.7.2-r1
index 8fc4026aeaf7..a2e4ec8c9ae9 100644
--- a/metadata/md5-cache/dev-util/bazel-3.7.2-r1
+++ b/metadata/md5-cache/dev-util/bazel-3.7.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/3.7.2/bazel-3.7.2-dist.zip
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=fa0c526b002ea22026c7874fc206cdf6
diff --git a/metadata/md5-cache/dev-util/bazel-4.2.2 b/metadata/md5-cache/dev-util/bazel-4.2.2
index bc5bddbb9601..141daa5e6f25 100644
--- a/metadata/md5-cache/dev-util/bazel-4.2.2
+++ b/metadata/md5-cache/dev-util/bazel-4.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/4.2.2/bazel-4.2.2-dist.zip
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	bazel	22b5540775bbabfc727e2d18c5d01dad	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	bazel	22b5540775bbabfc727e2d18c5d01dad	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=ea7ba83cf2a85fd50eca7b4d00ef0005
diff --git a/metadata/md5-cache/dev-util/bazel-5.0.0 b/metadata/md5-cache/dev-util/bazel-5.0.0
index 25c3437a525c..b7291aa39fdf 100644
--- a/metadata/md5-cache/dev-util/bazel-5.0.0
+++ b/metadata/md5-cache/dev-util/bazel-5.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/5.0.0/bazel-5.0.0-dist.zip
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	bazel	22b5540775bbabfc727e2d18c5d01dad	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	bazel	22b5540775bbabfc727e2d18c5d01dad	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=dc35c63d44ce488133fed43664393657
diff --git a/metadata/md5-cache/dev-util/bazel-5.1.1 b/metadata/md5-cache/dev-util/bazel-5.1.1
index b8821c6ce638..6282883ec918 100644
--- a/metadata/md5-cache/dev-util/bazel-5.1.1
+++ b/metadata/md5-cache/dev-util/bazel-5.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/5.1.1/bazel-5.1.1-dist.zip
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	bazel	22b5540775bbabfc727e2d18c5d01dad	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	bazel	22b5540775bbabfc727e2d18c5d01dad	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=eef296857d16dc0c1c4e4e578956a376
diff --git a/metadata/md5-cache/dev-util/bazel-5.3.0 b/metadata/md5-cache/dev-util/bazel-5.3.0
index fdc06f3ff854..ea1364f6d170 100644
--- a/metadata/md5-cache/dev-util/bazel-5.3.0
+++ b/metadata/md5-cache/dev-util/bazel-5.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/5.3.0/bazel-5.3.0-dist.zip
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	bazel	22b5540775bbabfc727e2d18c5d01dad	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	bazel	22b5540775bbabfc727e2d18c5d01dad	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=eef296857d16dc0c1c4e4e578956a376
diff --git a/metadata/md5-cache/dev-util/bazel-6.2.0 b/metadata/md5-cache/dev-util/bazel-6.2.0
index 79d86e9f0eaa..61ce1bbe567b 100644
--- a/metadata/md5-cache/dev-util/bazel-6.2.0
+++ b/metadata/md5-cache/dev-util/bazel-6.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/6.2.0/bazel-6.2.0-dist.zip
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	bazel	22b5540775bbabfc727e2d18c5d01dad	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	bazel	22b5540775bbabfc727e2d18c5d01dad	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=eef296857d16dc0c1c4e4e578956a376
diff --git a/metadata/md5-cache/dev-util/oprofile-1.4.0 b/metadata/md5-cache/dev-util/oprofile-1.4.0
index 4502c5e6852f..f38bc855093a 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=mirror://sourceforge/oprofile/oprofile-1.4.0.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=8dc40639c55ef6254bfbcccd8dd12519
diff --git a/metadata/md5-cache/dev-util/visualvm-2.1.6 b/metadata/md5-cache/dev-util/visualvm-2.1.6
index e783cae9d296..0ffb7cb3b991 100644
--- a/metadata/md5-cache/dev-util/visualvm-2.1.6
+++ b/metadata/md5-cache/dev-util/visualvm-2.1.6
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=dev-java/lz4-java:0 dev-java/asm:9 dev-java/hamcrest-core:1.3 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.6.tar.gz -> visualvm-2.1.6.tar.gz https://github.com/oracle/visualvm/releases/download/2.1.5/nb140_platform_20220908.zip https://repo1.maven.org/maven2/org/openjdk/jmc/flightrecorder/8.3.0/flightrecorder-8.3.0.jar https://repo1.maven.org/maven2/org/openjdk/jmc/common/8.3.0/common-8.3.0.jar https://repo1.maven.org/maven2/org/owasp/encoder/encoder/1.2.3/encoder-1.2.3.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=f4cee6a376b3c926855a0933cd1f9779
diff --git a/metadata/md5-cache/dev-util/visualvm-2.1.7 b/metadata/md5-cache/dev-util/visualvm-2.1.7
index 6a5c7b5aab48..084b97a79fc6 100644
--- a/metadata/md5-cache/dev-util/visualvm-2.1.7
+++ b/metadata/md5-cache/dev-util/visualvm-2.1.7
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=dev-java/lz4-java:0 dev-java/asm:9 dev-java/hamcrest-core:1.3 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.7.tar.gz -> visualvm-2.1.7.tar.gz https://github.com/oracle/visualvm/releases/download/2.1.7/nb140_platform_20230511.zip https://repo1.maven.org/maven2/org/openjdk/jmc/flightrecorder/8.3.0/flightrecorder-8.3.0.jar https://repo1.maven.org/maven2/org/openjdk/jmc/common/8.3.0/common-8.3.0.jar https://repo1.maven.org/maven2/org/owasp/encoder/encoder/1.2.3/encoder-1.2.3.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=49d01847f8e5eb70b5391f6e1dda2554
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 4bb5ba21050b..d81b5267e568 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=mirror://sourceforge/project/weka/weka-3-8/3.8.0/weka-3-8-0.zip
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=3d41a7ab2a5da973505fa5cbf7750b2b
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.1 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.1
new file mode 100644
index 000000000000..7f13df579386
--- /dev/null
+++ b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.1
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=-
+DEPEND=>=dev-libs/glib-2.66.0
+DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-dev-tools/start https://gitlab.xfce.org/xfce/xfce4-dev-tools/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.66.0
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.18/xfce4-dev-tools-4.18.1.tar.bz2
+_md5_=3d23578d63d979d5682bfa138af046aa
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 8e0322d6e121..f1bab379dbac 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 f5f4cd616d94..ce8d682fbc42 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 f395cbd440ab..b4024ba93d05 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	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	depend.apache	1d51223a0def226481583990f380519c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4e37e1004a0a27e41bb7025c0b974676	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	depend.apache	1d51223a0def226481583990f380519c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4e37e1004a0a27e41bb7025c0b974676	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	6c200c98361f47219e106ddc67c43a1e	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0aabefd3ee90e7e562481cb5b6402236
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 49f472ec79fd..2d6d65cb2c15 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-7.1 b/metadata/md5-cache/games-action/prismlauncher-7.1
index 5fdf6b6ad39c..bcb1934928ea 100644
--- a/metadata/md5-cache/games-action/prismlauncher-7.1
+++ b/metadata/md5-cache/games-action/prismlauncher-7.1
@@ -14,5 +14,5 @@ REQUIRED_USE=lto? ( !debug )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PrismLauncher/PrismLauncher/releases/download/7.1/PrismLauncher-7.1.tar.gz -> prismlauncher-7.1.tar.gz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=621f5fee356d3154ad2347a298e7e2d5
diff --git a/metadata/md5-cache/games-action/prismlauncher-7.2 b/metadata/md5-cache/games-action/prismlauncher-7.2
index 8f8a463bc40f..0517e523d4e9 100644
--- a/metadata/md5-cache/games-action/prismlauncher-7.2
+++ b/metadata/md5-cache/games-action/prismlauncher-7.2
@@ -14,5 +14,5 @@ REQUIRED_USE=lto? ( !debug )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PrismLauncher/PrismLauncher/releases/download/7.2/PrismLauncher-7.2.tar.gz -> prismlauncher-7.2.tar.gz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=686c73d6272f296f23256893f144fc8b
diff --git a/metadata/md5-cache/games-action/prismlauncher-9999 b/metadata/md5-cache/games-action/prismlauncher-9999
index 65ef905dbe1a..e6e03b8641e2 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	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=686c73d6272f296f23256893f144fc8b
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 13dddac4eeec..b24837514ed1 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-r2 b/metadata/md5-cache/games-board/domination-1.1.1.6-r2
index ddd4df9cea35..e5c1ab57f886 100644
--- a/metadata/md5-cache/games-board/domination-1.1.1.6-r2
+++ b/metadata/md5-cache/games-board/domination-1.1.1.6-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/domination/Domination_1.1.1.6.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=d84508fc64a1a47ce9ff0ac39786c4a8
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 33ecff0a80f0..aecc324e4b51 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=mirror://sourceforge/megamek/MegaMek-v0.34.10.zip https://dev.gentoo.org/~ionen/distfiles/megamek.png
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=baedb860857a3f2f1daa361df011c088
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index e64bd506c692..900b0bc8f00c 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-r3 b/metadata/md5-cache/games-puzzle/pauker-1.8-r3
index 1c0afdd87d89..5bfef24aae43 100644
--- a/metadata/md5-cache/games-puzzle/pauker-1.8-r3
+++ b/metadata/md5-cache/games-puzzle/pauker-1.8-r3
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/browserlauncher2:1.0 dev-java/javahelp 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=mirror://sourceforge/project/pauker/pauker/1.8/pauker-1.8.src.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=e76e5c6be2ea18d33ef92fcb54017b48
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index f1a75f583aa5..a44076d25f47 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.20.2 b/metadata/md5-cache/games-server/minecraft-server-1.20.2
index e420bdcb9218..5bc627593f35 100644
--- a/metadata/md5-cache/games-server/minecraft-server-1.20.2
+++ b/metadata/md5-cache/games-server/minecraft-server-1.20.2
@@ -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://launcher.mojang.com/v1/objects/5b868151bd02b41319f54c8d4061b8cae84e665c/server.jar -> minecraft-server-1.20.2.jar
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=4350d73f6322d6e71d1782796b7e9747
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index b133b6540308..baaab0861a4c 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 b529e0d6731d..240afc7972f6 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=mirror://sourceforge/project/freecol/freecol/freecol-1.0.0/freecol-1.0.0-src.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=b921ea9761830d6a4eb9b66516abad08
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 12873719663d..3383aa9a1a41 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 11cf1dc53fac..2a295259ac87 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	6ae9a4347149b19a112caa1182d03bde	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vala	db97951caa799e73a831a5f48e717da8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vala	db97951caa799e73a831a5f48e717da8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b8162c038b70c337831ab363dcb985be
diff --git a/metadata/md5-cache/gnustep-libs/Manifest.gz b/metadata/md5-cache/gnustep-libs/Manifest.gz
index eae5d55167e0..0293aaea193e 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 e7d814d977a1..b9d5a6034ac3 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	e5cc383ea8420f92fe3737be790021dc	gnustep-2	191cacca9e01ae0fe9b898b09e4555b8	gnustep-base	923cb81765be4cd65f6419d3f9019af5	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnustep-2	191cacca9e01ae0fe9b898b09e4555b8	gnustep-base	923cb81765be4cd65f6419d3f9019af5	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=c7783cf31ebfdff32bd1b5038e520cad
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index dc51c7f36764..239164770dfa 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/foot-1.16.2 b/metadata/md5-cache/gui-apps/foot-1.16.2
new file mode 100644
index 000000000000..24ad4ceef12a
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/foot-1.16.2
@@ -0,0 +1,17 @@
+BDEPEND=app-text/scdoc dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/wayland media-libs/fcft media-libs/fontconfig x11-libs/libxkbcommon x11-libs/pixman grapheme-clustering? ( dev-libs/libutf8proc:= media-libs/fcft[harfbuzz] ) >=dev-libs/tllist-1.1.0 >=dev-libs/wayland-protocols-1.32
+DESCRIPTION=Fast, lightweight and minimalistic Wayland terminal emulator
+EAPI=8
+HOMEPAGE=https://codeberg.org/dnkl/foot
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=meson xdg systemd
+IUSE=+grapheme-clustering test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=dev-libs/wayland media-libs/fcft media-libs/fontconfig x11-libs/libxkbcommon x11-libs/pixman grapheme-clustering? ( dev-libs/libutf8proc:= media-libs/fcft[harfbuzz] ) || ( >=sys-libs/ncurses-6.3[-minimal] ~gui-apps/foot-terminfo-1.16.2 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://codeberg.org/dnkl/foot/archive/1.16.2.tar.gz -> foot-1.16.2.tar.gz
+_eclasses_=meson	af1ca7ad21fdd31fcc4fa91d8abca977	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-utils-r1	12aa0037eb004139215ff04894d52b28	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=00722509e7515585213ea4c1815ba84f
diff --git a/metadata/md5-cache/gui-apps/foot-terminfo-1.16.2 b/metadata/md5-cache/gui-apps/foot-terminfo-1.16.2
new file mode 100644
index 000000000000..da7c63cda4b4
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/foot-terminfo-1.16.2
@@ -0,0 +1,11 @@
+BDEPEND=sys-libs/ncurses
+DEFINED_PHASES=install prepare
+DESCRIPTION=Terminfo for foot, a fast, lightweight and minimal Wayland terminal emulator
+EAPI=8
+HOMEPAGE=https://codeberg.org/dnkl/foot
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=!>=sys-libs/ncurses-6.3[-minimal]
+SLOT=0
+SRC_URI=https://codeberg.org/dnkl/foot/archive/1.16.2.tar.gz -> foot-1.16.2.tar.gz
+_md5_=39aaa51197561c17ff34a5d30d84be02
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 04db0c7ad8a3..7d25d184a72f 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 4905f47e7cc1..a4bf23397af7 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=e1f14379f539bdce576df2eea46edff2
diff --git a/metadata/md5-cache/media-gfx/plantuml-1.2022.7 b/metadata/md5-cache/media-gfx/plantuml-1.2022.7
index fe5599717ca0..08c43bbce481 100644
--- a/metadata/md5-cache/media-gfx/plantuml-1.2022.7
+++ b/metadata/md5-cache/media-gfx/plantuml-1.2022.7
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 media-gfx/graphviz >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/plantuml/plantuml-1.2022.7.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=889b865375f9d3d98eb399403630c9d5
diff --git a/metadata/md5-cache/media-gfx/zbar-0.23.92 b/metadata/md5-cache/media-gfx/zbar-0.23.92
index 0541a6945c50..04ee4b336975 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	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=6d86d4d6929a5659e777d61adc45f4d7
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 329558af257a..33163b8718a0 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.3 b/metadata/md5-cache/media-libs/libbluray-1.3.3
index 2001f9823502..225fee1583c2 100644
--- a/metadata/md5-cache/media-libs/libbluray-1.3.3
+++ b/metadata/md5-cache/media-libs/libbluray-1.3.3
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libudfread[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(-)?] ) java? ( >=virtual/jre-1.8:* ) 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? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/2
 SRC_URI=https://downloads.videolan.org/pub/videolan/libbluray/1.3.3/libbluray-1.3.3.tar.bz2
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=a749c58193d025398805a94a036895b7
diff --git a/metadata/md5-cache/media-libs/libbluray-1.3.4 b/metadata/md5-cache/media-libs/libbluray-1.3.4
index 149dbaee4e71..a540bb8eb51f 100644
--- a/metadata/md5-cache/media-libs/libbluray-1.3.4
+++ b/metadata/md5-cache/media-libs/libbluray-1.3.4
@@ -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(-)?] ) java? ( >=virtual/jre-1.8:* ) 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? ( >=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	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=f0397e7dd75cf16f99cbcd186a028be5
diff --git a/metadata/md5-cache/media-libs/libbluray-9999 b/metadata/md5-cache/media-libs/libbluray-9999
index 42be64d3e988..3b0e565a6fae 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(-)?] ) java? ( >=virtual/jre-1.8:* ) 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? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/2
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=3bad1f6d594edd3f2cbb403c35db4478
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.3 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.3
index 70d7d33d8566..98366a0c1ae1 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.3
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.3
@@ -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=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.1.3.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=20bf005cdd26c043bc0f5ad93f062793
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.4 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.4
index f5fcf97125e7..cda1f87556b9 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.4
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.4
@@ -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=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.1.4.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d9a8d06bdcab51390c2f5b7dc540b016
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 fda937ed4867..a5e8cf968898 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=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.1.5.1.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d3650c5f63e9b3d84bf05daa065d2731
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 867be1b7e721..c6cdcc1a3832 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=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-3.0.0.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9b5832dccffc70fa9a1d250cb848c295
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.20-r3 b/metadata/md5-cache/media-libs/libpano13-2.9.20-r3
index 7380968f8c43..5981cdf60e2c 100644
--- a/metadata/md5-cache/media-libs/libpano13-2.9.20-r3
+++ b/metadata/md5-cache/media-libs/libpano13-2.9.20-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:= media-libs/tiff:= media-libs/libjpeg-turbo:= sys-libs/zlib java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/panotools/libpano13-2.9.20.tar.gz
-_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=99cc2dd5151673a2ac7549409c84eaeb
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.22 b/metadata/md5-cache/media-libs/libpano13-2.9.22
index 09f2a5a655b0..0d885b34fac2 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=mirror://sourceforge/panotools/libpano13-2.9.22.tar.gz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=db709d7852a06d6e5fd159404c5ed2ae
diff --git a/metadata/md5-cache/media-libs/opencv-4.6.0-r4 b/metadata/md5-cache/media-libs/opencv-4.6.0-r4
index 4c6fa471866d..68f03a2e1ac9 100644
--- a/metadata/md5-cache/media-libs/opencv-4.6.0-r4
+++ b/metadata/md5-cache/media-libs/opencv-4.6.0-r4
@@ -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 ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
 SLOT=0/4.6.0
 SRC_URI=https://github.com/opencv/opencv/archive/4.6.0.tar.gz -> opencv-4.6.0.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.6.0.tar.gz -> opencv-4.6.0_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6f22b0ea3473060f4bdbf7205cc3589b
diff --git a/metadata/md5-cache/media-libs/opencv-4.7.0 b/metadata/md5-cache/media-libs/opencv-4.7.0
index 2f259e47a290..4dbdee3160fb 100644
--- a/metadata/md5-cache/media-libs/opencv-4.7.0
+++ b/metadata/md5-cache/media-libs/opencv-4.7.0
@@ -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 ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
 SLOT=0/4.7.0
 SRC_URI=https://github.com/opencv/opencv/archive/4.7.0.tar.gz -> opencv-4.7.0.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.7.0.tar.gz -> opencv-4.7.0_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=864db4d1ace44a48dbb5ba32831b9cec
diff --git a/metadata/md5-cache/media-libs/opencv-4.7.0-r1 b/metadata/md5-cache/media-libs/opencv-4.7.0-r1
index bda0d016a34f..4266c206bc15 100644
--- a/metadata/md5-cache/media-libs/opencv-4.7.0-r1
+++ b/metadata/md5-cache/media-libs/opencv-4.7.0-r1
@@ -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 ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
 SLOT=0/4.7.0
 SRC_URI=https://github.com/opencv/opencv/archive/4.7.0.tar.gz -> opencv-4.7.0.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.7.0.tar.gz -> opencv-4.7.0_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4f709bcea0e9eaf2689e7464702c21ed
diff --git a/metadata/md5-cache/media-libs/opencv-4.8.0 b/metadata/md5-cache/media-libs/opencv-4.8.0
index 24057373c4dc..57ec38119d6c 100644
--- a/metadata/md5-cache/media-libs/opencv-4.8.0
+++ b/metadata/md5-cache/media-libs/opencv-4.8.0
@@ -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 ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
 SLOT=0/4.8.0
 SRC_URI=https://github.com/opencv/opencv/archive/4.8.0.tar.gz -> opencv-4.8.0.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.8.0.tar.gz -> opencv-4.8.0_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4072f4fa34685d7f0dfe5b62884edfc8
diff --git a/metadata/md5-cache/media-libs/opencv-4.8.0-r1 b/metadata/md5-cache/media-libs/opencv-4.8.0-r1
index 6f427f7eb46c..549f8a399461 100644
--- a/metadata/md5-cache/media-libs/opencv-4.8.0-r1
+++ b/metadata/md5-cache/media-libs/opencv-4.8.0-r1
@@ -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 ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) examples? ( contribdnn ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
 SLOT=0/4.8.0
 SRC_URI=https://github.com/opencv/opencv/archive/4.8.0.tar.gz -> opencv-4.8.0.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.8.0.tar.gz -> opencv-4.8.0_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d63bdeab4379f0756a789449eb736970
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 1a40445f125a..f78d32e9e7e0 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-r3 b/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r3
index f31ef5e57466..d961bc571acd 100644
--- a/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r3
+++ b/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r3
@@ -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=mirror://sourceforge/channeleditor/channeleditor_1.9.2.1_src.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c318b439e1d65bd91e847a9cb86384af
diff --git a/metadata/md5-cache/media-tv/mythtv-33.1 b/metadata/md5-cache/media-tv/mythtv-33.1
index c5ae2a46ec94..459eeae1c7f2 100644
--- a/metadata/md5-cache/media-tv/mythtv-33.1
+++ b/metadata/md5-cache/media-tv/mythtv-33.1
@@ -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	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
 _md5_=b5bd4a50d033ab842ffc1e335bf8a6c7
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index ca71b878c3f4..19714651c1c8 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 d6a7938dda30..3f9301ea8746 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=5cb9022cc8d5d5de339b800f73b2861e
diff --git a/metadata/md5-cache/media-video/jubler-5.1 b/metadata/md5-cache/media-video/jubler-5.1
index 8e1e70d8b692..c0eeab590217 100644
--- a/metadata/md5-cache/media-video/jubler-5.1
+++ b/metadata/md5-cache/media-video/jubler-5.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=mplayer? ( media-video/mplayer[libass] ) spell? ( app-text/aspell ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jubler/Jubler-source-5.1.tar.bz2 -> jubler-5.1.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6c0167950f7c269c2550b1be255e2c50
diff --git a/metadata/md5-cache/media-video/jubler-7.0.3 b/metadata/md5-cache/media-video/jubler-7.0.3
index 279f69439fae..3a4603303c62 100644
--- a/metadata/md5-cache/media-video/jubler-7.0.3
+++ b/metadata/md5-cache/media-video/jubler-7.0.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/appenh:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/teras/Jubler/archive/v7.0.3.tar.gz -> jubler-7.0.3.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=742b91a930d879937a446c716417f88f
diff --git a/metadata/md5-cache/media-video/projectx-0.91.0.10-r4 b/metadata/md5-cache/media-video/projectx-0.91.0.10-r4
index 7834626c0449..355b209fd5d1 100644
--- a/metadata/md5-cache/media-video/projectx-0.91.0.10-r4
+++ b/metadata/md5-cache/media-video/projectx-0.91.0.10-r4
@@ -10,5 +10,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	edos2unix	33e347e171066657f91f8b0c72ec8773	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c4de92501c96e645502be8a11cb06bdf
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 6674b5ad01bb..41aa722b085d 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/munin-2.0.69-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.69-r1
index 0d0e95a59491..5661d344d798 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.69-r1
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.69-r1
@@ -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.69.tar.gz -> munin-2.0.69.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.69-gentoo-1.tar.xz https://github.com/munin-monitoring/munin/commit/47a2ea75899a6395a80918d043a21d61fe712b44.patch -> munin-remove-Date-Manip-DM5.patch
-_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=5f4c6674d62fc6562869ec3a0ef62349
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 f96187331708..a0f300d63048 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	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=32ca2a786e5909b77d42b34af2eff0ee
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.74 b/metadata/md5-cache/net-analyzer/munin-2.0.74
index 07f223283378..39c999441e94 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.74
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.74
@@ -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.74.tar.gz -> munin-2.0.74.tar.gz
-_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=812f7fba095db009accccb89af57b9d7
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.47 b/metadata/md5-cache/net-analyzer/zabbix-4.0.47
index b097d286dba0..7b697187ae24 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.47
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.47
@@ -12,5 +12,5 @@ RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual
 REQUIRED_USE=|| ( agent frontend proxy server ) ?? ( gnutls mbedtls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 SLOT=0/4.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.47.tar.gz
-_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=28214dcd8be3bd2dca1e4c3a87ae2772
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.48 b/metadata/md5-cache/net-analyzer/zabbix-4.0.48
index cc82b33dec12..982ff523df43 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.48
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.48
@@ -12,5 +12,5 @@ RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual
 REQUIRED_USE=|| ( agent frontend proxy server ) ?? ( gnutls mbedtls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 SLOT=0/4.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.48.tar.gz
-_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=bd5e8961f5a2f785605f9b64d97173bb
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.49 b/metadata/md5-cache/net-analyzer/zabbix-4.0.49
index b30b40e8a02c..d32018592c4a 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.49
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.49
@@ -12,5 +12,5 @@ RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual
 REQUIRED_USE=|| ( agent frontend proxy server ) ?? ( gnutls mbedtls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 SLOT=0/4.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.49.tar.gz
-_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=dc18229cdca9d1312377797840ac7a1d
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.36 b/metadata/md5-cache/net-analyzer/zabbix-5.0.36
index 7f7908b5636b..89dee6b30a39 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.36
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.36
@@ -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.36.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.36-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=d07ac0c6fbaf89b891f32958c774de01
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.37 b/metadata/md5-cache/net-analyzer/zabbix-5.0.37
index 0dc8445d2e16..c294a47eb87c 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.37
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.37
@@ -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.37.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.37-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=3c32c4e8c13b392f4f5cd6ae38c0adf5
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.38 b/metadata/md5-cache/net-analyzer/zabbix-5.0.38
index d30c32bdd636..31729735784c 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.38
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.38
@@ -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.38.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.38-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=01d241bd1124ff9dcc1df50a25ca6d6d
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.19 b/metadata/md5-cache/net-analyzer/zabbix-6.0.19
index 8bf10754ac9c..ce9d20030caf 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.19
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.19
@@ -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.19.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.19-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=a5a345d5a630f70c561d93893630ae99
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.21 b/metadata/md5-cache/net-analyzer/zabbix-6.0.21
index 9dc9c0f20b06..788794ad163b 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.21
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.21
@@ -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.21.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.21-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=fe71cdddcd4f80ecaf0dc8066c9382fb
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.22 b/metadata/md5-cache/net-analyzer/zabbix-6.0.22
index c70c48c71c08..254b63041565 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.22
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.22
@@ -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.22.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.22-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=1a3ee79e9eeb738fea838b47be723c78
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.6 b/metadata/md5-cache/net-analyzer/zabbix-6.4.6
index 968acb1701ff..bc8423ff2929 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.6
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.6
@@ -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.6.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.6-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=5f92020fb3ab13a7758a6ee7fead5d26
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.6-r1 b/metadata/md5-cache/net-analyzer/zabbix-6.4.6-r1
index 3c8894175404..45c68bf5410b 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.6-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.6-r1
@@ -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.6.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.6-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=13612c857c7a8af68605c65c55a0bf02
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.7 b/metadata/md5-cache/net-analyzer/zabbix-6.4.7
index a2d7ea8a3c82..17fcdc448783 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.7
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.7
@@ -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.7.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.7-go-deps.tar.xz )
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=13612c857c7a8af68605c65c55a0bf02
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 5449464c8624..5bceab3a9c81 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 05a63daccdeb..faa8063642d0 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	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=2ffcdbcf6f1cfa8bfe6e98a5edbc346f
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index f8a65d7d3757..48d58417ec36 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/ipmiview-2.21.1.230720 b/metadata/md5-cache/net-misc/ipmiview-2.21.1.230720
index 022297f077a0..2a719acdfae8 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=0d1bb8ab9f22ca158c34cadb25ab3fc3
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 7d95608ce8b8..261e2f297c3d 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	6ae9a4347149b19a112caa1182d03bde	cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bbdc4838cb5a7845830f59b157b847a0
diff --git a/metadata/md5-cache/net-misc/tigervnc-9999 b/metadata/md5-cache/net-misc/tigervnc-9999
index 0e776b0a6f67..2c0ee460ceb5 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.8.tar.xz )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=91d34164005452693df22e1aaefb5b6a
diff --git a/metadata/md5-cache/net-misc/turbovnc-3.0.3 b/metadata/md5-cache/net-misc/turbovnc-3.0.3
index 6630d77280ad..f21948d8592d 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	fc2f89084f590ac95c004ea95b0d2f80	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ad398a82694c83949dbf1b24055057bc
diff --git a/metadata/md5-cache/net-misc/turbovnc-3.0.91 b/metadata/md5-cache/net-misc/turbovnc-3.0.91
index b0332af80c34..bbaaaffb3886 100644
--- a/metadata/md5-cache/net-misc/turbovnc-3.0.91
+++ b/metadata/md5-cache/net-misc/turbovnc-3.0.91
@@ -11,5 +11,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.91%20%283.1%20beta2%29/turbovnc-3.0.91.tar.gz/download -> turbovnc-3.0.91.tar.gz verify-sig? ( https://sourceforge.net/projects/turbovnc/files/3.0.91%20%283.1%20beta2%29/turbovnc-3.0.91.tar.gz.sig/download -> turbovnc-3.0.91.tar.gz.sig )
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=18622bbf89a741e0763d2640cbf4d290
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 274a83b83fe6..2da5c7b6eb1e 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-r1 b/metadata/md5-cache/net-nds/jxplorer-3.3.1.2-r1
index 558d02c9bbaa..ac11440217a9 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.3.1.2-r1
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1.2-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-java/javahelp-2.0.02_p46:0 virtual/jre:1.8 >=dev-java/java-config-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/jxplorer-3.3.1.2-project.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5
 _md5_=2c9a0cda61214cf0f03928d326b33a1d
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 66990433f13c..27c86e7dbff6 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.4.0.0 b/metadata/md5-cache/net-p2p/biglybt-3.4.0.0
index 8eb6d21934c4..f866b1ef4a8d 100644
--- a/metadata/md5-cache/net-p2p/biglybt-3.4.0.0
+++ b/metadata/md5-cache/net-p2p/biglybt-3.4.0.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-cli:1 dev-java/swt:4.27 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/BiglySoftware/BiglyBT/archive/v3.4.0.0.tar.gz -> biglybt-3.4.0.0.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=7e044e08dadbeb3d3032c657bec861cf
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1497 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1497
index 247a2dba16a6..d6980f14afd3 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1497
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1497
@@ -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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=85bf1397222628ab70af82eaeaa983d5
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 0fd49b7020dd..c12d05422431 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 b/metadata/md5-cache/net-vpn/i2p-2.3.0
index ce779c3f0ffa..1338c998ea33 100644
--- a/metadata/md5-cache/net-vpn/i2p-2.3.0
+++ b/metadata/md5-cache/net-vpn/i2p-2.3.0
@@ -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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=a399303d6ae9fd5c273db4eb3e590e48
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index dc07dbbfdded..499b1f989a84 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 4415e7c5cce7..06ef58e20e87 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=32edec977367e908a7d93e10684382a3
diff --git a/metadata/md5-cache/net-wireless/tempestsdr-9999 b/metadata/md5-cache/net-wireless/tempestsdr-9999
index 5856588b09f7..5178ca0a43f8 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	2358a7b20091609e24bd3a83b3ac5991	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=git-r3	2358a7b20091609e24bd3a83b3ac5991	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 e956270ab506..fd5aa43573f0 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=879c0c697495617226af7465e39abc1d
diff --git a/metadata/md5-cache/net-wireless/unifi-7.3.83 b/metadata/md5-cache/net-wireless/unifi-7.3.83
index f76416e6dc86..2b0fb99112b6 100644
--- a/metadata/md5-cache/net-wireless/unifi-7.3.83
+++ b/metadata/md5-cache/net-wireless/unifi-7.3.83
@@ -12,5 +12,5 @@ RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:11 >=dev-jav
 RESTRICT=bindist mirror
 SLOT=0/7.3
 SRC_URI=https://dl.ui.com/unifi/7.3.83/UniFi.unix.zip -> unifi-7.3.83.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=0be34637810faaa79d2262a204fea610
diff --git a/metadata/md5-cache/net-wireless/unifi-7.4.162 b/metadata/md5-cache/net-wireless/unifi-7.4.162
index 676d24f7ee19..1c39e86dceae 100644
--- a/metadata/md5-cache/net-wireless/unifi-7.4.162
+++ b/metadata/md5-cache/net-wireless/unifi-7.4.162
@@ -12,5 +12,5 @@ RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:11 >=dev-jav
 RESTRICT=bindist mirror
 SLOT=0/7.4
 SRC_URI=https://dl.ui.com/unifi/7.4.162-3116043f9f/UniFi.unix.zip -> unifi-7.4.162.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=ebc83ebdadb1827181dbd149bcd07399
diff --git a/metadata/md5-cache/net-wireless/unifi-7.5.176-r1 b/metadata/md5-cache/net-wireless/unifi-7.5.176-r1
index f46effc1b9ac..042756f51704 100644
--- a/metadata/md5-cache/net-wireless/unifi-7.5.176-r1
+++ b/metadata/md5-cache/net-wireless/unifi-7.5.176-r1
@@ -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.176/UniFi.unix.zip -> unifi-7.5.176.zip
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=cde6997cd39723045fed865e8ffb0170
diff --git a/metadata/md5-cache/net-wireless/unifi-7.5.187 b/metadata/md5-cache/net-wireless/unifi-7.5.187
index 81c64d8cb132..148e07c4ac12 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=7f79bba6a08c2494a22c997ee0aec606
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 3dd22624fc84..a3cacff99f53 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 1bcf22f9ad08..ff62f8383b16 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	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=4b33accb8d302102e38ff0419cd528ac
diff --git a/metadata/md5-cache/sci-astronomy/gasgano-2.4.8 b/metadata/md5-cache/sci-astronomy/gasgano-2.4.8-r1
index 2a8877b3fc6a..550f6cbc51ea 100644
--- a/metadata/md5-cache/sci-astronomy/gasgano-2.4.8
+++ b/metadata/md5-cache/sci-astronomy/gasgano-2.4.8-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=ESO astronomical data file organizer
 EAPI=7
-HOMEPAGE=http://www.eso.org/sci/software/gasgano/
+HOMEPAGE=https://www.eso.org/sci/software/gasgano.html
 INHERIT=desktop java-pkg-2
 IUSE=doc
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.8:* dev-java/gnu-regexp dev-java/junit dev-java/jal >=dev-java/java-config-2.2.0-r3
+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? ( http://www.eso.org/sci/software/gasgano/VLT-PRO-ESO-19000-1932-V4.pdf )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
-_md5_=2c58b91f129428b4d9b310e37181df6e
+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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
+_md5_=e6037254ae27c7e2834c48eb66a07401
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index fa6e136a27dc..bbf7b6b0595e 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 8cdc3b821da2..03ae0ad4df31 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	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=b4e132581d5e91612a875f7f94387a1b
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index d10bcca28940..720992c9723a 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/tinker-8.2.1-r1 b/metadata/md5-cache/sci-chemistry/tinker-8.2.1-r1
index e0ed4f87a1ec..7367577c711e 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	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=6d70b9199ffe5bef7b7377329ae8781e
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 5563170e3e7e..1acb663c6a33 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 1d460b5ee8f6..3e4133c77e50 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=0b146561e5485cf4110561a12b73600d
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index d0cb19adc0b3..7d3601c52482 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-r2 b/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
index f3925444f11f..e897397a8836 100644
--- a/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
+++ b/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
@@ -9,5 +9,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.7 >=dev-java/java-config-2.2.0-r3
 SLOT=1
 SRC_URI=mirror://sourceforge/bt747/Stable/BT747_2.1.7_full.zip https://www.bt747.org/icon/bt747_128x128.gif -> bt747.gif
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5b5a21f2085ef0378a0b5edfe5f0f6ca
diff --git a/metadata/md5-cache/sci-geosciences/gpsprune-bin-23.2 b/metadata/md5-cache/sci-geosciences/gpsprune-bin-23.2
index 28427bb20b5b..266f82010971 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=edb789d8776e055aeb55d7cf25920629
diff --git a/metadata/md5-cache/sci-geosciences/josm-bin-18721 b/metadata/md5-cache/sci-geosciences/josm-bin-18721
index 8e36e9c80faa..ec04b2d83074 100644
--- a/metadata/md5-cache/sci-geosciences/josm-bin-18721
+++ b/metadata/md5-cache/sci-geosciences/josm-bin-18721
@@ -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-18721.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	d051ecd608488854eb9252d64d396140	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	30b5d143e64d691346fcdd85eef1c614	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=94140afbe3f7aae95ca34cbbb03fe76a
diff --git a/metadata/md5-cache/sci-geosciences/josm-bin-18746 b/metadata/md5-cache/sci-geosciences/josm-bin-18746
index f4e8460948f3..5d0b983adcca 100644
--- a/metadata/md5-cache/sci-geosciences/josm-bin-18746
+++ b/metadata/md5-cache/sci-geosciences/josm-bin-18746
@@ -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-18746.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	d051ecd608488854eb9252d64d396140	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	30b5d143e64d691346fcdd85eef1c614	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9dfd4caa61f71bd24a95f434358615ae
diff --git a/metadata/md5-cache/sci-geosciences/josm-bin-18772 b/metadata/md5-cache/sci-geosciences/josm-bin-18772
index 139db4171bbc..91b285266aa2 100644
--- a/metadata/md5-cache/sci-geosciences/josm-bin-18772
+++ b/metadata/md5-cache/sci-geosciences/josm-bin-18772
@@ -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-18772.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	d051ecd608488854eb9252d64d396140	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	30b5d143e64d691346fcdd85eef1c614	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=94140afbe3f7aae95ca34cbbb03fe76a
diff --git a/metadata/md5-cache/sci-geosciences/josm-bin-18822 b/metadata/md5-cache/sci-geosciences/josm-bin-18822
index b73fe4ad0db6..bef3d0d3e59c 100644
--- a/metadata/md5-cache/sci-geosciences/josm-bin-18822
+++ b/metadata/md5-cache/sci-geosciences/josm-bin-18822
@@ -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-18822.jar
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	d051ecd608488854eb9252d64d396140	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	30b5d143e64d691346fcdd85eef1c614	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9dfd4caa61f71bd24a95f434358615ae
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 59ceb1c8712a..e2d58709ebe7 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/cdf-3.8.0-r1 b/metadata/md5-cache/sci-libs/cdf-3.8.0-r1
index fb57a86a8c9f..d1d4780a708c 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_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=375d8888131cc79a2b79cb8784b77353
diff --git a/metadata/md5-cache/sci-libs/gdal-3.6.4 b/metadata/md5-cache/sci-libs/gdal-3.6.4
index 4c5b1fecfb90..88b9e63464f1 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.6.4
+++ b/metadata/md5-cache/sci-libs/gdal-3.6.4
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target
 RESTRICT=!test? ( test )
 SLOT=0/32
 SRC_URI=https://download.osgeo.org/gdal/3.6.4/gdal-3.6.4.tar.xz test? ( https://download.osgeo.org/gdal/3.6.4/gdalautotest-3.6.4.tar.gz )
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4d8c050b1cb967a6e3f8eecc06c64c05
diff --git a/metadata/md5-cache/sci-libs/gdal-3.7.0 b/metadata/md5-cache/sci-libs/gdal-3.7.0
index e215ff78f58e..843533b51dc5 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.7.0
+++ b/metadata/md5-cache/sci-libs/gdal-3.7.0
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target
 RESTRICT=!test? ( test )
 SLOT=0/33
 SRC_URI=https://download.osgeo.org/gdal/3.7.0/gdal-3.7.0.tar.xz test? ( https://download.osgeo.org/gdal/3.7.0/gdalautotest-3.7.0.tar.gz )
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=97da4ef3fb9db2790852333ac4ad8219
diff --git a/metadata/md5-cache/sci-libs/gdal-3.7.1 b/metadata/md5-cache/sci-libs/gdal-3.7.1
index 4852c35c945e..6882562edaca 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.7.1
+++ b/metadata/md5-cache/sci-libs/gdal-3.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target
 RESTRICT=!test? ( test )
 SLOT=0/33
 SRC_URI=https://download.osgeo.org/gdal/3.7.1/gdal-3.7.1.tar.xz test? ( https://download.osgeo.org/gdal/3.7.1/gdalautotest-3.7.1.tar.gz )
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d74801c52f46c10511a117d750f7c74e
diff --git a/metadata/md5-cache/sci-libs/gdal-3.7.2 b/metadata/md5-cache/sci-libs/gdal-3.7.2
index d8de42bd8539..825d555c470e 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.7.2
+++ b/metadata/md5-cache/sci-libs/gdal-3.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target
 RESTRICT=!test? ( test )
 SLOT=0/33
 SRC_URI=https://download.osgeo.org/gdal/3.7.2/gdal-3.7.2.tar.xz test? ( https://download.osgeo.org/gdal/3.7.2/gdalautotest-3.7.2.tar.gz )
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d74801c52f46c10511a117d750f7c74e
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 29569b8fa35d..d890fbd276f6 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	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=109a45a638bc573d292a2fe60cbd051a
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 fc0a478ac183..2e5fc543dc9b 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	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6d626dbc198d892acccde61b55ca6c26
diff --git a/metadata/md5-cache/sci-libs/libsigrok-9999 b/metadata/md5-cache/sci-libs/libsigrok-9999
index bdd665c38125..ca24c32f759d 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 ) )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2fa4331be94a804eda627dc4b06e3dd1
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.25-r1 b/metadata/md5-cache/sci-libs/libsvm-3.25-r1
index 9bcd9e3a6663..3c1b9cbb77db 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	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=9eb6a7f984460e6f5773d330b3981b81
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.30 b/metadata/md5-cache/sci-libs/libsvm-3.30
index 7f3916051cf6..95ffb06e4e4c 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	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=d2692abd5227cb76d6492429532da10d
diff --git a/metadata/md5-cache/sci-libs/plplot-5.15.0-r105 b/metadata/md5-cache/sci-libs/plplot-5.15.0-r105
index 98df101e99b2..a3a85fecba61 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.15.0-r105
+++ b/metadata/md5-cache/sci-libs/plplot-5.15.0-r105
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test ) octave? ( test )
 SLOT=0/14
 SRC_URI=mirror://sourceforge/plplot/plplot-5.15.0.tar.gz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8467e9a2b62c750dd6e30392e32fc4c0
diff --git a/metadata/md5-cache/sci-libs/vtk-9.2.5 b/metadata/md5-cache/sci-libs/vtk-9.2.5
index 8b59dda9cb0b..04aa9b006794 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	fc2f89084f590ac95c004ea95b0d2f80	cuda	a7ac8c78a0b64b58207dc6fda3ad9c7d	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	webapp	1aad5c010cfdf11d0376c80467b0de4c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	fc2f89084f590ac95c004ea95b0d2f80	cuda	a7ac8c78a0b64b58207dc6fda3ad9c7d	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	webapp	1aad5c010cfdf11d0376c80467b0de4c	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=68aa889af1b79671f3dd5fb37952f948
diff --git a/metadata/md5-cache/sci-libs/vtk-9.2.6 b/metadata/md5-cache/sci-libs/vtk-9.2.6
index a8a7dd4eb56d..e990a49732e3 100644
--- a/metadata/md5-cache/sci-libs/vtk-9.2.6
+++ b/metadata/md5-cache/sci-libs/vtk-9.2.6
@@ -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	fc2f89084f590ac95c004ea95b0d2f80	cuda	a7ac8c78a0b64b58207dc6fda3ad9c7d	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	webapp	1aad5c010cfdf11d0376c80467b0de4c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	fc2f89084f590ac95c004ea95b0d2f80	cuda	a7ac8c78a0b64b58207dc6fda3ad9c7d	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	webapp	1aad5c010cfdf11d0376c80467b0de4c	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8ddb283bd00bd904ffbfede0c1278a69
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 1121c7a2ad38..8040d1f9b296 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/octave-7.3.0-r2 b/metadata/md5-cache/sci-mathematics/octave-7.3.0-r2
index 2ecb5592575b..73c61a66ffed 100644
--- a/metadata/md5-cache/sci-mathematics/octave-7.3.0-r2
+++ b/metadata/md5-cache/sci-mathematics/octave-7.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/7.3.0
 SRC_URI=mirror://gnu/octave/octave-7.3.0.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b8120f83285fc745d8397342c2e07ad1
diff --git a/metadata/md5-cache/sci-mathematics/octave-8.1.0 b/metadata/md5-cache/sci-mathematics/octave-8.1.0
index 6b1a2dae6d83..ceb52a0c67e0 100644
--- a/metadata/md5-cache/sci-mathematics/octave-8.1.0
+++ b/metadata/md5-cache/sci-mathematics/octave-8.1.0
@@ -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.1.0
 SRC_URI=mirror://gnu/octave/octave-8.1.0.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=505fba3c2d070a1e9c92410f62b34df2
diff --git a/metadata/md5-cache/sci-mathematics/octave-8.2.0 b/metadata/md5-cache/sci-mathematics/octave-8.2.0
index e993f21d19cb..c994566c16df 100644
--- a/metadata/md5-cache/sci-mathematics/octave-8.2.0
+++ b/metadata/md5-cache/sci-mathematics/octave-8.2.0
@@ -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.2.0
 SRC_URI=mirror://gnu/octave/octave-8.2.0.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8e5747ea03b5a7920bc06fcc3a917d6c
diff --git a/metadata/md5-cache/sci-mathematics/octave-8.3.0 b/metadata/md5-cache/sci-mathematics/octave-8.3.0
index bfe5b5444dea..89659cc22a08 100644
--- a/metadata/md5-cache/sci-mathematics/octave-8.3.0
+++ b/metadata/md5-cache/sci-mathematics/octave-8.3.0
@@ -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	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8e5747ea03b5a7920bc06fcc3a917d6c
diff --git a/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018 b/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
index 250632538fae..c9f9fd006c8c 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	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=3ecc5cfa262ba9fd5ffbd0f2587dbb92
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.12.1 b/metadata/md5-cache/sci-mathematics/z3-4.12.1
index a2c5b8b61059..cae1a23e0096 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.12.1
+++ b/metadata/md5-cache/sci-mathematics/z3-4.12.1
@@ -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 )
 SLOT=0/4.12
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.12.1.tar.gz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0485c6d91f3ccec13f25dde19032be98
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 04225c0999b6..3b15f693943d 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 8fdf634ab339..df0b147a5b00 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	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 042a47156224..0c99e0d30a37 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	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 0f76d678f4d8..5e16ac70e687 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 8dc5ccdf471e..1a3be326abd2 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	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=dde15c1cca8789141ea5def1a8cc23eb
diff --git a/metadata/md5-cache/sci-physics/thepeg-2.2.3 b/metadata/md5-cache/sci-physics/thepeg-2.2.3
index 4d02a4189ac2..d5f678a213e2 100644
--- a/metadata/md5-cache/sci-physics/thepeg-2.2.3
+++ b/metadata/md5-cache/sci-physics/thepeg-2.2.3
@@ -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? ( 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	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=af4a383a085d345c42b73a6be44d190a
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 97be7a375db6..5cc9ae8c74c0 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 a86d74237e6f..d52816890928 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	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	b0070ace51ab296c51f93ef99c467be3	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=c7e5cc39217c49f76afad5deb4f69733
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index db3038d814b2..9656a48452b6 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/smcipmitool-2.27.2.230221 b/metadata/md5-cache/sys-apps/smcipmitool-2.27.2.230221
index 2a0e484ba1d2..1818624bae00 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	prefix	eab3c99d77fe00506c109c8a736186f7
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	prefix	eab3c99d77fe00506c109c8a736186f7
 _md5_=71e4c89c2df74ec302ba110a2a7af5e1
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 8e8cfa8c2262..077e5dd099a7 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 c2d3937081e0..3fbbabd6e84d 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=cf00bdd6e49647ab81a30dbbc58904e4
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 e74ed60a38d0..2ba46ada4d58 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	a7ac8c78a0b64b58207dc6fda3ad9c7d	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_eclasses_=cuda	a7ac8c78a0b64b58207dc6fda3ad9c7d	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
 _md5_=dc25b13a4bf9bd110a3ea5d57dc1fb41
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 10551c1940bc..101f59863958 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 10afb0101865..c1b0b8cb30a3 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 2fa1539a8953..1f6429dd2d68 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _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 89363da0e708..bdb036c5eb8e 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=b033a1b1b3fee29fb76a5a87f4447a2a
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.7.1 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.7.1
index 8bba0e5c13fb..b49d79ca808f 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.7.1
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.7.1
@@ -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.7.1/apache-zookeeper-3.7.1-bin.tar.gz -> zookeeper-bin-3.7.1.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=bccafb8fe60743e95a7f4926f08118c9
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.0 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.0
index 8a04798c5993..2e2e090845fb 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.0
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.0
@@ -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.0/apache-zookeeper-3.8.0-bin.tar.gz -> zookeeper-bin-3.8.0.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=ac98fa3ab894b75d3504f3d23829656c
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.1 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.1
index 135524ee7271..66c55db6546c 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.1
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.1
@@ -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.1/apache-zookeeper-3.8.1-bin.tar.gz -> zookeeper-bin-3.8.1.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8f4981be5e860453b6b04076da8eeb4b
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.2 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.2
index 11b7434b1d37..899d3cb1b965 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.2
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.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.8.2/apache-zookeeper-3.8.2-bin.tar.gz -> zookeeper-bin-3.8.2.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8f4981be5e860453b6b04076da8eeb4b
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.3 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.3
index 142cac9c8a7a..9d3f8ca4d63f 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.3
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.3
@@ -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.3/apache-zookeeper-3.8.3-bin.tar.gz -> zookeeper-bin-3.8.3.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8f4981be5e860453b6b04076da8eeb4b
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.9.0 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.9.0
index 9c21a162c565..1ed20863fd15 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.9.0
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.9.0
@@ -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.0/apache-zookeeper-3.9.0-bin.tar.gz -> zookeeper-bin-3.9.0.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8f4981be5e860453b6b04076da8eeb4b
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.9.1 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.9.1
index b3c5f006651b..7b858ff49252 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.9.1
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.9.1
@@ -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.1/apache-zookeeper-3.9.1-bin.tar.gz -> zookeeper-bin-3.9.1.tar.gz
-_eclasses_=java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=8f4981be5e860453b6b04076da8eeb4b
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 35ae74bd25f3..c8e76c620a02 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/gettext-0.21.1 b/metadata/md5-cache/sys-devel/gettext-0.21.1
index dc84259b3224..803cec50cae6 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	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=d1b3c7cbf4fd02e5e927a847cb1eff6e
diff --git a/metadata/md5-cache/sys-devel/gettext-0.22-r1 b/metadata/md5-cache/sys-devel/gettext-0.22-r1
index 188f47fcb182..37e7254d63db 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.22-r1
+++ b/metadata/md5-cache/sys-devel/gettext-0.22-r1
@@ -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.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.22.tar.xz.sig )
-_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=715f8217e1e6d16027302661ae4813eb
diff --git a/metadata/md5-cache/sys-devel/gettext-0.22.2 b/metadata/md5-cache/sys-devel/gettext-0.22.2
index e32079b45cc7..190cc63c767a 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.22.2
+++ b/metadata/md5-cache/sys-devel/gettext-0.22.2
@@ -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.2.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.22.2.tar.xz.sig )
-_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=6a1b4641d062cb9a56a162a267a54fd7
diff --git a/metadata/md5-cache/sys-devel/gettext-0.22.3 b/metadata/md5-cache/sys-devel/gettext-0.22.3
index 8590596a45f9..35edc1d90808 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.22.3
+++ b/metadata/md5-cache/sys-devel/gettext-0.22.3
@@ -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.3.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.22.3.tar.xz.sig )
-_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	30b5d143e64d691346fcdd85eef1c614	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=6a1b4641d062cb9a56a162a267a54fd7
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 0a840311285f..280a6f93f87c 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 df6916b11952..b8b6115c297d 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=63e25571aa60fbe2291074f07f668d2c
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 1e389770d057..67723ea55a9d 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/bottom-0.9.6 b/metadata/md5-cache/sys-process/bottom-0.9.6
index 259b296bc25b..b7e58a6a967c 100644
--- a/metadata/md5-cache/sys-process/bottom-0.9.6
+++ b/metadata/md5-cache/sys-process/bottom-0.9.6
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/ClementTsang/bottom
 INHERIT=bash-completion-r1 cargo
 IUSE=+battery +gpu +zfs debug
-KEYWORDS=~amd64 ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/addr2line/0.21.0/download -> addr2line-0.21.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.8.3/download -> ahash-0.8.3.crate https://crates.io/api/v1/crates/aho-corasick/1.0.4/download -> aho-corasick-1.0.4.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/anstream/0.3.2/download -> anstream-0.3.2.crate https://crates.io/api/v1/crates/anstyle/1.0.1/download -> anstyle-1.0.1.crate https://crates.io/api/v1/crates/anstyle-parse/0.2.1/download -> anstyle-parse-0.2.1.crate https://crates.io/api/v1/crates/anstyle-query/1.0.0/download -> anstyle-query-1.0.0.crate https://crates.io/api/v1/crates/anstyle-wincon/1.0.2/download -> anstyle-wincon-1.0.2.crate https://crates.io/api/v1/crates/anyhow/1.0.75/download -> anyhow-1.0.75.crate https://crates.io/api/v1/crates/assert_cmd/2.0.12/download -> assert_cmd-2.0.12.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.69/download -> backtrace-0.3.69.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.4.0/download -> bitflags-2.4.0.crate https://crates.io/api/v1/crates/bottom/0.9.6/download -> bottom-0.9.6.crate https://crates.io/api/v1/crates/bstr/1.6.0/download -> bstr-1.6.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cargo-husky/1.5.0/download -> cargo-husky-1.5.0.crate https://crates.io/api/v1/crates/cassowary/0.3.0/download -> cassowary-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.82/download -> cc-1.0.82.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/4.3.23/download -> clap-4.3.23.crate https://crates.io/api/v1/crates/clap_builder/4.3.23/download -> clap_builder-4.3.23.crate https://crates.io/api/v1/crates/clap_complete/4.3.2/download -> clap_complete-4.3.2.crate https://crates.io/api/v1/crates/clap_lex/0.5.0/download -> clap_lex-0.5.0.crate https://crates.io/api/v1/crates/clap_mangen/0.2.12/download -> clap_mangen-0.2.12.crate https://crates.io/api/v1/crates/colorchoice/1.0.0/download -> colorchoice-1.0.0.crate https://crates.io/api/v1/crates/concat-string/1.0.1/download -> concat-string-1.0.1.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.4/download -> core-foundation-sys-0.8.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.8/download -> crossbeam-channel-0.5.8.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.3/download -> crossbeam-deque-0.8.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.15/download -> crossbeam-epoch-0.9.15.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.16/download -> crossbeam-utils-0.8.16.crate https://crates.io/api/v1/crates/crossterm/0.26.1/download -> crossterm-0.26.1.crate https://crates.io/api/v1/crates/crossterm/0.27.0/download -> crossterm-0.27.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.9.1/download -> crossterm_winapi-0.9.1.crate https://crates.io/api/v1/crates/ctrlc/3.4.0/download -> ctrlc-3.4.0.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/deranged/0.3.7/download -> deranged-0.3.7.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/dirs/5.0.1/download -> dirs-5.0.1.crate https://crates.io/api/v1/crates/dirs-sys/0.4.1/download -> dirs-sys-0.4.1.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.9.0/download -> either-1.9.0.crate https://crates.io/api/v1/crates/enum-as-inner/0.5.1/download -> enum-as-inner-0.5.1.crate https://crates.io/api/v1/crates/equivalent/1.0.1/download -> equivalent-1.0.1.crate https://crates.io/api/v1/crates/errno/0.3.2/download -> errno-0.3.2.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fern/0.6.2/download -> fern-0.6.2.crate https://crates.io/api/v1/crates/filedescriptor/0.8.2/download -> filedescriptor-0.8.2.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/getrandom/0.2.10/download -> getrandom-0.2.10.crate https://crates.io/api/v1/crates/gimli/0.28.0/download -> gimli-0.28.0.crate https://crates.io/api/v1/crates/hashbrown/0.14.0/download -> hashbrown-0.14.0.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.3.2/download -> hermit-abi-0.3.2.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.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/indexmap/2.0.0/download -> indexmap-2.0.0.crate https://crates.io/api/v1/crates/indoc/2.0.3/download -> indoc-2.0.3.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.11/download -> io-lifetimes-1.0.11.crate https://crates.io/api/v1/crates/is-terminal/0.4.9/download -> is-terminal-0.4.9.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itertools/0.11.0/download -> itertools-0.11.0.crate https://crates.io/api/v1/crates/itoa/1.0.9/download -> itoa-1.0.9.crate https://crates.io/api/v1/crates/kstring/2.0.0/download -> kstring-2.0.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.147/download -> libc-0.2.147.crate https://crates.io/api/v1/crates/libloading/0.7.4/download -> libloading-0.7.4.crate https://crates.io/api/v1/crates/linux-raw-sys/0.3.8/download -> linux-raw-sys-0.3.8.crate https://crates.io/api/v1/crates/linux-raw-sys/0.4.5/download -> linux-raw-sys-0.4.5.crate https://crates.io/api/v1/crates/lock_api/0.4.10/download -> lock_api-0.4.10.crate https://crates.io/api/v1/crates/log/0.4.20/download -> log-0.4.20.crate https://crates.io/api/v1/crates/mach2/0.4.1/download -> mach2-0.4.1.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.7.1/download -> miniz_oxide-0.7.1.crate https://crates.io/api/v1/crates/mio/0.8.8/download -> mio-0.8.8.crate https://crates.io/api/v1/crates/nix/0.26.2/download -> nix-0.26.2.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/ntapi/0.4.1/download -> ntapi-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.16/download -> num-traits-0.2.16.crate https://crates.io/api/v1/crates/num_cpus/1.16.0/download -> num_cpus-1.16.0.crate https://crates.io/api/v1/crates/nvml-wrapper/0.9.0/download -> nvml-wrapper-0.9.0.crate https://crates.io/api/v1/crates/nvml-wrapper-sys/0.7.0/download -> nvml-wrapper-sys-0.7.0.crate https://crates.io/api/v1/crates/object/0.32.0/download -> object-0.32.0.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/option-ext/0.2.0/download -> option-ext-0.2.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.8/download -> parking_lot_core-0.9.8.crate https://crates.io/api/v1/crates/paste/1.0.14/download -> paste-1.0.14.crate https://crates.io/api/v1/crates/predicates/3.0.3/download -> predicates-3.0.3.crate https://crates.io/api/v1/crates/predicates-core/1.0.6/download -> predicates-core-1.0.6.crate https://crates.io/api/v1/crates/predicates-tree/1.0.9/download -> predicates-tree-1.0.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.66/download -> proc-macro2-1.0.66.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/ratatui/0.22.0/download -> ratatui-0.22.0.crate https://crates.io/api/v1/crates/rayon/1.7.0/download -> rayon-1.7.0.crate https://crates.io/api/v1/crates/rayon-core/1.11.0/download -> rayon-core-1.11.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_syscall/0.3.5/download -> redox_syscall-0.3.5.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.9.4/download -> regex-1.9.4.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/roff/0.2.1/download -> roff-0.2.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.23/download -> rustc-demangle-0.1.23.crate https://crates.io/api/v1/crates/rustix/0.37.23/download -> rustix-0.37.23.crate https://crates.io/api/v1/crates/rustix/0.38.9/download -> rustix-0.38.9.crate https://crates.io/api/v1/crates/ryu/1.0.15/download -> ryu-1.0.15.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.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/serde/1.0.188/download -> serde-1.0.188.crate https://crates.io/api/v1/crates/serde_derive/1.0.188/download -> serde_derive-1.0.188.crate https://crates.io/api/v1/crates/serde_json/1.0.105/download -> serde_json-1.0.105.crate https://crates.io/api/v1/crates/serde_spanned/0.6.3/download -> serde_spanned-0.6.3.crate https://crates.io/api/v1/crates/signal-hook/0.3.17/download -> signal-hook-0.3.17.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.3/download -> signal-hook-mio-0.2.3.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.1/download -> signal-hook-registry-1.4.1.crate https://crates.io/api/v1/crates/smallvec/1.11.0/download -> smallvec-1.11.0.crate https://crates.io/api/v1/crates/starship-battery/0.8.2/download -> starship-battery-0.8.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.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.29/download -> syn-2.0.29.crate https://crates.io/api/v1/crates/sysctl/0.5.4/download -> sysctl-0.5.4.crate https://crates.io/api/v1/crates/sysinfo/0.29.8/download -> sysinfo-0.29.8.crate https://crates.io/api/v1/crates/terminal_size/0.2.6/download -> terminal_size-0.2.6.crate https://crates.io/api/v1/crates/termtree/0.4.1/download -> termtree-0.4.1.crate https://crates.io/api/v1/crates/thiserror/1.0.47/download -> thiserror-1.0.47.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.47/download -> thiserror-impl-1.0.47.crate https://crates.io/api/v1/crates/time/0.3.27/download -> time-0.3.27.crate https://crates.io/api/v1/crates/time-core/0.1.1/download -> time-core-0.1.1.crate https://crates.io/api/v1/crates/time-macros/0.2.13/download -> time-macros-0.2.13.crate https://crates.io/api/v1/crates/toml_datetime/0.6.3/download -> toml_datetime-0.6.3.crate https://crates.io/api/v1/crates/toml_edit/0.19.14/download -> toml_edit-0.19.14.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.11/download -> unicode-ident-1.0.11.crate https://crates.io/api/v1/crates/unicode-segmentation/1.10.1/download -> unicode-segmentation-1.10.1.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/uom/0.35.0/download -> uom-0.35.0.crate https://crates.io/api/v1/crates/utf8parse/0.2.1/download -> utf8parse-0.2.1.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/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.3/download -> walkdir-2.3.3.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.51.1/download -> windows-0.51.1.crate https://crates.io/api/v1/crates/windows-core/0.51.1/download -> windows-core-0.51.1.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-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 https://crates.io/api/v1/crates/winnow/0.5.14/download -> winnow-0.5.14.crate https://crates.io/api/v1/crates/wrapcenum-derive/0.4.0/download -> wrapcenum-derive-0.4.0.crate
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	8520ae1bed0e6965d027399b471a3595	flag-o-matic	e5cc383ea8420f92fe3737be790021dc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=1c505969512ecf14ca887d953b0aa049
+_md5_=d600d8799c17f5d7c502463d539c9066
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 78a38685c29c..609ddf32bdb5 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/zeppelin-bin-0.10.1 b/metadata/md5-cache/www-apps/zeppelin-bin-0.10.1
index 916e90854a31..8b4c54d4da03 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	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614
 _md5_=302dbedf95d2a743d3b905243d71f040
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 2e5523ff673c..a5c910934610 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.15 b/metadata/md5-cache/www-servers/tomcat-10.1.15
index f04b7c328793..c8cfe2cd0911 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.1.15
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.15
@@ -12,5 +12,5 @@ RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-mi
 RESTRICT=test !test? ( test )
 SLOT=10.1
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.15/src/apache-tomcat-10.1.15-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.1/biz.aQute.bnd-6.4.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.15/src/apache-tomcat-10.1.15-src.tar.gz.asc )
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=45d8f63fcd990352e46d17cd654a6065
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.95 b/metadata/md5-cache/www-servers/tomcat-8.5.95
index ecf01d1a093f..5214881d470c 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.95
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.95
@@ -12,5 +12,5 @@ RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/j
 RESTRICT=test !test? ( test )
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.95/src/apache-tomcat-8.5.95-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.95/src/apache-tomcat-8.5.95-src.tar.gz.asc )
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=7955f81eb23457c5c48117eca424c49f
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.82 b/metadata/md5-cache/www-servers/tomcat-9.0.82
index 34966a68e30c..ba7b4da754d2 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.82
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.82
@@ -12,5 +12,5 @@ RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-
 RESTRICT=test !test? ( test )
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.82/src/apache-tomcat-9.0.82-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.1/biz.aQute.bnd-6.4.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.82/src/apache-tomcat-9.0.82-src.tar.gz.asc )
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	30b5d143e64d691346fcdd85eef1c614	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
 _md5_=c85153890eeecdd8ec9ebcc83db5fc77
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 60d5671bfdf3..531c07aac0ad 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/kitty-0.30.1 b/metadata/md5-cache/x11-terms/kitty-0.30.1
index a633b3f997d3..e876cdd69f57 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.30.1
+++ b/metadata/md5-cache/x11-terms/kitty-0.30.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://sw.kovidgoyal.net/kitty/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg verify-sig
 IUSE=+X test wayland python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3 ZLIB Apache-2.0 BSD BSD-2 MIT MPL-2.0
 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-libs/openssl:= dev-libs/xxhash media-libs/fontconfig media-libs/harfbuzz:=[truetype] media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-0.30.1 ~x11-terms/kitty-terminfo-0.30.1 X? ( x11-libs/libX11 ) wayland? ( dev-libs/wayland ) !sci-mathematics/kissat
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) || ( X wayland ) test? ( X wayland )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.30.1/kitty-0.30.1.tar.xz https://dev.gentoo.org/~ionen/distfiles/kitty-0.30.1-vendor.tar.xz verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v0.30.1/kitty-0.30.1.tar.xz.sig )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=490d4cd3b59e4db5af964e71bb9d3bc5
+_md5_=66821f28efc521cba34988c42b70d576
diff --git a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.30.1 b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.30.1
index 88119a7bafb1..b9f77ff3daac 100644
--- a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.30.1
+++ b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.30.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Shell integration scripts for kitty, a GPU-based terminal emulator
 EAPI=8
 HOMEPAGE=https://sw.kovidgoyal.net/kitty/
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.30.1/kitty-0.30.1.tar.xz
-_md5_=094f859ce7ea81b2668e3db01ecfddf2
+_md5_=ef31f9a342d698bc5bb395bc2ac7013a
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.30.1 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.30.1
index 2fcfca273116..d7512aeb31ee 100644
--- a/metadata/md5-cache/x11-terms/kitty-terminfo-0.30.1
+++ b/metadata/md5-cache/x11-terms/kitty-terminfo-0.30.1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Terminfo for kitty, a GPU-based terminal emulator
 EAPI=8
 HOMEPAGE=https://sw.kovidgoyal.net/kitty/
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.30.1/kitty-0.30.1.tar.xz
-_md5_=1271db4a43bedbc8e4a058c3a7ccaf6a
+_md5_=4abd21149d01157f3d0b778f786a74b5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 33e116565463..ce9b4cf71cd4 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-10-18T02:40:01Z
+TIMESTAMP 2023-10-18T08:40:03Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUvRYFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUvmeNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBwfw//dz7ryVYQPuEhHBkOgldvT4cQbyttz2BeX0M2wyPIoaQ1rdSggj0WkgLa
-rr1+e9fmmTgZG2P+PKnjb8/k+XjBYRsEfb0IfDazKEqDJa5RKRrrvpVcrK0aa/dw
-3VZ+R8pxkYkm6+0fA+RK3G0NenY/RYH1Lpr9yTeX+HAhiclymxXNb8rd5bNyfSNr
-Ha+SdqTDOl929d/LDgqKECVJcGVyzRw/5pglv9zGISR4oW8fjCllBthYxpvmTwMb
-tG/rFVJ37d0fblNSc+L7C/6L4u0BEe93m8kophCZoFPmjazvraPBOdn9yMGNxMyM
-+0RlQXN285xBDNrvOLeXQYulzwCWkmimkXHAWbr/T9zBTHZ8lDVRzO8aekhns4vD
-w9TsxlFAacXiHyS74Xhb3RoMt4Php0FaUCX6darhrwpFLa21eW37I1MOBXf5x30Z
-g3pwNVKqz3XjAbkqCv7OM8Bxql4VdC1+ej23qRBuOBgLyPxLXF6mSclrXOLpNNqB
-WyxEOYUzDZTkhJYHybXxlrk7mzDyvRCFfqjTLTpxVY0FoaodHBL9FtQrBQiKJmLR
-/ztzGaQt32+Cn+0UHJWt1GF+3AIecjQy6p494cGNfxvguumVm7oZDDufHEddR8sW
-9sJN6OWPofdtPZnpYQnPe3ITCkfwFhfLgx696IlM528f9gaft5Q=
-=AIGG
+klC8hQ/5AYCWEbe5KrirvjTB7mvLe6PwyHyXKUR1Tz6jqUdloHcCSz5PC7pdQDCa
+ZbwEKtITN7lIWmYRaWNLlbkzgii3vCCyFuTykk9GKvvdMnNhh2bi1JerxHnmS9XQ
+azo9QduxqSZs9Yl9odeVlWnE2yAWtpaii+x1/Kk+d8x3SooSoGsguECjp3Ur7Bhk
+2ysabItLeycHlsJst8a1x4IdSeBt5j+1RGKyUJTBXbbwELnVTavPfCvJYl6hHg2h
+Ytk7UmIVtVt2Nm5Y99uEFsLr00Cjmkfi0uB3UYLolX5Ajuafh9zdKDtURsKUwPV5
+hzcSw698/nsa8G8WCfuvKOcGAUaPObAAqykEeaG5gib24y2+UTxydLP+uHPJB/or
+dS371Kl0kXKmFhELr6TqKR+ct9xWwX2ynVHz3nWPkuKXjYdymQSdZUcdRaGrv3qK
+/NzHlKjcHLsfaztrdJ+AwkerKKwEkSAn3KC87pk5nmeKJ/cv4dq2XjMAXVv0wCln
+KmEJl+pT+5j2aRoIVR4a0QA3nr2c0sFv1vOwjzLXCRIIGfQ/injZBhrq8Hcln9Pd
+r4mf9bhwLZ4Dw6Ruxb0DsosL/2UbHKhzlMGYxCh95DH28TY9Dqx3t1GmM3vkAvaU
+f8A9bvEUzpAtDKipc0ljcNGoXcKa7xCeJaZEcOFQaPpN9plkS/8=
+=/0rN
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a8de8c0a07fa..96f7df1e2fa7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Oct 2023 02:39:57 +0000
+Wed, 18 Oct 2023 08:39:58 +0000
diff --git a/metadata/stabilization-groups/python/cpython.group b/metadata/stabilization-groups/python/cpython.group
new file mode 100644
index 000000000000..539033834c6e
--- /dev/null
+++ b/metadata/stabilization-groups/python/cpython.group
@@ -0,0 +1,2 @@
+app-doc/python-docs
+dev-lang/python
diff --git a/metadata/timestamp b/metadata/timestamp
index 71c95072be57..a9ae77f060c2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Oct 18 02:39:56 AM UTC 2023
+Wed Oct 18 08:39:58 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8d6a5397f9f1..925afddfb708 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Oct 2023 02:45:01 +0000
+Wed, 18 Oct 2023 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 9d49f0cef0d9..c4b57ca61a19 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f5d1c19fce1e6c6984de130dfde8a5b827de2ed5 1697581676 2023-10-17T22:27:56+00:00
+446869172d79a04a1f764f75058e6b1999dd1a13 1697615595 2023-10-18T07:53:15+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c74d5d58a096..3a837f08d965 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1697596801 Wed 18 Oct 2023 02:40:01 AM UTC
+1697618401 Wed 18 Oct 2023 08:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a8de8c0a07fa..96f7df1e2fa7 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Oct 2023 02:39:57 +0000
+Wed, 18 Oct 2023 08:39:58 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 34fe2fb8d84b..14855fea4315 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index de62ead0c3a4..9a9c36b373dd 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Michał Górny <mgorny@gentoo.org> (2023-10-18)
+# Unblock the support in python-exec while the target is masked.
+dev-lang/python-exec -python_targets_python3_12
+
 # Michał Górny <mgorny@gentoo.org> (2023-06-11)
 # xfce-base/libxfce4windowing is not ready to go stable (4.19 branch).
 xfce-extra/xfce4-pulseaudio-plugin libxfce4windowing
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b4143a6e9979..5ed28f7dde45 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1087,6 +1087,7 @@ app-text/atril:xps - Enable XPS viewer using app-text/libgxps
 app-text/blogc:git - Build blogc-git-receiver tool
 app-text/blogc:httpd - Build blogc-runserver tool
 app-text/blogc:make - Build blogc-make tool
+app-text/calibre:speech - Enable text-to-speech support
 app-text/coolreader:wxwidgets - Use x11-libs/wxGTK instead of Qt5
 app-text/crengine-ng:chm - Support chm format
 app-text/crengine-ng:fribidi - Support bidirectional text by dev-libs/fribidi
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 44e1823fedad..e96a3fee53fc 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/gasgano/Manifest b/sci-astronomy/gasgano/Manifest
index 51d7c7cba1fd..5c27a5c08650 100644
--- a/sci-astronomy/gasgano/Manifest
+++ b/sci-astronomy/gasgano/Manifest
@@ -1,4 +1,4 @@
 DIST VLT-PRO-ESO-19000-1932-V4.pdf 818369 BLAKE2B f58191ca9f1bd72f78e73eceecbfc32331fb88abcaed0eb27f7beb444e47788a95d43f3e8421b235e7637d452d22a773f7363934690644e2cc02acfdfd5cbb11 SHA512 272da18caee1bb1b5228df76a7f09411120be39a4b421b79d48e0bfc09972f250322a718bf380d7a83c3a528151260139efdcd8d2482c6a36ad45d727d93cce1
 DIST gasgano-2.4.8.tar.gz 9211627 BLAKE2B df0a7856ec8b06cb590ff180798841a18f919c55eef4553fb9712e2b8a17d8a39fdeb642c941f8169b866baa2a1fd9ca0795f7c331adfb6ed56c69098abdb9bd SHA512 94fbc9721077b15d2ec06e296d1503a0e33cb845c831a4102740b84d600bc900324ec5293b9a977df0956bd02cd5adf9cc62989be860417e8014e97ead41967c
-EBUILD gasgano-2.4.8.ebuild 964 BLAKE2B c21d12c8ae3171de84716e91883cdae3b102baab166202d42ea19b5e091fe846b47aa26eda16e36cea0b5c090498e5e38cbccb7530e36cc166d568f5a70da8cc SHA512 95a2eead9a15baf2f6e130dc147308a2d7a04359a3dfd4dd7970ad5d8326f487e6c7001b2ba6b7f486a68a52bcb22c58e148710224198e6a0f830c3fe15b563a
+EBUILD gasgano-2.4.8-r1.ebuild 976 BLAKE2B a1b5969cb9c8c896cafb4ecf874d55515b923f65338dc584dc633972176b92e800b90aee8650f2a6a1bfd7329b721921f6a8088620d55f67b936fa6958a55b7b SHA512 3579a73e728c43d0bc6081c9a6acae85e0478f7f781db9fd77100722c6c3bf04a33969ef3cdfdfb2956822275d36e859dfd045fe8625dd936d48c52c2f5f2281
 MISC metadata.xml 737 BLAKE2B 0e0ee3a471a3b6e9e37daf2109d72e64f8bcb0c5823b590051ec3de1113d957c79379caa43d2cae18b85a6e4d0c8cb9d969b6f1c59f948273820e26a516adc3d SHA512 a30d8a4d7c0323a1933fc510e586afc85a6910a2b2ace1fa6d699d10eb502cb6d664ba512787cfbc169b4f9b8e93a3949ffcb3ce36c293f0da47206bbe5a2f13
diff --git a/sci-astronomy/gasgano/gasgano-2.4.8.ebuild b/sci-astronomy/gasgano/gasgano-2.4.8-r1.ebuild
index 3ff50e574f33..2aeaa63b02a0 100644
--- a/sci-astronomy/gasgano/gasgano-2.4.8.ebuild
+++ b/sci-astronomy/gasgano/gasgano-2.4.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,9 +8,9 @@ inherit desktop java-pkg-2
 PDOC=VLT-PRO-ESO-19000-1932-V4
 
 DESCRIPTION="ESO astronomical data file organizer"
-HOMEPAGE="http://www.eso.org/sci/software/gasgano/"
+HOMEPAGE="https://www.eso.org/sci/software/gasgano.html"
 SRC_URI="ftp://ftp.eso.org/pub/dfs/${PN}/${P}.tar.gz
-	doc? ( http://www.eso.org/sci/software/gasgano/${PDOC}.pdf )"
+	doc? ( https://www.eso.org/sci/software/gasgano/${PDOC}.pdf )"
 
 LICENSE="Apache-1.1"
 SLOT="0"
@@ -20,9 +20,9 @@ IUSE="doc"
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND="
 	>=virtual/jre-1.8:*
-	dev-java/gnu-regexp
-	dev-java/junit
-	dev-java/jal"
+	dev-java/gnu-regexp:1
+	dev-java/junit:0
+	dev-java/jal:0"
 
 src_prepare() {
 	default
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 02a4da57b906..5a975f97ed66 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/bottom/Manifest b/sys-process/bottom/Manifest
index 4fc8e72b1173..fd3222dfb1fb 100644
--- a/sys-process/bottom/Manifest
+++ b/sys-process/bottom/Manifest
@@ -293,5 +293,5 @@ DIST winnow-0.5.14.crate 144956 BLAKE2B ae9b3b19cc02de450456369974392bb93dfa8687
 DIST wrapcenum-derive-0.4.0.crate 7281 BLAKE2B fd5c935f64c6bb7d1e7e4fbe38b6550ac1cbea7d0817204e5c0d73c6711028e472f323563ff52e329f9cbadf5d45d547e3468a8b97f3d5577514cdc705714edd SHA512 85b8a9ec70ef30c2de04ad766694a5b29ea97d0cefab0708421976f1b5168761f8af652851155e06b5eb39fce32e3c9ceb4ff440f8ef687aa2b03c7017f1de0d
 EBUILD bottom-0.9.1.ebuild 5065 BLAKE2B 8bb350ee62a4c978ae3014b0e1a17156ef739f8ebd714739c9769385c0841993367f00d1dd2659da6ecda7ed0187e2240d420350dabaf77755e03795776787c6 SHA512 0784bc55cac4ede83cd9c41d9cf97cd42733cd8fd8b64d9e7e3103ffbbd8f12f3dd9f82078a4d4856f04d61a1da3f5a1bb2f3b722313a2242e388d522691390b
 EBUILD bottom-0.9.3.ebuild 4766 BLAKE2B 52489329430de129384ecf2342615d60bf77125cc8a5802da0538ccfa4595ce3943f6e59383d29ec02b77bdeaec21f8a755cc68a7c0f0336053b9d1942d46392 SHA512 18e925b4b7a1b2bb0757b444eb2ef6ebec531dd09683568bba2a515453e7add746a29db516d0875213bdbc65bb2a1d4406e4ab151717b8e3b960ed88ff71b44c
-EBUILD bottom-0.9.6.ebuild 4885 BLAKE2B 137d255bbd4cdb8e3a66e967c895de784b0eaf2494460bdfea5cf69e9306aa8afc9d6b1fcc5cd29273ffe4eaada43070c2be16a39e334cb0b69992c6059cfe71 SHA512 3f060d289baf2f997e5c8da9c18d83daa7901ac76fc39a5f22612dcbcbba31f471b958c1c559ffd0a50cb366a8a5681389d0c261192d82ab54b02ecafedf61f3
+EBUILD bottom-0.9.6.ebuild 4884 BLAKE2B c05b14de019d5c2c903a15d8991ae112d3e4deafc7699be43883766d0cf0f832860d4320a192f6d7334b987622b72e576f9bad8691c6d47c46aa05dbc2e54420 SHA512 1c3924d3e4ee81f9b5511afa0bbecfc63b2bbbcfb7c15cc4250bfb647d909d693648ced9fe77fb769f913ea1666c23fb1efe5525c3a80a59853b9d33fd440762
 MISC metadata.xml 966 BLAKE2B 1b23ea1d8fb31ff8b6d039c408f738d5f2858b17e6ec685265fc19828e3e05a8f10718084a2a72d6d38bf278d6bbd0089777cf99e7366ca11670ab7ce3be4a69 SHA512 3fe83314b77e63a2261bc3c2967f5fc53e590e8f4461609be181504ebd8c690cea119c8dd7b6dec692691e7f33d363f13858b525d09929e2672aadc448443071
diff --git a/sys-process/bottom/bottom-0.9.6.ebuild b/sys-process/bottom/bottom-0.9.6.ebuild
index f5079ea37788..7dbec61affe7 100644
--- a/sys-process/bottom/bottom-0.9.6.ebuild
+++ b/sys-process/bottom/bottom-0.9.6.ebuild
@@ -184,7 +184,7 @@ SRC_URI="$(cargo_crate_uris)"
 
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 IUSE="+battery +gpu +zfs"
 
 # Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 27f4bbf6ddae..a3c4e176d67f 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
index 626e753e9dac..9ec761952986 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -2,6 +2,6 @@ AUX kitty-0.30.1-no-sudo.patch 943 BLAKE2B 9e043ff036d98cb85f841fbeaff1ea586c285
 DIST kitty-0.29.2.tar.xz 7809388 BLAKE2B 6928d79a6cc0eaac4d92ce3babbeb0a42bf1dbc92b775386b521c8399352ba77ab9828f8cfd9f40c3e4f29ae98852b6f3cb9ee1f412474ba2ef655c18d2c294d SHA512 a34d8b5bc817dd9d27f1afa190856d916576f52458ede2253655b294358b6b89b1f103acb90d8d66a494b346420ddedc9fcf1a3399f561268ded82e7b1954b06
 DIST kitty-0.30.1.tar.xz 7799076 BLAKE2B 99ada03fa957819e716d3225fbee20af62135ff8861d3a6ce8aaf442b4526a69f34dae0ec126db48a4336fcbd2dfde5583e2ff8f16140e938fada6c0a8854a60 SHA512 e5fd68b8acf3eae8f53a2c27101d998eb0d8eff1571de1b03ab431bceafcab0efae821590684ec48b5ed6e3d86fb984d9e04784022ba50c0378d37a68598f9ed
 EBUILD kitty-shell-integration-0.29.2.ebuild 1495 BLAKE2B bc45a20de5feb70d9b28c1dd8213e6534c63a92a773977624b99519d3241fd6a88e9ef077bbcbd7085d017f13cfbe4493dfd0465ee7534939e3d57075d04ac32 SHA512 bfd89b4cc1ed6a4140e0c69167d8a60dabef6f9138f8aae5938971ef91510684a6535a5c1d526e11a896a446a54dd6c987ac0bbeaee184ba3884ecfad21bced1
-EBUILD kitty-shell-integration-0.30.1.ebuild 1552 BLAKE2B 9754d1ff17987ab57a19f7073ccb71f614b56fe310db1b7367cba3ca370e8f7d36402cd7b1e3adf3a870cc6e8a605847c61016787a972c9cd2b7d32898d618e0 SHA512 879c6b4718776205946a64c2c74e16edeb9d883aee14cc600a42f186e29700c9fc09f80b2f06064e9f7df097f2f58f18368fca1c1bdb9b8ae1b513a9d7c91813
+EBUILD kitty-shell-integration-0.30.1.ebuild 1550 BLAKE2B 6349b75aa61427e2aa755c7e0ef09e57725c77ea584202a9fbcfd4de2145c9fbc2182b1d2af7d7be35c9bf546960723fb019a7abe9e7080aa62188adf8f16b80 SHA512 232c31fd06e95c0e4443d0723d293889f84fa0ab607297641044cbe41c8530fbf8961467d34e540eb68654c7e14a86530474a321de8d0f8f57abfef82c66543c
 EBUILD kitty-shell-integration-9999.ebuild 1463 BLAKE2B d802b7fbb8458695322a32490f8c78dfa83293e8439b66d7a7e504fc4626c4ad691b113571f265e7417b5ce61d849a7760515596bea930e40357ad072d28b70c SHA512 ab5ba31963236d79445d268512ebef98d6fd7a2ccf4f9c7e4f743801c28c256dc3a97b0baa380e1ba4e35fbde90d725bc891f2e172d0abc6908fe923e4bbffd6
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.30.1.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.30.1.ebuild
index 17f4df44ff93..3ad3570dee0a 100644
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.30.1.ebuild
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.30.1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 RESTRICT="test" # intended to be ran on the full kitty package
 
 PATCHES=(
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index e534cf7ca8a6..8c5162e4bca1 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,6 +1,6 @@
 DIST kitty-0.29.2.tar.xz 7809388 BLAKE2B 6928d79a6cc0eaac4d92ce3babbeb0a42bf1dbc92b775386b521c8399352ba77ab9828f8cfd9f40c3e4f29ae98852b6f3cb9ee1f412474ba2ef655c18d2c294d SHA512 a34d8b5bc817dd9d27f1afa190856d916576f52458ede2253655b294358b6b89b1f103acb90d8d66a494b346420ddedc9fcf1a3399f561268ded82e7b1954b06
 DIST kitty-0.30.1.tar.xz 7799076 BLAKE2B 99ada03fa957819e716d3225fbee20af62135ff8861d3a6ce8aaf442b4526a69f34dae0ec126db48a4336fcbd2dfde5583e2ff8f16140e938fada6c0a8854a60 SHA512 e5fd68b8acf3eae8f53a2c27101d998eb0d8eff1571de1b03ab431bceafcab0efae821590684ec48b5ed6e3d86fb984d9e04784022ba50c0378d37a68598f9ed
 EBUILD kitty-terminfo-0.29.2.ebuild 632 BLAKE2B 080ce8fe07e719f2ae6d70e5d06225e1d24b3eeeea624f7c185a2b0f22956bb77557699e68cf810a2ea4ce28dcc5fe45431a72545db8736656a9b05dbdcefd69 SHA512 7a6cf4fef1f58cfdbed17cf8998d0c2d3571958bd002b4acf933d443048a9b4969c94bab2e98230216a8f0820caa8a29accf03e6ca59a2a10e5f83fca24be5a1
-EBUILD kitty-terminfo-0.30.1.ebuild 634 BLAKE2B 11d12b66f50d9e856af48d8dff2988ccc1ac467a697e2e3d4f5bafd253ce005b82bb04af560b938ed5b3254ed09013a9e8a719847a9fa78c1ed01948e4280126 SHA512 b8d43b0e6a391d3d62d4b91109a8f0227f0b63b2c036c2faac33318ce7147e7e816e7bddda28516c5f210fda812090b1dbffecb35815f7050f4958f8198a95b0
+EBUILD kitty-terminfo-0.30.1.ebuild 632 BLAKE2B 080ce8fe07e719f2ae6d70e5d06225e1d24b3eeeea624f7c185a2b0f22956bb77557699e68cf810a2ea4ce28dcc5fe45431a72545db8736656a9b05dbdcefd69 SHA512 7a6cf4fef1f58cfdbed17cf8998d0c2d3571958bd002b4acf933d443048a9b4969c94bab2e98230216a8f0820caa8a29accf03e6ca59a2a10e5f83fca24be5a1
 EBUILD kitty-terminfo-9999.ebuild 545 BLAKE2B 50bf783694580b016f3291640d6c4ab3e8ee335f78d13b75cb7ebe6628ddd2f244fab2e7c465a3964ed6b5e0ebbdb144c739a01ffa7239c8518503ea107a52f2 SHA512 267b8b4a526ee22159f7c1c0d9a089e183308e1e7f61d775834e4ed5d4f25be7aac8cc3db4afa3c3f1e933159f27abff25c31989dd6478c1727eec590bf0a3c8
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.30.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.30.1.ebuild
index f217412c7ed0..53f4810db87e 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.30.1.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.30.1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 RESTRICT="test" # intended to be ran on the full kitty package
 
 BDEPEND="sys-libs/ncurses"
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 2174b24154ff..1866d1410c7a 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -6,6 +6,6 @@ DIST kitty-0.30.1-vendor.tar.xz 1425096 BLAKE2B dcf65787badf2439b5e7dc9ff1fb2073
 DIST kitty-0.30.1.tar.xz 7799076 BLAKE2B 99ada03fa957819e716d3225fbee20af62135ff8861d3a6ce8aaf442b4526a69f34dae0ec126db48a4336fcbd2dfde5583e2ff8f16140e938fada6c0a8854a60 SHA512 e5fd68b8acf3eae8f53a2c27101d998eb0d8eff1571de1b03ab431bceafcab0efae821590684ec48b5ed6e3d86fb984d9e04784022ba50c0378d37a68598f9ed
 DIST kitty-0.30.1.tar.xz.sig 566 BLAKE2B 18ad4df3ef3e161d8382f635f371b0100ff812d3eb2d5d1a2af1df2e04d1c15a344e4dd86d6a8faaf663a6a9d579521cdacdf6c5b1852d2120d94c43cd765826 SHA512 8c90733cb1683f6cb7c57fcf1efdbd0a99b16c4e1edca9b7e99820e5108694fcee521fecd7adaecc331a744b04d2041594adbf058d6218cd82099550f04b961e
 EBUILD kitty-0.29.2-r1.ebuild 4514 BLAKE2B 7bd3a195e2e87bf5844d95e5c554e59cc995e97e067866d4a091a486c1b4a023116cf4b64d1f08d003746c69dcb772da64e758525f6b0d557cff2c6b99184c8d SHA512 bf2afe85063be288741dda6a2be0946cb51b1e71635ababbbc542b208b8a8857200b19bf38f1d2b117bc709eb4315396292d51a0f61298190fe8e283dbc32e56
-EBUILD kitty-0.30.1.ebuild 4588 BLAKE2B d1d3e189bcdf9caddf8f2397e0132b6f6c504d161b0ac22348c0998b7898bfee28700a9fd4a47fdfe9396f75ad3e581537c4a9cfa4f28aa138723112fab50025 SHA512 7172f62173094ac7c76175d254e94a2295a1274f28b325f6f6bde50043ae69c5403dc7c5b96bbc8cd46902f12a8fe88d6395b92faa4b22ff196d36b282da3721
+EBUILD kitty-0.30.1.ebuild 4586 BLAKE2B 5a4ad41adb6e2ab8b5d166b3afb3f86f88bf8e9027b5e333387cf83bbcea732a8acf73f27fa7f59839c4e04b609322abff5be161d06d7cee8aeaa36e76cea879 SHA512 6457f38a9cd452815e33e8e51d0c0bd009940fa286f63664d07d77570837d503b15dbe42e08dcefeea568b95c9e6fb8884b4b81502bbfde94af0c3970144e7be
 EBUILD kitty-9999.ebuild 4588 BLAKE2B d1d3e189bcdf9caddf8f2397e0132b6f6c504d161b0ac22348c0998b7898bfee28700a9fd4a47fdfe9396f75ad3e581537c4a9cfa4f28aa138723112fab50025 SHA512 7172f62173094ac7c76175d254e94a2295a1274f28b325f6f6bde50043ae69c5403dc7c5b96bbc8cd46902f12a8fe88d6395b92faa4b22ff196d36b282da3721
 MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003
diff --git a/x11-terms/kitty/kitty-0.30.1.ebuild b/x11-terms/kitty/kitty-0.30.1.ebuild
index b5fe9c792ba6..0feadbcf70c2 100644
--- a/x11-terms/kitty/kitty-0.30.1.ebuild
+++ b/x11-terms/kitty/kitty-0.30.1.ebuild
@@ -16,7 +16,7 @@ else
 		https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
 		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )
 	"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Fast, feature-rich, GPU-based terminal"